> -----Original Message----- > From: Intel-wired-lan <[email protected]> On Behalf Of > Ahmed Zaki > Sent: Monday, May 27, 2024 8:58 PM > To: [email protected] > Cc: [email protected]; Zaki, Ahmed <[email protected]>; Marcin > Szycik <[email protected]>; Nguyen, Anthony L > <[email protected]>; Samudrala, Sridhar > <[email protected]>; Keller, Jacob E <[email protected]> > Subject: [Intel-wired-lan] [PATCH iwl-next v2 12/13] iavf: refactor add/del > FDIR > filters > > In preparation for a second type of FDIR filters that can be added by tc-u32, > move > the add/del of the FDIR logic to be entirely contained in iavf_fdir.c. > > The iavf_find_fdir_fltr_by_loc() is renamed to iavf_find_fdir_fltr() to be > more > agnostic to the filter ID parameter (for now @loc, which is relevant only to > current FDIR filters added via ethtool). > > Reviewed-by: Sridhar Samudrala <[email protected]> > Reviewed-by: Marcin Szycik <[email protected]> > Signed-off-by: Ahmed Zaki <[email protected]> > --- > drivers/net/ethernet/intel/iavf/iavf.h | 5 ++ > .../net/ethernet/intel/iavf/iavf_ethtool.c | 56 ++------------- > drivers/net/ethernet/intel/iavf/iavf_fdir.c | 68 +++++++++++++++++-- > drivers/net/ethernet/intel/iavf/iavf_fdir.h | 7 +- > 4 files changed, 79 insertions(+), 57 deletions(-) > > diff --git a/drivers/net/ethernet/intel/iavf/iavf.h > b/drivers/net/ethernet/intel/iavf/iavf.h > index 23a6557fc3db..85bd6a85cf2d 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf.h > +++ b/drivers/net/ethernet/intel/iavf/iavf.h > @@ -444,6 +444,11 @@ struct iavf_adapter { > spinlock_t adv_rss_lock; /* protect the RSS management list */ > }; > > +/* Must be called with fdir_fltr_lock lock held */ static inline bool > +iavf_fdir_max_reached(struct iavf_adapter *adapter) { > + return (adapter->fdir_active_fltr >= IAVF_MAX_FDIR_FILTERS); } > > /* Ethtool Private Flags */ > > diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > index 52273f7eab2c..7ab445eeee18 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > @@ -927,7 +927,7 @@ iavf_get_ethtool_fdir_entry(struct iavf_adapter *adapter,
Tested-by: Rafal Romanowski <[email protected]>
