Skip to content

Commit

Permalink
net/bnxt: make offload flags mapping per-ring
Browse files Browse the repository at this point in the history 
[ upstream commit d5bbd72 ]

Refactor offload flags mapping table to be dynamic  and
per-ring instead of static and global.

Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
  • Loading branch information
@bluca
Lance Richardson authored and bluca committed Feb 2, 2021
1 parent 1c1c491 commit cee5f38
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 37 deletions.
34 changes: 11 additions & 23 deletions drivers/net/bnxt/bnxt_rxr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,24 +406,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)
Expand All @@ -440,7 +430,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))
Expand All @@ -455,13 +445,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;
Expand All @@ -482,10 +470,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);
Expand Down Expand Up @@ -740,7 +728,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) &
Expand Down Expand Up @@ -1109,9 +1097,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);

Expand All @@ -1121,6 +1106,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);

prod = rxr->rx_prod;
for (i = 0; i < ring->ring_size; i++) {
if (unlikely(!rxr->rx_buf_ring[i])) {
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/bnxt/bnxt_rxr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
10 changes: 6 additions & 4 deletions drivers/net/bnxt/bnxt_rxtx_vec_neon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
}

Expand All @@ -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) */
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 6 additions & 4 deletions drivers/net/bnxt/bnxt_rxtx_vec_sse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
}

Expand All @@ -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 */
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit cee5f38

Please sign in to comment.