openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnxt_en: Fix the vlan_tci exact match check. 

It is possible that OVS may set don’t care for DEI/CFI bit in
vlan_tci mask. Hence, checking for vlan_tci exact match will endup
in a vlan flow rejection.

This patch fixes the problem by checking for vlan_pcp and vid
separately, instead of checking for the entire vlan_tci.

Fixes: e85a9be93c (bnxt_en: do not allow wildcard matches for L2 flows)
Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Venkat Duvvuru 2018-07-09 02:24:47 -04:00 committed by David S. Miller
parent 26420d9ce0
commit e32d4e60b3
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
View File

@ -27,6 +27,15 @@
#define BNXT_FID_INVALID 0xffff #define BNXT_FID_INVALID 0xffff
#define VLAN_TCI(vid, prio) ((vid) | ((prio) << VLAN_PRIO_SHIFT)) #define VLAN_TCI(vid, prio) ((vid) | ((prio) << VLAN_PRIO_SHIFT))
#define is_vlan_pcp_wildcarded(vlan_tci_mask) \
((ntohs(vlan_tci_mask) & VLAN_PRIO_MASK) == 0x0000)
#define is_vlan_pcp_exactmatch(vlan_tci_mask) \
((ntohs(vlan_tci_mask) & VLAN_PRIO_MASK) == VLAN_PRIO_MASK)
#define is_vlan_pcp_zero(vlan_tci) \
((ntohs(vlan_tci) & VLAN_PRIO_MASK) == 0x0000)
#define is_vid_exactmatch(vlan_tci_mask) \
((ntohs(vlan_tci_mask) & VLAN_VID_MASK) == VLAN_VID_MASK)
/* Return the dst fid of the func for flow forwarding /* Return the dst fid of the func for flow forwarding
* For PFs: src_fid is the fid of the PF * For PFs: src_fid is the fid of the PF
* For VF-reps: src_fid the fid of the VF * For VF-reps: src_fid the fid of the VF
@ -389,6 +398,21 @@ static bool is_exactmatch(void *mask, int len)
return true; return true;
} }
static bool is_vlan_tci_allowed(__be16 vlan_tci_mask,
__be16 vlan_tci)
{
/* VLAN priority must be either exactly zero or fully wildcarded and
* VLAN id must be exact match.
*/
if (is_vid_exactmatch(vlan_tci_mask) &&
((is_vlan_pcp_exactmatch(vlan_tci_mask) &&
is_vlan_pcp_zero(vlan_tci)) ||
is_vlan_pcp_wildcarded(vlan_tci_mask)))
return true;
return false;
}
static bool bits_set(void *key, int len) static bool bits_set(void *key, int len)
{ {
const u8 *p = key; const u8 *p = key;
@ -803,9 +827,9 @@ static bool bnxt_tc_can_offload(struct bnxt *bp, struct bnxt_tc_flow *flow)
/* Currently VLAN fields cannot be partial wildcard */ /* Currently VLAN fields cannot be partial wildcard */
if (bits_set(&flow->l2_key.inner_vlan_tci, if (bits_set(&flow->l2_key.inner_vlan_tci,
sizeof(flow->l2_key.inner_vlan_tci)) && sizeof(flow->l2_key.inner_vlan_tci)) &&
!is_exactmatch(&flow->l2_mask.inner_vlan_tci, !is_vlan_tci_allowed(flow->l2_mask.inner_vlan_tci,
sizeof(flow->l2_mask.inner_vlan_tci))) { flow->l2_key.inner_vlan_tci)) {
netdev_info(bp->dev, "Wildcard match unsupported for VLAN TCI\n"); netdev_info(bp->dev, "Unsupported VLAN TCI\n");
return false; return false;
} }
if (bits_set(&flow->l2_key.inner_vlan_tpid, if (bits_set(&flow->l2_key.inner_vlan_tpid,