From patchwork Fri Dec 18 20:28:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Richardson X-Patchwork-Id: 85486 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C9471A09FD; Fri, 18 Dec 2020 21:29:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 07415CB00; Fri, 18 Dec 2020 21:28:48 +0100 (CET) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by dpdk.org (Postfix) with ESMTP id 328D6CAF7; Fri, 18 Dec 2020 21:28:46 +0100 (CET) Received: by mail-oi1-f172.google.com with SMTP id p126so4171557oif.7; Fri, 18 Dec 2020 12:28:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VH0FwAeCy+/d1xs+JCrlgaVvuy9m2mDd/d9Ad9MagNM=; b=eaY52FFgkMZixJ0qSJ5u2mumJ8Iv0f5pKPXz21h8tPxBhZ7EPm1OwPph1BtR75zhuC NCs5IvNKyhytm7UMFO7clFuGD95Gk3H9uIzsSjb9apyDnoj9zb3fTSh4gc0QP1tS75ZU p6yogtcRWA9ZzC4cfn2RSCHQ9FvuVp5rzS8L19GZ3rmcTOTAC7KdqBtObEAArDHbLVs/ 0jF374aaRwYZVSXAklch7GQuhVjbOw33R3PeeuuprCtZq0DhyZ9hLwnsf/E8fo8cobLn hmijF2FN5OWGT7YS5s0Xk2Ca0esY/cKnJkpD65Ku79J6MtFrtSEdbuSSt+KuwK4wAI79 Vaog== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=VH0FwAeCy+/d1xs+JCrlgaVvuy9m2mDd/d9Ad9MagNM=; b=rHq7fPHULrqWzJfkaun8MRe5FoHcLD60FzWbVr95tZQk0K9mMdl1MtoJ1jaF6Q3ZSH QVPyWmnF8P2fLEGnkA4d4lU5lyD/F7iVYEa/wmgGEKH9NvH7Wf21BU+wFlGaKzNzfW3F XNMguvyLG3/UCGQEt0JGt4GqcnN8Um38O7pBNTn7SFYvvxJMK1Cov2ckqRwRNW2o5JoZ 5ksdj6TNl1jd/0U8dPBzktcEkGloJ8AIXZgYsBsej3Y5klGwK7Y/puxK7wCJ9MO/p+2H Jm7+F6WUigxJ4HHMXZEbxkDyZzPRFt+puVHnLTgu6m3zIkfS9yTdgZxeSFYg7pu+QTV0 Qt2w== X-Gm-Message-State: AOAM533QoOLJEQQfyQoqExplYON3FxyNfZfT01hwv0Q2kblfD2rwvhj9 C17HPRjhX1n15eKgb0+jCMY= X-Google-Smtp-Source: ABdhPJwCPZw1Fgk7exEu2SJ3bdzbm4wO/lptqdsaHHNx1SOpeAZccnbsAZZsUIydIs1qWQqnPA4nxg== X-Received: by 2002:aca:c592:: with SMTP id v140mr3955179oif.10.1608323324475; Fri, 18 Dec 2020 12:28:44 -0800 (PST) Received: from CoffeeLake.attlocal.net ([2600:1700:f91:f630:d94f:a2b3:4cb3:e1b]) by smtp.gmail.com with ESMTPSA id n31sm2100059otn.33.2020.12.18.12.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 12:28:44 -0800 (PST) From: Lance Richardson X-Google-Original-From: Lance Richardson To: Ajit Khaparde , Somnath Kotur , Jerin Jacob , Ruifeng Wang , Bruce Richardson , Konstantin Ananyev Cc: dev@dpdk.org, Lance Richardson , stable@dpdk.org Date: Fri, 18 Dec 2020 15:28:36 -0500 Message-Id: <20201218202837.2074736-2-lance604@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201218202837.2074736-1-lance604@gmail.com> References: <20201218202837.2074736-1-lance604@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] net/bnxt: make offload flags mapping per-ring 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: Lance Richardson Refactor offload flags mapping table to be dynamic and per-ring instead of static and global. Signed-off-by: Lance Richardson Cc: stable@dpdk.org --- drivers/net/bnxt/bnxt_rxr.c | 34 +++++++++------------------ drivers/net/bnxt/bnxt_rxr.h | 12 +++++----- drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 10 ++++---- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 10 ++++---- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 288b403bf0..1edc8dac43 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -415,24 +415,14 @@ bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1) return bnxt_ptype_table[index]; } -uint32_t -bnxt_ol_flags_table[BNXT_OL_FLAGS_TBL_DIM] __rte_cache_aligned; - -uint32_t -bnxt_ol_flags_err_table[BNXT_OL_FLAGS_ERR_TBL_DIM] __rte_cache_aligned; - static void __rte_cold -bnxt_init_ol_flags_tables(void) +bnxt_init_ol_flags_tables(struct bnxt_rx_ring_info *rxr) { - static bool initialized; uint32_t *pt; int i; - if (initialized) - return; - /* Initialize ol_flags table. */ - pt = bnxt_ol_flags_table; + pt = rxr->ol_flags_table; for (i = 0; i < BNXT_OL_FLAGS_TBL_DIM; i++) { pt[i] = 0; if (i & RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN) @@ -449,7 +439,7 @@ bnxt_init_ol_flags_tables(void) } /* Initialize checksum error table. */ - pt = bnxt_ol_flags_err_table; + pt = rxr->ol_flags_err_table; for (i = 0; i < BNXT_OL_FLAGS_ERR_TBL_DIM; i++) { pt[i] = 0; if (i & (RX_PKT_CMPL_ERRORS_IP_CS_ERROR >> 4)) @@ -464,13 +454,11 @@ bnxt_init_ol_flags_tables(void) if (i & (RX_PKT_CMPL_ERRORS_T_L4_CS_ERROR >> 4)) pt[i] |= PKT_RX_OUTER_L4_CKSUM_BAD; } - - initialized = true; } static void -bnxt_set_ol_flags(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1, - struct rte_mbuf *mbuf) +bnxt_set_ol_flags(struct bnxt_rx_ring_info *rxr, struct rx_pkt_cmpl *rxcmp, + struct rx_pkt_cmpl_hi *rxcmp1, struct rte_mbuf *mbuf) { uint16_t flags_type, errors, flags; uint64_t ol_flags; @@ -491,10 +479,10 @@ bnxt_set_ol_flags(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1, RX_PKT_CMPL_ERRORS_T_L4_CS_ERROR); errors = (errors >> 4) & flags; - ol_flags = bnxt_ol_flags_table[flags & ~errors]; + ol_flags = rxr->ol_flags_table[flags & ~errors]; if (errors) - ol_flags |= bnxt_ol_flags_err_table[errors]; + ol_flags |= rxr->ol_flags_err_table[errors]; if (flags_type & RX_PKT_CMPL_FLAGS_RSS_VALID) { mbuf->hash.rss = rte_le_to_cpu_32(rxcmp->rss_hash); @@ -749,7 +737,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, mbuf->data_len = mbuf->pkt_len; mbuf->port = rxq->port_id; - bnxt_set_ol_flags(rxcmp, rxcmp1, mbuf); + bnxt_set_ol_flags(rxr, rxcmp, rxcmp1, mbuf); #ifdef RTE_LIBRTE_IEEE1588 if (unlikely((rte_le_to_cpu_16(rxcmp->flags_type) & @@ -1127,9 +1115,6 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) /* Initialize packet type table. */ bnxt_init_ptype_table(); - /* Initialize offload flags parsing table. */ - bnxt_init_ol_flags_tables(); - size = rte_pktmbuf_data_room_size(rxq->mb_pool) - RTE_PKTMBUF_HEADROOM; size = RTE_MIN(BNXT_MAX_PKT_LEN, size); @@ -1139,6 +1124,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) ring = rxr->rx_ring_struct; bnxt_init_rxbds(ring, type, size); + /* Initialize offload flags parsing table. */ + bnxt_init_ol_flags_tables(rxr); + raw_prod = rxr->rx_raw_prod; for (i = 0; i < ring->ring_size; i++) { if (unlikely(!rxr->rx_buf_ring[i])) { diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h index af6ff0972d..4db1e8761e 100644 --- a/drivers/net/bnxt/bnxt_rxr.h +++ b/drivers/net/bnxt/bnxt_rxr.h @@ -42,6 +42,9 @@ static inline uint16_t bnxt_tpa_start_agg_id(struct bnxt *bp, /* Number of descriptors to process per inner loop in vector mode. */ #define RTE_BNXT_DESCS_PER_LOOP 4U +#define BNXT_OL_FLAGS_TBL_DIM 32 +#define BNXT_OL_FLAGS_ERR_TBL_DIM 16 + struct bnxt_tpa_info { struct rte_mbuf *mbuf; uint16_t len; @@ -73,6 +76,9 @@ struct bnxt_rx_ring_info { struct rte_bitmap *ag_bitmap; struct bnxt_tpa_info *tpa_info; + + uint32_t ol_flags_table[BNXT_OL_FLAGS_TBL_DIM]; + uint32_t ol_flags_err_table[BNXT_OL_FLAGS_ERR_TBL_DIM]; }; uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -116,10 +122,4 @@ bnxt_cfa_code_dynfield(struct rte_mbuf *mbuf) #define BNXT_PTYPE_TBL_DIM 128 extern uint32_t bnxt_ptype_table[BNXT_PTYPE_TBL_DIM]; - -#define BNXT_OL_FLAGS_TBL_DIM 32 -extern uint32_t bnxt_ol_flags_table[BNXT_OL_FLAGS_TBL_DIM]; - -#define BNXT_OL_FLAGS_ERR_TBL_DIM 16 -extern uint32_t bnxt_ol_flags_err_table[BNXT_OL_FLAGS_ERR_TBL_DIM]; #endif diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c index 81f9a7da2b..d9ac822be8 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c @@ -27,11 +27,11 @@ uint32_t tmp, of; \ \ of = vgetq_lane_u32((rss_flags), (pi)) | \ - bnxt_ol_flags_table[vgetq_lane_u32((ol_idx), (pi))]; \ + rxr->ol_flags_table[vgetq_lane_u32((ol_idx), (pi))]; \ \ tmp = vgetq_lane_u32((errors), (pi)); \ if (tmp) \ - of |= bnxt_ol_flags_err_table[tmp]; \ + of |= rxr->ol_flags_err_table[tmp]; \ (ol_flags) = of; \ } @@ -58,7 +58,8 @@ static void descs_to_mbufs(uint32x4_t mm_rxcmp[4], uint32x4_t mm_rxcmp1[4], - uint64x2_t mb_init, struct rte_mbuf **mbuf) + uint64x2_t mb_init, struct rte_mbuf **mbuf, + struct bnxt_rx_ring_info *rxr) { const uint8x16_t shuf_msk = { 0xFF, 0xFF, 0xFF, 0xFF, /* pkt_type (zeroes) */ @@ -286,7 +287,8 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, goto out; } - descs_to_mbufs(rxcmp, rxcmp1, mb_init, &rx_pkts[nb_rx_pkts]); + descs_to_mbufs(rxcmp, rxcmp1, mb_init, &rx_pkts[nb_rx_pkts], + rxr); nb_rx_pkts += num_valid; if (num_valid < RTE_BNXT_DESCS_PER_LOOP) diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index ce92629ab0..7f5825d333 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -27,11 +27,11 @@ uint32_t tmp, of; \ \ of = _mm_extract_epi32((rss_flags), (pi)) | \ - bnxt_ol_flags_table[_mm_extract_epi32((ol_index), (pi))]; \ + rxr->ol_flags_table[_mm_extract_epi32((ol_index), (pi))]; \ \ tmp = _mm_extract_epi32((errors), (pi)); \ if (tmp) \ - of |= bnxt_ol_flags_err_table[tmp]; \ + of |= rxr->ol_flags_err_table[tmp]; \ (ol_flags) = of; \ } @@ -54,7 +54,8 @@ static inline void descs_to_mbufs(__m128i mm_rxcmp[4], __m128i mm_rxcmp1[4], - __m128i mbuf_init, struct rte_mbuf **mbuf) + __m128i mbuf_init, struct rte_mbuf **mbuf, + struct bnxt_rx_ring_info *rxr) { const __m128i shuf_msk = _mm_set_epi8(15, 14, 13, 12, /* rss */ @@ -268,7 +269,8 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, goto out; } - descs_to_mbufs(rxcmp, rxcmp1, mbuf_init, &rx_pkts[nb_rx_pkts]); + descs_to_mbufs(rxcmp, rxcmp1, mbuf_init, &rx_pkts[nb_rx_pkts], + rxr); nb_rx_pkts += num_valid; if (num_valid < RTE_BNXT_DESCS_PER_LOOP)