• Brett Creeley's avatar
    ice: Add hot path support for 802.1Q and 802.1ad VLAN offloads · 0d54d8f7
    Brett Creeley authored
    Currently the driver only supports 802.1Q VLAN insertion and stripping.
    However, once Double VLAN Mode (DVM) is fully supported, then both 802.1Q
    and 802.1ad VLAN insertion and stripping will be supported. Unfortunately
    the VSI context parameters only allow for one VLAN ethertype at a time
    for VLAN offloads so only one or the other VLAN ethertype offload can be
    supported at once.
    
    To support this, multiple changes are needed.
    
    Rx path changes:
    
    [1] In DVM, the Rx queue context l2tagsel field needs to be cleared so
    the outermost tag shows up in the l2tag2_2nd field of the Rx flex
    descriptor. In Single VLAN Mode (SVM), the l2tagsel field should remain
    1 to support SVM configurations.
    
    [2] Modify the ice_test_staterr() function to take a __le16 instead of
    the ice_32b_rx_flex_desc union pointer so this function can be used for
    both rx_desc->wb.status_error0 and rx_desc->wb.status_error1.
    
    [3] Add the new inline function ice_get_vlan_tag_from_rx_desc() that
    checks if there is a VLAN tag in l2tag1 or l2tag2_2nd.
    
    [4] In ice_receive_skb(), add a check to see if NETIF_F_HW_VLAN_STAG_RX
    is enabled in netdev->features. If it is, then this is the VLAN
    ethertype that needs to be added to the stripping VLAN tag. Since
    ice_fix_features() prevents CTAG_RX and STAG_RX from being enabled
    simultaneously, the VLAN ethertype will only ever be 802.1Q or 802.1ad.
    
    Tx path changes:
    
    [1] In DVM, the VLAN tag needs to be placed in the l2tag2 field of the Tx
    context descriptor. The new define ICE_TX_FLAGS_HW_OUTER_SINGLE_VLAN was
    added to the list of tx_flags to handle this case.
    
    [2] When the stack requests the VLAN tag to be offloaded on Tx, the
    driver needs to set either ICE_TX_FLAGS_HW_OUTER_SINGLE_VLAN or
    ICE_TX_FLAGS_HW_VLAN, so the tag is inserted in l2tag2 or l2tag1
    respectively. To determine which location to use, set a bit in the Tx
    ring flags field during ring allocation that can be used to determine
    which field to use in the Tx descriptor. In DVM, always use l2tag2,
    and in SVM, always use l2tag1.
    Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
    Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
    Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
    0d54d8f7
ice_txrx.c 68 KB