hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-25 01:55:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ixv: Separate VFTA table for each interface

Browse Source 
The vlan setting is independent for each interface. Use VFTA table in
'struct ixgbe_softc' that is already defined.

This pull request fixes following bug scenario.

    create ixv0.10
    create ixv1.10
    destroy ixv1.10
    create ixv0.11
    ixv0.10 no longer receives vlan 10 packets.

In this case, destroying ixv1.10 affects to ixv0.

MFC after:	1 week
Pull Request:	https://github.com/freebsd/freebsd-src/pull/774
This commit is contained in:
Yuichiro Naito 2023-08-03 13:36:21 -07:00 committed by Kevin Bowling
parent 1b01772f01
commit 61a8231d15
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ixgbe/if_ixv.c
View File

@ -197,12 +197,6 @@ TUNABLE_INT("hw.ixv.flow_control", &ixv_flow_control);
static int ixv_header_split = false; static int ixv_header_split = false;
TUNABLE_INT("hw.ixv.hdr_split", &ixv_header_split); TUNABLE_INT("hw.ixv.hdr_split", &ixv_header_split);
/*
* Shadow VFTA table, this is needed because
* the real filter table gets cleared during
* a soft reset and we need to repopulate it.
*/
static u32 ixv_shadow_vfta[IXGBE_VFTA_SIZE];
extern struct if_txrx ixgbe_txrx; extern struct if_txrx ixgbe_txrx;
static struct if_shared_ctx ixv_sctx_init = { static struct if_shared_ctx ixv_sctx_init = {
@ -1541,9 +1535,9 @@ ixv_setup_vlan_support(if_ctx_t ctx)
* we need to repopulate it now. * we need to repopulate it now.
*/ */
for (int i = 0; i < IXGBE_VFTA_SIZE; i++) { for (int i = 0; i < IXGBE_VFTA_SIZE; i++) {
if (ixv_shadow_vfta[i] == 0) if (sc->shadow_vfta[i] == 0)
continue; continue;
vfta = ixv_shadow_vfta[i]; vfta = sc->shadow_vfta[i];
/* /*
* Reconstruct the vlan id's * Reconstruct the vlan id's
* based on the bits set in each * based on the bits set in each
@ -1579,7 +1573,7 @@ ixv_if_register_vlan(if_ctx_t ctx, u16 vtag)
index = (vtag >> 5) & 0x7F; index = (vtag >> 5) & 0x7F;
bit = vtag & 0x1F; bit = vtag & 0x1F;
ixv_shadow_vfta[index] |= (1 << bit); sc->shadow_vfta[index] |= (1 << bit);
++sc->num_vlans; ++sc->num_vlans;
} /* ixv_if_register_vlan */ } /* ixv_if_register_vlan */
@ -1597,7 +1591,7 @@ ixv_if_unregister_vlan(if_ctx_t ctx, u16 vtag)
index = (vtag >> 5) & 0x7F; index = (vtag >> 5) & 0x7F;
bit = vtag & 0x1F; bit = vtag & 0x1F;
ixv_shadow_vfta[index] &= ~(1 << bit); sc->shadow_vfta[index] &= ~(1 << bit);
--sc->num_vlans; --sc->num_vlans;
} /* ixv_if_unregister_vlan */ } /* ixv_if_unregister_vlan */