> -----Original Message----- > From: Intel-wired-lan <[email protected]> On Behalf Of > Jacob Keller > Sent: Tuesday, November 28, 2023 12:34 AM > To: Intel Wired LAN <[email protected]> > Cc: Keller, Jacob E <[email protected]>; Kitszel, Przemyslaw > <[email protected]>; Nguyen, Anthony L > <[email protected]> > Subject: [Intel-wired-lan] [PATCH iwl-net v2] iavf: validate tx_coalesce_usecs > even if rx_coalesce_usecs is zero > > In __iavf_set_coalesce, the driver checks both ec->rx_coalesce_usecs and > ec->tx_coalesce_usecs for validity. It does this via a chain if > ec->if/else-if > blocks. If every single branch of the series of if statements exited, this > would > be fine. However, the rx_coalesce_usecs is checked against zero to print an > informative message if use_adaptive_rx_coalesce is enabled. If this check is > true, it short circuits the entire chain of statements, preventing validation > of > the tx_coalesce_usecs field. > > Indeed, since commit e792779e6b63 ("iavf: Prevent changing static ITR values > if adaptive moderation is on") the iavf driver actually rejects any change to > the > tx_coalesce_usecs or rx_coalesce_usecs when use_adaptive_tx_coalesce or > use_adaptive_rx_coalesce is enabled, making this checking a bit redundant. > > Fix this error by removing the unnecessary and redundant checks for > use_adaptive_rx_coalesce and use_adaptive_tx_coalesce. Since zero is a valid > value, and since the tx_coalesce_usecs and rx_coalesce_usecs fields are > already > unsigned, remove the minimum value check. This allows assigning an ITR value > ranging from 0-8160 as described by the printed message. > > Fixes: 65e87c0398f5 ("i40evf: support queue-specific settings for interrupt > moderation") > Signed-off-by: Jacob Keller <[email protected]> > --- > > Changes since v1: > * Fix the new check to continue allowing zero as a valid ITR value > > drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 12 ++---------- > drivers/net/ethernet/intel/iavf/iavf_txrx.h | 1 - > 2 files changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > index 6f236d1a6444..19cbfe554689 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
Tested-by: Rafal Romanowski <[email protected]> _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
