From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 496B7A04A4; Thu, 30 Apr 2020 22:39:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AB0171DBB4; Thu, 30 Apr 2020 22:39:35 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 47A0D1DB6B for ; Thu, 30 Apr 2020 22:39:34 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id d3so3450075pgj.6 for ; Thu, 30 Apr 2020 13:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=2+BbYplSCLgtip9JKfkbF0nLy2U5RZ8ZbfXUmHQVoQs=; b=VKSPMdRujvBf0PxsY5rQTHRNmwfLniWZuZqAHPhZ2m41at3L7OGLzqBwRWWAbmf/CR ciK7heySYw7Z6tApzyB7YPwgg41LBJgcJMKNMY1bSWO5PpG+miFUqH8EnbkGvMNKZysB FbABwG7n5H677aK3K2wsggoyOEM6A2AqcDm/w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2+BbYplSCLgtip9JKfkbF0nLy2U5RZ8ZbfXUmHQVoQs=; b=dzGyAV6Ha0cZxZoLFwmEGwbZtffNf3ISdxl7tFN68bbIU8F2ulBp1XYgQNLOUZ9oMt SnN/mHnohdT4kxJLfZA6WoEo1amYHsIx75DIGPkolSlHlx+EUutmFd22Gv391pHnBAqX OYD7tOUhj3jxXVCNpSH6A2Oiv/GS8K2jnYQ07kBAs221+JyEYTgm+SrRGw8mRn5THLBI CE6oRWEHzFeAFSsJjoOlAZICH5MhAgYXTd15lDwi9l7bCYiLL3iT3pUHQRk5/dPyQ9lh ipvhvO9fVjCyy8Y6dq7Fg2x0WbiNopYRTpsdFmSArgjpgcRCGqh+JVZt3oRngbLJGPAn CqPw== X-Gm-Message-State: AGi0PuY43k4jVjhv9d5nTk09O9dpajWe7KXgeIvO0C+FpoJv56bLUrIh V006f32q/6b8vPvdKrp2711hjePWtPEgFM4DFA7GalApvQXdY8WnPOGZmwTqiourwt2hXeVtAD5 m8LRp1bVaYg7OHjY6FP7QafQ/1F0rBdcqEY6B5XnBzoWU5oDTKTEvq/W52Gpb4WHdt7PF X-Google-Smtp-Source: APiQypLky6nCjzgmszubFmRFcbmKOO2xV7Ssont263RtqXBw3gVVVOf6oW/4nayDCrKU2yOAmWigSA== X-Received: by 2002:a62:ed14:: with SMTP id u20mr577637pfh.69.1588279172627; Thu, 30 Apr 2020 13:39:32 -0700 (PDT) Received: from S60.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id e11sm555715pfl.85.2020.04.30.13.39.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 13:39:31 -0700 (PDT) From: Venkat Duvvuru To: dev@dpdk.org Cc: Mike Baucom Date: Fri, 1 May 2020 02:09:13 +0530 Message-Id: <1588279153-14028-1-git-send-email-venkatkumar.duvvuru@broadcom.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] net/bnxt: mark handling needs to look at meta_fmt instead of meta data X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Mike Baucom The current mark handling uses the meta data field of the rxcmp as the first level check for determining gfid vs lfid. When the meta data is zero due to only the lowest 16bits of the gfid being set, the cfa code is incorrectly interpreted as being an lfid. Changing code to look at meta fmt instead of the meta data directly for the determination. Signed-off-by: Mike Baucom Reviewed-by: Ajit Kumar Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_rxr.c | 85 +++++++++++++++++++++++++++------------------ drivers/net/bnxt/bnxt_rxr.h | 2 ++ 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index a657150..9ecdf5e 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -409,7 +409,7 @@ bnxt_ulp_set_mark_in_mbuf(struct bnxt *bp, struct rx_pkt_cmpl_hi *rxcmp1, uint32_t cfa_code; uint32_t meta_fmt; uint32_t meta; - uint32_t eem = 0; + bool gfid = false; uint32_t mark_id; uint32_t flags2; int rc; @@ -417,53 +417,70 @@ bnxt_ulp_set_mark_in_mbuf(struct bnxt *bp, struct rx_pkt_cmpl_hi *rxcmp1, cfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code); flags2 = rte_le_to_cpu_32(rxcmp1->flags2); meta = rte_le_to_cpu_32(rxcmp1->metadata); - if (meta) { - meta >>= BNXT_RX_META_CFA_CODE_SHIFT; - /* The flags field holds extra bits of info from [6:4] - * which indicate if the flow is in TCAM or EM or EEM + /* + * The flags field holds extra bits of info from [6:4] + * which indicate if the flow is in TCAM or EM or EEM + */ + meta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >> + BNXT_CFA_META_FMT_SHFT; + + switch (meta_fmt) { + case 0: + /* Not an LFID or GFID, a flush cmd. */ + goto skip_mark; + case 4: + case 5: + /* + * EM/TCAM case + * Assume that EM doesn't support Mark due to GFID + * collisions with EEM. Simply return without setting the mark + * in the mbuf. */ - meta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >> - BNXT_CFA_META_FMT_SHFT; - /* meta_fmt == 4 => 'b100 => 'b10x => EM. - * meta_fmt == 5 => 'b101 => 'b10x => EM + VLAN - * meta_fmt == 6 => 'b110 => 'b11x => EEM - * meta_fmt == 7 => 'b111 => 'b11x => EEM + VLAN. + if (BNXT_CFA_META_EM_TEST(meta)) + goto skip_mark; + /* + * It is a TCAM entry, so it is an LFID. The TCAM IDX and Mode + * can also be determined by decoding the meta_data. We are not + * using these for now. */ - meta_fmt >>= BNXT_CFA_META_FMT_EM_EEM_SHFT; - - eem = meta_fmt == BNXT_CFA_META_FMT_EEM; + break; + case 6: + case 7: + /* EEM Case, only using gfid in EEM for now. */ + gfid = true; - /* For EEM flows, The first part of cfa_code is 16 bits. + /* + * For EEM flows, The first part of cfa_code is 16 bits. * The second part is embedded in the * metadata field from bit 19 onwards. The driver needs to * ignore the first 19 bits of metadata and use the next 12 * bits as higher 12 bits of cfa_code. */ - if (eem) - cfa_code |= meta << BNXT_CFA_CODE_META_SHIFT; + meta >>= BNXT_RX_META_CFA_CODE_SHIFT; + cfa_code |= meta << BNXT_CFA_CODE_META_SHIFT; + break; + default: + /* For other values, the cfa_code is assumed to be an LFID. */ + break; } if (cfa_code) { - mbuf->hash.fdir.hi = 0; - mbuf->hash.fdir.id = 0; - if (eem) - rc = ulp_mark_db_mark_get(&bp->ulp_ctx, true, - cfa_code, &mark_id); - else - rc = ulp_mark_db_mark_get(&bp->ulp_ctx, false, - cfa_code, &mark_id); - /* If the above fails, simply return and don't add the mark to - * mbuf - */ - if (rc) + rc = ulp_mark_db_mark_get(&bp->ulp_ctx, gfid, + cfa_code, &mark_id); + if (!rc) { + /* Got the mark, write it to the mbuf and return */ + mbuf->hash.fdir.hi = mark_id; + mbuf->udata64 = (cfa_code & 0xffffffffull) << 32; + mbuf->hash.fdir.id = rxcmp1->cfa_code; + mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID; return; - - mbuf->hash.fdir.hi = mark_id; - mbuf->udata64 = (cfa_code & 0xffffffffull) << 32; - mbuf->hash.fdir.id = rxcmp1->cfa_code; - mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID; + } } + +skip_mark: + mbuf->hash.fdir.hi = 0; + mbuf->hash.fdir.id = 0; } void bnxt_set_mark_in_mbuf(struct bnxt *bp, diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h index d10dae2..811dcd8 100644 --- a/drivers/net/bnxt/bnxt_rxr.h +++ b/drivers/net/bnxt/bnxt_rxr.h @@ -238,5 +238,7 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, #define BNXT_CFA_META_FMT_SHFT 4 #define BNXT_CFA_META_FMT_EM_EEM_SHFT 1 #define BNXT_CFA_META_FMT_EEM 3 +#define BNXT_CFA_META_EEM_TCAM_SHIFT 31 +#define BNXT_CFA_META_EM_TEST(x) ((x) >> BNXT_CFA_META_EEM_TCAM_SHIFT) #endif -- 2.7.4