[PATCH 19.11 2/2] net/bnxt: fix VLAN indication in Rx mbuf

[Christian Ehrhardt]

On Sun, Dec 5, 2021 at 4:42 AM Kalesh A P
<kalesh-anakkur.purayil at broadcom.com> wrote:
>
> From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
>
> [ upstream commit 620e0290d14cc9a1126ef1af4eaa71ef9eadca72 ]

Applied, thanks!

> Fix to ignore the RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN
> when the firmware doesn't support the VLAN strip offload.
>
> Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code")
>
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
> Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
> Reviewed-by: Lance Richardson <lance.richardson at broadcom.com>
> Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
> ---
>  drivers/net/bnxt/bnxt.h              | 1 +
>  drivers/net/bnxt/bnxt_rxr.c          | 8 +++++---
>  drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 5 +++--
>  3 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
> index 63d7475..73001b1 100644
> --- a/drivers/net/bnxt/bnxt.h
> +++ b/drivers/net/bnxt/bnxt.h
> @@ -599,6 +599,7 @@ struct bnxt {
>         uint32_t                vnic_cap_flags;
>  #define BNXT_VNIC_CAP_COS_CLASSIFY     BIT(0)
>  #define BNXT_VNIC_CAP_VLAN_RX_STRIP    BIT(1)
> +#define BNXT_RX_VLAN_STRIP_EN(bp)      ((bp)->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
>         unsigned int            rx_nr_rings;
>         unsigned int            rx_cp_nr_rings;
>         unsigned int            rx_num_qs_per_vnic;
> diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
> index 56213f0..3355e00 100644
> --- a/drivers/net/bnxt/bnxt_rxr.c
> +++ b/drivers/net/bnxt/bnxt_rxr.c
> @@ -209,8 +209,9 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
>                 mbuf->hash.fdir.id = rte_le_to_cpu_16(tpa_start1->cfa_code);
>                 mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
>         }
> -       if (tpa_start1->flags2 &
> -           rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
> +       if (BNXT_RX_VLAN_STRIP_EN(rxq->bp) &&
> +           (tpa_start1->flags2 &
> +            rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN))) {
>                 mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
>                 mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
>         }
> @@ -601,7 +602,8 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
>         if (agg_buf)
>                 bnxt_rx_pages(rxq, mbuf, &tmp_raw_cons, agg_buf, NULL);
>
> -       if (rxcmp1->flags2 & RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN) {
> +       if (BNXT_RX_VLAN_STRIP_EN(rxq->bp) &&
> +           (rxcmp1->flags2 & RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN)) {
>                 mbuf->vlan_tci = rxcmp1->metadata &
>                         (RX_PKT_CMPL_METADATA_VID_MASK |
>                         RX_PKT_CMPL_METADATA_DE |
> diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
> index 9c3ae39..3d2081b 100644
> --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
> +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
> @@ -287,8 +287,9 @@ recv_burst_vec_sse(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
>                         if (rxcmp->flags_type & RX_PKT_CMPL_FLAGS_RSS_VALID)
>                                 mbuf->ol_flags |= PKT_RX_RSS_HASH;
>
> -                       if (rxcmp1->flags2 &
> -                           RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN) {
> +                       if (BNXT_RX_VLAN_STRIP_EN(rxq->bp) &&
> +                           (rxcmp1->flags2 &
> +                            RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN)) {
>                                 mbuf->vlan_tci = rxcmp1->metadata &
>                                         (RX_PKT_CMPL_METADATA_VID_MASK |
>                                         RX_PKT_CMPL_METADATA_DE |
> --
> 2.10.1
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd