qed, qede: improve chain API and add XDP_REDIRECT support
Subsystems (6)
v2 cover qed, qede: improve chain API and add XDP_REDIRECT support
This series adds missing XDP_REDIRECT case handling in QLogic Everest Ethernet driver with all necessary prerequisites and ops. QEDE Tx relies heavily on chain API, so make sure it is in its best at first.
v2 (from [1]):
- add missing includes to #003 to pass the build on Alpha;
- no functional changes.
[1] https://lore.kernel.org/netdev/[email protected]/
Alexander Lobakin (15):
qed: reformat "qed_chain.h" a bit
qed: reformat Makefile
qed: move chain methods to a separate file
qed: prevent possible double-frees of the chains
qed: sanitize PBL chains allocation
qed: move chain initialization inlines next to allocation functions
qed: simplify initialization of the chains with an external PBL
qed: simplify chain allocation with init params struct
qed: add support for different page sizes for chains
qed: optimize common chain accessors
qed: introduce qed_chain_get_elem_used{,u32}()
qede: reformat several structures in "qede.h"
qede: reformat net_device_ops declarations
qede: refactor XDP Tx processing
qede: add .ndo_xdp_xmit() and XDP_REDIRECT support
drivers/infiniband/hw/qedr/main.c | 20 +- drivers/infiniband/hw/qedr/verbs.c | 97 ++--- drivers/net/ethernet/qlogic/qed/Makefile | 37 +- drivers/net/ethernet/qlogic/qed/qed_chain.c | 369 ++++++++++++++++++ drivers/net/ethernet/qlogic/qed/qed_dev.c | 273 ------------- drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 32 +- drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 39 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 44 ++- .../net/ethernet/qlogic/qed/qed_sp_commands.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_spq.c | 90 +++-- drivers/net/ethernet/qlogic/qede/qede.h | 175 +++++---- drivers/net/ethernet/qlogic/qede/qede_fp.c | 174 ++++++--- drivers/net/ethernet/qlogic/qede/qede_main.c | 185 +++++---- include/linux/qed/qed_chain.h | 328 ++++++---------- include/linux/qed/qed_if.h | 9 +- 15 files changed, 1018 insertions(+), 858 deletions(-) create mode 100644 drivers/net/ethernet/qlogic/qed/qed_chain.c
--
Netdev folks, could you please take the entire series through your tree after the necessary acks and reviews? Patches 8-9 also touch qedr driver under rdma tree, but these changes can't be separated as it would break incremental buildability and bisecting.
Signature · 1 line
2.25.1
PATCH v2 1/15 qed: reformat "qed_chain.h" a bit
Reformat structs and macros definitions a bit prior to making functional changes.
--- include/linux/qed/qed_chain.h | 126 ++++++++++++++++++---------------- 1 file changed, 66 insertions(+), 60 deletions(-)
include/linux/qed/qed_chain.h +66 -60
@@ -26,9 +26,9 @@ enum qed_chain_mode { };enum qed_chain_use_mode { -QED_CHAIN_USE_TO_PRODUCE ,/* Chain starts empty */ -QED_CHAIN_USE_TO_CONSUME ,/* Chain starts full */ -QED_CHAIN_USE_TO_CONSUME_PRODUCE ,/* Chain starts empty */ +QED_CHAIN_USE_TO_PRODUCE ,/* Chain starts empty */ +QED_CHAIN_USE_TO_CONSUME ,/* Chain starts full */ +QED_CHAIN_USE_TO_CONSUME_PRODUCE ,/* Chain starts empty */ };enum qed_chain_cnt_type {
@@ -40,84 +40,86 @@ enum qed_chain_cnt_type { };struct qed_chain_next { -struct regpair next_phys; -void *next_virt; +struct regpair next_phys; +void *next_virt; };struct qed_chain_pbl_u16 { -u16 prod_page_idx; -u16 cons_page_idx; +u16 prod_page_idx; +u16 cons_page_idx; };struct qed_chain_pbl_u32 { -u32 prod_page_idx; -u32 cons_page_idx; +u32 prod_page_idx; +u32 cons_page_idx; };struct qed_chain_ext_pbl { -dma_addr_t p_pbl_phys; -void *p_pbl_virt; +dma_addr_t p_pbl_phys; +void *p_pbl_virt; };struct qed_chain_u16 {/* Cyclic index of next element to produce/consme */ -u16 prod_idx; -u16 cons_idx; +u16 prod_idx; +u16 cons_idx; };struct qed_chain_u32 {/* Cyclic index of next element to produce/consme */ -u32 prod_idx; -u32 cons_idx; +u32 prod_idx; +u32 cons_idx; };struct addr_tbl_entry { -void *virt_addr; -dma_addr_t dma_map; +void *virt_addr; +dma_addr_t dma_map; };struct qed_chain { -/* fastpath portion of the chain - required for commands such +/* Fastpath portion of the chain - required for commands such * as produce / consume. */ +/* Point to next element to produce/consume */ -void *p_prod_elem; -void *p_cons_elem; +void *p_prod_elem; +void *p_cons_elem;/* Fastpath portions of the PBL [if exists] */ +struct {/* Table for keeping the virtual and physical addresses of the * chain pages, respectively to the physical addresses * in the pbl table. */ -struct addr_tbl_entry *pp_addr_tbl; +struct addr_tbl_entry *pp_addr_tbl;union { -struct qed_chain_pbl_u16 u16; -struct qed_chain_pbl_u32 u32; - } c; - } pbl; +struct qed_chain_pbl_u16 u16; +struct qed_chain_pbl_u32 u32; + } c; + } pbl;union { -struct qed_chain_u16 chain16; -struct qed_chain_u32 chain32; - } u; +struct qed_chain_u16 chain16; +struct qed_chain_u32 chain32; + } u;/* Capacity counts only usable elements */ -u32 capacity; -u32 page_cnt; +u32 capacity; +u32 page_cnt; -enum qed_chain_mode mode; +enum qed_chain_mode mode;/* Elements information for fast calculations */ -u16 elem_per_page; -u16 elem_per_page_mask; -u16 elem_size; -u16 next_page_mask; -u16 usable_per_page; -u8 elem_unusable; +u16 elem_per_page; +u16 elem_per_page_mask; +u16 elem_size; +u16 next_page_mask; +u16 usable_per_page; +u8 elem_unusable; -u8 cnt_type; +u8 cnt_type;/* Slowpath of the chain - required for initialization and destruction, * but isn't involved in regular functionality.
@@ -125,43 +127,47 @@ struct qed_chain {/* Base address of a pre-allocated buffer for pbl */ struct { -dma_addr_t p_phys_table; -void *p_virt_table; - } pbl_sp; +dma_addr_t p_phys_table; +void *p_virt_table; + } pbl_sp;/* Address of first page of the chain - the address is required * for fastpath operation [consume/produce] but only for the SINGLE * flavour which isn't considered fastpath [== SPQ]. */ -void *p_virt_addr; -dma_addr_t p_phys_addr; +void *p_virt_addr; +dma_addr_t p_phys_addr;/* Total number of elements [for entire chain] */ -u32 size; +u32 size; -u8 intended_use; +u8 intended_use; -bool b_external_pbl; +bool b_external_pbl; }; -#define QED_CHAIN_PBL_ENTRY_SIZE (8) -#define QED_CHAIN_PAGE_SIZE (0x1000) -#define ELEMS_PER_PAGE (elem_size) (QED_CHAIN_PAGE_SIZE / (elem_size)) +#define QED_CHAIN_PBL_ENTRY_SIZE 8 +#define QED_CHAIN_PAGE_SIZE 0x1000 + +#define ELEMS_PER_PAGE (elem_size) \ + (QED_CHAIN_PAGE_SIZE / (elem_size)) -#define UNUSABLE_ELEMS_PER_PAGE (elem_size, mode) \ - (((mode) == QED_CHAIN_MODE_NEXT_PTR) ? \ - (u8)(1 + ((sizeof(struct qed_chain_next) - 1) / \ - (elem_size))) : 0) +#define UNUSABLE_ELEMS_PER_PAGE (elem_size, mode) \ + (((mode) == QED_CHAIN_MODE_NEXT_PTR) ? \ + (u8)(1 + ((sizeof(struct qed_chain_next) - 1) / (elem_size))) : \ + 0) -#define USABLE_ELEMS_PER_PAGE (elem_size, mode) \ - ((u32)(ELEMS_PER_PAGE(elem_size) - \ - UNUSABLE_ELEMS_PER_PAGE(elem_size, mode))) +#define USABLE_ELEMS_PER_PAGE (elem_size, mode) \ + ((u32)(ELEMS_PER_PAGE(elem_size) - \ + UNUSABLE_ELEMS_PER_PAGE((elem_size), (mode)))) -#define QED_CHAIN_PAGE_CNT (elem_cnt, elem_size, mode) \ - DIV_ROUND_UP(elem_cnt, USABLE_ELEMS_PER_PAGE(elem_size, mode)) +#define QED_CHAIN_PAGE_CNT (elem_cnt, elem_size, mode) \ + DIV_ROUND_UP((elem_cnt), USABLE_ELEMS_PER_PAGE((elem_size), (mode))) -#define is_chain_u16 (p) ((p)->cnt_type == QED_CHAIN_CNT_TYPE_U16) -#define is_chain_u32 (p) ((p)->cnt_type == QED_CHAIN_CNT_TYPE_U32) +#define is_chain_u16 (p) \ + ((p)->cnt_type == QED_CHAIN_CNT_TYPE_U16) +#define is_chain_u32 (p) \ + ((p)->cnt_type == QED_CHAIN_CNT_TYPE_U32)/* Accessors */ static inline u16 qed_chain_get_prod_idx (struct qed_chain *p_chain)
Signature · 1 line
2.25.1
Re: [PATCH v2 net-next 01/15] qed: reformat "qed_chain.h" a bit
Quoted 26 lines · Alexander Lobakin
Reformat structs and macros definitions a bit prior to making functional changes.
Signed-off-by Alexander Lobakin <[email protected]>Signed-off-by Igor Russkikh <[email protected]>Signed-off-by Michal Kalderon <[email protected]>include/linux/qed/qed_chain.h | 126 ++++++++++++++++++---------------- 1 file changed, 66 insertions(+), 60 deletions(-)include/linux/qed/qed_chain.h +4
-3+++ b/include/linux/qed/qed_chain.h@@ -26,9 +26,9 @@ enum qed_chain_mode { };enum qed_chain_use_mode { -QED_CHAIN_USE_TO_PRODUCE ,/* Chain starts empty */ -QED_CHAIN_USE_TO_CONSUME ,/* Chain starts full */ -QED_CHAIN_USE_TO_CONSUME_PRODUCE ,/* Chain starts empty */ +QED_CHAIN_USE_TO_PRODUCE ,/* Chain starts empty */ +QED_CHAIN_USE_TO_CONSUME ,/* Chain starts full */ +QED_CHAIN_USE_TO_CONSUME_PRODUCE ,/* Chain starts empty */ };enum qed_chain_cnt_type {
include/linux/qed/qed_chain.h enum qed_chain_cnt_type { · line 45
Quoted 8 lines
include/linux/qed/qed_chain.h +2
-2@@ -40,84 +40,86 @@ enum qed_chain_cnt_type { };struct qed_chain_next { -struct regpair next_phys; -void *next_virt; +struct regpair next_phys; +void *next_virt; };
I'm surprised this is considered an improvement??
I've been encouring people to go the other way, maintaining vertical alignment is harmful to backporting..
Jason
PATCH v2 2/15 qed: reformat Makefile
In reply to Alexander LobakinList one entry per line and sort them alphabetically to simplify the addition of the new ones.
--- drivers/net/ethernet/qlogic/qed/Makefile | 36 +++++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-)
drivers/net/ethernet/qlogic/qed/Makefile +29 -7
@@ -3,12 +3,34 @@ obj-$(CONFIG_QED) := qed.o -qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \ - qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o \ - qed_selftest.o qed_dcbx.o qed_debug.o qed_ptp.o qed_mng_tlv.o -qed-$(CONFIG_QED_SRIOV) += qed_sriov.o qed_vf.o -qed-$(CONFIG_QED_LL2) += qed_ll2.o -qed-$(CONFIG_QED_RDMA) += qed_roce.o qed_rdma.o qed_iwarp.o -qed-$(CONFIG_QED_ISCSI) += qed_iscsi.o +qed-y := \ + qed_cxt.o \ + qed_dcbx.o \ + qed_debug.o \ + qed_dev.o \ + qed_hw.o \ + qed_init_fw_funcs.o \ + qed_init_ops.o \ + qed_int.o \ + qed_l2.o \ + qed_main.o \ + qed_mcp.o \ + qed_mng_tlv.o \ + qed_ptp.o \ + qed_selftest.o \ + qed_sp_commands.o \ + qed_spq.o + qed-$(CONFIG_QED_FCOE) += qed_fcoe.o +qed-$(CONFIG_QED_ISCSI) += qed_iscsi.o +qed-$(CONFIG_QED_LL2) += qed_ll2.o qed-$(CONFIG_QED_OOO) += qed_ooo.o + +qed-$(CONFIG_QED_RDMA) += \ + qed_iwarp.o \ + qed_rdma.o \ + qed_roce.o + +qed-$(CONFIG_QED_SRIOV) += \ + qed_sriov.o \ + qed_vf.o
Signature · 1 line
2.25.1
PATCH v2 3/15 qed: move chain methods to a separate file
In reply to Alexander LobakinMove chain allocation/freeing functions to a new file to not mix it with hardware-related code.
--- drivers/net/ethernet/qlogic/qed/Makefile | 1 + drivers/net/ethernet/qlogic/qed/qed_chain.c | 302 ++++++++++++++++++++ drivers/net/ethernet/qlogic/qed/qed_dev.c | 273 ------------------ 3 files changed, 303 insertions(+), 273 deletions(-) create mode 100644 drivers/net/ethernet/qlogic/qed/qed_chain.c
drivers/net/ethernet/qlogic/qed/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_QED) := qed.o qed-y := \ + qed_chain.o \ qed_cxt.o \ qed_dcbx.o \ qed_debug.o \
drivers/net/ethernet/qlogic/qed/qed_chain.c new file +302 -0
302 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_dev.c +0 -273
279 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 4/15 qed: prevent possible double-frees of the chains
In reply to Alexander LobakinZero-initialize chain on qed_chain_free(), so it couldn't be freed twice and provoke undefined behaviour.
--- drivers/net/ethernet/qlogic/qed/qed_chain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_chain.c +3 -1
@@ -92,8 +92,10 @@ void qed_chain_free(struct qed_dev *cdev, struct qed_chain *chain)qed_chain_free_pbl (cdev, chain);break ;default : -break ; +return ; } + +qed_chain_init_mem (chain,NULL ,0 ); } static int
Signature · 1 line
2.25.1
PATCH v2 5/15 qed: sanitize PBL chains allocation
In reply to Alexander LobakinPBL chain elements are actually DMA addresses stored in __le64, but currently their size is hardcoded to 8, and DMA addresses are assigned via cast to variable-sized dma_addr_t without any bitwise conversions. Change the type of pbl_virt array to match the actual one, add a new field to store the size of allocated DMA memory and sanitize elements assignment.
Misc: give more logic names to the members of qed_chain::pbl_sp embedded struct.
--- drivers/net/ethernet/qlogic/qed/qed_chain.c | 21 +++++++++---------- .../net/ethernet/qlogic/qed/qed_sp_commands.c | 4 ++-- include/linux/qed/qed_chain.h | 16 +++++++------- 3 files changed, 20 insertions(+), 21 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_chain.c +10 -11
@@ -49,7 +49,7 @@ static void qed_chain_free_pbl(struct qed_dev *cdev, struct qed_chain *chain) {struct device *dev = &cdev->pdev->dev;struct addr_tbl_entry *entry; -u32 pbl_size, i; +u32 i;if (!chain->pbl.pp_addr_tbl)return ;
@@ -63,11 +63,10 @@ static void qed_chain_free_pbl(struct qed_dev *cdev, struct qed_chain *chain) entry->dma_map); } - pbl_size = chain->page_cnt *QED_CHAIN_PBL_ENTRY_SIZE ; -if (!chain->b_external_pbl) -dma_free_coherent (dev, pbl_size, chain->pbl_sp.p_virt_table, - chain->pbl_sp.p_phys_table); +dma_free_coherent (dev, chain->pbl_sp.table_size, + chain->pbl_sp.table_virt, + chain->pbl_sp.table_phys);vfree (chain->pbl.pp_addr_tbl); chain->pbl.pp_addr_tbl =NULL ;
@@ -190,7 +189,7 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain,struct device *dev = &cdev->pdev->dev;struct addr_tbl_entry *addr_tbl;dma_addr_t phys, pbl_phys; -void *pbl_virt; +__le64 *pbl_virt;u32 page_cnt, i;size_t size;void *virt;
@@ -214,7 +213,7 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain, chain->b_external_pbl = true; }else { - size =array_size (page_cnt,QED_CHAIN_PBL_ENTRY_SIZE ); + size =array_size (page_cnt,sizeof (*pbl_virt));if (unlikely (size ==SIZE_MAX ))return -EOVERFLOW ;
@@ -225,8 +224,9 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain,if (!pbl_virt)return -ENOMEM ; - chain->pbl_sp.p_virt_table = pbl_virt; - chain->pbl_sp.p_phys_table = pbl_phys; + chain->pbl_sp.table_virt = pbl_virt; + chain->pbl_sp.table_phys = pbl_phys; + chain->pbl_sp.table_size = size;for (i =0 ; i < page_cnt; i++) { virt = dma_alloc_coherent(dev, QED_CHAIN_PAGE_SIZE, &phys,
@@ -240,8 +240,7 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain, }/* Fill the PBL table with the physical address of the page */ - *(dma_addr_t *)pbl_virt = phys; - pbl_virt +=QED_CHAIN_PBL_ENTRY_SIZE ; + pbl_virt[i] =cpu_to_le64 (phys);/* Keep the virtual address of the page */ addr_tbl[i].virt_addr = virt;
drivers/net/ethernet/qlogic/qed/qed_sp_commands.c +2 -2
@@ -366,11 +366,11 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,/* Place EQ address in RAMROD */ DMA_REGPAIR_LE (p_ramrod->event_ring_pbl_addr, - p_hwfn->p_eq->chain.pbl_sp.p_phys_table); +qed_chain_get_pbl_phys (&p_hwfn->p_eq->chain)); page_cnt = (u8 )qed_chain_get_page_cnt (&p_hwfn->p_eq->chain); p_ramrod->event_ring_num_pages = page_cnt;DMA_REGPAIR_LE (p_ramrod->consolid_q_pbl_addr, - p_hwfn->p_consq->chain.pbl_sp.p_phys_table); +qed_chain_get_pbl_phys (&p_hwfn->p_consq->chain));qed_tunn_set_pf_start_params (p_hwfn, p_tunn, &p_ramrod->tunnel_config);
include/linux/qed/qed_chain.h +8 -8
@@ -127,8 +127,9 @@ struct qed_chain {/* Base address of a pre-allocated buffer for pbl */ struct { -dma_addr_t p_phys_table; -void *p_virt_table; +__le64 *table_virt; +dma_addr_t table_phys; +size_t table_size; } pbl_sp;/* Address of first page of the chain - the address is required
@@ -146,7 +147,6 @@ struct qed_chain {bool b_external_pbl; }; -#define QED_CHAIN_PBL_ENTRY_SIZE 8#define QED_CHAIN_PAGE_SIZE 0x1000#define ELEMS_PER_PAGE (elem_size) \
@@ -236,7 +236,7 @@ static inline u32 qed_chain_get_page_cnt(struct qed_chain *p_chain)static inline dma_addr_t qed_chain_get_pbl_phys (struct qed_chain *p_chain) { -return p_chain->pbl_sp.p_phys_table; +return p_chain->pbl_sp.table_phys; }/**
@@ -527,8 +527,8 @@ static inline void qed_chain_init_params(struct qed_chain *p_chain, p_chain->capacity = p_chain->usable_per_page * page_cnt; p_chain->size = p_chain->elem_per_page * page_cnt; - p_chain->pbl_sp.p_phys_table =0 ; - p_chain->pbl_sp.p_virt_table =NULL ; + p_chain->pbl_sp.table_phys =0 ; + p_chain->pbl_sp.table_virt =NULL ; p_chain->pbl.pp_addr_tbl =NULL ; }
@@ -569,8 +569,8 @@ static inline void qed_chain_init_pbl_mem(struct qed_chain *p_chain,dma_addr_t p_phys_pbl, struct addr_tbl_entry *pp_addr_tbl) { - p_chain->pbl_sp.p_phys_table = p_phys_pbl; - p_chain->pbl_sp.p_virt_table = p_virt_pbl; + p_chain->pbl_sp.table_phys = p_phys_pbl; + p_chain->pbl_sp.table_virt = p_virt_pbl; p_chain->pbl.pp_addr_tbl = pp_addr_tbl; }
Signature · 1 line
2.25.1
PATCH v2 6/15 qed: move chain initialization inlines next to allocation functions
In reply to Alexander Lobakinqed_chain_init*() are used in one file/place on "cold" path only, so they can be uninlined and moved next to the call sites.
--- drivers/net/ethernet/qlogic/qed/qed_chain.c | 47 ++++++++ include/linux/qed/qed_chain.h | 112 -------------------- 2 files changed, 47 insertions(+), 112 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_chain.c +47 -0
@@ -7,6 +7,53 @@#include "qed_dev_api.h" +static void qed_chain_init_params (struct qed_chain *chain, +u32 page_cnt,u8 elem_size, +enum qed_chain_use_mode intended_use, +enum qed_chain_mode mode, +enum qed_chain_cnt_type cnt_type) +{ +memset (chain,0 ,sizeof (*chain)); + + chain->elem_size = elem_size; + chain->intended_use = intended_use; + chain->mode = mode; + chain->cnt_type = cnt_type; + + chain->elem_per_page =ELEMS_PER_PAGE (elem_size); + chain->usable_per_page =USABLE_ELEMS_PER_PAGE (elem_size, mode); + chain->elem_unusable =UNUSABLE_ELEMS_PER_PAGE (elem_size, mode); + + chain->elem_per_page_mask = chain->elem_per_page -1 ; + chain->next_page_mask = chain->usable_per_page & + chain->elem_per_page_mask; + + chain->page_cnt = page_cnt; + chain->capacity = chain->usable_per_page * page_cnt; + chain->size = chain->elem_per_page * page_cnt; +} + +static void qed_chain_init_next_ptr_elem (const struct qed_chain *chain, +void *virt_curr,void *virt_next, +dma_addr_t phys_next) +{ +struct qed_chain_next *next; +u32 size; + + size = chain->elem_size * chain->usable_per_page; + next = virt_curr + size; + +DMA_REGPAIR_LE (next->next_phys, phys_next); + next->next_virt = virt_next; +} + +static void qed_chain_init_mem (struct qed_chain *chain,void *virt_addr, +dma_addr_t phys_addr) +{ + chain->p_virt_addr = virt_addr; + chain->p_phys_addr = phys_addr; +} +static void qed_chain_free_next_ptr (struct qed_dev *cdev,struct qed_chain *chain) {
include/linux/qed/qed_chain.h +0 -112
118 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 7/15 qed: simplify initialization of the chains with an external PBL
In reply to Alexander LobakinFill PBL table parameters for chains with an external PBL data earlier on qed_chain_init_params() rather than on allocation itself. This simplifies allocation code and allows to extend struct ext_pbl for other chain types.
--- drivers/net/ethernet/qlogic/qed/qed_chain.c | 37 +++++++++++---------- 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_chain.c +19 -18
@@ -11,7 +11,8 @@ static void qed_chain_init_params(struct qed_chain *chain, u32 page_cnt, u8 elem_size, enum qed_chain_use_mode intended_use, enum qed_chain_mode mode, - enum qed_chain_cnt_type cnt_type) + enum qed_chain_cnt_type cnt_type, + const struct qed_chain_ext_pbl *ext_pbl) { memset(chain, 0, sizeof(*chain));
@@ -31,6 +32,13 @@ static void qed_chain_init_params(struct qed_chain *chain, chain->page_cnt = page_cnt; chain->capacity = chain->usable_per_page * page_cnt; chain->size = chain->elem_per_page * page_cnt; + +if (ext_pbl && ext_pbl->p_pbl_virt) { + chain->pbl_sp.table_virt = ext_pbl->p_pbl_virt; + chain->pbl_sp.table_phys = ext_pbl->p_pbl_phys; + + chain->b_external_pbl = true; + } } static void qed_chain_init_next_ptr_elem(const struct qed_chain *chain,
@@ -230,8 +238,7 @@ static int qed_chain_alloc_single(struct qed_dev *cdev,return 0 ; } -static int qed_chain_alloc_pbl (struct qed_dev *cdev,struct qed_chain *chain, -struct qed_chain_ext_pbl *ext_pbl) +static int qed_chain_alloc_pbl (struct qed_dev *cdev,struct qed_chain *chain) {struct device *dev = &cdev->pdev->dev;struct addr_tbl_entry *addr_tbl;
@@ -253,21 +260,14 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain, chain->pbl.pp_addr_tbl = addr_tbl; -if (ext_pbl) { - size =0 ; - pbl_virt = ext_pbl->p_pbl_virt; - pbl_phys = ext_pbl->p_pbl_phys; +if (chain->b_external_pbl) + goto alloc_pages; - chain->b_external_pbl = true; - }else { - size =array_size (page_cnt,sizeof (*pbl_virt)); -if (unlikely (size ==SIZE_MAX )) -return -EOVERFLOW ; - - pbl_virt =dma_alloc_coherent (dev, size, &pbl_phys, -GFP_KERNEL ); - } + size =array_size (page_cnt,sizeof (*pbl_virt)); +if (unlikely (size ==SIZE_MAX )) +return -EOVERFLOW ; + pbl_virt =dma_alloc_coherent (dev, size, &pbl_phys,GFP_KERNEL );if (!pbl_virt)return -ENOMEM ;
@@ -275,6 +275,7 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain, chain->pbl_sp.table_phys = pbl_phys; chain->pbl_sp.table_size = size; +alloc_pages:for (i =0 ; i < page_cnt; i++) { virt =dma_alloc_coherent (dev,QED_CHAIN_PAGE_SIZE , &phys,GFP_KERNEL );
@@ -325,7 +326,7 @@ int qed_chain_alloc(struct qed_dev *cdev, }qed_chain_init_params (chain, page_cnt, elem_size, intended_use, mode, - cnt_type); + cnt_type, ext_pbl);switch (mode) {case QED_CHAIN_MODE_NEXT_PTR :
@@ -335,7 +336,7 @@ int qed_chain_alloc(struct qed_dev *cdev, rc =qed_chain_alloc_single (cdev, chain);break ;case QED_CHAIN_MODE_PBL : - rc =qed_chain_alloc_pbl (cdev, chain, ext_pbl); + rc =qed_chain_alloc_pbl (cdev, chain);break ;default :return -EINVAL ;
Signature · 1 line
2.25.1
PATCH v2 8/15 qed: simplify chain allocation with init params struct
In reply to Alexander LobakinTo simplify qed_chain_alloc() prototype and call sites, introduce struct qed_chain_init_params to specify chain params, and pass a pointer to filled struct to the actual qed_chain_alloc() instead of a long list of separate arguments.
--- drivers/infiniband/hw/qedr/main.c | 20 ++-- drivers/infiniband/hw/qedr/verbs.c | 95 +++++++++---------- drivers/net/ethernet/qlogic/qed/qed_chain.c | 80 +++++++++------- drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 32 +------ drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 39 ++++---- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 44 +++++---- drivers/net/ethernet/qlogic/qed/qed_spq.c | 90 +++++++++++------- drivers/net/ethernet/qlogic/qede/qede_main.c | 45 ++++----- include/linux/qed/qed_chain.h | 21 ++-- include/linux/qed/qed_if.h | 9 +- 10 files changed, 242 insertions(+), 233 deletions(-)
drivers/infiniband/hw/qedr/main.c +11 -9
@@ -346,9 +346,14 @@ static void qedr_free_resources(struct qedr_dev *dev)static int qedr_alloc_resources (struct qedr_dev *dev) { +struct qed_chain_init_params params = { + .mode =QED_CHAIN_MODE_PBL , + .intended_use =QED_CHAIN_USE_TO_CONSUME , + .cnt_type =QED_CHAIN_CNT_TYPE_U16 , + .elem_size =sizeof (struct regpair *), + };struct qedr_cnq *cnq;__le16 *cons_pi; -u16 n_entries;int i, rc; dev->sgid_tbl = kcalloc(QEDR_MAX_SGID, sizeof(union ib_gid),
@@ -382,7 +387,9 @@ static int qedr_alloc_resources(struct qedr_dev *dev) dev->sb_start = dev->ops->rdma_get_start_sb (dev->cdev);/* Allocate CNQ PBLs */ - n_entries =min_t (u32,QED_RDMA_MAX_CNQ_SIZE ,QEDR_ROCE_MAX_CNQ_SIZE ); + params.num_elems =min_t (u32,QED_RDMA_MAX_CNQ_SIZE , +QEDR_ROCE_MAX_CNQ_SIZE ); +for (i =0 ; i < dev->num_cnq; i++) { cnq = &dev->cnq_array[i];
@@ -391,13 +398,8 @@ static int qedr_alloc_resources(struct qedr_dev *dev)if (rc) goto err3; - rc = dev->ops->common->chain_alloc (dev->cdev, -QED_CHAIN_USE_TO_CONSUME , -QED_CHAIN_MODE_PBL , -QED_CHAIN_CNT_TYPE_U16 , - n_entries, -sizeof (struct regpair *), - &cnq->pbl,NULL ); + rc = dev->ops->common->chain_alloc (dev->cdev, &cnq->pbl, + ¶ms);if (rc) goto err4;
drivers/infiniband/hw/qedr/verbs.c +47 -48
158 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_chain.c +45 -35
131 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_dev_api.h +3 -29
@@ -254,35 +254,9 @@ int qed_dmae_host2host(struct qed_hwfn *p_hwfn,dma_addr_t dest_addr, u32 size_in_dwords, struct qed_dmae_params *p_params); -/** -* @brief qed_chain_alloc - Allocate and initialize a chain -* -* @param p_hwfn -* @param intended_use -* @param mode -* @param num_elems -* @param elem_size -* @param p_chain -* @param ext_pbl - a possible external PBL -* -* @return int -*/ -int -qed_chain_alloc (struct qed_dev *cdev, -enum qed_chain_use_mode intended_use, -enum qed_chain_mode mode, -enum qed_chain_cnt_type cnt_type, -u32 num_elems, -size_t elem_size, -struct qed_chain *p_chain,struct qed_chain_ext_pbl *ext_pbl); - -/** -* @brief qed_chain_free - Free chain DMA memory -* -* @param p_hwfn -* @param p_chain -*/ -void qed_chain_free (struct qed_dev *cdev,struct qed_chain *p_chain); +int qed_chain_alloc (struct qed_dev *cdev,struct qed_chain *chain, +struct qed_chain_init_params *params); +void qed_chain_free (struct qed_dev *cdev,struct qed_chain *chain);/** * @@brief qed_fw_l2_queue - Get absolute L2 queue ID
drivers/net/ethernet/qlogic/qed/qed_iscsi.c +17 -22
@@ -684,9 +684,13 @@ static int qed_iscsi_setup_connection(struct qed_iscsi_conn *p_conn)static int qed_iscsi_allocate_connection (struct qed_hwfn *p_hwfn,struct qed_iscsi_conn **p_out_conn) { -u16 uhq_num_elements =0 , xhq_num_elements =0 , r2tq_num_elements =0 ;struct scsi_terminate_extra_params *p_q_cnts =NULL ;struct qed_iscsi_pf_params *p_params =NULL ; +struct qed_chain_init_params params = { + .mode =QED_CHAIN_MODE_PBL , + .intended_use =QED_CHAIN_USE_TO_CONSUME_PRODUCE , + .cnt_type =QED_CHAIN_CNT_TYPE_U16 , + };struct tcp_upload_params *p_tcp =NULL ;struct qed_iscsi_conn *p_conn =NULL ;int rc =0 ;
@@ -727,34 +731,25 @@ static int qed_iscsi_allocate_connection(struct qed_hwfn *p_hwfn, goto nomem_upload_param; p_conn->tcp_upload_params_virt_addr = p_tcp; - r2tq_num_elements = p_params->num_r2tq_pages_in_ring * -QED_CHAIN_PAGE_SIZE /0x80 ; - rc =qed_chain_alloc (p_hwfn->cdev, -QED_CHAIN_USE_TO_CONSUME_PRODUCE , -QED_CHAIN_MODE_PBL , -QED_CHAIN_CNT_TYPE_U16 , - r2tq_num_elements,0x80 , &p_conn->r2tq,NULL ); + params.num_elems = p_params->num_r2tq_pages_in_ring * +QED_CHAIN_PAGE_SIZE /sizeof (struct iscsi_wqe ); + params.elem_size =sizeof (struct iscsi_wqe ); + + rc =qed_chain_alloc (p_hwfn->cdev, &p_conn->r2tq, ¶ms);if (rc) goto nomem_r2tq; - uhq_num_elements = p_params->num_uhq_pages_in_ring * + params.num_elems = p_params->num_uhq_pages_in_ring *QED_CHAIN_PAGE_SIZE /sizeof (struct iscsi_uhqe ); - rc =qed_chain_alloc (p_hwfn->cdev, -QED_CHAIN_USE_TO_CONSUME_PRODUCE , -QED_CHAIN_MODE_PBL , -QED_CHAIN_CNT_TYPE_U16 , - uhq_num_elements, -sizeof (struct iscsi_uhqe ), &p_conn->uhq,NULL ); + params.elem_size =sizeof (struct iscsi_uhqe ); + + rc =qed_chain_alloc (p_hwfn->cdev, &p_conn->uhq, ¶ms);if (rc) goto nomem_uhq; - xhq_num_elements = uhq_num_elements; - rc =qed_chain_alloc (p_hwfn->cdev, -QED_CHAIN_USE_TO_CONSUME_PRODUCE , -QED_CHAIN_MODE_PBL , -QED_CHAIN_CNT_TYPE_U16 , - xhq_num_elements, -sizeof (struct iscsi_xhqe ), &p_conn->xhq,NULL ); + params.elem_size =sizeof (struct iscsi_xhqe ); + + rc =qed_chain_alloc (p_hwfn->cdev, &p_conn->xhq, ¶ms);if (rc) goto nomem;
drivers/net/ethernet/qlogic/qed/qed_ll2.c +23 -21
74 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_spq.c +57 -33
159 lines not on this page · raw message
drivers/net/ethernet/qlogic/qede/qede_main.c +23 -22
73 lines not on this page · raw message
include/linux/qed/qed_chain.h +14 -7
@@ -54,11 +54,6 @@ struct qed_chain_pbl_u32 {u32 cons_page_idx; }; -struct qed_chain_ext_pbl { -dma_addr_t p_pbl_phys; -void *p_pbl_virt; -}; -struct qed_chain_u16 {/* Cyclic index of next element to produce/consme */ u16 prod_idx;
@@ -119,7 +114,7 @@ struct qed_chain {u16 usable_per_page;u8 elem_unusable; -u8 cnt_type; +enum qed_chain_cnt_type cnt_type;/* Slowpath of the chain - required for initialization and destruction, * but isn't involved in regular functionality.
@@ -142,11 +137,23 @@ struct qed_chain {/* Total number of elements [for entire chain] */ u32 size; -u8 intended_use; +enum qed_chain_use_mode intended_use;bool b_external_pbl; }; +struct qed_chain_init_params { +enum qed_chain_mode mode; +enum qed_chain_use_mode intended_use; +enum qed_chain_cnt_type cnt_type; + +u32 num_elems; +size_t elem_size; + +void *ext_pbl_virt; +dma_addr_t ext_pbl_phys; +}; +#define QED_CHAIN_PAGE_SIZE 0x1000#define ELEMS_PER_PAGE (elem_size) \
include/linux/qed/qed_if.h +2 -7
@@ -948,13 +948,8 @@ struct qed_common_ops { u8 dp_level);int (*chain_alloc)(struct qed_dev *cdev, -enum qed_chain_use_mode intended_use, -enum qed_chain_mode mode, -enum qed_chain_cnt_type cnt_type, -u32 num_elems, -size_t elem_size, -struct qed_chain *p_chain, -struct qed_chain_ext_pbl *ext_pbl); +struct qed_chain *chain, +struct qed_chain_init_params *params);void (*chain_free)(struct qed_dev *cdev,struct qed_chain *p_chain);
Signature · 1 line
2.25.1
PATCH v2 9/15 qed: add support for different page sizes for chains
In reply to Alexander LobakinExtend current infrastructure to store chain page size in a struct and use it in all functions instead of fixed QED_CHAIN_PAGE_SIZE. Its value remains the default one, but can be overridden in qed_chain_init_params before chain allocation.
--- drivers/infiniband/hw/qedr/verbs.c | 2 ++ drivers/net/ethernet/qlogic/qed/qed_chain.c | 28 +++++++++++++-------- include/linux/qed/qed_chain.h | 21 ++++++++++------ 3 files changed, 33 insertions(+), 18 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +2 -0
@@ -1960,9 +1960,11 @@ qedr_iwarp_create_kernel_qp(struct qedr_dev *dev, in_params->sq_num_pages =QED_CHAIN_PAGE_CNT (n_sq_elems,QEDR_SQE_ELEMENT_SIZE , +QED_CHAIN_PAGE_SIZE ,QED_CHAIN_MODE_PBL ); in_params->rq_num_pages =QED_CHAIN_PAGE_CNT (n_rq_elems,QEDR_RQE_ELEMENT_SIZE , +QED_CHAIN_PAGE_SIZE ,QED_CHAIN_MODE_PBL ); qp->qed_qp = dev->ops->rdma_create_qp(dev->rdma_ctx,
drivers/net/ethernet/qlogic/qed/qed_chain.c +18 -10
@@ -18,8 +18,10 @@ static void qed_chain_init(struct qed_chain *chain, chain->mode = params->mode; chain->cnt_type = params->cnt_type; - chain->elem_per_page =ELEMS_PER_PAGE (params->elem_size); + chain->elem_per_page =ELEMS_PER_PAGE (params->elem_size, + params->page_size); chain->usable_per_page =USABLE_ELEMS_PER_PAGE (params->elem_size, + params->page_size, params->mode); chain->elem_unusable =UNUSABLE_ELEMS_PER_PAGE (params->elem_size, params->mode);
@@ -28,6 +30,7 @@ static void qed_chain_init(struct qed_chain *chain, chain->next_page_mask = chain->usable_per_page & chain->elem_per_page_mask; + chain->page_size = params->page_size; chain->page_cnt = page_cnt; chain->capacity = chain->usable_per_page * page_cnt; chain->size = chain->elem_per_page * page_cnt;
@@ -82,7 +85,7 @@ static void qed_chain_free_next_ptr(struct qed_dev *cdev, virt_next = next->next_virt; phys_next =HILO_DMA_REGPAIR (next->next_phys); -dma_free_coherent (dev,QED_CHAIN_PAGE_SIZE , virt, phys); +dma_free_coherent (dev, chain->page_size, virt, phys); virt = virt_next; phys = phys_next;
@@ -95,7 +98,7 @@ static void qed_chain_free_single(struct qed_dev *cdev,if (!chain->p_virt_addr)return ; -dma_free_coherent (&cdev->pdev->dev,QED_CHAIN_PAGE_SIZE , +dma_free_coherent (&cdev->pdev->dev, chain->page_size, chain->p_virt_addr, chain->p_phys_addr); }
@@ -113,7 +116,7 @@ static void qed_chain_free_pbl(struct qed_dev *cdev, struct qed_chain *chain)if (!entry->virt_addr)break ; -dma_free_coherent (dev,QED_CHAIN_PAGE_SIZE , entry->virt_addr, +dma_free_coherent (dev, chain->page_size, entry->virt_addr, entry->dma_map); }
@@ -158,7 +161,7 @@ qed_chain_alloc_sanity_check(struct qed_dev *cdev, {u64 chain_size; - chain_size =ELEMS_PER_PAGE (params->elem_size); + chain_size =ELEMS_PER_PAGE (params->elem_size, params->page_size); chain_size *= page_cnt;if (!chain_size)
@@ -201,7 +204,7 @@ static int qed_chain_alloc_next_ptr(struct qed_dev *cdev,u32 i;for (i =0 ; i < chain->page_cnt; i++) { - virt =dma_alloc_coherent (dev,QED_CHAIN_PAGE_SIZE , &phys, + virt =dma_alloc_coherent (dev, chain->page_size, &phys,GFP_KERNEL );if (!virt)return -ENOMEM ;
@@ -232,7 +235,7 @@ static int qed_chain_alloc_single(struct qed_dev *cdev,dma_addr_t phys;void *virt; - virt =dma_alloc_coherent (&cdev->pdev->dev,QED_CHAIN_PAGE_SIZE , + virt =dma_alloc_coherent (&cdev->pdev->dev, chain->page_size, &phys,GFP_KERNEL );if (!virt)return -ENOMEM ;
@@ -282,7 +285,7 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *chain) alloc_pages:for (i =0 ; i < page_cnt; i++) { - virt =dma_alloc_coherent (dev,QED_CHAIN_PAGE_SIZE , &phys, + virt =dma_alloc_coherent (dev, chain->page_size, &phys,GFP_KERNEL );if (!virt)return -ENOMEM ;
@@ -318,11 +321,15 @@ int qed_chain_alloc(struct qed_dev *cdev, struct qed_chain *chain,u32 page_cnt;int rc; +if (!params->page_size) + params->page_size =QED_CHAIN_PAGE_SIZE ; +if (params->mode ==QED_CHAIN_MODE_SINGLE ) page_cnt =1 ;else page_cnt =QED_CHAIN_PAGE_CNT (params->num_elems, params->elem_size, + params->page_size, params->mode); rc =qed_chain_alloc_sanity_check (cdev, params, page_cnt);
@@ -330,9 +337,10 @@ int qed_chain_alloc(struct qed_dev *cdev, struct qed_chain *chain,DP_NOTICE (cdev,"Cannot allocate a chain with the given arguments:\n" );DP_NOTICE (cdev, -"[use_mode %d, mode %d, cnt_type %d, num_elems %d, elem_size %zu]\n" , +"[use_mode %d, mode %d, cnt_type %d, num_elems %d, elem_size %zu, page_size %u]\n" , params->intended_use, params->mode, params->cnt_type, - params->num_elems, params->elem_size); + params->num_elems, params->elem_size, + params->page_size);return rc; }
include/linux/qed/qed_chain.h +13 -8
@@ -11,6 +11,7 @@#include <asm/byteorder.h> #include <linux/kernel.h> #include <linux/list.h> +#include <linux/sizes.h> #include <linux/slab.h> #include <linux/qed/common_hsi.h>
@@ -120,6 +121,8 @@ struct qed_chain {* but isn't involved in regular functionality. */ +u32 page_size; +/* Base address of a pre-allocated buffer for pbl */ struct {__le64 *table_virt;
@@ -147,6 +150,7 @@ struct qed_chain_init_params {enum qed_chain_use_mode intended_use;enum qed_chain_cnt_type cnt_type; +u32 page_size;u32 num_elems;size_t elem_size;
@@ -154,22 +158,23 @@ struct qed_chain_init_params {dma_addr_t ext_pbl_phys; }; -#define QED_CHAIN_PAGE_SIZE 0x1000 +#define QED_CHAIN_PAGE_SIZE SZ_4K -#define ELEMS_PER_PAGE (elem_size) \ - (QED_CHAIN_PAGE_SIZE / (elem_size)) +#define ELEMS_PER_PAGE (elem_size, page_size) \ + ((page_size) / (elem_size))#define UNUSABLE_ELEMS_PER_PAGE (elem_size, mode) \ (((mode) == QED_CHAIN_MODE_NEXT_PTR) ? \ (u8)(1 + ((sizeof(struct qed_chain_next) - 1) / (elem_size))) : \ 0) -#define USABLE_ELEMS_PER_PAGE (elem_size, mode) \ - ((u32)(ELEMS_PER_PAGE(elem_size) - \ +#define USABLE_ELEMS_PER_PAGE (elem_size, page_size, mode) \ + ((u32)(ELEMS_PER_PAGE((elem_size), (page_size)) - \ UNUSABLE_ELEMS_PER_PAGE((elem_size), (mode)))) -#define QED_CHAIN_PAGE_CNT (elem_cnt, elem_size, mode) \ - DIV_ROUND_UP((elem_cnt), USABLE_ELEMS_PER_PAGE((elem_size), (mode))) +#define QED_CHAIN_PAGE_CNT (elem_cnt, elem_size, page_size, mode) \ + DIV_ROUND_UP((elem_cnt), \ + USABLE_ELEMS_PER_PAGE((elem_size), (page_size), (mode)))#define is_chain_u16 (p) \ ((p)->cnt_type == QED_CHAIN_CNT_TYPE_U16)
@@ -604,7 +609,7 @@ static inline void qed_chain_pbl_zero_mem(struct qed_chain *p_chain)for (i =0 ; i < page_cnt; i++)memset (p_chain->pbl.pp_addr_tbl[i].virt_addr,0 , - QED_CHAIN_PAGE_SIZE); + p_chain->page_size); }#endif
Signature · 1 line
2.25.1
PATCH v2 10/15 qed: optimize common chain accessors
In reply to Alexander LobakinConstify chain pointers and refactor qed_chain_get_elem_left{,u32}() a bit.
--- include/linux/qed/qed_chain.h | 60 +++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 27 deletions(-)
include/linux/qed/qed_chain.h +33 -27
@@ -182,73 +182,79 @@ struct qed_chain_init_params { ((p)->cnt_type ==QED_CHAIN_CNT_TYPE_U32 ) /* Accessors */ -static inline u16 qed_chain_get_prod_idx (struct qed_chain *p_chain) + +static inline u16 qed_chain_get_prod_idx (const struct qed_chain *chain) +{ +return chain->u.chain16.prod_idx; +} + +static inline u16 qed_chain_get_cons_idx (const struct qed_chain *chain) { -return p_chain->u.chain16.prod_idx; +return chain->u.chain16.cons_idx; } -static inline u16 qed_chain_get_cons_idx (struct qed_chain *p_chain) +static inline u32 qed_chain_get_prod_idx_u32 (const struct qed_chain *chain) { -return p_chain->u.chain16.cons_idx; +return chain->u.chain32.prod_idx; } -static inline u32 qed_chain_get_cons_idx_u32 (struct qed_chain *p_chain) +static inline u32 qed_chain_get_cons_idx_u32 (const struct qed_chain *chain) { -return p_chain->u.chain32.cons_idx; +return chain->u.chain32.cons_idx; } -static inline u16 qed_chain_get_elem_left (struct qed_chain *p_chain) +static inline u16 qed_chain_get_elem_left (const struct qed_chain *chain) { -u16 elem_per_page = p_chain->elem_per_page; -u32 prod = p_chain->u.chain16.prod_idx; -u32 cons = p_chain->u.chain16.cons_idx; +u32 prod =qed_chain_get_prod_idx (chain); +u32 cons =qed_chain_get_cons_idx (chain); +u16 elem_per_page = chain->elem_per_page;u16 used;if (prod < cons) prod += (u32 )U16_MAX +1 ; used = (u16)(prod - cons); -if (p_chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) - used -= prod / elem_per_page - cons / elem_per_page; +if (chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) + used -= (u16)(prod / elem_per_page - cons / elem_per_page); -return (u16)(p_chain->capacity - used); +return (u16)(chain->capacity - used); } -static inline u32 qed_chain_get_elem_left_u32 (struct qed_chain *p_chain) +static inline u32 qed_chain_get_elem_left_u32 (const struct qed_chain *chain) { -u16 elem_per_page = p_chain->elem_per_page; -u64 prod = p_chain->u.chain32.prod_idx; -u64 cons = p_chain->u.chain32.cons_idx; +u64 prod =qed_chain_get_prod_idx_u32 (chain); +u64 cons =qed_chain_get_cons_idx_u32 (chain); +u16 elem_per_page = chain->elem_per_page;u32 used;if (prod < cons) prod += (u64 )U32_MAX +1 ; used = (u32)(prod - cons); -if (p_chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) +if (chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) used -= (u32)(prod / elem_per_page - cons / elem_per_page); -return p_chain->capacity - used; +return chain->capacity - used; } -static inline u16 qed_chain_get_usable_per_page (struct qed_chain *p_chain) +static inline u16 qed_chain_get_usable_per_page (const struct qed_chain *chain) { -return p_chain->usable_per_page; +return chain->usable_per_page; } -static inline u8 qed_chain_get_unusable_per_page (struct qed_chain *p_chain) +static inline u8 qed_chain_get_unusable_per_page (const struct qed_chain *chain) { -return p_chain->elem_unusable; +return chain->elem_unusable; } -static inline u32 qed_chain_get_page_cnt (struct qed_chain *p_chain) +static inline u32 qed_chain_get_page_cnt (const struct qed_chain *chain) { -return p_chain->page_cnt; +return chain->page_cnt; } -static inline dma_addr_t qed_chain_get_pbl_phys (struct qed_chain *p_chain) +static inline dma_addr_t qed_chain_get_pbl_phys (const struct qed_chain *chain) { -return p_chain->pbl_sp.table_phys; +return chain->pbl_sp.table_phys; }/**
Signature · 1 line
2.25.1
PATCH v2 11/15 qed: introduce qed_chain_get_elem_used{,u32}()
In reply to Alexander LobakinAdd reverse-variants of qed_chain_get_elem_left{,u32}() to be able to know current chain occupation. They will be used in the upcoming qede XDP_REDIRECT code.
They share most of the logics with the mentioned ones, so were reused to collapse the latters.
--- include/linux/qed/qed_chain.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
include/linux/qed/qed_chain.h +14 -4
@@ -203,7 +203,7 @@ static inline u32 qed_chain_get_cons_idx_u32(const struct qed_chain *chain)return chain->u.chain32.cons_idx; } -static inline u16 qed_chain_get_elem_left (const struct qed_chain *chain) +static inline u16 qed_chain_get_elem_used (const struct qed_chain *chain) {u32 prod =qed_chain_get_prod_idx (chain);u32 cons =qed_chain_get_cons_idx (chain);
@@ -217,10 +217,15 @@ static inline u16 qed_chain_get_elem_left(const struct qed_chain *chain)if (chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) used -= (u16)(prod / elem_per_page - cons / elem_per_page); -return (u16)(chain->capacity - used); +return used; } -static inline u32 qed_chain_get_elem_left_u32 (const struct qed_chain *chain) +static inline u16 qed_chain_get_elem_left (const struct qed_chain *chain) +{ +return (u16)(chain->capacity -qed_chain_get_elem_used (chain)); +} + +static inline u32 qed_chain_get_elem_used_u32 (const struct qed_chain *chain) {u64 prod =qed_chain_get_prod_idx_u32 (chain);u64 cons =qed_chain_get_cons_idx_u32 (chain);
@@ -234,7 +239,12 @@ static inline u32 qed_chain_get_elem_left_u32(const struct qed_chain *chain)if (chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) used -= (u32)(prod / elem_per_page - cons / elem_per_page); -return chain->capacity - used; +return used; +} + +static inline u32 qed_chain_get_elem_left_u32 (const struct qed_chain *chain) +{ +return chain->capacity -qed_chain_get_elem_used_u32 (chain); }static inline u16 qed_chain_get_usable_per_page (const struct qed_chain *chain)
Signature · 1 line
2.25.1
PATCH v2 12/15 qede: reformat several structures in "qede.h"
In reply to Alexander LobakinMake the file more readable and easier for adding new fields.
Misc: use IFNAMSIZ and netdev_name() instead of sizeof_field() and direct net_device::name dereferencing.
--- drivers/net/ethernet/qlogic/qede/qede.h | 166 +++++++++++++----------- 1 file changed, 89 insertions(+), 77 deletions(-)
drivers/net/ethernet/qlogic/qede/qede.h +89 -77
@@ -176,16 +176,17 @@ struct qede_dev {u32 dp_module;u8 dp_level; -unsigned long flags; -#define IS_VF (edev) (test_bit(QEDE_FLAGS_IS_VF, &(edev)->flags)) +unsigned long flags; +#define IS_VF (edev) test_bit(QEDE_FLAGS_IS_VF, \ + &(edev)->flags)const struct qed_eth_ops *ops;struct qede_ptp *ptp;u64 ptp_skip_txts; -struct qed_dev_eth_info dev_info; -#define QEDE_MAX_RSS_CNT (edev) ((edev)->dev_info.num_queues) -#define QEDE_MAX_TSS_CNT (edev) ((edev)->dev_info.num_queues) +struct qed_dev_eth_info dev_info; +#define QEDE_MAX_RSS_CNT (edev) ((edev)->dev_info.num_queues) +#define QEDE_MAX_TSS_CNT (edev) ((edev)->dev_info.num_queues)#define QEDE_IS_BB (edev) \ ((edev)->dev_info.common.dev_type == QED_DEV_TYPE_BB)#define QEDE_IS_AH (edev) \
@@ -198,14 +199,15 @@ struct qede_dev {u8 fp_num_rx;u16 req_queues;u16 num_queues; -#define QEDE_QUEUE_CNT (edev) ((edev)->num_queues) -#define QEDE_RSS_COUNT (edev) ((edev)->num_queues - (edev)->fp_num_tx) + +#define QEDE_QUEUE_CNT (edev) ((edev)->num_queues) +#define QEDE_RSS_COUNT (edev) ((edev)->num_queues - (edev)->fp_num_tx)#define QEDE_RX_QUEUE_IDX (edev, i) (i) -#define QEDE_TSS_COUNT (edev) ((edev)->num_queues - (edev)->fp_num_rx) +#define QEDE_TSS_COUNT (edev) ((edev)->num_queues - (edev)->fp_num_rx)struct qed_int_info int_info; -/* Smaller private varaiant of the RTNL lock */ +/* Smaller private variant of the RTNL lock */ struct mutex qede_lock;u32 state;/* Protected by qede_lock */ u16 rx_buf_size;
@@ -226,22 +228,28 @@ struct qede_dev { SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))struct qede_stats stats; -#define QEDE_RSS_INDIR_INITED BIT(0) -#define QEDE_RSS_KEY_INITED BIT(1) -#define QEDE_RSS_CAPS_INITED BIT(2) -u32 rss_params_inited;/* bit-field to track initialized rss params */ -u16 rss_ind_table[128 ]; -u32 rss_key[10 ]; -u8 rss_caps; - -u16 q_num_rx_buffers;/* Must be a power of two */ -u16 q_num_tx_buffers;/* Must be a power of two */ - -bool gro_disable; -struct list_head vlan_list; -u16 configured_vlans; -u16 non_configured_vlans; -bool accept_any_vlan; + +/* Bitfield to track initialized RSS params */ +u32 rss_params_inited; +#define QEDE_RSS_INDIR_INITED BIT(0) +#define QEDE_RSS_KEY_INITED BIT(1) +#define QEDE_RSS_CAPS_INITED BIT(2) + +u16 rss_ind_table[128 ]; +u32 rss_key[10 ]; +u8 rss_caps; + +/* Both must be a power of two */ +u16 q_num_rx_buffers; +u16 q_num_tx_buffers; + +bool gro_disable; + +struct list_head vlan_list; +u16 configured_vlans; +u16 non_configured_vlans; +bool accept_any_vlan; +struct delayed_work sp_task;unsigned long sp_flags;u16 vxlan_dst_port;
@@ -252,14 +260,14 @@ struct qede_dev {struct qede_rdma_dev rdma_info; -struct bpf_prog *xdp_prog; +struct bpf_prog *xdp_prog; -unsigned long err_flags; -#define QEDE_ERR_IS_HANDLED 31 -#define QEDE_ERR_ATTN_CLR_EN 0 -#define QEDE_ERR_GET_DBG_INFO 1 -#define QEDE_ERR_IS_RECOVERABLE 2 -#define QEDE_ERR_WARN 3 +unsigned long err_flags; +#define QEDE_ERR_IS_HANDLED 31 +#define QEDE_ERR_ATTN_CLR_EN 0 +#define QEDE_ERR_GET_DBG_INFO 1 +#define QEDE_ERR_IS_RECOVERABLE 2 +#define QEDE_ERR_WARN 3struct qede_dump_info dump_info; };
@@ -372,29 +380,30 @@ struct sw_tx_bd { };struct sw_tx_xdp { -struct page *page; -dma_addr_t mapping; +struct page *page; +dma_addr_t mapping; };struct qede_tx_queue { -u8 is_xdp; -bool is_legacy; -u16 sw_tx_cons; -u16 sw_tx_prod; -u16 num_tx_buffers;/* Slowpath only */ +u8 is_xdp; +bool is_legacy; +u16 sw_tx_cons; +u16 sw_tx_prod; +u16 num_tx_buffers;/* Slowpath only */ -u64 xmit_pkts; -u64 stopped_cnt; -u64 tx_mem_alloc_err; +u64 xmit_pkts; +u64 stopped_cnt; +u64 tx_mem_alloc_err; -__le16 *hw_cons_ptr; +__le16 *hw_cons_ptr;/* Needed for the mapping of packets */ -struct device *dev; +struct device *dev; + +void __iomem *doorbell_addr; +union db_prod tx_db; -void __iomem *doorbell_addr; -union db_prod tx_db; -int index;/* Slowpath only */ +int index;/* Slowpath only */ #define QEDE_TXQ_XDP_TO_IDX (edev, txq) ((txq)->index - \ QEDE_MAX_TSS_CNT(edev))#define QEDE_TXQ_IDX_TO_XDP (edev, idx) ((idx) + QEDE_MAX_TSS_CNT(edev))
@@ -406,22 +415,22 @@ struct qede_tx_queue {#define QEDE_NDEV_TXQ_ID_TO_TXQ (edev, idx) \ (&((edev)->fp_array[QEDE_NDEV_TXQ_ID_TO_FP_ID(edev, idx)].txq \ [QEDE_NDEV_TXQ_ID_TO_TXQ_COS(edev, idx)])) -#define QEDE_FP_TC0_TXQ (fp) (&((fp)->txq[0])) +#define QEDE_FP_TC0_TXQ (fp) (&((fp)->txq[0]))/* Regular Tx requires skb + metadata for release purpose, * while XDP requires the pages and the mapped address. */ union { -struct sw_tx_bd *skbs; -struct sw_tx_xdp *xdp; - } sw_tx_ring; +struct sw_tx_bd *skbs; +struct sw_tx_xdp *xdp; + } sw_tx_ring; -struct qed_chain tx_pbl; +struct qed_chain tx_pbl;/* Slowpath; Should be kept in end [unless missing padding] */ -void *handle; -u16 cos; -u16 ndev_txq_id; +void *handle; +u16 cos; +u16 ndev_txq_id; };#define BD_UNMAP_ADDR (bd) HILO_U64(le32_to_cpu((bd)->addr.hi), \
@@ -435,32 +444,35 @@ struct qede_tx_queue {#define BD_UNMAP_LEN (bd) (le16_to_cpu((bd)->nbytes))struct qede_fastpath { -struct qede_dev *edev; -#define QEDE_FASTPATH_TX BIT(0) -#define QEDE_FASTPATH_RX BIT(1) -#define QEDE_FASTPATH_XDP BIT(2) -#define QEDE_FASTPATH_COMBINED (QEDE_FASTPATH_TX | QEDE_FASTPATH_RX) -u8 type; -u8 id; -u8 xdp_xmit; -struct napi_struct napi; -struct qed_sb_info *sb_info; -struct qede_rx_queue *rxq; -struct qede_tx_queue *txq; -struct qede_tx_queue *xdp_tx; - -#define VEC_NAME_SIZE (sizeof_field(struct net_device, name) + 8) -char name[VEC_NAME_SIZE ]; +struct qede_dev *edev; + +u8 type; +#define QEDE_FASTPATH_TX BIT(0) +#define QEDE_FASTPATH_RX BIT(1) +#define QEDE_FASTPATH_XDP BIT(2) +#define QEDE_FASTPATH_COMBINED (QEDE_FASTPATH_TX | QEDE_FASTPATH_RX) + +u8 id; + +u8 xdp_xmit; + +struct napi_struct napi; +struct qed_sb_info *sb_info; +struct qede_rx_queue *rxq; +struct qede_tx_queue *txq; +struct qede_tx_queue *xdp_tx; + +char name[IFNAMSIZ +8 ]; };/* Debug print definitions */ -#define DP_NAME (edev) ((edev)->ndev->name) +#define DP_NAME (edev) netdev_name((edev)->ndev) -#define XMIT_PLAIN 0 -#define XMIT_L4_CSUM BIT(0) -#define XMIT_LSO BIT(1) -#define XMIT_ENC BIT(2) -#define XMIT_ENC_GSO_L4_CSUM BIT(3) +#define XMIT_PLAIN 0 +#define XMIT_L4_CSUM BIT(0) +#define XMIT_LSO BIT(1) +#define XMIT_ENC BIT(2) +#define XMIT_ENC_GSO_L4_CSUM BIT(3)#define QEDE_CSUM_ERROR BIT(0)#define QEDE_CSUM_UNNECESSARY BIT(1)
Signature · 1 line
2.25.1
PATCH v2 13/15 qede: reformat net_device_ops declarations
In reply to Alexander LobakinCorrect the indentation of net_device_ops declarations for fancier look.
--- drivers/net/ethernet/qlogic/qede/qede_main.c | 122 +++++++++---------- 1 file changed, 61 insertions(+), 61 deletions(-)
drivers/net/ethernet/qlogic/qede/qede_main.c +61 -61
@@ -639,79 +639,79 @@ qede_setup_tc_offload(struct net_device *dev, enum tc_setup_type type, }static const struct net_device_ops qede_netdev_ops = { - .ndo_open = qede_open, - .ndo_stop = qede_close, - .ndo_start_xmit = qede_start_xmit, - .ndo_select_queue = qede_select_queue, - .ndo_set_rx_mode = qede_set_rx_mode, - .ndo_set_mac_address = qede_set_mac_addr, - .ndo_validate_addr = eth_validate_addr, - .ndo_change_mtu = qede_change_mtu, - .ndo_do_ioctl = qede_ioctl, - .ndo_tx_timeout = qede_tx_timeout, + .ndo_open = qede_open, + .ndo_stop = qede_close, + .ndo_start_xmit = qede_start_xmit, + .ndo_select_queue = qede_select_queue, + .ndo_set_rx_mode = qede_set_rx_mode, + .ndo_set_mac_address = qede_set_mac_addr, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = qede_change_mtu, + .ndo_do_ioctl = qede_ioctl, + .ndo_tx_timeout = qede_tx_timeout, #ifdef CONFIG_QED_SRIOV - .ndo_set_vf_mac = qede_set_vf_mac, - .ndo_set_vf_vlan = qede_set_vf_vlan, - .ndo_set_vf_trust = qede_set_vf_trust, + .ndo_set_vf_mac = qede_set_vf_mac, + .ndo_set_vf_vlan = qede_set_vf_vlan, + .ndo_set_vf_trust = qede_set_vf_trust, #endif - .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid, - .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid, - .ndo_fix_features = qede_fix_features, - .ndo_set_features = qede_set_features, - .ndo_get_stats64 = qede_get_stats64, + .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid, + .ndo_fix_features = qede_fix_features, + .ndo_set_features = qede_set_features, + .ndo_get_stats64 = qede_get_stats64, #ifdef CONFIG_QED_SRIOV - .ndo_set_vf_link_state = qede_set_vf_link_state, - .ndo_set_vf_spoofchk = qede_set_vf_spoofchk, - .ndo_get_vf_config = qede_get_vf_config, - .ndo_set_vf_rate = qede_set_vf_rate, + .ndo_set_vf_link_state = qede_set_vf_link_state, + .ndo_set_vf_spoofchk = qede_set_vf_spoofchk, + .ndo_get_vf_config = qede_get_vf_config, + .ndo_set_vf_rate = qede_set_vf_rate, #endif - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, - .ndo_features_check = qede_features_check, - .ndo_bpf = qede_xdp, + .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, + .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, + .ndo_features_check = qede_features_check, + .ndo_bpf = qede_xdp, #ifdef CONFIG_RFS_ACCEL - .ndo_rx_flow_steer = qede_rx_flow_steer, + .ndo_rx_flow_steer = qede_rx_flow_steer, #endif - .ndo_setup_tc = qede_setup_tc_offload, + .ndo_setup_tc = qede_setup_tc_offload, };static const struct net_device_ops qede_netdev_vf_ops = { - .ndo_open = qede_open, - .ndo_stop = qede_close, - .ndo_start_xmit = qede_start_xmit, - .ndo_select_queue = qede_select_queue, - .ndo_set_rx_mode = qede_set_rx_mode, - .ndo_set_mac_address = qede_set_mac_addr, - .ndo_validate_addr = eth_validate_addr, - .ndo_change_mtu = qede_change_mtu, - .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid, - .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid, - .ndo_fix_features = qede_fix_features, - .ndo_set_features = qede_set_features, - .ndo_get_stats64 = qede_get_stats64, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, - .ndo_features_check = qede_features_check, + .ndo_open = qede_open, + .ndo_stop = qede_close, + .ndo_start_xmit = qede_start_xmit, + .ndo_select_queue = qede_select_queue, + .ndo_set_rx_mode = qede_set_rx_mode, + .ndo_set_mac_address = qede_set_mac_addr, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = qede_change_mtu, + .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid, + .ndo_fix_features = qede_fix_features, + .ndo_set_features = qede_set_features, + .ndo_get_stats64 = qede_get_stats64, + .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, + .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, + .ndo_features_check = qede_features_check, };static const struct net_device_ops qede_netdev_vf_xdp_ops = { - .ndo_open = qede_open, - .ndo_stop = qede_close, - .ndo_start_xmit = qede_start_xmit, - .ndo_select_queue = qede_select_queue, - .ndo_set_rx_mode = qede_set_rx_mode, - .ndo_set_mac_address = qede_set_mac_addr, - .ndo_validate_addr = eth_validate_addr, - .ndo_change_mtu = qede_change_mtu, - .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid, - .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid, - .ndo_fix_features = qede_fix_features, - .ndo_set_features = qede_set_features, - .ndo_get_stats64 = qede_get_stats64, - .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, - .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, - .ndo_features_check = qede_features_check, - .ndo_bpf = qede_xdp, + .ndo_open = qede_open, + .ndo_stop = qede_close, + .ndo_start_xmit = qede_start_xmit, + .ndo_select_queue = qede_select_queue, + .ndo_set_rx_mode = qede_set_rx_mode, + .ndo_set_mac_address = qede_set_mac_addr, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = qede_change_mtu, + .ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid, + .ndo_fix_features = qede_fix_features, + .ndo_set_features = qede_set_features, + .ndo_get_stats64 = qede_get_stats64, + .ndo_udp_tunnel_add = udp_tunnel_nic_add_port, + .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, + .ndo_features_check = qede_features_check, + .ndo_bpf = qede_xdp, };/* -------------------------------------------------------------------------
Signature · 1 line
2.25.1
PATCH v2 14/15 qede: refactor XDP Tx processing
In reply to Alexander LobakinCurrent XDP Tx logic is suboptimal and can't be reused for XDP_REDIRECT path.
Make qede_xdp_{tx_int,xmit}() more universal and effective in general to allow future expanding.
Misc: use unlikely() hints where appropriate and replace "fallthrough" comments with pseudo-keywords.
--- drivers/net/ethernet/qlogic/qede/qede.h | 1 + drivers/net/ethernet/qlogic/qede/qede_fp.c | 89 +++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-)
drivers/net/ethernet/qlogic/qede/qede.h +1 -0
@@ -455,6 +455,7 @@ struct qede_fastpath {u8 id;u8 xdp_xmit; +#define QEDE_XDP_TX BIT(0)struct napi_struct napi;struct qed_sb_info *sb_info;
drivers/net/ethernet/qlogic/qede/qede_fp.c +44 -45
160 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 15/15 qede: add .ndo_xdp_xmit() and XDP_REDIRECT support
In reply to Alexander LobakinAdd XDP_REDIRECT case handling and the corresponding NDO to support redirecting XDP frames. This also includes registering driver memory model (currently order-0 page mode) in BPF subsystem.
The total number of XDP queues is usually 1:1 with Rx ones.
--- drivers/net/ethernet/qlogic/qede/qede.h | 8 ++ drivers/net/ethernet/qlogic/qede/qede_fp.c | 97 +++++++++++++++++++- drivers/net/ethernet/qlogic/qede/qede_main.c | 18 ++++ 3 files changed, 118 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qede/qede.h +8 -0
@@ -199,6 +199,7 @@ struct qede_dev {u8 fp_num_rx;u16 req_queues;u16 num_queues; +u16 total_xdp_queues;#define QEDE_QUEUE_CNT (edev) ((edev)->num_queues)#define QEDE_RSS_COUNT (edev) ((edev)->num_queues - (edev)->fp_num_tx)
@@ -381,6 +382,7 @@ struct sw_tx_bd {struct sw_tx_xdp {struct page *page; +struct xdp_frame *xdpf;dma_addr_t mapping; };
@@ -403,6 +405,9 @@ struct qede_tx_queue {void __iomem *doorbell_addr;union db_prod tx_db; +/* Spinlock for XDP queues in case of XDP_REDIRECT */ +spinlock_t xdp_tx_lock; +int index;/* Slowpath only */ #define QEDE_TXQ_XDP_TO_IDX (edev, txq) ((txq)->index - \ QEDE_MAX_TSS_CNT(edev))
@@ -456,6 +461,7 @@ struct qede_fastpath {u8 xdp_xmit;#define QEDE_XDP_TX BIT(0) +#define QEDE_XDP_REDIRECT BIT(1)struct napi_struct napi;struct qed_sb_info *sb_info;
@@ -516,6 +522,8 @@ struct qede_reload_args {/* Datapath functions definition */ netdev_tx_t qede_start_xmit (struct sk_buff *skb,struct net_device *ndev); +int qede_xdp_transmit (struct net_device *dev,int n_frames, +struct xdp_frame **frames,u32 flags);u16 qede_select_queue (struct net_device *dev,struct sk_buff *skb,struct net_device *sb_dev); netdev_features_t qede_features_check(struct sk_buff *skb,
drivers/net/ethernet/qlogic/qede/qede_fp.c +92 -5
146 lines not on this page · raw message
drivers/net/ethernet/qlogic/qede/qede_main.c +18 -0
@@ -672,6 +672,7 @@ static const struct net_device_ops qede_netdev_ops = {#ifdef CONFIG_RFS_ACCEL .ndo_rx_flow_steer = qede_rx_flow_steer, #endif + .ndo_xdp_xmit = qede_xdp_transmit, .ndo_setup_tc = qede_setup_tc_offload, };
@@ -712,6 +713,7 @@ static const struct net_device_ops qede_netdev_vf_xdp_ops = { .ndo_udp_tunnel_del = udp_tunnel_nic_del_port, .ndo_features_check = qede_features_check, .ndo_bpf = qede_xdp, + .ndo_xdp_xmit = qede_xdp_transmit, };/* -------------------------------------------------------------------------
@@ -1712,6 +1714,7 @@ static void qede_init_fp(struct qede_dev *edev) {int queue_id, rxq_index =0 , txq_index =0 ;struct qede_fastpath *fp; +bool init_xdp = false;for_each_queue (queue_id) { fp = &edev->fp_array[queue_id];
@@ -1723,6 +1726,9 @@ static void qede_init_fp(struct qede_dev *edev) fp->xdp_tx->index =QEDE_TXQ_IDX_TO_XDP (edev, rxq_index); fp->xdp_tx->is_xdp =1 ; + +spin_lock_init (&fp->xdp_tx->xdp_tx_lock); + init_xdp = true; }if (fp->type &QEDE_FASTPATH_RX ) {
@@ -1738,6 +1744,13 @@ static void qede_init_fp(struct qede_dev *edev)/* Driver have no error path from here */ WARN_ON (xdp_rxq_info_reg (&fp->rxq->xdp_rxq, edev->ndev, fp->rxq->rxq_id) <0 ); + +if (xdp_rxq_info_reg_mem_model (&fp->rxq->xdp_rxq, +MEM_TYPE_PAGE_ORDER0 , +NULL )) { +DP_NOTICE (edev, +"Failed to register XDP memory model\n" ); + } }if (fp->type &QEDE_FASTPATH_TX ) {
@@ -1763,6 +1776,11 @@ static void qede_init_fp(struct qede_dev *edev)snprintf (fp->name,sizeof (fp->name),"%s-fp-%d" , edev->ndev->name, queue_id); } + +if (init_xdp) { + edev->total_xdp_queues =QEDE_RSS_COUNT (edev); +DP_INFO (edev,"Total XDP queues: %u\n" , edev->total_xdp_queues); + } }static int qede_set_real_num_queues (struct qede_dev *edev)
Signature · 1 line
2.25.1
Quoted 4 lines · Alexander Lobakin
Netdev folks, could you please take the entire series through your tree after the necessary acks and reviews? Patches 8-9 also touch qedr driver under rdma tree, but these changes can't be separated as it would break incremental buildability and bisecting.
There is nothing significant in the rdma changes, just be wary to not submit patches to the rdma tree that would cause conflicts
Thanks
Jason
David Miller
maintainerFrom: Alexander Lobakin <[email protected]>
Date: Thu, 23 Jul 2020 01:10:30 +0300
Quoted 10 lines
This series adds missing
XDP_REDIRECTcase handling in QLogic Everest Ethernet driver with all necessary prerequisites and ops. QEDE Tx relies heavily on chain API, so make sure it is in its best at first.v2 (from [1]):
- add missing includes to #003 to pass the build on Alpha;
- no functional changes.
Series applied, thank you.