ice: Allow egress control packets from PF_VSI

For control packets (i.e. LLDP packets) to be able to egress
from the main VSI, a bit has to be set in the TX_descriptor.
This should only be done for the main VSI and only if the
FW LLDP agent is disabled.  A bit to allow this also has to
be set in the VSI context.

Add the logic to add the necessary bits in the VSI context
for the PF_VSI and the TX_descriptors for control packets
egressing the PF_VSI.

Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 6e34c40e784055e7f2df8eae3ae7f636f0ce847a..d6279dfe029e6f7ea2b277e1a0183b0a49c44cf6 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -1010,6 +1010,13 @@ static int ice_vsi_init(struct ice_vsi *vsi)
                        ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF;
        }
 
+       /* Allow control frames out of main VSI */
+       if (vsi->type == ICE_VSI_PF) {
+               ctxt->info.sec_flags |= ICE_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD;
+               ctxt->info.valid_sections |=
+                       cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);
+       }
+
        ret = ice_add_vsi(hw, vsi->idx, ctxt, NULL);
        if (ret) {
                dev_err(&pf->pdev->dev,

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index e5c4c9139e546ac24358fd15bf471507d4fc4130..5bf5c179a73879622e2a2ef4c776ac9a3ab6d17b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -2106,6 +2106,7 @@ static netdev_tx_t
 ice_xmit_frame_ring(struct sk_buff *skb, struct ice_ring *tx_ring)
 {
        struct ice_tx_offload_params offload = { 0 };
+       struct ice_vsi *vsi = tx_ring->vsi;
        struct ice_tx_buf *first;
        unsigned int count;
        int tso, csum;
@@ -2153,7 +2154,15 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_ring *tx_ring)
        if (csum < 0)
                goto out_drop;
 
-       if (tso || offload.cd_tunnel_params) {
+       /* allow CONTROL frames egress from main VSI if FW LLDP disabled */
+       if (unlikely(skb->priority == TC_PRIO_CONTROL &&
+                    vsi->type == ICE_VSI_PF &&
+                    vsi->port_info->is_sw_lldp))
+               offload.cd_qw1 |= (u64)(ICE_TX_DESC_DTYPE_CTX |
+                                       ICE_TX_CTX_DESC_SWTCH_UPLINK <<
+                                       ICE_TXD_CTX_QW1_CMD_S);
+
+       if (offload.cd_qw1 & ICE_TX_DESC_DTYPE_CTX) {
                struct ice_tx_ctx_desc *cdesc;
                int i = tx_ring->next_to_use;