igc: Reject NFC rules with multiple matches
Subsystems (2)
PATCH 1/2 igc: Reject NFC rules with multiple matches
The way rx queue assignment based on mac address, ethetype and vlan priority filtering operates in I225 doesn't allow us to properly support NFC rules with multiple matches.
Consider the following example which assigns to queue 2 frames matching the address MACADDR *and* ethertype ETYPE.
$ ethtool -N eth0 flow-type ether dst <MACADDR> proto <ETYPE> queue 2
When such rule is applied, we have 2 unwanted behaviors:
1) Any frame matching MACADDR will be assigned to queue 2. It doesn't matter the ETYPE value.
2) Any accepted frame that has ethertype equals to ETYPE, no matter the mac address, will be assigned to queue 2 as well.
In current code, multiple-match filters are accepted by the driver, even though it doesn't support them properly. This patch adds a check for multiple-match rules in igc_ethtool_is_nfc_rule_valid() so they are rejected.
--- drivers/net/ethernet/intel/igc/igc_ethtool.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/igc/igc_ethtool.c +4 -5
@@ -1222,8 +1222,8 @@ static void igc_ethtool_init_nfc_rule(struct igc_nfc_rule *rule,* @adapter: Pointer to adapter. * @rule: Rule under evaluation. * -* Rules with both destination and source MAC addresses are considered invalid -* since the driver doesn't support them. +* The driver doesn't support rules with multiple matches so if more than +* one bit in filter flags is set, @rule is considered invalid. * * Also, if there is already another rule with the same filter in a different * location, @rule is considered invalid.
@@ -1244,9 +1244,8 @@ static int igc_ethtool_check_nfc_rule(struct igc_adapter *adapter,return -EINVAL ; } -if (flags &IGC_FILTER_FLAG_DST_MAC_ADDR && - flags &IGC_FILTER_FLAG_SRC_MAC_ADDR ) { -netdev_dbg (dev,"Filters with both dst and src are not supported" ); +if (flags & (flags -1 )) { +netdev_dbg (dev,"Rule with multiple matches not supported" );return -EOPNOTSUPP ; }
Signature · 1 line
2.26.2
PATCH 2/2 igc: Fix IGC_MAX_RXNFC_RULES
IGC supports a total of 32 rules. 16 MAC address based, 8 VLAN priority based, and 8 ethertype based. This patch fixes IGC_MAX_RXNFC_RULES accordingly.
--- drivers/net/ethernet/intel/igc/igc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc.h +4 -1
@@ -457,7 +457,10 @@ struct igc_nfc_rule {u16 action; }; -#define IGC_MAX_RXNFC_RULES 16 +/* IGC supports a total of 32 NFC rules: 16 MAC address based,, 8 VLAN priority +* based, and 8 ethertype based. +*/ +#define IGC_MAX_RXNFC_RULES 32/* igc_desc_unused - calculate if we have unused descriptors */ static inline u16 igc_desc_unused (const struct igc_ring *ring)
Signature · 1 line
2.26.2
Neftin
PATCH 2/2 igc: Fix IGC_MAX_RXNFC_RULES
Quoted 16 lines · Andre Guedes
IGC supports a total of 32 rules. 16 MAC address based, 8 VLAN priority based, and 8 ethertype based. This patch fixes
IGC_MAX_RXNFC_RULESaccordingly.Signed-off-by Andre Guedes <[email protected]>--- drivers/net/ethernet/intel/igc/igc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/net/ethernet/intel/igc/igc.h +0
-0@@ -457,7 +457,10 @@ struct igc_nfc_rule {u16 action;
drivers/net/ethernet/intel/igc/igc.h struct igc_nfc_rule { · line 466
Quoted 10 lines
drivers/net/ethernet/intel/igc/igc.h +4
-1}; -#define IGC_MAX_RXNFC_RULES 16 +/* IGC supports a total of 32 NFC rules: 16 MAC address based,, 8 VLAN priority +* based, and 8 ethertype based. +*/ +#define IGC_MAX_RXNFC_RULES 32/* igc_desc_unused - calculate if we have unused descriptors */ static inline u16 igc_desc_unused (const struct igc_ring *ring)