Support add/remove memory region and get-max-slots
Subsystems (2)
v13 cover Support add/remove memory region and get-max-slots
From: Pravin M Bathija <[email protected]>
This is version v13 of the patchset and it incorporates the recommendations made by Fengcheng Wen.
Changes made to patch 3/5 and 4/5
* Relocated function remove_guest_pages from patch 3/5 to 4/5.
* Renamed VhostUserSingleMemReg to VhostUserMemRegMsg and memory_single to memreg.
This implementation has been extensively tested by doing Read/Write I/O from multiple instances of fio + libblkio (front-end) talking to spdk/dpdk (back-end) based drives. Tested with qemu front-end talking to dpdk testpmd (back-end) performing add/removal of memory regions. Also tested post-copy live migration after doing add_memory_region.
Version Log:
Version v13 (Current version): Incorporate code review suggestions from Fengcheng Wen as described above.
Version v12: Incorporate code review suggestions from Maxime Coquelin and ai-code-review.
Changes made to patch 3/5
Refactored async_dma_map() to delegate to async_dma_map_region(), eliminating code duplication between the two functions. Restored original comments in async_dma_map_region() explaining why ENODEV and EINVAL errors are ignored (these were stripped in v10) Reverted unnecessary changes to vhost_user_postcopy_register() -- removed the host_user_addr == 0 checks and reg_msg_index indirection that were added in v10, since this function is only called from vhost_user_set_mem_table() where regions are always contiguous.
Version v11: Incorporate code review suggestions from Stephen Hemminger. Change made to patch 4/5
Fix incomplete cleanup in vhost_user_add_mem_reg() when vhost_user_mmap_region() fails after the mmap succeeds (e.g. add_guest_pages() realloc failure) realloc failure). The error path now calls remove_guest_pages() and free_mem_region() to undo the mapping and stale guest-page entries, preventing a leaked mmap and slot reuse corruption. The plain close(fd) path is kept for pre-mmap failures.
Version v10: Incorporate code review suggestions from Stephen Hemminger. Change made to patch 4/5
Moved dev_invalidate_vrings after free_mem_region, array compaction, and nregions decrement. This ensures translate_ring_addresses only sees surviving memory regions, preventing vring pointers from resolving into a region that is about to be unmapped.
Version v9: Incorporate code review suggestions from Stephen Hemminger. Changes made to patch 3/5
Restored max_guest_pages initial value to hardcoded 8 instead of VHOST_MEMORY_MAX_NREGIONS, matching upstream semantics. Changes made to patch 4/5
Added close(reg->fd) and reg->fd = -1 before goto close_msg_fds in the mmap failure path to fix fd leak after fd was moved from ctx->fds[0]. Converted dev_invalidate_vrings from a plain function to a macro + implementation function pair, accepting message ID as a parameter so the static_assert reports the correct handler at each call site. Updated dev_invalidate_vrings call in add_mem_reg to pass VHOST_USER_ADD_MEM_REG as message ID.
Updated dev_invalidate_vrings call in rem_mem_reg to pass VHOST_USER_REM_MEM_REG as message ID.
Version v8: Incorporate code review suggestions from Stephen Hemminger. rewrite async_dma_map_region function to iterate guest pages by host address range matching
change function dev_invalidate_vrings to accept a double pointer to propagate pointer updates
new function remove_guest_pages was addedadd_mem_reg error path was narrowed to only clean up the single failed region instead of destroting all existing regions
Version v7: Incorporate code review suggestions from Maxime Coquelin. Add debug messages to vhost_postcopy_register function.
Version v6: Added the enablement of this feature as a final patch in this patch-set and other code optimizations as suggested by Maxime Coquelin.
Version v5: removed the patch that increased the number of memory regions from 8 to 128. This will be submitted as a separate feature at a later point after incorporating additional optimizations. Also includes code optimizations as suggested by Feng Cheng Wen.
Version v4: code optimizations as suggested by Feng Cheng Wen.
Version v3: code optimizations as suggested by Maxime Coquelin and Thomas Monjalon.
Version v2: code optimizations as suggested by Maxime Coquelin.
Version v1: Initial patch set.
Pravin M Bathija (5):
vhost: add user to mailmap and define to vhost hdr
vhost_user: header defines for add/rem mem region
vhost_user: support function defines for back-end
vhost_user: Function defs for add/rem mem regions
vhost_user: enable configure memory slots
.mailmap | 1 + lib/vhost/rte_vhost.h | 4 + lib/vhost/vhost_user.c | 418 +++++++++++++++++++++++++++++++++++------ lib/vhost/vhost_user.h | 10 + 4 files changed, 371 insertions(+), 62 deletions(-)
Signature · 1 line
2.43.0
PATCH v13 1/5 vhost: add user to mailmap and define to vhost hdr
From: Pravin M Bathija <[email protected]>
- add user to mailmap file.
- define a bit-field called VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS that depicts if the feature/capability to add/remove memory regions is supported. This is a part of the overall support for add/remove memory region feature in this patchset.
--- .mailmap | 1 + lib/vhost/rte_vhost.h | 4 ++++ 2 files changed, 5 insertions(+)
.mailmap +1 -0
@@ -1295,6 +1295,7 @@ Prateek Agarwal <[email protected]> Prathisna Padmasanan <[email protected]> Praveen Kaligineedi <[email protected]> Praveen Shetty <[email protected]> +Pravin M Bathija <[email protected]> Pravin Pathak <[email protected]> <[email protected]> Prince Takkar <[email protected]> Priyalee Kushwaha <[email protected]>
lib/vhost/rte_vhost.h +4 -0
@@ -109,6 +109,10 @@ extern "C" {#define VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD 12#endif +#ifndef VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS +#define VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS 15 +#endif +#ifndef VHOST_USER_PROTOCOL_F_STATUS #define VHOST_USER_PROTOCOL_F_STATUS 16#endif
Signature · 1 line
2.43.0
PATCH v13 2/5 vhost_user: header defines for add/rem mem region
In reply to [email protected]From: Pravin M Bathija <[email protected]>
The changes in this file cover the enum message requests for supporting add/remove memory regions. The front-end vhost-user client sends messages like get max memory slots, add memory region and remove memory region which are covered in these changes which are on the vhost-user back-end. The changes also include data structure definition of memory region to be added/removed. The data structure VhostUserMsg has been changed to include the memory region.
--- lib/vhost/vhost_user.h | 9 +++++++++ 1 file changed, 9 insertions(+)
lib/vhost/vhost_user.h +9 -0
@@ -67,6 +67,9 @@ typedef enum VhostUserRequest {VHOST_USER_POSTCOPY_END =30 ,VHOST_USER_GET_INFLIGHT_FD =31 ,VHOST_USER_SET_INFLIGHT_FD =32 , +VHOST_USER_GET_MAX_MEM_SLOTS =36 , +VHOST_USER_ADD_MEM_REG =37 , +VHOST_USER_REM_MEM_REG =38 ,VHOST_USER_SET_STATUS =39 ,VHOST_USER_GET_STATUS =40 , } VhostUserRequest;
@@ -91,6 +94,11 @@ typedef struct VhostUserMemory {VhostUserMemoryRegion regions[VHOST_MEMORY_MAX_NREGIONS ]; } VhostUserMemory; +typedef struct VhostUserMemRegMsg { +uint64_t padding; +VhostUserMemoryRegion region; +}VhostUserMemRegMsg ; + typedef struct VhostUserLog { uint64_t mmap_size; uint64_t mmap_offset;
@@ -186,6 +194,7 @@ typedef struct __rte_packed_begin VhostUserMsg {struct vhost_vring_state state;struct vhost_vring_addr addr;VhostUserMemory memory; +VhostUserMemRegMsg memreg;VhostUserLog log;struct vhost_iotlb_msg iotlb;VhostUserCryptoSessionParam crypto_session;
Signature · 1 line
2.43.0
PATCH v13 3/5 vhost_user: support function defines for back-end
In reply to [email protected]From: Pravin M Bathija <[email protected]>
Here we define support functions which are called from the various vhost-user back-end message functions like set memory table, get memory slots, add memory region, remove memory region. These are essentially common functions to unmap a set of memory regions, perform register copy, align memory addresses and dma map/unmap a single memory region.
--- lib/vhost/vhost_user.c | 89 ++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 29 deletions(-)
lib/vhost/vhost_user.c +60 -29
@@ -171,20 +171,27 @@ get_blk_size(int fd)return ret ==-1 ? (uint64_t )-1 : (uint64_t )stat.st_blksize; } -static void -async_dma_map (struct virtio_net *dev,bool do_map) +static int +async_dma_map_region (struct virtio_net *dev,struct rte_vhost_mem_region *reg,bool do_map) { -int ret =0 ;uint32_t i; -struct guest_page *page; +int ret; +uint64_t reg_start = reg->host_user_addr; +uint64_t reg_end = reg_start + reg->size; + +for (i =0 ; i < dev->nr_guest_pages; i++) { +struct guest_page *page = &dev->guest_pages[i]; + +/* Only process pages belonging to this region */ +if (page->host_user_addr < reg_start || + page->host_user_addr >= reg_end) +continue ; -if (do_map) { -for (i =0 ; i < dev->nr_guest_pages; i++) { - page = &dev->guest_pages[i]; +if (do_map) { ret =rte_vfio_container_dma_map (RTE_VFIO_DEFAULT_CONTAINER_FD , - page->host_user_addr, - page->host_iova, - page->size); + page->host_user_addr, + page->host_iova, + page->size);if (ret) {/* * DMA device may bind with kernel driver, in this case,
@@ -199,33 +206,57 @@ async_dma_map(struct virtio_net *dev, bool do_map)* normal case in async path. This is a workaround. */ if (rte_errno ==ENODEV ) -return ; +return 0 ;/* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */ VHOST_CONFIG_LOG (dev->ifname,ERR ,"DMA engine map failed" ); +return -1 ; } - } - - }else { -for (i =0 ; i < dev->nr_guest_pages; i++) { - page = &dev->guest_pages[i]; + }else { ret =rte_vfio_container_dma_unmap (RTE_VFIO_DEFAULT_CONTAINER_FD , - page->host_user_addr, - page->host_iova, - page->size); + page->host_user_addr, + page->host_iova, + page->size);if (ret) {/* like DMA map, ignore the kernel driver case when unmap. */ if (rte_errno ==EINVAL ) -return ; +return 0 ;VHOST_CONFIG_LOG (dev->ifname,ERR ,"DMA engine unmap failed" ); +return -1 ; } } } + +return 0 ; +} + +static void +async_dma_map (struct virtio_net *dev,bool do_map) +{ +uint32_t i; +struct rte_vhost_mem_region *reg; + +for (i =0 ; i <VHOST_MEMORY_MAX_NREGIONS ; i++) { + reg = &dev->mem->regions[i]; +if (reg->host_user_addr ==0 ) +continue ; +async_dma_map_region (dev, reg, do_map); + } }static void -free_mem_region (struct virtio_net *dev) +free_mem_region (struct rte_vhost_mem_region *reg) +{ +if (reg !=NULL && reg->mmap_addr) { +munmap (reg->mmap_addr, reg->mmap_size); +close (reg->fd); +memset (reg,0 ,sizeof (struct rte_vhost_mem_region )); + } +} + +static void +free_all_mem_regions (struct virtio_net *dev) {uint32_t i;struct rte_vhost_mem_region *reg;
@@ -236,12 +267,10 @@ free_mem_region(struct virtio_net *dev)if (dev->async_copy &&rte_vfio_is_enabled ("vfio" ))async_dma_map (dev, false); -for (i =0 ; i < dev->mem->nregions; i++) { +for (i =0 ; i <VHOST_MEMORY_MAX_NREGIONS ; i++) { reg = &dev->mem->regions[i]; -if (reg->host_user_addr) { -munmap (reg->mmap_addr, reg->mmap_size); -close (reg->fd); - } +if (reg->mmap_addr) +free_mem_region (reg); } }
@@ -255,7 +284,7 @@ vhost_backend_cleanup(struct virtio_net *dev) vdpa_dev->ops->dev_cleanup (dev->vid);if (dev->mem) { -free_mem_region (dev); +free_all_mem_regions (dev);rte_free (dev->mem); dev->mem =NULL ; }
@@ -704,7 +733,7 @@ numa_realloc(struct virtio_net **pdev, struct vhost_virtqueue **pvq) vhost_devices[dev->vid] = dev; mem_size =sizeof (struct rte_vhost_memory ) + -sizeof (struct rte_vhost_mem_region ) * dev->mem->nregions; +sizeof (struct rte_vhost_mem_region ) *VHOST_MEMORY_MAX_NREGIONS ; mem =rte_realloc_socket (dev->mem, mem_size,0 , node);if (!mem) { VHOST_CONFIG_LOG(dev->ifname, ERR,
@@ -808,8 +837,10 @@ hua_to_alignment(struct rte_vhost_memory *mem, void *ptr)uint32_t i;uintptr_t hua = (uintptr_t )ptr; -for (i =0 ; i < mem->nregions; i++) { +for (i =0 ; i <VHOST_MEMORY_MAX_NREGIONS ; i++) { r = &mem->regions[i]; +if (r->host_user_addr ==0 ) +continue ;if (hua >= r->host_user_addr && hua < r->host_user_addr + r->size) {return get_blk_size (r->fd);
Signature · 1 line
2.43.0
PATCH v13 4/5 vhost_user: Function defs for add/rem mem regions
In reply to [email protected]From: Pravin M Bathija <[email protected]>
These changes cover the function definition for add/remove memory region calls which are invoked on receiving vhost user message from vhost user front-end (e.g. Qemu). In our case, in addition to testing with qemu front-end, the testing has also been performed with libblkio front-end and spdk/dpdk back-end. We did I/O using libblkio based device driver, to spdk based drives.
There are also changes for set_mem_table and new definition for get memory slots. Our changes optimize the set memory table call to use common support functions. A new vhost_user_initialize_memory() function is introduced to factor out the common memory initialization logic from the function vhost_user_set_mem_table(), which is now called from both the SET_MEM_TABLE message handler and the ADD_MEM_REG handler (for the first region). Message get memory slots is how the vhost-user front-end queries the vhost-user back-end about the number of memory slots available to be registered by the back-end. In addition support function to invalidate vring is also defined which is used in add/remove memory region functions. The helper function remove_guest_pages is also defined here which is called from vhost_user_add_mem_reg.
--- lib/vhost/vhost_user.c | 329 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 296 insertions(+), 33 deletions(-)
lib/vhost/vhost_user.c +296 -33
@@ -71,6 +71,9 @@ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_FEATURES, vhost_user_set_features, false, t VHOST_MESSAGE_HANDLER(VHOST_USER_SET_OWNER, vhost_user_set_owner, false, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_RESET_OWNER, vhost_user_reset_owner, false, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_MEM_TABLE, vhost_user_set_mem_table, true, true) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_GET_MAX_MEM_SLOTS, vhost_user_get_max_mem_slots, false, false) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_ADD_MEM_REG, vhost_user_add_mem_reg, true, true) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_REM_MEM_REG, vhost_user_rem_mem_reg, true, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_LOG_BASE, vhost_user_set_log_base, true, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_LOG_FD, vhost_user_set_log_fd, true, true) \VHOST_MESSAGE_HANDLER (VHOST_USER_SET_VRING_NUM , vhost_user_set_vring_num, false, true) \
@@ -1167,6 +1170,24 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,return 0 ; } +static void +remove_guest_pages (struct virtio_net *dev,struct rte_vhost_mem_region *reg) +{ +uint64_t reg_start = reg->host_user_addr; +uint64_t reg_end = reg_start + reg->size; +uint32_t i, j =0 ; + +for (i =0 ; i < dev->nr_guest_pages; i++) { +if (dev->guest_pages[i].host_user_addr >= reg_start && + dev->guest_pages[i].host_user_addr < reg_end) +continue ; +if (j != i) + dev->guest_pages[j] = dev->guest_pages[i]; + j++; + } + dev->nr_guest_pages = j; +} +#ifdef RTE_LIBRTE_VHOST_DEBUG /* TODO: enable it only in debug mode? */ static void
@@ -1413,6 +1434,52 @@ vhost_user_mmap_region(struct virtio_net *dev,return 0 ; } +static int +vhost_user_initialize_memory (struct virtio_net **pdev) +{ +struct virtio_net *dev = *pdev; +int numa_node =SOCKET_ID_ANY ; + +if (dev->mem !=NULL ) { +VHOST_CONFIG_LOG (dev->ifname,ERR , +"memory already initialized, free it first" ); +return -1 ; + } + +/* +* If VQ 0 has already been allocated, try to allocate on the same +* NUMA node. It can be reallocated later in numa_realloc(). +*/ +if (dev->nr_vring >0 ) + numa_node = dev->virtqueue[0 ]->numa_node; + + dev->nr_guest_pages =0 ; +if (dev->guest_pages ==NULL ) { + dev->max_guest_pages =8 ; + dev->guest_pages =rte_zmalloc_socket (NULL , + dev->max_guest_pages * +sizeof (struct guest_page ), +RTE_CACHE_LINE_SIZE , + numa_node); +if (dev->guest_pages ==NULL ) { +VHOST_CONFIG_LOG (dev->ifname,ERR , +"failed to allocate memory for dev->guest_pages" ); +return -1 ; + } + } + + dev->mem =rte_zmalloc_socket ("vhost-mem-table" ,sizeof (struct rte_vhost_memory ) + +sizeof (struct rte_vhost_mem_region ) *VHOST_MEMORY_MAX_NREGIONS ,0 , numa_node); +if (dev->mem ==NULL ) { +VHOST_CONFIG_LOG (dev->ifname,ERR ,"failed to allocate memory for dev->mem" ); +rte_free (dev->guest_pages); + dev->guest_pages =NULL ; +return -1 ; + } + +return 0 ; +} + static int vhost_user_set_mem_table(struct virtio_net **pdev, struct vhu_msg_context *ctx,
@@ -1421,7 +1488,6 @@ vhost_user_set_mem_table(struct virtio_net **pdev,struct virtio_net *dev = *pdev;struct VhostUserMemory *memory = &ctx->msg.payload.memory;struct rte_vhost_mem_region *reg; -int numa_node =SOCKET_ID_ANY ;uint64_t mmap_offset;uint32_t i;bool async_notify = false;
@@ -1466,39 +1532,13 @@ vhost_user_set_mem_table(struct virtio_net **pdev,if (dev->features & (1ULL <<VIRTIO_F_IOMMU_PLATFORM ))vhost_user_iotlb_flush_all (dev); -free_mem_region (dev); +free_all_mem_regions (dev);rte_free (dev->mem); dev->mem =NULL ; } -/* -* If VQ 0 has already been allocated, try to allocate on the same -* NUMA node. It can be reallocated later in numa_realloc(). -*/ -if (dev->nr_vring >0 ) - numa_node = dev->virtqueue[0 ]->numa_node; - - dev->nr_guest_pages =0 ; -if (dev->guest_pages ==NULL ) { - dev->max_guest_pages =8 ; - dev->guest_pages =rte_zmalloc_socket (NULL , - dev->max_guest_pages * -sizeof (struct guest_page ), -RTE_CACHE_LINE_SIZE , - numa_node); -if (dev->guest_pages ==NULL ) { -VHOST_CONFIG_LOG (dev->ifname,ERR , -"failed to allocate memory for dev->guest_pages" ); - goto close_msg_fds; - } - } - - dev->mem =rte_zmalloc_socket ("vhost-mem-table" ,sizeof (struct rte_vhost_memory ) + -sizeof (struct rte_vhost_mem_region ) * memory->nregions,0 , numa_node); -if (dev->mem ==NULL ) { -VHOST_CONFIG_LOG (dev->ifname,ERR ,"failed to allocate memory for dev->mem" ); - goto free_guest_pages; - } +if (vhost_user_initialize_memory (pdev) <0 ) + goto close_msg_fds;for (i =0 ; i < memory->nregions; i++) { reg = &dev->mem->regions[i];
@@ -1562,11 +1602,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev,return RTE_VHOST_MSG_RESULT_OK ; free_mem_table: -free_mem_region (dev); +free_all_mem_regions (dev);rte_free (dev->mem); dev->mem =NULL ; - -free_guest_pages:rte_free (dev->guest_pages); dev->guest_pages =NULL ; close_msg_fds:
@@ -1574,6 +1612,231 @@ vhost_user_set_mem_table(struct virtio_net **pdev,return RTE_VHOST_MSG_RESULT_ERR ; } + +static int +vhost_user_get_max_mem_slots(struct virtio_net **pdev __rte_unused, +struct vhu_msg_context *ctx, + int main_fd __rte_unused) +{ +uint32_t max_mem_slots =VHOST_MEMORY_MAX_NREGIONS ; + + ctx->msg.payload.u64 = (uint64_t )max_mem_slots; + ctx->msg.size =sizeof (ctx->msg.payload.u64); + ctx->fd_num =0 ; + +return RTE_VHOST_MSG_RESULT_REPLY ; +} + +static void +_dev_invalidate_vrings (struct virtio_net **pdev) +{ +struct virtio_net *dev = *pdev; +uint32_t i; + +for (i =0 ; i < dev->nr_vring; i++) { +struct vhost_virtqueue *vq = dev->virtqueue[i]; + +if (!vq) +continue ; + +if (vq->desc || vq->avail || vq->used) { +vq_assert_lock (dev, vq); + +/* +* If the memory table got updated, the ring addresses +* need to be translated again as virtual addresses have +* changed. +*/ +vring_invalidate (dev, vq); + +translate_ring_addresses (&dev, &vq); + } + } + + *pdev = dev; +} + +/* +* Macro wrapper that performs the compile-time lock assertion with the +* correct message ID at the call site, then calls the implementation. +*/ +#define dev_invalidate_vrings (pdev, id) do { \ + static_assert(id ## _LOCK_ALL_QPS, \ + #id " handler is not declared as locking all queue pairs"); \ + _dev_invalidate_vrings(pdev); \ +} while (0) + +static int +vhost_user_add_mem_reg (struct virtio_net **pdev, +struct vhu_msg_context *ctx, + int main_fd __rte_unused) +{ +uint32_t i; +struct virtio_net *dev = *pdev; +struct VhostUserMemoryRegion *region = &ctx->msg.payload.memreg.region; + +/* convert first region add to normal memory table set */ +if (dev->mem ==NULL ) { +if (vhost_user_initialize_memory (pdev) <0 ) + goto close_msg_fds; + } + +/* make sure new region will fit */ +if (dev->mem->nregions >=VHOST_MEMORY_MAX_NREGIONS ) { +VHOST_CONFIG_LOG (dev->ifname,ERR ,"too many memory regions already (%u)" , + dev->mem->nregions); + goto close_msg_fds; + } + +/* make sure supplied memory fd present */ +if (ctx->fd_num !=1 ) { +VHOST_CONFIG_LOG (dev->ifname,ERR ,"fd count makes no sense (%u)" , ctx->fd_num); + goto close_msg_fds; + } + +/* Make sure no overlap in guest virtual address space */ +for (i =0 ; i < dev->mem->nregions; i++) { +struct rte_vhost_mem_region *current_region = &dev->mem->regions[i]; +uint64_t current_region_guest_start = current_region->guest_user_addr; +uint64_t current_region_guest_end = current_region_guest_start + + current_region->size -1 ; +uint64_t proposed_region_guest_start = region->userspace_addr; +uint64_t proposed_region_guest_end = proposed_region_guest_start + + region->memory_size -1 ; + +if (!((proposed_region_guest_end < current_region_guest_start) || + (proposed_region_guest_start > current_region_guest_end))) { +VHOST_CONFIG_LOG (dev->ifname,ERR , +"requested memory region overlaps with another region" ); +VHOST_CONFIG_LOG (dev->ifname,ERR , +"\tRequested region address:0x%" PRIx64, + region->userspace_addr); +VHOST_CONFIG_LOG (dev->ifname,ERR , +"\tRequested region size:0x%" PRIx64, + region->memory_size); +VHOST_CONFIG_LOG (dev->ifname,ERR , +"\tOverlapping region address:0x%" PRIx64, + current_region->guest_user_addr); +VHOST_CONFIG_LOG (dev->ifname,ERR , +"\tOverlapping region size:0x%" PRIx64, + current_region->size); + goto close_msg_fds; + } + } + +/* New region goes at the end of the contiguous array */ +struct rte_vhost_mem_region *reg = &dev->mem->regions[dev->mem->nregions]; + + reg->guest_phys_addr = region->guest_phys_addr; + reg->guest_user_addr = region->userspace_addr; + reg->size = region->memory_size; + reg->fd = ctx->fds[0 ]; + ctx->fds[0 ] =-1 ; + +if (vhost_user_mmap_region (dev, reg, region->mmap_offset) <0 ) { +VHOST_CONFIG_LOG (dev->ifname,ERR ,"failed to mmap region" ); +if (reg->mmap_addr) { +/* mmap succeeded but a later step (e.g. add_guest_pages) +* failed; undo the mapping and any guest-page entries. +*/ +remove_guest_pages (dev, reg); +free_mem_region (reg); + }else { +close (reg->fd); + reg->fd =-1 ; + } + goto close_msg_fds; + } + + dev->mem->nregions++; + +if (dev->async_copy &&rte_vfio_is_enabled ("vfio" )) { +if (async_dma_map_region (dev, reg, true) <0 ) + goto free_new_region; + } + +if (dev->postcopy_listening) { +/* +* Cannot use vhost_user_postcopy_register() here because it +* reads ctx->msg.payload.memory (SET_MEM_TABLE layout), but +* ADD_MEM_REG uses the memreg payload. Register the +* single new region directly instead. +*/ +if (vhost_user_postcopy_region_register (dev, reg) <0 ) + goto free_new_region; + } + +dev_invalidate_vrings (pdev,VHOST_USER_ADD_MEM_REG ); + dev = *pdev; +dump_guest_pages (dev); + +return RTE_VHOST_MSG_RESULT_OK ; + +free_new_region: +if (dev->async_copy &&rte_vfio_is_enabled ("vfio" )) +async_dma_map_region (dev, reg, false); +remove_guest_pages (dev, reg); +free_mem_region (reg); + dev->mem->nregions--; +close_msg_fds: +close_msg_fds (ctx); +return RTE_VHOST_MSG_RESULT_ERR ; +} + +static int +vhost_user_rem_mem_reg (struct virtio_net **pdev, +struct vhu_msg_context *ctx, + int main_fd __rte_unused) +{ +uint32_t i; +struct virtio_net *dev = *pdev; +struct VhostUserMemoryRegion *region = &ctx->msg.payload.memreg.region; + +if (dev->mem ==NULL || dev->mem->nregions ==0 ) { +VHOST_CONFIG_LOG (dev->ifname,ERR ,"no memory regions to remove" ); +close_msg_fds (ctx); +return RTE_VHOST_MSG_RESULT_ERR ; + } + +for (i =0 ; i < dev->mem->nregions; i++) { +struct rte_vhost_mem_region *current_region = &dev->mem->regions[i]; + +/* +* According to the vhost-user specification: +* The memory region to be removed is identified by its GPA, +* user address and size. The mmap offset is ignored. +*/ +if (region->userspace_addr == current_region->guest_user_addr + && region->guest_phys_addr == current_region->guest_phys_addr + && region->memory_size == current_region->size) { +if (dev->async_copy &&rte_vfio_is_enabled ("vfio" )) +async_dma_map_region (dev, current_region, false); +remove_guest_pages (dev, current_region); +free_mem_region (current_region); + +/* Compact the regions array to keep it contiguous */ +if (i < dev->mem->nregions -1 ) { +memmove (&dev->mem->regions[i], + &dev->mem->regions[i +1 ], + (dev->mem->nregions -1 - i) * +sizeof (struct rte_vhost_mem_region )); +memset (&dev->mem->regions[dev->mem->nregions -1 ], +0 ,sizeof (struct rte_vhost_mem_region )); + } + + dev->mem->nregions--; +dev_invalidate_vrings (pdev,VHOST_USER_REM_MEM_REG ); + dev = *pdev; +close_msg_fds (ctx); +return RTE_VHOST_MSG_RESULT_OK ; + } + } + +VHOST_CONFIG_LOG (dev->ifname,ERR ,"failed to find region" ); +close_msg_fds (ctx); +return RTE_VHOST_MSG_RESULT_ERR ; +} +static bool vq_is_ready (struct virtio_net *dev,struct vhost_virtqueue *vq) {
Signature · 1 line
2.43.0
PATCH v13 5/5 vhost_user: enable configure memory slots
In reply to [email protected]From: Pravin M Bathija <[email protected]>
This patch enables configure memory slots in the header define VHOST_USER_PROTOCOL_FEATURES.
--- lib/vhost/vhost_user.h | 1 + 1 file changed, 1 insertion(+)
lib/vhost/vhost_user.h +1 -0
@@ -32,6 +32,7 @@ (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT) | \ + (1ULL << VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS) | \ (1ULL << VHOST_USER_PROTOCOL_F_STATUS)) typedef enum VhostUserRequest {
Signature · 1 line
2.43.0
v14 cover net/sxe2: fix logic errors and address feedback
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v14 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset for mbuf_def in vector init to avoid uninitialized reads.
- Converted pci_map_addr_info to designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updated burst_mode_get to accurately report AVX paths.
- Adjusted SXE2_ETH_OVERHEAD to match actual VLAN capabilities.
Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup
.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 29 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 89 ++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 965 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 357 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1045 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 200 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 72 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9157 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Signature · 1 line
2.47.3
PATCH v14 1/11 mailmap: add Jie Liu
From: Jie Liu <[email protected]>
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -739,6 +739,7 @@ Jiawen Wu <[email protected]> Jiayu Hu <[email protected]> <[email protected]> Jie Hai <[email protected]> Jie Liu <[email protected]> +Jie Liu <[email protected]> Jie Pan <[email protected]> Jie Wang <[email protected]> Jie Zhou <[email protected]> <[email protected]>
Signature · 1 line
2.47.3
PATCH v14 2/11 doc: add sxe2 guide and release notes
In reply to [email protected]From: Jie Liu <[email protected]>
Add a new guide for SXE2 PMD in the nics directory. The guide contains driver capabilities, prerequisites, and compilation/usage instructions.
Update the release notes to announce the addition of the sxe2 network driver.
--- doc/guides/nics/features/sxe2.ini | 29 ++++++++++++++++++++++ doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_26_07.rst | 4 +++ 4 files changed, 68 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst
doc/guides/nics/features/sxe2.ini new file +29 -0
@@ -0,0 +1,29 @@ +; +; Supported features of the 'sxe2' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +; A feature with "P" indicates only be supported when non-vector path +; is selected. +; +[Features] +Fast mbuf free = P +Free Tx mbuf on demand = Y +Burst mode info = Y +Queue start/stop = Y +Buffer split on Rx = P +Scattered Rx = Y +CRC offload = Y +VLAN offload = Y +QinQ offload = P +L3 checksum offload = Y +L4 checksum offload = Y +Timestamp offload = P +Inner L3 checksum = P +Inner L4 checksum = P +Rx descriptor status = Y +Tx descriptor status = Y +FreeBSD = Y +Linux = Y +x86-32 = Y +x86-64 = Y
doc/guides/nics/index.rst +1 -0
@@ -68,6 +68,7 @@ Network Interface Controller Drivers rnp sfc_efx softnic + sxe2 tap thunderx txgbe
doc/guides/nics/sxe2.rst new file +34 -0
@@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +SXE2 Poll Mode Driver +====================== + +The sxe2 PMD (**librte_net_sxe2**) provides poll mode driver support for +10/25/50/100 Gbps Network Adapters. +The embedded switch, Physical Functions (PF), +and SR-IOV Virtual Functions (VF) are supported. + +Implementation details +---------------------- + +The sxe2 PMD is designed to operate alongside the sxe2 kernel network driver. +For management and control operations, the PMD communicates with the kernel +driver via ioctl interfaces. These commands are processed by the kernel +driver and subsequently dispatched to the hardware firmware for execution. + +For security and robustness, the driver's data path is optimized to operate +using virtual addresses (IOVA as VA mode). However, to ensure full +compatibility in system environments where an IOMMU is absent or disabled, +the driver also provides an explicit path to support physical addressing +(IOVA as PA mode). + +The hardware is capable of handling the corresponding IOVA addresses (either +VA or PA) directly, as provided by the DPDK memory subsystem. This ensures +that DPDK applications can only access memory segments explicitly allocated +to the current process, preventing unauthorized access to random physical +memory. + +This capability allows the PMD to coexist with kernel network interfaces +which remain functional, although they stop receiving unicast packets as +long as they share the same MAC address.
doc/guides/rel_notes/release_26_07.rst +4 -0
@@ -64,6 +64,10 @@ New Features * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Added Linkdata sxe2 ethernet driver.** + + Added network driver for the Linkdata Network Adapters. + Removed Items -------------
Signature · 1 line
2.47.3
PATCH v14 3/11 common/sxe2: add sxe2 basic structures
In reply to [email protected]From: Jie Liu <[email protected]>
This patch adds the base infrastructure for the sxe2 common library. It includes the mandatory OS abstraction layer (OSAL), common structure definitions, error codes, and the logging system implementation.
Specifically, this commit:
- Implements the logging stream management using RTE_LOG_LINE.
- Defines device-specific error codes and status registers.
- Adds the initial meson build configuration for the common library.
--- drivers/common/sxe2/sxe2_common_log.h | 82 +++ drivers/common/sxe2/sxe2_host_regs.h | 707 ++++++++++++++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 ++ drivers/common/sxe2/sxe2_osal.h | 89 +++ 4 files changed, 911 insertions(+) create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_osal.h
drivers/common/sxe2/sxe2_common_log.h new file +82 -0
@@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_COMMON_LOG_H__ +#define __SXE2_COMMON_LOG_H__ + +extern int32_t sxe2_common_log; +extern int32_t sxe2_log_init; +extern int32_t sxe2_log_driver; +extern int32_t sxe2_log_rx; +extern int32_t sxe2_log_tx; +extern int32_t sxe2_log_hw; + +#define RTE_LOGTYPE_SXE2_COM sxe2_common_log +#define RTE_LOGTYPE_SXE2_INIT sxe2_log_init +#define RTE_LOGTYPE_SXE2_DRV sxe2_log_driver +#define RTE_LOGTYPE_SXE2_RX sxe2_log_rx +#define RTE_LOGTYPE_SXE2_TX sxe2_log_tx +#define RTE_LOGTYPE_SXE2_HW sxe2_log_hw + +#define SXE2_PMD_LOG (level, log_type, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): ", \ + __func__, __VA_ARGS__) + +#define SXE2_PMD_DRV_LOG (level, log_type, adapter, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): port:%u ", \ + __func__ RTE_LOG_COMMA \ + adapter->dev_port_id, __VA_ARGS__) + +#define PMD_LOG_DEBUG (logtype, fmt, ...) \ + SXE2_PMD_LOG(DEBUG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_INFO (logtype, fmt, ...) \ + SXE2_PMD_LOG(INFO, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_NOTICE (logtype, fmt, ...) \ + SXE2_PMD_LOG(NOTICE, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_WARN (logtype, fmt, ...) \ + SXE2_PMD_LOG(WARNING, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ERR (logtype, fmt, ...) \ + SXE2_PMD_LOG(ERR, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_CRIT (logtype, fmt, ...) \ + SXE2_PMD_LOG(CRIT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ALERT (logtype, fmt, ...) \ + SXE2_PMD_LOG(ALERT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_EMERG (logtype, fmt, ...) \ + SXE2_PMD_LOG(EMERG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_DEBUG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(DEBUG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_INFO (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(INFO, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_NOTICE (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(NOTICE, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_WARN (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(WARNING, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ERR (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ERR, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_CRIT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(CRIT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ALERT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ALERT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_EMERG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(EMERG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>") + +#endif /* __SXE2_COMMON_LOG_H__ */ +
drivers/common/sxe2/sxe2_host_regs.h new file +707 -0
707 lines not on this page · raw message
drivers/common/sxe2/sxe2_internal_ver.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_INTERNAL_VER_H__ +#define __SXE2_INTERNAL_VER_H__ + +#define SXE2_VER_MAJOR_OFFSET (16) +#define SXE2_MK_VER (major, minor) \ + (major << SXE2_VER_MAJOR_OFFSET | minor) +#define SXE2_MK_VER_MAJOR (ver) (((ver) >> SXE2_VER_MAJOR_OFFSET) & 0xff) +#define SXE2_MK_VER_MINOR (ver) ((ver) & 0xff) + +#define SXE2_ITR_VER_MAJOR_V100 1 +#define SXE2_ITR_VER_MAJOR_V200 2 + +#define SXE2_ITR_VER_MAJOR 1 +#define SXE2_ITR_VER_MINOR 1 +#define SXE2_ITR_VER SXE2_MK_VER(SXE2_ITR_VER_MAJOR, SXE2_ITR_VER_MINOR) + +#define SXE2_CTRL_VER_IS_V100 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V100) +#define SXE2_CTRL_VER_IS_V200 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V200) + +#define SXE2LIB_ITR_VER_MAJOR 1 +#define SXE2LIB_ITR_VER_MINOR 1 +#define SXE2LIB_ITR_VER SXE2_MK_VER(SXE2LIB_ITR_VER_MAJOR, SXE2LIB_ITR_VER_MINOR) + +#define SXE2_DRV_CLI_VER_MAJOR 1 +#define SXE2_DRV_CLI_VER_MINOR 1 +#define SXE2_DRV_CLI_VER \ + SXE2_MK_VER(SXE2_DRV_CLI_VER_MAJOR, SXE2_DRV_CLI_VER_MINOR) + +#endif /* __SXE2_INTERNAL_VER_H__ */
drivers/common/sxe2/sxe2_osal.h new file +89 -0
89 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v14 4/11 drivers: add base driver skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the sxe2 PMD skeleton by implementing the PCI probe and remove functions. This includes the setup and cleanup of a character device used for control path communication between the user space and the hardware.
The character device provides an interface for ioctl-based management operations, supporting device-specific configuration.
--- drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 635 +++++++++++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 +++ drivers/common/sxe2/sxe2_common_log.h | 1 - drivers/common/sxe2/sxe2_host_regs.h | 226 ++++---- drivers/common/sxe2/sxe2_ioctl_chnl.c | 160 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 44 ++ drivers/common/sxe2/sxe2_osal.h | 2 +- drivers/meson.build | 1 + 10 files changed, 1184 insertions(+), 115 deletions(-) create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h
drivers/common/sxe2/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Corigine, Inc. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +deps += ['bus_pci', 'net', 'eal', 'ethdev'] + +sources = files( + 'sxe2_common.c', + 'sxe2_ioctl_chnl.c', +)
drivers/common/sxe2/sxe2_common.c new file +635 -0
635 lines not on this page · raw message
drivers/common/sxe2/sxe2_common.h new file +85 -0
85 lines not on this page · raw message
drivers/common/sxe2/sxe2_common_log.h +0 -1
@@ -79,4 +79,3 @@ extern int32_t sxe2_log_hw;#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>")#endif /* __SXE2_COMMON_LOG_H__ */ -
drivers/common/sxe2/sxe2_host_regs.h +113 -113
466 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.c new file +160 -0
160 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.h new file +130 -0
130 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h new file +44 -0
44 lines not on this page · raw message
drivers/common/sxe2/sxe2_osal.h +1 -1
@@ -63,7 +63,7 @@ enum sxe2_itr_idx {#define ETH_P_QINQ1 0x9100#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(unsigned long)) -#define BITS_TO_U32 (nr) DIV_ROUND_UP(nr, 32) +#define BITS_TO_uint32_t (nr) DIV_ROUND_UP(nr, 32)#define BITMAP_LAST_WORD_MASK (nbits) (~0UL >> (-(nbits) & (__BITS_PER_LONG - 1)))
drivers/meson.build +1 -0
@@ -12,6 +12,7 @@ subdirs = [ 'common/qat', # depends on bus. 'common/sfc_efx', # depends on bus. 'common/zsda', # depends on bus. + 'common/sxe2', # depends on bus. 'mempool', # depends on common and bus. 'dma', # depends on common and bus. 'net', # depends on common, bus, mempool
Signature · 1 line
2.47.3
PATCH v14 5/11 drivers: add base driver probe skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the eth_dev_ops for the sxe2 PMD. This includes the implementation of mandatory ethdev operations such as dev_configure, dev_start, dev_stop, and dev_infos_get.
Set up the basic infrastructure for device initialization to allow the driver to be recognized as a valid ethernet device within the DPDK framework.
--- drivers/common/sxe2/sxe2_common.c | 2 +- drivers/common/sxe2/sxe2_ioctl_chnl.c | 33 +- drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 13 +- drivers/common/sxe2/sxe2_osal.h | 7 +- drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 23 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 +++++++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 ++ drivers/net/sxe2/sxe2_drv_cmd.h | 388 +++++++++++++ drivers/net/sxe2/sxe2_ethdev.c | 613 +++++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 293 ++++++++++ drivers/net/sxe2/sxe2_irq.h | 48 ++ drivers/net/sxe2/sxe2_queue.c | 38 ++ drivers/net/sxe2/sxe2_queue.h | 191 +++++++ drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 16 + drivers/net/sxe2/sxe2_vsi.c | 214 +++++++ drivers/net/sxe2/sxe2_vsi.h | 204 +++++++ 18 files changed, 2975 insertions(+), 9 deletions(-) create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
drivers/common/sxe2/sxe2_common.c +1 -1
@@ -183,7 +183,7 @@ static int32_t sxe2_common_device_setup(struct sxe2_common_device *cdev) goto l_end; } - ret =sxe2_drv_dev_handshark (cdev); + ret =sxe2_drv_dev_handshke (cdev);if (ret !=0 ) {PMD_LOG_ERR (COM ,"Handshark failed, ret=%d" , ret); goto l_close_dev;
drivers/common/sxe2/sxe2_ioctl_chnl.c +30 -3
@@ -112,9 +112,9 @@ sxe2_drv_dev_close(struct sxe2_common_device *cdev)SXE2_CDEV_TO_CMD_FD (cdev) =-1 ; } -RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_handshark) +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_handshke) int32_t -sxe2_drv_dev_handshark (struct sxe2_common_device *cdev) +sxe2_drv_dev_handshke (struct sxe2_common_device *cdev) {int32_t ret =0 ;int32_t cmd_fd =0 ;
@@ -144,7 +144,7 @@ sxe2_drv_dev_handshark(struct sxe2_common_device *cdev)if (ret <0 ) {PMD_LOG_ERR (COM ,"Failed to handshark, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); - ret = -EIO ; + ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock); goto l_end; }
@@ -158,3 +158,30 @@ sxe2_drv_dev_handshark(struct sxe2_common_device *cdev) l_end:return ret; } + +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len) +{ +int32_t ret =0 ; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , + virt, len); + + ret =munmap (virt, len); +if (ret <0 ) { +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , + virt, len,strerror (errno)); + ret = -errno; + goto l_end; + } + +l_end: +return ret; +}
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +11 -2
@@ -35,10 +35,19 @@ sxe2_drv_dev_close(struct sxe2_common_device *cdev);__rte_internal int32_t -sxe2_drv_dev_handshark (struct sxe2_common_device *cdev); +sxe2_drv_dev_handshke (struct sxe2_common_device *cdev); + +__rte_internal +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx, +uint64_t len,uint64_t offset); + +__rte_internal +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len);#ifdef __cplusplus }#endif -#endif +#endif /* __SXE2_IOCTL_CHNL_FUNC_H__ */
drivers/common/sxe2/sxe2_osal.h +4 -3
@@ -58,9 +58,10 @@ enum sxe2_itr_idx { SXE2_ITR_IDX_NONE, }; -#define ETH_P_8021Q 0x8100 -#define ETH_P_8021AD 0x88a8 -#define ETH_P_QINQ1 0x9100 +#define ETH_P_8021Q 0x8100 +#define ETH_P_8021AD 0x88a8 +#define ETH_P_QINQ1 0x9100 +#define ETH_ALEN 6#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(unsigned long))#define BITS_TO_uint32_t (nr) DIV_ROUND_UP(nr, 32)
drivers/net/meson.build +1 -0
@@ -58,6 +58,7 @@ drivers = [ 'rnp', 'sfc', 'softnic', + 'sxe2', 'tap', 'thunderx', 'txgbe',
drivers/net/sxe2/meson.build new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +cflags += ['-g'] + +deps += ['common_sxe2', 'hash','cryptodev','security'] + +includes += include_directories('../../common/sxe2') + +sources += files( + 'sxe2_ethdev.c', + 'sxe2_cmd_chnl.c', + 'sxe2_vsi.c', + 'sxe2_queue.c', +) + +allow_internal_get_api = true
drivers/net/sxe2/sxe2_cmd_chnl.c new file +323 -0
323 lines not on this page · raw message
drivers/net/sxe2/sxe2_cmd_chnl.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_CMD_CHNL_H__ +#define __SXE2_CMD_CHNL_H__ + +#include "sxe2_ethdev.h" +#include "sxe2_drv_cmd.h" +#include "sxe2_ioctl_chnl_func.h" + +int32_t sxe2_drv_dev_caps_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_caps_resp *dev_caps); + +int32_t sxe2_drv_dev_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_info_resp *dev_info_resp); + +int32_t sxe2_drv_dev_fw_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_fw_info_resp *dev_fw_info_resp); + +int32_t sxe2_drv_vsi_add (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_vsi_del (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_rxq_switch (struct sxe2_adapter *adapter,struct sxe2_rx_queue *rxq,bool enable); + +int32_t sxe2_drv_txq_switch (struct sxe2_adapter *adapter,struct sxe2_tx_queue *txq,bool enable); + +int32_t sxe2_drv_rxq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_rx_queue *rxq, +uint16_t rxq_cnt); + +int32_t sxe2_drv_txq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_tx_queue *txq, +uint16_t txq_cnt); + +#endif
drivers/net/sxe2/sxe2_drv_cmd.h new file +388 -0
388 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.c new file +613 -0
613 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h new file +293 -0
293 lines not on this page · raw message
drivers/net/sxe2/sxe2_irq.h new file +48 -0
48 lines not on this page · raw message
drivers/net/sxe2/sxe2_queue.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#include "sxe2_ethdev.h" +#include "sxe2_queue.h" +#include "sxe2_common_log.h" + +void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter, +struct sxe2_drv_queue_caps *q_caps) +{ + adapter->q_ctxt.qp_cnt_assign = q_caps->queues_cnt; + adapter->q_ctxt.base_idx_in_pf = q_caps->base_idx_in_pf; +} + +int32_t sxe2_queues_init (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; +uint16_t buf_size; +uint16_t frame_size; +struct sxe2_rx_queue *rxq; +uint16_t nb_rxq; + + frame_size = dev->data->mtu +SXE2_ETH_OVERHEAD ; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; +if (!rxq) +continue ; + + buf_size =rte_pktmbuf_data_room_size (rxq->mb_pool) -RTE_PKTMBUF_HEADROOM ; + rxq->rx_buf_len =RTE_ALIGN_FLOOR (buf_size, (1 <<SXE2_RXQ_CTX_DBUFF_SHIFT )); + rxq->rx_buf_len =RTE_MIN (rxq->rx_buf_len,SXE2_RX_MAX_DATA_BUF_SIZE ); +if (frame_size > rxq->rx_buf_len) + dev->data->scattered_rx =1 ; + } + +return ret; +}
drivers/net/sxe2/sxe2_queue.h new file +191 -0
191 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_common.h new file +540 -0
540 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_poll.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_POLL_H +#define SXE2_TXRX_POLL_H + +#include "sxe2_queue.h" + +uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +#endif /* __SXE2_TXRX_POLL_H__ */
drivers/net/sxe2/sxe2_vsi.c new file +214 -0
214 lines not on this page · raw message
drivers/net/sxe2/sxe2_vsi.h new file +204 -0
178 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.47.3
Part of the diff is not shown here. View the raw message.
PATCH v14 6/11 drivers: support PCI BAR mapping
In reply to [email protected]From: Jie Liu <[email protected]>
Implement PCI BAR (Base Address Register) mapping and unmapping logic to enable MMIO (Memory Mapped I/O) access to hardware registers.
The driver retrieves the BAR0 virtual address from the PCI resource during the probing phase. This mapping is used for subsequent register-level operations. Proper cleanup is implemented in the device close path.
--- drivers/common/sxe2/sxe2_common.c | 8 +- drivers/common/sxe2/sxe2_ioctl_chnl.c | 38 ++- drivers/net/sxe2/sxe2_ethdev.c | 326 +++++++++++++++++++++++++- drivers/net/sxe2/sxe2_ethdev.h | 18 ++ 4 files changed, 381 insertions(+), 9 deletions(-)
drivers/common/sxe2/sxe2_common.c +4 -4
@@ -185,7 +185,7 @@ static int32_t sxe2_common_device_setup(struct sxe2_common_device *cdev) ret =sxe2_drv_dev_handshke (cdev);if (ret !=0 ) { -PMD_LOG_ERR (COM ,"Handshark failed, ret=%d" , ret); +PMD_LOG_ERR (COM ,"handshake failed, ret=%d" , ret); goto l_close_dev; }
@@ -605,18 +605,18 @@ static void sxe2_common_pci_init(void)return ; } -static bool sxe2_commoin_inited; +static bool sxe2_common_inited;RTE_EXPORT_INTERNAL_SYMBOL (sxe2_common_init) voidsxe2_common_init (void ) { -if (sxe2_commoin_inited) +if (sxe2_common_inited) goto l_end;pthread_mutex_init (&sxe2_common_devices_list_lock,NULL );sxe2_common_pci_init (); - sxe2_commoin_inited = true; + sxe2_common_inited = true; l_end:return ;
drivers/common/sxe2/sxe2_ioctl_chnl.c +36 -2
@@ -133,7 +133,7 @@ sxe2_drv_dev_handshke(struct sxe2_common_device *cdev) goto l_end; } -PMD_LOG_DEBUG (COM ,"Open fd=%d to handshark with kernel" , cmd_fd); +PMD_LOG_DEBUG (COM ,"Open fd=%d to handshake with kernel" , cmd_fd);memset (&cmd_params,0 ,sizeof (struct sxe2_ioctl_cmd_common_hdr )); cmd_params.dpdk_ver =SXE2_COM_VER ;
@@ -142,7 +142,7 @@ sxe2_drv_dev_handshke(struct sxe2_common_device *cdev) (void )pthread_mutex_lock (&cdev->config.lock); ret =ioctl (cmd_fd,SXE2_COM_CMD_HANDSHAKE , &cmd_params);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to handshark, fd=%d, ret=%d, err:%s" , +PMD_LOG_ERR (COM ,"Failed to handshake, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock);
@@ -159,6 +159,40 @@ sxe2_drv_dev_handshke(struct sxe2_common_device *cdev)return ret; } +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_mmap) +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx,uint64_t len,uint64_t offset) +{ +int32_t cmd_fd =0 ; +void *virt =NULL ; + +if (cdev->config.kernel_reset) { +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_err; + } + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_err; + } + +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , + bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); + + virt =mmap (NULL , len,PROT_READ |PROT_WRITE , +MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); +if (virt ==MAP_FAILED ) { +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , + cmd_fd, len, offset,strerror (errno)); + goto l_err; + } + +return virt; +l_err: +return NULL ; +} +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) int32_tsxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len)
drivers/net/sxe2/sxe2_ethdev.c +323 -3
380 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +18 -0
@@ -290,4 +290,22 @@ struct sxe2_adapter {#define SXE2_DEV_PRIVATE_TO_ADAPTER (dev) \ ((struct sxe2_adapter *)(dev)->data->dev_private) +#define SXE2_DEV_TO_PCI (eth_dev) \ + RTE_DEV_TO_PCI((eth_dev)->device) + +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type); + +int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); + +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, +uint32_t item_cnt,uint32_t item_base); + +void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type); + +int32_t sxe2_dev_pci_map_init (struct rte_eth_dev *dev); + +void sxe2_dev_pci_map_uinit (struct rte_eth_dev *dev); +#endif /* __SXE2_ETHDEV_H__ */
Signature · 1 line
2.47.3
PATCH v14 7/11 common/sxe2: add ioctl interface for DMA map and unmap
In reply to [email protected]From: Jie Liu <[email protected]>
Implement DMA mapping and unmapping functionality using ioctl calls. This allows the driver to configure the hardware's IOMMU/DMA tables, ensuring the device can safely access memory buffers allocated by the userspace.
The mapping is established during device initialization or queue setup and is revoked during device closure to prevent memory leaks and ensure hardware security.
--- drivers/common/sxe2/sxe2_common.c | 50 +++++++++- drivers/common/sxe2/sxe2_ioctl_chnl.c | 104 +++++++++++++++++++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 ++ 3 files changed, 162 insertions(+), 1 deletion(-)
drivers/common/sxe2/sxe2_common.c +49 -1
@@ -442,7 +442,7 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev) cdev =sxe2_rtedev_to_cdev (&pci_dev->device);if (cdev ==NULL ) { ret = -ENODEV ; -PMD_LOG_ERR (COM ,"Fail to get remove device." ); +PMD_LOG_ERR (COM ,"Fail to get device when remove." ); goto l_end; }
@@ -466,12 +466,60 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev)return ret; } +static int32_t sxe2_common_pci_dma_map (struct rte_pci_device *pci_dev, +void *addr,uint64_t iova,size_t len) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma map." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_map (cdev, (uint64_t )(uintptr_t )addr, iova, len); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to map dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} + +static int32_t sxe2_common_pci_dma_unmap (struct rte_pci_device *pci_dev, + void *addr __rte_unused, uint64_t iova, size_t len __rte_unused) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma unmap." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_unmap (cdev, iova); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to unmap dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} +static struct rte_pci_driver sxe2_common_pci_driver = { .driver = { .name =SXE2_COMMON_PCI_DRIVER_NAME , }, .probe = sxe2_common_pci_probe, .remove = sxe2_common_pci_remove, + .dma_map = sxe2_common_pci_dma_map, + .dma_unmap = sxe2_common_pci_dma_unmap, };static uint32_t sxe2_common_pci_id_table_size_get (const struct rte_pci_id *id_table)
drivers/common/sxe2/sxe2_ioctl_chnl.c +104 -0
107 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -46,6 +46,15 @@ __rte_internalint32_t sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); +__rte_internal +int32_t +sxe2_drv_dev_dma_map (struct sxe2_common_device *cdev,uint64_t vaddr, +uint64_t iova,uint64_t size); + +__rte_internal +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova); + #ifdef __cplusplus }#endif
Signature · 1 line
2.47.3
PATCH v14 8/11 net/sxe2: support queue setup and control
In reply to [email protected]From: Jie Liu <[email protected]>
Add support for Rx and Tx queue setup, release, and management. Implement eth_dev_ops callbacks for rx_queue_setup, tx_queue_setup, rx_queue_release, and tx_queue_release.
This includes:
- Allocating memory for hardware ring descriptors.
- Initializing software ring structures and hardware head/tail pointers.
- Implementing proper resource cleanup logic to prevent memory leaks during queue reconfiguration or device close.
--- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 79 +++-- drivers/net/sxe2/sxe2_ethdev.h | 15 +- drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++++++++++++++++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 ++ drivers/net/sxe2/sxe2_tx.c | 420 +++++++++++++++++++++++++ drivers/net/sxe2/sxe2_tx.h | 32 ++ 7 files changed, 1115 insertions(+), 26 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h
drivers/net/sxe2/meson.build +2 -0
@@ -18,6 +18,8 @@ sources += files( 'sxe2_cmd_chnl.c', 'sxe2_vsi.c', 'sxe2_queue.c', + 'sxe2_tx.c', + 'sxe2_rx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +57 -22
124 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +11 -4
@@ -293,14 +293,21 @@ struct sxe2_adapter {#define SXE2_DEV_TO_PCI (eth_dev) \ RTE_DEV_TO_PCI((eth_dev)->device) +void *sxe2_pci_map_addr_get (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type, +uint16_t idx_in_func); +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type); +enum sxe2_pci_map_resource res_type);int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); +enum sxe2_pci_map_resource res_type, +uint64_t org_len,uint64_t org_offset); -int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, -uint32_t item_cnt,uint32_t item_base); +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter, +uint32_t res_type, +uint32_t item_cnt, +uint32_t item_base);void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type);
drivers/net/sxe2/sxe2_rx.c new file +559 -0
559 lines not on this page · raw message
drivers/net/sxe2/sxe2_rx.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_RX_H__ +#define __SXE2_RX_H__ + +#include "sxe2_queue.h" + +int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_rxconf *rx_conf, +struct rte_mempool *mp); + +int32_t __rte_cold sxe2_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +void __rte_cold sxe2_rx_queue_mbufs_release(struct sxe2_rx_queue *rxq); + +void __rte_cold sxe2_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_rxq_info *qinfo); + +int32_t __rte_cold sxe2_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int32_t __rte_cold sxe2_rxqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rxqs_all_stop(struct rte_eth_dev *dev); + +struct rte_mbuf *sxe2_mbuf_raw_alloc (struct rte_mempool *mp); + +#endif
drivers/net/sxe2/sxe2_tx.c new file +420 -0
420 lines not on this page · raw message
drivers/net/sxe2/sxe2_tx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_TX_H__ +#define __SXE2_TX_H__ +#include "sxe2_queue.h" + +void __rte_cold sxe2_tx_queue_reset(struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id); + +void sxe2_tx_queue_mbufs_release (struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id); + +int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_txconf *tx_conf); + +void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_txq_info *qinfo); + +int32_t __rte_cold sxe2_txqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_txqs_all_stop(struct rte_eth_dev *dev); + +#endif
Signature · 1 line
2.47.3
PATCH v14 9/11 drivers: add data path for Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
Implement receive and transmit burst functions for sxe2 PMD. Add sxe2_recv_pkts and sxe2_xmit_pkts as the primary data path interfaces.
The implementation includes:
- Efficient descriptor fetching and mbuf allocation for Rx.
- Descriptor setup and checksum offload handling for Tx.
- Buffer recycling and hardware tail pointer updates.
- Performance-oriented loop unrolling and prefetching where applicable.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 8 +- drivers/common/sxe2/sxe2_osal.h | 3 +- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 13 +- drivers/net/sxe2/sxe2_txrx.c | 246 +++++++ drivers/net/sxe2/sxe2_txrx.h | 21 + drivers/net/sxe2/sxe2_txrx_poll.c | 919 ++++++++++++++++++++++++++ 7 files changed, 1205 insertions(+), 7 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c
drivers/common/sxe2/sxe2_ioctl_chnl.c +4 -4
@@ -177,13 +177,13 @@ void goto l_err; } -PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=%" PRIu64", src=0x%" PRIx64", offset=0x%" PRIx64"" , bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); virt =mmap (NULL , len,PROT_READ |PROT_WRITE ,MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset));if (virt ==MAP_FAILED ) { -PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=%" PRIu64", offset=0x%" PRIx64", err:%s" , cmd_fd, len, offset,strerror (errno)); goto l_err; }
@@ -205,12 +205,12 @@ sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) goto l_end; } -PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%" PRIx64"" , virt, len); ret =munmap (virt, len);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=%" PRIu64", err:%s" , virt, len,strerror (errno)); ret = -errno; goto l_end;
drivers/common/sxe2/sxe2_osal.h +1 -2
@@ -22,8 +22,7 @@#endif #define BIT_WORD (nr) ((nr) / __BITS_PER_LONG)#define BIT_MASK (nr) (1UL << ((nr) % __BITS_PER_LONG)) - -#define BITS_PER_BYTE 8 +#define BITS_PER_BYTE 8#define IS_UNICAST_ETHER_ADDR (addr) \ ((bool)((((uint8_t *)(addr))[0] % ((uint8_t)0x2)) == 0))
drivers/net/sxe2/meson.build +2 -0
@@ -20,6 +20,8 @@ sources += files( 'sxe2_queue.c', 'sxe2_tx.c', 'sxe2_rx.c', + 'sxe2_txrx_poll.c', + 'sxe2_txrx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +12 -1
@@ -26,6 +26,7 @@#include "sxe2_cmd_chnl.h" #include "sxe2_tx.h" #include "sxe2_rx.h" +#include "sxe2_txrx.h" #include "sxe2_common.h" #include "sxe2_common_log.h" #include "sxe2_host_regs.h"
@@ -137,6 +138,9 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev) goto l_end; } +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); + ret =sxe2_queues_start (dev);if (ret) {PMD_LOG_ERR (INIT ,"enable queues failed" );
@@ -760,10 +764,17 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,PMD_INIT_FUNC_TRACE (); +sxe2_set_common_function (dev); + dev->dev_ops = &sxe2_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); +if (ret !=0 ) +PMD_LOG_ERR (INIT ,"Failed to mp init (secondary), ret=%d" , ret); goto l_end; + } ret =sxe2_hw_init (dev);if (ret) {
drivers/net/sxe2/sxe2_txrx.c new file +246 -0
246 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_H +#define SXE2_TXRX_H +#include <ethdev_driver.h> +#include "sxe2_queue.h" + +void sxe2_set_common_function (struct rte_eth_dev *dev); + +uint16_t sxe2_tx_pkts_prepare (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); + +void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); + +#endif
drivers/net/sxe2/sxe2_txrx_poll.c new file +919 -0
919 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v14 10/11 net/sxe2: add vectorized Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the vectorized data path for the sxe2 PMD. It utilizes SIMD instructions (e.g., SSE) to process multiple packets simultaneously, significantly improving throughput for small packet processing.
The implementation includes:
* Vectorized Rx burst function for bulk descriptor processing.
* Vectorized Tx burst function with optimized resource cleanup.
* Capability flags update to reflect vectorized path support.
--- drivers/net/sxe2/meson.build | 5 + drivers/net/sxe2/sxe2_ethdev.c | 31 +- drivers/net/sxe2/sxe2_queue.c | 28 ++ drivers/net/sxe2/sxe2_queue.h | 4 + drivers/net/sxe2/sxe2_txrx.c | 197 +++++++-- drivers/net/sxe2/sxe2_txrx.h | 13 +- drivers/net/sxe2/sxe2_txrx_poll.c | 29 +- drivers/net/sxe2/sxe2_txrx_poll.h | 4 + drivers/net/sxe2/sxe2_txrx_vec.c | 200 +++++++++ drivers/net/sxe2/sxe2_txrx_vec.h | 72 ++++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 ++++++++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++++++++++++++++ 12 files changed, 1294 insertions(+), 73 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c
drivers/net/sxe2/meson.build +5 -0
@@ -13,6 +13,10 @@ deps += ['common_sxe2', 'hash','cryptodev','security'] includes += include_directories('../../common/sxe2') +if arch_subdir == 'x86' + sources += files('sxe2_txrx_vec_sse.c') +endif + sources += files( 'sxe2_ethdev.c', 'sxe2_cmd_chnl.c',
@@ -22,6 +26,7 @@ sources += files( 'sxe2_rx.c', 'sxe2_txrx_poll.c', 'sxe2_txrx.c', + 'sxe2_txrx_vec.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +8 -23
@@ -107,25 +107,6 @@ static int32_t sxe2_dev_stop(struct rte_eth_dev *dev)return ret; } -static int32_t sxe2_queues_start (struct rte_eth_dev *dev) -{ -int32_t ret =0 ; - ret =sxe2_txqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); - goto l_end; - } - - ret =sxe2_rxqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); -sxe2_txqs_all_stop (dev); - } - -l_end: -return ret; -} -static int32_t sxe2_dev_start (struct rte_eth_dev *dev) {int32_t ret =0 ;
@@ -158,7 +139,7 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev)static int32_t sxe2_dev_close (struct rte_eth_dev *dev) { (void )sxe2_dev_stop (dev); - + (void )sxe2_queues_release (dev);sxe2_vsi_uninit (dev);sxe2_dev_pci_map_uinit (dev);
@@ -296,13 +277,19 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .dev_close = sxe2_dev_close, .dev_infos_get = sxe2_dev_infos_get, + .rx_queue_start = sxe2_rx_queue_start, + .rx_queue_stop = sxe2_rx_queue_stop, + .tx_queue_start = sxe2_tx_queue_start, + .tx_queue_stop = sxe2_tx_queue_stop, .rx_queue_setup = sxe2_rx_queue_setup, - .tx_queue_setup = sxe2_tx_queue_setup, .rx_queue_release = sxe2_rx_queue_release, + .tx_queue_setup = sxe2_tx_queue_setup, .tx_queue_release = sxe2_tx_queue_release, .rxq_info_get = sxe2_rx_queue_info_get, .txq_info_get = sxe2_tx_queue_info_get, + .rx_burst_mode_get = sxe2_rx_burst_mode_get, + .tx_burst_mode_get = sxe2_tx_burst_mode_get, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
@@ -771,8 +758,6 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) {sxe2_rx_mode_func_set (dev);sxe2_tx_mode_func_set (dev); -if (ret !=0 ) -PMD_LOG_ERR (INIT ,"Failed to mp init (secondary), ret=%d" , ret); goto l_end; }
drivers/net/sxe2/sxe2_queue.c +28 -0
@@ -5,6 +5,8 @@#include "sxe2_ethdev.h" #include "sxe2_queue.h" #include "sxe2_common_log.h" +#include "sxe2_tx.h" +#include "sxe2_rx.h" void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter,struct sxe2_drv_queue_caps *q_caps)
@@ -36,3 +38,29 @@ int32_t sxe2_queues_init(struct rte_eth_dev *dev)return ret; } + +int32_t sxe2_queues_start (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; + + ret =sxe2_txqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); + goto l_end; + } + + ret =sxe2_rxqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); +sxe2_txqs_all_stop (dev); + } +l_end: +return ret; +} + +void sxe2_queues_release (struct rte_eth_dev *dev) +{ +sxe2_all_rxqs_release (dev); + +sxe2_all_txqs_release (dev); +}
drivers/net/sxe2/sxe2_queue.h +4 -0
@@ -188,4 +188,8 @@ void sxe2_sw_queue_ctx_hw_cap_set(struct sxe2_adapter *adapter,int32_t sxe2_queues_init (struct rte_eth_dev *dev); +int32_t sxe2_queues_start (struct rte_eth_dev *dev); + +void sxe2_queues_release (struct rte_eth_dev *dev); +#endif /* __SXE2_QUEUE_H__ */
drivers/net/sxe2/sxe2_txrx.c +154 -43
330 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h +7 -6
@@ -6,16 +6,17 @@#define SXE2_TXRX_H #include <ethdev_driver.h> #include "sxe2_queue.h" -void sxe2_set_common_function (struct rte_eth_dev *dev); +int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, +uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); -void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); - void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); -void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); - -#endif +int32_t sxe2_tx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +int32_t sxe2_rx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +#endif /* SXE2_TXRX_H */
drivers/net/sxe2/sxe2_txrx_poll.c +28 -1
@@ -369,11 +369,12 @@ uint16_t sxe2_tx_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkt desc->read.type_cmd_off_bsz_l2t |=rte_cpu_to_le_64 (((uint64_t )desc_cmd) <<SXE2_TX_DATA_DESC_CMD_SHIFT ); } + goto l_end_of_tx; l_exit_logic:if (tx_num ==0 ) goto l_end; - goto l_end_of_tx; + l_end_of_tx:SXE2_PCI_REG_WRITE_WC (txq->tdt_reg_addr, next_use); PMD_LOG_DEBUG(TX, "port_id=%u queue_id=%u next_use=%u send_pkts=%u",
@@ -483,6 +484,32 @@ static inline uint16_t sxe2_tx_pkts_batch(void *tx_queue,return nb_pkts; } +uint16_t sxe2_tx_pkts_simple (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +uint16_t tx_done_num; +uint16_t tx_once_num; +uint16_t tx_need_num; +if (likely (nb_pkts <=SXE2_TX_PKTS_BURST_BATCH_NUM )) { + tx_done_num =sxe2_tx_pkts_batch (tx_queue, + tx_pkts, nb_pkts); + goto l_end; + } + tx_done_num =0 ; +while (nb_pkts) { + tx_need_num =RTE_MIN (nb_pkts,SXE2_TX_PKTS_BURST_BATCH_NUM ); + tx_once_num =sxe2_tx_pkts_batch (tx_queue, + &tx_pkts[tx_done_num], + tx_need_num); + nb_pkts -= tx_once_num; + tx_done_num += tx_once_num; +if (tx_once_num < tx_need_num) +break ; + } +l_end: +return tx_done_num; +} +static inline void sxe2_update_rx_tail (struct sxe2_rx_queue *rxq,uint16_t hold_num,uint16_t rx_id) {
drivers/net/sxe2/sxe2_txrx_poll.h +4 -0
@@ -9,6 +9,10 @@uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +uint16_t sxe2_tx_pkts_simple (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);
drivers/net/sxe2/sxe2_txrx_vec.c new file +200 -0
200 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec.h new file +72 -0
72 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_common.h new file +235 -0
235 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_sse.c new file +549 -0
549 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v14 11/11 net/sxe2: implement Tx done cleanup
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the 'tx_done_cleanup' ethdev ops in the sxe2 PMD. This interface allows applications to explicitly request the driver to release mbufs that have been transmitted and are no longer needed by the hardware.
The implementation iterates through the Tx ring, checking the status of the descriptors starting from the last cleaned tail. It releases the corresponding mbufs back to the mempool until either the requested number of packets are freed or no more completed descriptors are found.
--- drivers/net/sxe2/sxe2_ethdev.c | 1 + drivers/net/sxe2/sxe2_txrx.h | 1 + drivers/net/sxe2/sxe2_txrx_poll.c | 101 +++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 1 deletion(-)
drivers/net/sxe2/sxe2_ethdev.c +1 -0
@@ -290,6 +290,7 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .txq_info_get = sxe2_tx_queue_info_get, .rx_burst_mode_get = sxe2_rx_burst_mode_get, .tx_burst_mode_get = sxe2_tx_burst_mode_get, + .tx_done_cleanup = sxe2_tx_done_cleanup, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_txrx.h +1 -0
@@ -12,6 +12,7 @@ int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +int32_t sxe2_tx_done_cleanup (void *txq,uint32_t free_cnt);void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq);void sxe2_rx_mode_func_set (struct rte_eth_dev *dev);
drivers/net/sxe2/sxe2_txrx_poll.c +100 -1
118 lines not on this page · raw message
Signature · 1 line
2.47.3
v15 cover net/sxe2: fix logic errors and address feedback
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v15 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset for mbuf_def in vector init to avoid uninitialized reads.
- Converted pci_map_addr_info to designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updated burst_mode_get to accurately report AVX paths.
- Adjusted SXE2_ETH_OVERHEAD to match actual VLAN capabilities.
Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup
.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 29 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 73 ++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 357 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1045 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 200 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 73 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9145 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Signature · 1 line
2.47.3
PATCH v15 1/11 mailmap: add Jie Liu
From: Jie Liu <[email protected]>
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -739,6 +739,7 @@ Jiawen Wu <[email protected]> Jiayu Hu <[email protected]> <[email protected]> Jie Hai <[email protected]> Jie Liu <[email protected]> +Jie Liu <[email protected]> Jie Pan <[email protected]> Jie Wang <[email protected]> Jie Zhou <[email protected]> <[email protected]>
Signature · 1 line
2.47.3
PATCH v15 2/11 doc: add sxe2 guide and release notes
In reply to [email protected]From: Jie Liu <[email protected]>
Add a new guide for SXE2 PMD in the nics directory. The guide contains driver capabilities, prerequisites, and compilation/usage instructions.
Update the release notes to announce the addition of the sxe2 network driver.
--- doc/guides/nics/features/sxe2.ini | 29 ++++++++++++++++++++++ doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_26_07.rst | 4 +++ 4 files changed, 68 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst
doc/guides/nics/features/sxe2.ini new file +29 -0
@@ -0,0 +1,29 @@ +; +; Supported features of the 'sxe2' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +; A feature with "P" indicates only be supported when non-vector path +; is selected. +; +[Features] +Fast mbuf free = P +Free Tx mbuf on demand = Y +Burst mode info = Y +Queue start/stop = Y +Buffer split on Rx = P +Scattered Rx = Y +CRC offload = Y +VLAN offload = Y +QinQ offload = P +L3 checksum offload = Y +L4 checksum offload = Y +Timestamp offload = P +Inner L3 checksum = P +Inner L4 checksum = P +Rx descriptor status = Y +Tx descriptor status = Y +FreeBSD = Y +Linux = Y +x86-32 = Y +x86-64 = Y
doc/guides/nics/index.rst +1 -0
@@ -68,6 +68,7 @@ Network Interface Controller Drivers rnp sfc_efx softnic + sxe2 tap thunderx txgbe
doc/guides/nics/sxe2.rst new file +34 -0
@@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +SXE2 Poll Mode Driver +====================== + +The sxe2 PMD (**librte_net_sxe2**) provides poll mode driver support for +10/25/50/100 Gbps Network Adapters. +The embedded switch, Physical Functions (PF), +and SR-IOV Virtual Functions (VF) are supported. + +Implementation details +---------------------- + +The sxe2 PMD is designed to operate alongside the sxe2 kernel network driver. +For management and control operations, the PMD communicates with the kernel +driver via ioctl interfaces. These commands are processed by the kernel +driver and subsequently dispatched to the hardware firmware for execution. + +For security and robustness, the driver's data path is optimized to operate +using virtual addresses (IOVA as VA mode). However, to ensure full +compatibility in system environments where an IOMMU is absent or disabled, +the driver also provides an explicit path to support physical addressing +(IOVA as PA mode). + +The hardware is capable of handling the corresponding IOVA addresses (either +VA or PA) directly, as provided by the DPDK memory subsystem. This ensures +that DPDK applications can only access memory segments explicitly allocated +to the current process, preventing unauthorized access to random physical +memory. + +This capability allows the PMD to coexist with kernel network interfaces +which remain functional, although they stop receiving unicast packets as +long as they share the same MAC address.
doc/guides/rel_notes/release_26_07.rst +4 -0
@@ -64,6 +64,10 @@ New Features * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Added Linkdata sxe2 ethernet driver.** + + Added network driver for the Linkdata Network Adapters. + Removed Items -------------
Signature · 1 line
2.47.3
PATCH v15 3/11 common/sxe2: add sxe2 basic structures
In reply to [email protected]From: Jie Liu <[email protected]>
This patch adds the base infrastructure for the sxe2 common library. It includes the mandatory OS abstraction layer (OSAL), common structure definitions, error codes, and the logging system implementation.
Specifically, this commit:
- Implements the logging stream management using RTE_LOG_LINE.
- Defines device-specific error codes and status registers.
- Adds the initial meson build configuration for the common library.
--- drivers/common/sxe2/sxe2_common_log.h | 81 +++ drivers/common/sxe2/sxe2_host_regs.h | 707 ++++++++++++++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 ++ drivers/common/sxe2/sxe2_osal.h | 89 +++ 4 files changed, 910 insertions(+) create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_osal.h
drivers/common/sxe2/sxe2_common_log.h new file +81 -0
@@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_COMMON_LOG_H__ +#define __SXE2_COMMON_LOG_H__ + +extern int32_t sxe2_common_log; +extern int32_t sxe2_log_init; +extern int32_t sxe2_log_driver; +extern int32_t sxe2_log_rx; +extern int32_t sxe2_log_tx; +extern int32_t sxe2_log_hw; + +#define RTE_LOGTYPE_SXE2_COM sxe2_common_log +#define RTE_LOGTYPE_SXE2_INIT sxe2_log_init +#define RTE_LOGTYPE_SXE2_DRV sxe2_log_driver +#define RTE_LOGTYPE_SXE2_RX sxe2_log_rx +#define RTE_LOGTYPE_SXE2_TX sxe2_log_tx +#define RTE_LOGTYPE_SXE2_HW sxe2_log_hw + +#define SXE2_PMD_LOG (level, log_type, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): ", \ + __func__, __VA_ARGS__) + +#define SXE2_PMD_DRV_LOG (level, log_type, adapter, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): port:%u ", \ + __func__ RTE_LOG_COMMA \ + adapter->dev_port_id, __VA_ARGS__) + +#define PMD_LOG_DEBUG (logtype, fmt, ...) \ + SXE2_PMD_LOG(DEBUG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_INFO (logtype, fmt, ...) \ + SXE2_PMD_LOG(INFO, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_NOTICE (logtype, fmt, ...) \ + SXE2_PMD_LOG(NOTICE, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_WARN (logtype, fmt, ...) \ + SXE2_PMD_LOG(WARNING, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ERR (logtype, fmt, ...) \ + SXE2_PMD_LOG(ERR, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_CRIT (logtype, fmt, ...) \ + SXE2_PMD_LOG(CRIT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ALERT (logtype, fmt, ...) \ + SXE2_PMD_LOG(ALERT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_EMERG (logtype, fmt, ...) \ + SXE2_PMD_LOG(EMERG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_DEBUG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(DEBUG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_INFO (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(INFO, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_NOTICE (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(NOTICE, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_WARN (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(WARNING, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ERR (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ERR, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_CRIT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(CRIT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ALERT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ALERT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_EMERG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(EMERG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>") + +#endif /* __SXE2_COMMON_LOG_H__ */
drivers/common/sxe2/sxe2_host_regs.h new file +707 -0
707 lines not on this page · raw message
drivers/common/sxe2/sxe2_internal_ver.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_INTERNAL_VER_H__ +#define __SXE2_INTERNAL_VER_H__ + +#define SXE2_VER_MAJOR_OFFSET (16) +#define SXE2_MK_VER (major, minor) \ + (major << SXE2_VER_MAJOR_OFFSET | minor) +#define SXE2_MK_VER_MAJOR (ver) (((ver) >> SXE2_VER_MAJOR_OFFSET) & 0xff) +#define SXE2_MK_VER_MINOR (ver) ((ver) & 0xff) + +#define SXE2_ITR_VER_MAJOR_V100 1 +#define SXE2_ITR_VER_MAJOR_V200 2 + +#define SXE2_ITR_VER_MAJOR 1 +#define SXE2_ITR_VER_MINOR 1 +#define SXE2_ITR_VER SXE2_MK_VER(SXE2_ITR_VER_MAJOR, SXE2_ITR_VER_MINOR) + +#define SXE2_CTRL_VER_IS_V100 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V100) +#define SXE2_CTRL_VER_IS_V200 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V200) + +#define SXE2LIB_ITR_VER_MAJOR 1 +#define SXE2LIB_ITR_VER_MINOR 1 +#define SXE2LIB_ITR_VER SXE2_MK_VER(SXE2LIB_ITR_VER_MAJOR, SXE2LIB_ITR_VER_MINOR) + +#define SXE2_DRV_CLI_VER_MAJOR 1 +#define SXE2_DRV_CLI_VER_MINOR 1 +#define SXE2_DRV_CLI_VER \ + SXE2_MK_VER(SXE2_DRV_CLI_VER_MAJOR, SXE2_DRV_CLI_VER_MINOR) + +#endif /* __SXE2_INTERNAL_VER_H__ */
drivers/common/sxe2/sxe2_osal.h new file +89 -0
89 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v15 4/11 drivers: add base driver skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the sxe2 PMD skeleton by implementing the PCI probe and remove functions. This includes the setup and cleanup of a character device used for control path communication between the user space and the hardware.
The character device provides an interface for ioctl-based management operations, supporting device-specific configuration.
--- drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 635 +++++++++++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 +++ drivers/common/sxe2/sxe2_host_regs.h | 226 ++++---- drivers/common/sxe2/sxe2_ioctl_chnl.c | 160 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 44 ++ drivers/common/sxe2/sxe2_osal.h | 4 +- drivers/meson.build | 1 + 9 files changed, 1185 insertions(+), 115 deletions(-) create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h
drivers/common/sxe2/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Corigine, Inc. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +deps += ['bus_pci', 'net', 'eal', 'ethdev'] + +sources = files( + 'sxe2_common.c', + 'sxe2_ioctl_chnl.c', +)
drivers/common/sxe2/sxe2_common.c new file +635 -0
635 lines not on this page · raw message
drivers/common/sxe2/sxe2_common.h new file +85 -0
85 lines not on this page · raw message
drivers/common/sxe2/sxe2_host_regs.h +113 -113
466 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.c new file +160 -0
160 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.h new file +130 -0
130 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h new file +44 -0
44 lines not on this page · raw message
drivers/common/sxe2/sxe2_osal.h +2 -2
@@ -63,7 +63,7 @@ enum sxe2_itr_idx {#define ETH_P_QINQ1 0x9100#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(unsigned long)) -#define BITS_TO_U32 (nr) DIV_ROUND_UP(nr, 32) +#define BITS_TO_uint32_t (nr) DIV_ROUND_UP(nr, 32)#define BITMAP_LAST_WORD_MASK (nbits) (~0UL >> (-(nbits) & (__BITS_PER_LONG - 1)))
@@ -86,4 +86,4 @@ static inline uint32_t sxe2_test_bit(uint32_t nr, const volatile unsigned long * return 1UL & (addr[BIT_WORD(nr)] >> (nr & (__BITS_PER_LONG-1))); } -#endif /* __SXE2_OSAL_H */ +#endif /* __SXE2_OSAL_H__ */
drivers/meson.build +1 -0
@@ -12,6 +12,7 @@ subdirs = [ 'common/qat', # depends on bus. 'common/sfc_efx', # depends on bus. 'common/zsda', # depends on bus. + 'common/sxe2', # depends on bus. 'mempool', # depends on common and bus. 'dma', # depends on common and bus. 'net', # depends on common, bus, mempool
Signature · 1 line
2.47.3
PATCH v15 5/11 drivers: add base driver probe skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the eth_dev_ops for the sxe2 PMD. This includes the implementation of mandatory ethdev operations such as dev_configure, dev_start, dev_stop, and dev_infos_get.
Set up the basic infrastructure for device initialization to allow the driver to be recognized as a valid ethernet device within the DPDK framework.
--- drivers/common/sxe2/sxe2_common.c | 2 +- drivers/common/sxe2/sxe2_ioctl_chnl.c | 33 +- drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 11 +- drivers/common/sxe2/sxe2_osal.h | 28 +- drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 23 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 +++++++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 ++ drivers/net/sxe2/sxe2_drv_cmd.h | 388 +++++++++++++ drivers/net/sxe2/sxe2_ethdev.c | 613 +++++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 293 ++++++++++ drivers/net/sxe2/sxe2_irq.h | 48 ++ drivers/net/sxe2/sxe2_queue.c | 38 ++ drivers/net/sxe2/sxe2_queue.h | 191 +++++++ drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 16 + drivers/net/sxe2/sxe2_vsi.c | 214 +++++++ drivers/net/sxe2/sxe2_vsi.h | 204 +++++++ 18 files changed, 2976 insertions(+), 27 deletions(-) create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
drivers/common/sxe2/sxe2_common.c +1 -1
@@ -183,7 +183,7 @@ static int32_t sxe2_common_device_setup(struct sxe2_common_device *cdev) goto l_end; } - ret =sxe2_drv_dev_handshark (cdev); + ret =sxe2_drv_dev_handshke (cdev);if (ret !=0 ) {PMD_LOG_ERR (COM ,"Handshark failed, ret=%d" , ret); goto l_close_dev;
drivers/common/sxe2/sxe2_ioctl_chnl.c +30 -3
@@ -112,9 +112,9 @@ sxe2_drv_dev_close(struct sxe2_common_device *cdev)SXE2_CDEV_TO_CMD_FD (cdev) =-1 ; } -RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_handshark) +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_handshke) int32_t -sxe2_drv_dev_handshark (struct sxe2_common_device *cdev) +sxe2_drv_dev_handshke (struct sxe2_common_device *cdev) {int32_t ret =0 ;int32_t cmd_fd =0 ;
@@ -144,7 +144,7 @@ sxe2_drv_dev_handshark(struct sxe2_common_device *cdev)if (ret <0 ) {PMD_LOG_ERR (COM ,"Failed to handshark, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); - ret = -EIO ; + ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock); goto l_end; }
@@ -158,3 +158,30 @@ sxe2_drv_dev_handshark(struct sxe2_common_device *cdev) l_end:return ret; } + +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len) +{ +int32_t ret =0 ; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , + virt, len); + + ret =munmap (virt, len); +if (ret <0 ) { +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , + virt, len,strerror (errno)); + ret = -errno; + goto l_end; + } + +l_end: +return ret; +}
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +10 -1
@@ -35,7 +35,16 @@ sxe2_drv_dev_close(struct sxe2_common_device *cdev);__rte_internal int32_t -sxe2_drv_dev_handshark (struct sxe2_common_device *cdev); +sxe2_drv_dev_handshke (struct sxe2_common_device *cdev); + +__rte_internal +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx, +uint64_t len,uint64_t offset); + +__rte_internal +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); #ifdef __cplusplus }
drivers/common/sxe2/sxe2_osal.h +6 -22
@@ -23,14 +23,6 @@#define BIT_WORD (nr) ((nr) / __BITS_PER_LONG)#define BIT_MASK (nr) (1UL << ((nr) % __BITS_PER_LONG)) -#define BITS_PER_BYTE 8 - -#define IS_UNICAST_ETHER_ADDR (addr) \ - ((bool)((((uint8_t *)(addr))[0] % ((uint8_t)0x2)) == 0)) - -#define STRUCT_SIZE (ptr, field, num) \ - (sizeof(*(ptr)) + sizeof(*(ptr)->field) * (num)) -#ifndef TAILQ_FOREACH_SAFE #define TAILQ_FOREACH_SAFE (var, head, field, tvar) \ for ((var) = TAILQ_FIRST((head)); \
@@ -38,16 +30,11 @@ (var) = (tvar))#endif -#define SXE2_QUEUE_WAIT_RETRY_CNT (50) -#define upper_32_bits (n) ((uint32_t)(((n) >> 16) >> 16))#define lower_32_bits (n) ((uint32_t)((n) & 0xffffffff)) -#define FIELD_SIZEOF (t, f) RTE_SIZEOF_FIELD(t, f) -#define ARRAY_SIZE (arr) RTE_DIM(arr) - -#ifndef DIV_ROUND_UP -#define DIV_ROUND_UP (n, d) \ +#ifndef SXE2_DIV_ROUND_UP +#define SXE2_DIV_ROUND_UP (n, d) \ (((n) + (typeof(n))(d) - (typeof(n))1) / (typeof(n))(d))#endif
@@ -58,12 +45,9 @@ enum sxe2_itr_idx { SXE2_ITR_IDX_NONE, }; -#define ETH_P_8021Q 0x8100 -#define ETH_P_8021AD 0x88a8 -#define ETH_P_QINQ1 0x9100 - -#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(unsigned long)) -#define BITS_TO_uint32_t (nr) DIV_ROUND_UP(nr, 32) +#define SXE2_ETH_ALEN 6 +#define BITS_TO_LONGS (nr) SXE2_DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(unsigned long)) +#define BITS_TO_uint32_t (nr) SXE2_DIV_ROUND_UP(nr, 32)#define BITMAP_LAST_WORD_MASK (nbits) (~0UL >> (-(nbits) & (__BITS_PER_LONG - 1)))
@@ -81,7 +65,7 @@ static inline void sxe2_clear_bit(uint32_t nr, unsigned long *addr) addr[nr / __BITS_PER_LONG] &= ~(1UL << (nr % __BITS_PER_LONG)); } -static inline uint32_t sxe2_test_bit (uint32_t nr,const volatile unsigned long *addr) +static inline uint32_t sxe2_test_bit (uint32_t nr,const unsigned long *addr) {return 1UL & (addr[BIT_WORD (nr)] >> (nr & (__BITS_PER_LONG-1 ))); }
drivers/net/meson.build +1 -0
@@ -58,6 +58,7 @@ drivers = [ 'rnp', 'sfc', 'softnic', + 'sxe2', 'tap', 'thunderx', 'txgbe',
drivers/net/sxe2/meson.build new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +cflags += ['-g'] + +deps += ['common_sxe2', 'hash','cryptodev','security'] + +includes += include_directories('../../common/sxe2') + +sources += files( + 'sxe2_ethdev.c', + 'sxe2_cmd_chnl.c', + 'sxe2_vsi.c', + 'sxe2_queue.c', +) + +allow_internal_get_api = true
drivers/net/sxe2/sxe2_cmd_chnl.c new file +323 -0
323 lines not on this page · raw message
drivers/net/sxe2/sxe2_cmd_chnl.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_CMD_CHNL_H__ +#define __SXE2_CMD_CHNL_H__ + +#include "sxe2_ethdev.h" +#include "sxe2_drv_cmd.h" +#include "sxe2_ioctl_chnl_func.h" + +int32_t sxe2_drv_dev_caps_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_caps_resp *dev_caps); + +int32_t sxe2_drv_dev_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_info_resp *dev_info_resp); + +int32_t sxe2_drv_dev_fw_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_fw_info_resp *dev_fw_info_resp); + +int32_t sxe2_drv_vsi_add (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_vsi_del (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_rxq_switch (struct sxe2_adapter *adapter,struct sxe2_rx_queue *rxq,bool enable); + +int32_t sxe2_drv_txq_switch (struct sxe2_adapter *adapter,struct sxe2_tx_queue *txq,bool enable); + +int32_t sxe2_drv_rxq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_rx_queue *rxq, +uint16_t rxq_cnt); + +int32_t sxe2_drv_txq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_tx_queue *txq, +uint16_t txq_cnt); + +#endif /* __SXE2_CMD_CHNL_H__ */
drivers/net/sxe2/sxe2_drv_cmd.h new file +388 -0
388 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.c new file +613 -0
613 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h new file +293 -0
293 lines not on this page · raw message
drivers/net/sxe2/sxe2_irq.h new file +48 -0
48 lines not on this page · raw message
drivers/net/sxe2/sxe2_queue.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#include "sxe2_ethdev.h" +#include "sxe2_queue.h" +#include "sxe2_common_log.h" + +void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter, +struct sxe2_drv_queue_caps *q_caps) +{ + adapter->q_ctxt.qp_cnt_assign = q_caps->queues_cnt; + adapter->q_ctxt.base_idx_in_pf = q_caps->base_idx_in_pf; +} + +int32_t sxe2_queues_init (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; +uint16_t buf_size; +uint16_t frame_size; +struct sxe2_rx_queue *rxq; +uint16_t nb_rxq; + + frame_size = dev->data->mtu +SXE2_ETH_OVERHEAD ; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; +if (!rxq) +continue ; + + buf_size =rte_pktmbuf_data_room_size (rxq->mb_pool) -RTE_PKTMBUF_HEADROOM ; + rxq->rx_buf_len =RTE_ALIGN_FLOOR (buf_size, (1 <<SXE2_RXQ_CTX_DBUFF_SHIFT )); + rxq->rx_buf_len =RTE_MIN (rxq->rx_buf_len,SXE2_RX_MAX_DATA_BUF_SIZE ); +if (frame_size > rxq->rx_buf_len) + dev->data->scattered_rx =1 ; + } + +return ret; +}
drivers/net/sxe2/sxe2_queue.h new file +191 -0
191 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_common.h new file +540 -0
540 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_poll.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_POLL_H +#define SXE2_TXRX_POLL_H + +#include "sxe2_queue.h" + +uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +#endif /* __SXE2_TXRX_POLL_H__ */
drivers/net/sxe2/sxe2_vsi.c new file +214 -0
214 lines not on this page · raw message
drivers/net/sxe2/sxe2_vsi.h new file +204 -0
140 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.47.3
Part of the diff is not shown here. View the raw message.
PATCH v15 6/11 drivers: support PCI BAR mapping
In reply to [email protected]From: Jie Liu <[email protected]>
Implement PCI BAR (Base Address Register) mapping and unmapping logic to enable MMIO (Memory Mapped I/O) access to hardware registers.
The driver retrieves the BAR0 virtual address from the PCI resource during the probing phase. This mapping is used for subsequent register-level operations. Proper cleanup is implemented in the device close path.
--- drivers/common/sxe2/sxe2_common.c | 8 +- drivers/common/sxe2/sxe2_ioctl_chnl.c | 38 ++- drivers/net/sxe2/sxe2_ethdev.c | 326 +++++++++++++++++++++++++- drivers/net/sxe2/sxe2_ethdev.h | 18 ++ 4 files changed, 381 insertions(+), 9 deletions(-)
drivers/common/sxe2/sxe2_common.c +4 -4
@@ -185,7 +185,7 @@ static int32_t sxe2_common_device_setup(struct sxe2_common_device *cdev) ret =sxe2_drv_dev_handshke (cdev);if (ret !=0 ) { -PMD_LOG_ERR (COM ,"Handshark failed, ret=%d" , ret); +PMD_LOG_ERR (COM ,"handshake failed, ret=%d" , ret); goto l_close_dev; }
@@ -605,18 +605,18 @@ static void sxe2_common_pci_init(void)return ; } -static bool sxe2_commoin_inited; +static bool sxe2_common_inited;RTE_EXPORT_INTERNAL_SYMBOL (sxe2_common_init) voidsxe2_common_init (void ) { -if (sxe2_commoin_inited) +if (sxe2_common_inited) goto l_end;pthread_mutex_init (&sxe2_common_devices_list_lock,NULL );sxe2_common_pci_init (); - sxe2_commoin_inited = true; + sxe2_common_inited = true; l_end:return ;
drivers/common/sxe2/sxe2_ioctl_chnl.c +36 -2
@@ -133,7 +133,7 @@ sxe2_drv_dev_handshke(struct sxe2_common_device *cdev) goto l_end; } -PMD_LOG_DEBUG (COM ,"Open fd=%d to handshark with kernel" , cmd_fd); +PMD_LOG_DEBUG (COM ,"Open fd=%d to handshake with kernel" , cmd_fd);memset (&cmd_params,0 ,sizeof (struct sxe2_ioctl_cmd_common_hdr )); cmd_params.dpdk_ver =SXE2_COM_VER ;
@@ -142,7 +142,7 @@ sxe2_drv_dev_handshke(struct sxe2_common_device *cdev) (void )pthread_mutex_lock (&cdev->config.lock); ret =ioctl (cmd_fd,SXE2_COM_CMD_HANDSHAKE , &cmd_params);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to handshark, fd=%d, ret=%d, err:%s" , +PMD_LOG_ERR (COM ,"Failed to handshake, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock);
@@ -159,6 +159,40 @@ sxe2_drv_dev_handshke(struct sxe2_common_device *cdev)return ret; } +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_mmap) +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx,uint64_t len,uint64_t offset) +{ +int32_t cmd_fd =0 ; +void *virt =NULL ; + +if (cdev->config.kernel_reset) { +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_err; + } + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_err; + } + +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , + bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); + + virt =mmap (NULL , len,PROT_READ |PROT_WRITE , +MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); +if (virt ==MAP_FAILED ) { +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , + cmd_fd, len, offset,strerror (errno)); + goto l_err; + } + +return virt; +l_err: +return NULL ; +} +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) int32_tsxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len)
drivers/net/sxe2/sxe2_ethdev.c +323 -3
380 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +18 -0
@@ -290,4 +290,22 @@ struct sxe2_adapter {#define SXE2_DEV_PRIVATE_TO_ADAPTER (dev) \ ((struct sxe2_adapter *)(dev)->data->dev_private) +#define SXE2_DEV_TO_PCI (eth_dev) \ + RTE_DEV_TO_PCI((eth_dev)->device) + +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type); + +int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); + +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, +uint32_t item_cnt,uint32_t item_base); + +void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type); + +int32_t sxe2_dev_pci_map_init (struct rte_eth_dev *dev); + +void sxe2_dev_pci_map_uinit (struct rte_eth_dev *dev); +#endif /* __SXE2_ETHDEV_H__ */
Signature · 1 line
2.47.3
PATCH v15 7/11 common/sxe2: add ioctl interface for DMA map and unmap
In reply to [email protected]From: Jie Liu <[email protected]>
Implement DMA mapping and unmapping functionality using ioctl calls. This allows the driver to configure the hardware's IOMMU/DMA tables, ensuring the device can safely access memory buffers allocated by the userspace.
The mapping is established during device initialization or queue setup and is revoked during device closure to prevent memory leaks and ensure hardware security.
--- drivers/common/sxe2/sxe2_common.c | 50 +++++++++- drivers/common/sxe2/sxe2_ioctl_chnl.c | 104 +++++++++++++++++++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 ++ 3 files changed, 162 insertions(+), 1 deletion(-)
drivers/common/sxe2/sxe2_common.c +49 -1
@@ -442,7 +442,7 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev) cdev =sxe2_rtedev_to_cdev (&pci_dev->device);if (cdev ==NULL ) { ret = -ENODEV ; -PMD_LOG_ERR (COM ,"Fail to get remove device." ); +PMD_LOG_ERR (COM ,"Fail to get device when remove." ); goto l_end; }
@@ -466,12 +466,60 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev)return ret; } +static int32_t sxe2_common_pci_dma_map (struct rte_pci_device *pci_dev, +void *addr,uint64_t iova,size_t len) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma map." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_map (cdev, (uint64_t )(uintptr_t )addr, iova, len); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to map dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} + +static int32_t sxe2_common_pci_dma_unmap (struct rte_pci_device *pci_dev, + void *addr __rte_unused, uint64_t iova, size_t len __rte_unused) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma unmap." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_unmap (cdev, iova); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to unmap dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} +static struct rte_pci_driver sxe2_common_pci_driver = { .driver = { .name =SXE2_COMMON_PCI_DRIVER_NAME , }, .probe = sxe2_common_pci_probe, .remove = sxe2_common_pci_remove, + .dma_map = sxe2_common_pci_dma_map, + .dma_unmap = sxe2_common_pci_dma_unmap, };static uint32_t sxe2_common_pci_id_table_size_get (const struct rte_pci_id *id_table)
drivers/common/sxe2/sxe2_ioctl_chnl.c +104 -0
107 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -46,6 +46,15 @@ __rte_internalint32_t sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); +__rte_internal +int32_t +sxe2_drv_dev_dma_map (struct sxe2_common_device *cdev,uint64_t vaddr, +uint64_t iova,uint64_t size); + +__rte_internal +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova); + #ifdef __cplusplus }#endif
Signature · 1 line
2.47.3
PATCH v15 8/11 net/sxe2: support queue setup and control
In reply to [email protected]From: Jie Liu <[email protected]>
Add support for Rx and Tx queue setup, release, and management. Implement eth_dev_ops callbacks for rx_queue_setup, tx_queue_setup, rx_queue_release, and tx_queue_release.
This includes:
- Allocating memory for hardware ring descriptors.
- Initializing software ring structures and hardware head/tail pointers.
- Implementing proper resource cleanup logic to prevent memory leaks during queue reconfiguration or device close.
--- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 82 +++-- drivers/net/sxe2/sxe2_ethdev.h | 15 +- drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++++++++++++++++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 ++ drivers/net/sxe2/sxe2_tx.c | 420 +++++++++++++++++++++++++ drivers/net/sxe2/sxe2_tx.h | 32 ++ 7 files changed, 1118 insertions(+), 26 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h
drivers/net/sxe2/meson.build +2 -0
@@ -18,6 +18,8 @@ sources += files( 'sxe2_cmd_chnl.c', 'sxe2_vsi.c', 'sxe2_queue.c', + 'sxe2_tx.c', + 'sxe2_rx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +60 -22
127 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +11 -4
@@ -293,14 +293,21 @@ struct sxe2_adapter {#define SXE2_DEV_TO_PCI (eth_dev) \ RTE_DEV_TO_PCI((eth_dev)->device) +void *sxe2_pci_map_addr_get (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type, +uint16_t idx_in_func); +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type); +enum sxe2_pci_map_resource res_type);int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); +enum sxe2_pci_map_resource res_type, +uint64_t org_len,uint64_t org_offset); -int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, -uint32_t item_cnt,uint32_t item_base); +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter, +uint32_t res_type, +uint32_t item_cnt, +uint32_t item_base);void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type);
drivers/net/sxe2/sxe2_rx.c new file +559 -0
559 lines not on this page · raw message
drivers/net/sxe2/sxe2_rx.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_RX_H__ +#define __SXE2_RX_H__ + +#include "sxe2_queue.h" + +int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_rxconf *rx_conf, +struct rte_mempool *mp); + +int32_t __rte_cold sxe2_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +void __rte_cold sxe2_rx_queue_mbufs_release(struct sxe2_rx_queue *rxq); + +void __rte_cold sxe2_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_rxq_info *qinfo); + +int32_t __rte_cold sxe2_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int32_t __rte_cold sxe2_rxqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rxqs_all_stop(struct rte_eth_dev *dev); + +struct rte_mbuf *sxe2_mbuf_raw_alloc (struct rte_mempool *mp); + +#endif /* __SXE2_RX_H__ */
drivers/net/sxe2/sxe2_tx.c new file +420 -0
420 lines not on this page · raw message
drivers/net/sxe2/sxe2_tx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_TX_H__ +#define __SXE2_TX_H__ +#include "sxe2_queue.h" + +void __rte_cold sxe2_tx_queue_reset(struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id); + +void sxe2_tx_queue_mbufs_release (struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id); + +int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_txconf *tx_conf); + +void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_txq_info *qinfo); + +int32_t __rte_cold sxe2_txqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_txqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_TX_H__ */
Signature · 1 line
2.47.3
PATCH v15 9/11 drivers: add data path for Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
Implement receive and transmit burst functions for sxe2 PMD. Add sxe2_recv_pkts and sxe2_xmit_pkts as the primary data path interfaces.
The implementation includes:
- Efficient descriptor fetching and mbuf allocation for Rx.
- Descriptor setup and checksum offload handling for Tx.
- Buffer recycling and hardware tail pointer updates.
- Performance-oriented loop unrolling and prefetching where applicable.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 8 +- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 13 +- drivers/net/sxe2/sxe2_txrx.c | 246 +++++++ drivers/net/sxe2/sxe2_txrx.h | 21 + drivers/net/sxe2/sxe2_txrx_poll.c | 919 ++++++++++++++++++++++++++ 6 files changed, 1204 insertions(+), 5 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c
drivers/common/sxe2/sxe2_ioctl_chnl.c +4 -4
@@ -177,13 +177,13 @@ void goto l_err; } -PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=%" PRIu64", src=0x%" PRIx64", offset=0x%" PRIx64"" , bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); virt =mmap (NULL , len,PROT_READ |PROT_WRITE ,MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset));if (virt ==MAP_FAILED ) { -PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=%" PRIu64", offset=0x%" PRIx64", err:%s" , cmd_fd, len, offset,strerror (errno)); goto l_err; }
@@ -205,12 +205,12 @@ sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) goto l_end; } -PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%" PRIx64"" , virt, len); ret =munmap (virt, len);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=%" PRIu64", err:%s" , virt, len,strerror (errno)); ret = -errno; goto l_end;
drivers/net/sxe2/meson.build +2 -0
@@ -20,6 +20,8 @@ sources += files( 'sxe2_queue.c', 'sxe2_tx.c', 'sxe2_rx.c', + 'sxe2_txrx_poll.c', + 'sxe2_txrx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +12 -1
@@ -26,6 +26,7 @@#include "sxe2_cmd_chnl.h" #include "sxe2_tx.h" #include "sxe2_rx.h" +#include "sxe2_txrx.h" #include "sxe2_common.h" #include "sxe2_common_log.h" #include "sxe2_host_regs.h"
@@ -137,6 +138,9 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev) goto l_end; } +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); + ret =sxe2_queues_start (dev);if (ret) {PMD_LOG_ERR (INIT ,"enable queues failed" );
@@ -763,10 +767,17 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,PMD_INIT_FUNC_TRACE (); +sxe2_set_common_function (dev); + dev->dev_ops = &sxe2_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); +if (ret !=0 ) +PMD_LOG_ERR (INIT ,"Failed to mp init (secondary), ret=%d" , ret); goto l_end; + } ret =sxe2_hw_init (dev);if (ret) {
drivers/net/sxe2/sxe2_txrx.c new file +246 -0
246 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_H +#define SXE2_TXRX_H +#include <ethdev_driver.h> +#include "sxe2_queue.h" + +void sxe2_set_common_function (struct rte_eth_dev *dev); + +uint16_t sxe2_tx_pkts_prepare (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); + +void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); + +#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c new file +919 -0
919 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v15 10/11 net/sxe2: add vectorized Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the vectorized data path for the sxe2 PMD. It utilizes SIMD instructions (e.g., SSE) to process multiple packets simultaneously, significantly improving throughput for small packet processing.
The implementation includes:
* Vectorized Rx burst function for bulk descriptor processing.
* Vectorized Tx burst function with optimized resource cleanup.
* Capability flags update to reflect vectorized path support.
--- drivers/net/sxe2/meson.build | 5 + drivers/net/sxe2/sxe2_ethdev.c | 31 +- drivers/net/sxe2/sxe2_queue.c | 28 ++ drivers/net/sxe2/sxe2_queue.h | 4 + drivers/net/sxe2/sxe2_txrx.c | 199 +++++++-- drivers/net/sxe2/sxe2_txrx.h | 11 +- drivers/net/sxe2/sxe2_txrx_poll.c | 31 +- drivers/net/sxe2/sxe2_txrx_poll.h | 4 + drivers/net/sxe2/sxe2_txrx_vec.c | 200 +++++++++ drivers/net/sxe2/sxe2_txrx_vec.h | 73 ++++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 ++++++++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++++++++++++++++ 12 files changed, 1296 insertions(+), 74 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c
drivers/net/sxe2/meson.build +5 -0
@@ -13,6 +13,10 @@ deps += ['common_sxe2', 'hash','cryptodev','security'] includes += include_directories('../../common/sxe2') +if arch_subdir == 'x86' + sources += files('sxe2_txrx_vec_sse.c') +endif + sources += files( 'sxe2_ethdev.c', 'sxe2_cmd_chnl.c',
@@ -22,6 +26,7 @@ sources += files( 'sxe2_rx.c', 'sxe2_txrx_poll.c', 'sxe2_txrx.c', + 'sxe2_txrx_vec.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +8 -23
@@ -107,25 +107,6 @@ static int32_t sxe2_dev_stop(struct rte_eth_dev *dev)return ret; } -static int32_t sxe2_queues_start (struct rte_eth_dev *dev) -{ -int32_t ret =0 ; - ret =sxe2_txqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); - goto l_end; - } - - ret =sxe2_rxqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); -sxe2_txqs_all_stop (dev); - } - -l_end: -return ret; -} -static int32_t sxe2_dev_start (struct rte_eth_dev *dev) {int32_t ret =0 ;
@@ -158,7 +139,7 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev)static int32_t sxe2_dev_close (struct rte_eth_dev *dev) { (void )sxe2_dev_stop (dev); - + (void )sxe2_queues_release (dev);sxe2_vsi_uninit (dev);sxe2_dev_pci_map_uinit (dev);
@@ -296,13 +277,19 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .dev_close = sxe2_dev_close, .dev_infos_get = sxe2_dev_infos_get, + .rx_queue_start = sxe2_rx_queue_start, + .rx_queue_stop = sxe2_rx_queue_stop, + .tx_queue_start = sxe2_tx_queue_start, + .tx_queue_stop = sxe2_tx_queue_stop, .rx_queue_setup = sxe2_rx_queue_setup, - .tx_queue_setup = sxe2_tx_queue_setup, .rx_queue_release = sxe2_rx_queue_release, + .tx_queue_setup = sxe2_tx_queue_setup, .tx_queue_release = sxe2_tx_queue_release, .rxq_info_get = sxe2_rx_queue_info_get, .txq_info_get = sxe2_tx_queue_info_get, + .rx_burst_mode_get = sxe2_rx_burst_mode_get, + .tx_burst_mode_get = sxe2_tx_burst_mode_get, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
@@ -774,8 +761,6 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) {sxe2_rx_mode_func_set (dev);sxe2_tx_mode_func_set (dev); -if (ret !=0 ) -PMD_LOG_ERR (INIT ,"Failed to mp init (secondary), ret=%d" , ret); goto l_end; }
drivers/net/sxe2/sxe2_queue.c +28 -0
@@ -5,6 +5,8 @@#include "sxe2_ethdev.h" #include "sxe2_queue.h" #include "sxe2_common_log.h" +#include "sxe2_tx.h" +#include "sxe2_rx.h" void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter,struct sxe2_drv_queue_caps *q_caps)
@@ -36,3 +38,29 @@ int32_t sxe2_queues_init(struct rte_eth_dev *dev)return ret; } + +int32_t sxe2_queues_start (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; + + ret =sxe2_txqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); + goto l_end; + } + + ret =sxe2_rxqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); +sxe2_txqs_all_stop (dev); + } +l_end: +return ret; +} + +void sxe2_queues_release (struct rte_eth_dev *dev) +{ +sxe2_all_rxqs_release (dev); + +sxe2_all_txqs_release (dev); +}
drivers/net/sxe2/sxe2_queue.h +4 -0
@@ -188,4 +188,8 @@ void sxe2_sw_queue_ctx_hw_cap_set(struct sxe2_adapter *adapter,int32_t sxe2_queues_init (struct rte_eth_dev *dev); +int32_t sxe2_queues_start (struct rte_eth_dev *dev); + +void sxe2_queues_release (struct rte_eth_dev *dev); +#endif /* __SXE2_QUEUE_H__ */
drivers/net/sxe2/sxe2_txrx.c +155 -44
332 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h +6 -5
@@ -6,16 +6,17 @@#define SXE2_TXRX_H #include <ethdev_driver.h> #include "sxe2_queue.h" -void sxe2_set_common_function (struct rte_eth_dev *dev); +int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, +uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); -void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); - void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); -void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); - +int32_t sxe2_tx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +int32_t sxe2_rx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode);#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c +29 -2
@@ -125,7 +125,7 @@ sxe2_tx_pkt_data_desc_count(struct rte_mbuf *tx_pkt)uint16_t count =0 ;while (m_seg !=NULL ) { - count +=DIV_ROUND_UP (m_seg->data_len, + count +=SXE2_DIV_ROUND_UP (m_seg->data_len,SXE2_TX_MAX_DATA_NUM_PER_DESC ); m_seg = m_seg->next; }
@@ -369,11 +369,12 @@ uint16_t sxe2_tx_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkt desc->read.type_cmd_off_bsz_l2t |=rte_cpu_to_le_64 (((uint64_t )desc_cmd) <<SXE2_TX_DATA_DESC_CMD_SHIFT ); } + goto l_end_of_tx; l_exit_logic:if (tx_num ==0 ) goto l_end; - goto l_end_of_tx; + l_end_of_tx:SXE2_PCI_REG_WRITE_WC (txq->tdt_reg_addr, next_use); PMD_LOG_DEBUG(TX, "port_id=%u queue_id=%u next_use=%u send_pkts=%u",
@@ -483,6 +484,32 @@ static inline uint16_t sxe2_tx_pkts_batch(void *tx_queue,return nb_pkts; } +uint16_t sxe2_tx_pkts_simple (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +uint16_t tx_done_num; +uint16_t tx_once_num; +uint16_t tx_need_num; +if (likely (nb_pkts <=SXE2_TX_PKTS_BURST_BATCH_NUM )) { + tx_done_num =sxe2_tx_pkts_batch (tx_queue, + tx_pkts, nb_pkts); + goto l_end; + } + tx_done_num =0 ; +while (nb_pkts) { + tx_need_num =RTE_MIN (nb_pkts,SXE2_TX_PKTS_BURST_BATCH_NUM ); + tx_once_num =sxe2_tx_pkts_batch (tx_queue, + &tx_pkts[tx_done_num], + tx_need_num); + nb_pkts -= tx_once_num; + tx_done_num += tx_once_num; +if (tx_once_num < tx_need_num) +break ; + } +l_end: +return tx_done_num; +} +static inline void sxe2_update_rx_tail (struct sxe2_rx_queue *rxq,uint16_t hold_num,uint16_t rx_id) {
drivers/net/sxe2/sxe2_txrx_poll.h +4 -0
@@ -9,6 +9,10 @@uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +uint16_t sxe2_tx_pkts_simple (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);
drivers/net/sxe2/sxe2_txrx_vec.c new file +200 -0
200 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec.h new file +73 -0
73 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_common.h new file +235 -0
235 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_sse.c new file +549 -0
549 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v15 11/11 net/sxe2: implement Tx done cleanup
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the 'tx_done_cleanup' ethdev ops in the sxe2 PMD. This interface allows applications to explicitly request the driver to release mbufs that have been transmitted and are no longer needed by the hardware.
The implementation iterates through the Tx ring, checking the status of the descriptors starting from the last cleaned tail. It releases the corresponding mbufs back to the mempool until either the requested number of packets are freed or no more completed descriptors are found.
--- drivers/net/sxe2/sxe2_ethdev.c | 1 + drivers/net/sxe2/sxe2_txrx.h | 1 + drivers/net/sxe2/sxe2_txrx_poll.c | 101 +++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 1 deletion(-)
drivers/net/sxe2/sxe2_ethdev.c +1 -0
@@ -290,6 +290,7 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .txq_info_get = sxe2_tx_queue_info_get, .rx_burst_mode_get = sxe2_rx_burst_mode_get, .tx_burst_mode_get = sxe2_tx_burst_mode_get, + .tx_done_cleanup = sxe2_tx_done_cleanup, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_txrx.h +1 -0
@@ -12,6 +12,7 @@ int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +int32_t sxe2_tx_done_cleanup (void *txq,uint32_t free_cnt);void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq);void sxe2_rx_mode_func_set (struct rte_eth_dev *dev);
drivers/net/sxe2/sxe2_txrx_poll.c +100 -1
118 lines not on this page · raw message
Signature · 1 line
2.47.3
v16 cover net/sxe2: fix logic errors and address feedback
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v16 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset for mbuf_def in vector init to avoid uninitialized reads.
- Converted pci_map_addr_info to designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updated burst_mode_get to accurately report AVX paths.
- Adjusted SXE2_ETH_OVERHEAD to match actual VLAN capabilities.
Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup
.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 29 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 362 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 73 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9230 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Signature · 1 line
2.47.3
PATCH v16 1/11 mailmap: add Jie Liu
From: Jie Liu <[email protected]>
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -739,6 +739,7 @@ Jiawen Wu <[email protected]> Jiayu Hu <[email protected]> <[email protected]> Jie Hai <[email protected]> Jie Liu <[email protected]> +Jie Liu <[email protected]> Jie Pan <[email protected]> Jie Wang <[email protected]> Jie Zhou <[email protected]> <[email protected]>
Signature · 1 line
2.47.3
PATCH v16 2/11 doc: add sxe2 guide and release notes
In reply to [email protected]From: Jie Liu <[email protected]>
Add a new guide for SXE2 PMD in the nics directory. The guide contains driver capabilities, prerequisites, and compilation/usage instructions.
Update the release notes to announce the addition of the sxe2 network driver.
--- doc/guides/nics/features/sxe2.ini | 29 ++++++++++++++++++++++ doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_26_07.rst | 4 +++ 4 files changed, 68 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst
doc/guides/nics/features/sxe2.ini new file +29 -0
@@ -0,0 +1,29 @@ +; +; Supported features of the 'sxe2' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +; A feature with "P" indicates only be supported when non-vector path +; is selected. +; +[Features] +Fast mbuf free = P +Free Tx mbuf on demand = Y +Burst mode info = Y +Queue start/stop = Y +Buffer split on Rx = P +Scattered Rx = Y +CRC offload = Y +VLAN offload = Y +QinQ offload = P +L3 checksum offload = Y +L4 checksum offload = Y +Timestamp offload = P +Inner L3 checksum = P +Inner L4 checksum = P +Rx descriptor status = Y +Tx descriptor status = Y +FreeBSD = Y +Linux = Y +x86-32 = Y +x86-64 = Y
doc/guides/nics/index.rst +1 -0
@@ -68,6 +68,7 @@ Network Interface Controller Drivers rnp sfc_efx softnic + sxe2 tap thunderx txgbe
doc/guides/nics/sxe2.rst new file +34 -0
@@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +SXE2 Poll Mode Driver +====================== + +The sxe2 PMD (**librte_net_sxe2**) provides poll mode driver support for +10/25/50/100 Gbps Network Adapters. +The embedded switch, Physical Functions (PF), +and SR-IOV Virtual Functions (VF) are supported. + +Implementation details +---------------------- + +The sxe2 PMD is designed to operate alongside the sxe2 kernel network driver. +For management and control operations, the PMD communicates with the kernel +driver via ioctl interfaces. These commands are processed by the kernel +driver and subsequently dispatched to the hardware firmware for execution. + +For security and robustness, the driver's data path is optimized to operate +using virtual addresses (IOVA as VA mode). However, to ensure full +compatibility in system environments where an IOMMU is absent or disabled, +the driver also provides an explicit path to support physical addressing +(IOVA as PA mode). + +The hardware is capable of handling the corresponding IOVA addresses (either +VA or PA) directly, as provided by the DPDK memory subsystem. This ensures +that DPDK applications can only access memory segments explicitly allocated +to the current process, preventing unauthorized access to random physical +memory. + +This capability allows the PMD to coexist with kernel network interfaces +which remain functional, although they stop receiving unicast packets as +long as they share the same MAC address.
doc/guides/rel_notes/release_26_07.rst +4 -0
@@ -64,6 +64,10 @@ New Features * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Added Linkdata sxe2 ethernet driver.** + + Added network driver for the Linkdata Network Adapters. + Removed Items -------------
Signature · 1 line
2.47.3
PATCH v16 3/11 common/sxe2: add sxe2 basic structures
In reply to [email protected]From: Jie Liu <[email protected]>
This patch adds the base infrastructure for the sxe2 common library. It includes the mandatory OS abstraction layer (OSAL), common structure definitions, error codes, and the logging system implementation.
Specifically, this commit:
- Implements the logging stream management using RTE_LOG_LINE.
- Defines device-specific error codes and status registers.
- Adds the initial meson build configuration for the common library.
--- drivers/common/sxe2/sxe2_common_log.h | 81 +++ drivers/common/sxe2/sxe2_host_regs.h | 707 ++++++++++++++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 ++ drivers/common/sxe2/sxe2_osal.h | 152 +++++ 4 files changed, 973 insertions(+) create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_osal.h
drivers/common/sxe2/sxe2_common_log.h new file +81 -0
@@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_COMMON_LOG_H__ +#define __SXE2_COMMON_LOG_H__ + +extern int32_t sxe2_common_log; +extern int32_t sxe2_log_init; +extern int32_t sxe2_log_driver; +extern int32_t sxe2_log_rx; +extern int32_t sxe2_log_tx; +extern int32_t sxe2_log_hw; + +#define RTE_LOGTYPE_SXE2_COM sxe2_common_log +#define RTE_LOGTYPE_SXE2_INIT sxe2_log_init +#define RTE_LOGTYPE_SXE2_DRV sxe2_log_driver +#define RTE_LOGTYPE_SXE2_RX sxe2_log_rx +#define RTE_LOGTYPE_SXE2_TX sxe2_log_tx +#define RTE_LOGTYPE_SXE2_HW sxe2_log_hw + +#define SXE2_PMD_LOG (level, log_type, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): ", \ + __func__, __VA_ARGS__) + +#define SXE2_PMD_DRV_LOG (level, log_type, adapter, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): port:%u ", \ + __func__ RTE_LOG_COMMA \ + adapter->dev_port_id, __VA_ARGS__) + +#define PMD_LOG_DEBUG (logtype, fmt, ...) \ + SXE2_PMD_LOG(DEBUG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_INFO (logtype, fmt, ...) \ + SXE2_PMD_LOG(INFO, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_NOTICE (logtype, fmt, ...) \ + SXE2_PMD_LOG(NOTICE, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_WARN (logtype, fmt, ...) \ + SXE2_PMD_LOG(WARNING, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ERR (logtype, fmt, ...) \ + SXE2_PMD_LOG(ERR, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_CRIT (logtype, fmt, ...) \ + SXE2_PMD_LOG(CRIT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ALERT (logtype, fmt, ...) \ + SXE2_PMD_LOG(ALERT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_EMERG (logtype, fmt, ...) \ + SXE2_PMD_LOG(EMERG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_DEBUG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(DEBUG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_INFO (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(INFO, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_NOTICE (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(NOTICE, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_WARN (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(WARNING, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ERR (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ERR, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_CRIT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(CRIT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ALERT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ALERT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_EMERG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(EMERG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>") + +#endif /* __SXE2_COMMON_LOG_H__ */
drivers/common/sxe2/sxe2_host_regs.h new file +707 -0
707 lines not on this page · raw message
drivers/common/sxe2/sxe2_internal_ver.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_INTERNAL_VER_H__ +#define __SXE2_INTERNAL_VER_H__ + +#define SXE2_VER_MAJOR_OFFSET (16) +#define SXE2_MK_VER (major, minor) \ + (major << SXE2_VER_MAJOR_OFFSET | minor) +#define SXE2_MK_VER_MAJOR (ver) (((ver) >> SXE2_VER_MAJOR_OFFSET) & 0xff) +#define SXE2_MK_VER_MINOR (ver) ((ver) & 0xff) + +#define SXE2_ITR_VER_MAJOR_V100 1 +#define SXE2_ITR_VER_MAJOR_V200 2 + +#define SXE2_ITR_VER_MAJOR 1 +#define SXE2_ITR_VER_MINOR 1 +#define SXE2_ITR_VER SXE2_MK_VER(SXE2_ITR_VER_MAJOR, SXE2_ITR_VER_MINOR) + +#define SXE2_CTRL_VER_IS_V100 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V100) +#define SXE2_CTRL_VER_IS_V200 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V200) + +#define SXE2LIB_ITR_VER_MAJOR 1 +#define SXE2LIB_ITR_VER_MINOR 1 +#define SXE2LIB_ITR_VER SXE2_MK_VER(SXE2LIB_ITR_VER_MAJOR, SXE2LIB_ITR_VER_MINOR) + +#define SXE2_DRV_CLI_VER_MAJOR 1 +#define SXE2_DRV_CLI_VER_MINOR 1 +#define SXE2_DRV_CLI_VER \ + SXE2_MK_VER(SXE2_DRV_CLI_VER_MAJOR, SXE2_DRV_CLI_VER_MINOR) + +#endif /* __SXE2_INTERNAL_VER_H__ */
drivers/common/sxe2/sxe2_osal.h new file +152 -0
152 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v16 4/11 drivers: add base driver skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the sxe2 PMD skeleton by implementing the PCI probe and remove functions. This includes the setup and cleanup of a character device used for control path communication between the user space and the hardware.
The character device provides an interface for ioctl-based management operations, supporting device-specific configuration.
--- drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 635 +++++++++++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 +++ drivers/common/sxe2/sxe2_host_regs.h | 226 ++++---- drivers/common/sxe2/sxe2_ioctl_chnl.c | 160 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 44 ++ drivers/meson.build | 1 + 8 files changed, 1183 insertions(+), 113 deletions(-) create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h
drivers/common/sxe2/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Corigine, Inc. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +deps += ['bus_pci', 'net', 'eal', 'ethdev'] + +sources = files( + 'sxe2_common.c', + 'sxe2_ioctl_chnl.c', +)
drivers/common/sxe2/sxe2_common.c new file +635 -0
635 lines not on this page · raw message
drivers/common/sxe2/sxe2_common.h new file +85 -0
85 lines not on this page · raw message
drivers/common/sxe2/sxe2_host_regs.h +113 -113
466 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.c new file +160 -0
160 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.h new file +130 -0
130 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h new file +44 -0
44 lines not on this page · raw message
drivers/meson.build +1 -0
@@ -12,6 +12,7 @@ subdirs = [ 'common/qat', # depends on bus. 'common/sfc_efx', # depends on bus. 'common/zsda', # depends on bus. + 'common/sxe2', # depends on bus. 'mempool', # depends on common and bus. 'dma', # depends on common and bus. 'net', # depends on common, bus, mempool
Signature · 1 line
2.47.3
PATCH v16 5/11 drivers: add base driver probe skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the eth_dev_ops for the sxe2 PMD. This includes the implementation of mandatory ethdev operations such as dev_configure, dev_start, dev_stop, and dev_infos_get.
Set up the basic infrastructure for device initialization to allow the driver to be recognized as a valid ethernet device within the DPDK framework.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 29 +- drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 + drivers/common/sxe2/sxe2_osal.h | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 23 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 +++++++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 ++ drivers/net/sxe2/sxe2_drv_cmd.h | 388 +++++++++++++ drivers/net/sxe2/sxe2_ethdev.c | 613 +++++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 293 ++++++++++ drivers/net/sxe2/sxe2_irq.h | 48 ++ drivers/net/sxe2/sxe2_queue.c | 38 ++ drivers/net/sxe2/sxe2_queue.h | 191 +++++++ drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 16 + drivers/net/sxe2/sxe2_vsi.c | 214 +++++++ drivers/net/sxe2/sxe2_vsi.h | 204 +++++++ 17 files changed, 2967 insertions(+), 1 deletion(-) create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
drivers/common/sxe2/sxe2_ioctl_chnl.c +28 -1
@@ -144,7 +144,7 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)if (ret <0 ) {PMD_LOG_ERR (COM ,"Failed to handshark, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); - ret = -EIO ; + ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock); goto l_end; }
@@ -158,3 +158,30 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev) l_end:return ret; } + +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len) +{ +int32_t ret =0 ; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , + virt, len); + + ret =munmap (virt, len); +if (ret <0 ) { +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , + virt, len,strerror (errno)); + ret = -errno; + goto l_end; + } + +l_end: +return ret; +}
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -37,6 +37,15 @@ __rte_internalint32_t sxe2_drv_dev_handshake (struct sxe2_common_device *cdev); +__rte_internal +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx, +uint64_t len,uint64_t offset); + +__rte_internal +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); + #ifdef __cplusplus }#endif
drivers/common/sxe2/sxe2_osal.h +1 -0
@@ -46,6 +46,7 @@ enum sxe2_itr_idx { };#define SXE2_ETH_ALEN 6 +#define SXE2_BITS_PER_BYTE 8#define BITS_TO_LONGS (nr) SXE2_DIV_ROUND_UP(nr, SXE2_BITS_PER_BYTE * sizeof(unsigned long))#define BITS_TO_U32 (nr) SXE2_DIV_ROUND_UP(nr, 32)
drivers/net/meson.build +1 -0
@@ -58,6 +58,7 @@ drivers = [ 'rnp', 'sfc', 'softnic', + 'sxe2', 'tap', 'thunderx', 'txgbe',
drivers/net/sxe2/meson.build new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +cflags += ['-g'] + +deps += ['common_sxe2', 'hash','cryptodev','security'] + +includes += include_directories('../../common/sxe2') + +sources += files( + 'sxe2_ethdev.c', + 'sxe2_cmd_chnl.c', + 'sxe2_vsi.c', + 'sxe2_queue.c', +) + +allow_internal_get_api = true
drivers/net/sxe2/sxe2_cmd_chnl.c new file +323 -0
323 lines not on this page · raw message
drivers/net/sxe2/sxe2_cmd_chnl.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_CMD_CHNL_H__ +#define __SXE2_CMD_CHNL_H__ + +#include "sxe2_ethdev.h" +#include "sxe2_drv_cmd.h" +#include "sxe2_ioctl_chnl_func.h" + +int32_t sxe2_drv_dev_caps_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_caps_resp *dev_caps); + +int32_t sxe2_drv_dev_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_info_resp *dev_info_resp); + +int32_t sxe2_drv_dev_fw_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_fw_info_resp *dev_fw_info_resp); + +int32_t sxe2_drv_vsi_add (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_vsi_del (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_rxq_switch (struct sxe2_adapter *adapter,struct sxe2_rx_queue *rxq,bool enable); + +int32_t sxe2_drv_txq_switch (struct sxe2_adapter *adapter,struct sxe2_tx_queue *txq,bool enable); + +int32_t sxe2_drv_rxq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_rx_queue *rxq, +uint16_t rxq_cnt); + +int32_t sxe2_drv_txq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_tx_queue *txq, +uint16_t txq_cnt); + +#endif /* __SXE2_CMD_CHNL_H__ */
drivers/net/sxe2/sxe2_drv_cmd.h new file +388 -0
388 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.c new file +613 -0
613 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h new file +293 -0
293 lines not on this page · raw message
drivers/net/sxe2/sxe2_irq.h new file +48 -0
48 lines not on this page · raw message
drivers/net/sxe2/sxe2_queue.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#include "sxe2_ethdev.h" +#include "sxe2_queue.h" +#include "sxe2_common_log.h" + +void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter, +struct sxe2_drv_queue_caps *q_caps) +{ + adapter->q_ctxt.qp_cnt_assign = q_caps->queues_cnt; + adapter->q_ctxt.base_idx_in_pf = q_caps->base_idx_in_pf; +} + +int32_t sxe2_queues_init (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; +uint16_t buf_size; +uint16_t frame_size; +struct sxe2_rx_queue *rxq; +uint16_t nb_rxq; + + frame_size = dev->data->mtu +SXE2_ETH_OVERHEAD ; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; +if (!rxq) +continue ; + + buf_size =rte_pktmbuf_data_room_size (rxq->mb_pool) -RTE_PKTMBUF_HEADROOM ; + rxq->rx_buf_len =RTE_ALIGN_FLOOR (buf_size, (1 <<SXE2_RXQ_CTX_DBUFF_SHIFT )); + rxq->rx_buf_len =RTE_MIN (rxq->rx_buf_len,SXE2_RX_MAX_DATA_BUF_SIZE ); +if (frame_size > rxq->rx_buf_len) + dev->data->scattered_rx =1 ; + } + +return ret; +}
drivers/net/sxe2/sxe2_queue.h new file +191 -0
191 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_common.h new file +540 -0
540 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_poll.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_POLL_H +#define SXE2_TXRX_POLL_H + +#include "sxe2_queue.h" + +uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +#endif /* __SXE2_TXRX_POLL_H__ */
drivers/net/sxe2/sxe2_vsi.c new file +214 -0
214 lines not on this page · raw message
drivers/net/sxe2/sxe2_vsi.h new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v16 6/11 drivers: support PCI BAR mapping
In reply to [email protected]From: Jie Liu <[email protected]>
Implement PCI BAR (Base Address Register) mapping and unmapping logic to enable MMIO (Memory Mapped I/O) access to hardware registers.
The driver retrieves the BAR0 virtual address from the PCI resource during the probing phase. This mapping is used for subsequent register-level operations. Proper cleanup is implemented in the device close path.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 38 ++- drivers/net/sxe2/sxe2_ethdev.c | 326 +++++++++++++++++++++++++- drivers/net/sxe2/sxe2_ethdev.h | 18 ++ 3 files changed, 377 insertions(+), 5 deletions(-)
drivers/common/sxe2/sxe2_ioctl_chnl.c +36 -2
@@ -133,7 +133,7 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev) goto l_end; } -PMD_LOG_DEBUG (COM ,"Open fd=%d to handshark with kernel" , cmd_fd); +PMD_LOG_DEBUG (COM ,"Open fd=%d to handshake with kernel" , cmd_fd);memset (&cmd_params,0 ,sizeof (struct sxe2_ioctl_cmd_common_hdr )); cmd_params.dpdk_ver =SXE2_COM_VER ;
@@ -142,7 +142,7 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev) (void )pthread_mutex_lock (&cdev->config.lock); ret =ioctl (cmd_fd,SXE2_COM_CMD_HANDSHAKE , &cmd_params);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to handshark, fd=%d, ret=%d, err:%s" , +PMD_LOG_ERR (COM ,"Failed to handshake, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock);
@@ -159,6 +159,40 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)return ret; } +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_mmap) +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx,uint64_t len,uint64_t offset) +{ +int32_t cmd_fd =0 ; +void *virt =NULL ; + +if (cdev->config.kernel_reset) { +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_err; + } + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_err; + } + +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , + bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); + + virt =mmap (NULL , len,PROT_READ |PROT_WRITE , +MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); +if (virt ==MAP_FAILED ) { +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , + cmd_fd, len, offset,strerror (errno)); + goto l_err; + } + +return virt; +l_err: +return NULL ; +} +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) int32_tsxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len)
drivers/net/sxe2/sxe2_ethdev.c +323 -3
380 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +18 -0
@@ -290,4 +290,22 @@ struct sxe2_adapter {#define SXE2_DEV_PRIVATE_TO_ADAPTER (dev) \ ((struct sxe2_adapter *)(dev)->data->dev_private) +#define SXE2_DEV_TO_PCI (eth_dev) \ + RTE_DEV_TO_PCI((eth_dev)->device) + +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type); + +int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); + +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, +uint32_t item_cnt,uint32_t item_base); + +void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type); + +int32_t sxe2_dev_pci_map_init (struct rte_eth_dev *dev); + +void sxe2_dev_pci_map_uinit (struct rte_eth_dev *dev); +#endif /* __SXE2_ETHDEV_H__ */
Signature · 1 line
2.47.3
PATCH v16 7/11 common/sxe2: add ioctl interface for DMA map and unmap
In reply to [email protected]From: Jie Liu <[email protected]>
Implement DMA mapping and unmapping functionality using ioctl calls. This allows the driver to configure the hardware's IOMMU/DMA tables, ensuring the device can safely access memory buffers allocated by the userspace.
The mapping is established during device initialization or queue setup and is revoked during device closure to prevent memory leaks and ensure hardware security.
--- drivers/common/sxe2/sxe2_common.c | 50 +++++++++- drivers/common/sxe2/sxe2_ioctl_chnl.c | 104 +++++++++++++++++++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 ++ 3 files changed, 162 insertions(+), 1 deletion(-)
drivers/common/sxe2/sxe2_common.c +49 -1
@@ -442,7 +442,7 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev) cdev =sxe2_rtedev_to_cdev (&pci_dev->device);if (cdev ==NULL ) { ret = -ENODEV ; -PMD_LOG_ERR (COM ,"Fail to get remove device." ); +PMD_LOG_ERR (COM ,"Fail to get device when remove." ); goto l_end; }
@@ -466,12 +466,60 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev)return ret; } +static int32_t sxe2_common_pci_dma_map (struct rte_pci_device *pci_dev, +void *addr,uint64_t iova,size_t len) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma map." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_map (cdev, (uint64_t )(uintptr_t )addr, iova, len); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to map dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} + +static int32_t sxe2_common_pci_dma_unmap (struct rte_pci_device *pci_dev, + void *addr __rte_unused, uint64_t iova, size_t len __rte_unused) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma unmap." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_unmap (cdev, iova); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to unmap dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} +static struct rte_pci_driver sxe2_common_pci_driver = { .driver = { .name =SXE2_COMMON_PCI_DRIVER_NAME , }, .probe = sxe2_common_pci_probe, .remove = sxe2_common_pci_remove, + .dma_map = sxe2_common_pci_dma_map, + .dma_unmap = sxe2_common_pci_dma_unmap, };static uint32_t sxe2_common_pci_id_table_size_get (const struct rte_pci_id *id_table)
drivers/common/sxe2/sxe2_ioctl_chnl.c +104 -0
107 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -46,6 +46,15 @@ __rte_internalint32_t sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); +__rte_internal +int32_t +sxe2_drv_dev_dma_map (struct sxe2_common_device *cdev,uint64_t vaddr, +uint64_t iova,uint64_t size); + +__rte_internal +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova); + #ifdef __cplusplus }#endif
Signature · 1 line
2.47.3
PATCH v16 8/11 net/sxe2: support queue setup and control
In reply to [email protected]From: Jie Liu <[email protected]>
Add support for Rx and Tx queue setup, release, and management. Implement eth_dev_ops callbacks for rx_queue_setup, tx_queue_setup, rx_queue_release, and tx_queue_release.
This includes:
- Allocating memory for hardware ring descriptors.
- Initializing software ring structures and hardware head/tail pointers.
- Implementing proper resource cleanup logic to prevent memory leaks during queue reconfiguration or device close.
--- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 82 +++-- drivers/net/sxe2/sxe2_ethdev.h | 15 +- drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++++++++++++++++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 ++ drivers/net/sxe2/sxe2_tx.c | 420 +++++++++++++++++++++++++ drivers/net/sxe2/sxe2_tx.h | 32 ++ 7 files changed, 1118 insertions(+), 26 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h
drivers/net/sxe2/meson.build +2 -0
@@ -18,6 +18,8 @@ sources += files( 'sxe2_cmd_chnl.c', 'sxe2_vsi.c', 'sxe2_queue.c', + 'sxe2_tx.c', + 'sxe2_rx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +60 -22
127 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +11 -4
@@ -293,14 +293,21 @@ struct sxe2_adapter {#define SXE2_DEV_TO_PCI (eth_dev) \ RTE_DEV_TO_PCI((eth_dev)->device) +void *sxe2_pci_map_addr_get (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type, +uint16_t idx_in_func); +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type); +enum sxe2_pci_map_resource res_type);int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); +enum sxe2_pci_map_resource res_type, +uint64_t org_len,uint64_t org_offset); -int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, -uint32_t item_cnt,uint32_t item_base); +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter, +uint32_t res_type, +uint32_t item_cnt, +uint32_t item_base);void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type);
drivers/net/sxe2/sxe2_rx.c new file +559 -0
559 lines not on this page · raw message
drivers/net/sxe2/sxe2_rx.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_RX_H__ +#define __SXE2_RX_H__ + +#include "sxe2_queue.h" + +int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_rxconf *rx_conf, +struct rte_mempool *mp); + +int32_t __rte_cold sxe2_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +void __rte_cold sxe2_rx_queue_mbufs_release(struct sxe2_rx_queue *rxq); + +void __rte_cold sxe2_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_rxq_info *qinfo); + +int32_t __rte_cold sxe2_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int32_t __rte_cold sxe2_rxqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rxqs_all_stop(struct rte_eth_dev *dev); + +struct rte_mbuf *sxe2_mbuf_raw_alloc (struct rte_mempool *mp); + +#endif /* __SXE2_RX_H__ */
drivers/net/sxe2/sxe2_tx.c new file +420 -0
420 lines not on this page · raw message
drivers/net/sxe2/sxe2_tx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_TX_H__ +#define __SXE2_TX_H__ +#include "sxe2_queue.h" + +void __rte_cold sxe2_tx_queue_reset(struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id); + +void sxe2_tx_queue_mbufs_release (struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id); + +int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_txconf *tx_conf); + +void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_txq_info *qinfo); + +int32_t __rte_cold sxe2_txqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_txqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_TX_H__ */
Signature · 1 line
2.47.3
PATCH v16 9/11 drivers: add data path for Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
Implement receive and transmit burst functions for sxe2 PMD. Add sxe2_recv_pkts and sxe2_xmit_pkts as the primary data path interfaces.
The implementation includes:
- Efficient descriptor fetching and mbuf allocation for Rx.
- Descriptor setup and checksum offload handling for Tx.
- Buffer recycling and hardware tail pointer updates.
- Performance-oriented loop unrolling and prefetching where applicable.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 8 +- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 11 +- drivers/net/sxe2/sxe2_txrx.c | 246 +++++++ drivers/net/sxe2/sxe2_txrx.h | 21 + drivers/net/sxe2/sxe2_txrx_poll.c | 916 ++++++++++++++++++++++++++ 6 files changed, 1199 insertions(+), 5 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c
drivers/common/sxe2/sxe2_ioctl_chnl.c +4 -4
@@ -177,13 +177,13 @@ void goto l_err; } -PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=%" PRIu64", src=0x%" PRIx64", offset=0x%" PRIx64"" , bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); virt =mmap (NULL , len,PROT_READ |PROT_WRITE ,MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset));if (virt ==MAP_FAILED ) { -PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=%" PRIu64", offset=0x%" PRIx64", err:%s" , cmd_fd, len, offset,strerror (errno)); goto l_err; }
@@ -205,12 +205,12 @@ sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) goto l_end; } -PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%" PRIx64"" , virt, len); ret =munmap (virt, len);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=%" PRIu64", err:%s" , virt, len,strerror (errno)); ret = -errno; goto l_end;
drivers/net/sxe2/meson.build +2 -0
@@ -20,6 +20,8 @@ sources += files( 'sxe2_queue.c', 'sxe2_tx.c', 'sxe2_rx.c', + 'sxe2_txrx_poll.c', + 'sxe2_txrx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +10 -1
@@ -26,6 +26,7 @@#include "sxe2_cmd_chnl.h" #include "sxe2_tx.h" #include "sxe2_rx.h" +#include "sxe2_txrx.h" #include "sxe2_common.h" #include "sxe2_common_log.h" #include "sxe2_host_regs.h"
@@ -137,6 +138,9 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev) goto l_end; } +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); + ret =sxe2_queues_start (dev);if (ret) {PMD_LOG_ERR (INIT ,"enable queues failed" );
@@ -763,10 +767,15 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,PMD_INIT_FUNC_TRACE (); +sxe2_set_common_function (dev); + dev->dev_ops = &sxe2_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); goto l_end; + } ret =sxe2_hw_init (dev);if (ret) {
drivers/net/sxe2/sxe2_txrx.c new file +246 -0
246 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_H +#define SXE2_TXRX_H +#include <ethdev_driver.h> +#include "sxe2_queue.h" + +void sxe2_set_common_function (struct rte_eth_dev *dev); + +uint16_t sxe2_tx_pkts_prepare (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); + +void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); + +#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c new file +916 -0
916 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v16 10/11 net/sxe2: add vectorized Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the vectorized data path for the sxe2 PMD. It utilizes SIMD instructions (e.g., SSE) to process multiple packets simultaneously, significantly improving throughput for small packet processing.
The implementation includes:
* Vectorized Rx burst function for bulk descriptor processing.
* Vectorized Tx burst function with optimized resource cleanup.
* Capability flags update to reflect vectorized path support.
--- drivers/net/sxe2/meson.build | 5 + drivers/net/sxe2/sxe2_ethdev.c | 29 +- drivers/net/sxe2/sxe2_queue.c | 28 ++ drivers/net/sxe2/sxe2_queue.h | 4 + drivers/net/sxe2/sxe2_txrx.c | 214 ++++++--- drivers/net/sxe2/sxe2_txrx.h | 11 +- drivers/net/sxe2/sxe2_txrx_poll.c | 26 ++ drivers/net/sxe2/sxe2_txrx_poll.h | 4 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 +++++++++ drivers/net/sxe2/sxe2_txrx_vec.h | 73 ++++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 ++++++++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++++++++++++++++ 12 files changed, 1304 insertions(+), 75 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c
drivers/net/sxe2/meson.build +5 -0
@@ -13,6 +13,10 @@ deps += ['common_sxe2', 'hash','cryptodev','security'] includes += include_directories('../../common/sxe2') +if arch_subdir == 'x86' + sources += files('sxe2_txrx_vec_sse.c') +endif + sources += files( 'sxe2_ethdev.c', 'sxe2_cmd_chnl.c',
@@ -22,6 +26,7 @@ sources += files( 'sxe2_rx.c', 'sxe2_txrx_poll.c', 'sxe2_txrx.c', + 'sxe2_txrx_vec.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +8 -21
@@ -107,25 +107,6 @@ static int32_t sxe2_dev_stop(struct rte_eth_dev *dev)return ret; } -static int32_t sxe2_queues_start (struct rte_eth_dev *dev) -{ -int32_t ret =0 ; - ret =sxe2_txqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); - goto l_end; - } - - ret =sxe2_rxqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); -sxe2_txqs_all_stop (dev); - } - -l_end: -return ret; -} -static int32_t sxe2_dev_start (struct rte_eth_dev *dev) {int32_t ret =0 ;
@@ -158,7 +139,7 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev)static int32_t sxe2_dev_close (struct rte_eth_dev *dev) { (void )sxe2_dev_stop (dev); - + (void )sxe2_queues_release (dev);sxe2_vsi_uninit (dev);sxe2_dev_pci_map_uinit (dev);
@@ -296,13 +277,19 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .dev_close = sxe2_dev_close, .dev_infos_get = sxe2_dev_infos_get, + .rx_queue_start = sxe2_rx_queue_start, + .rx_queue_stop = sxe2_rx_queue_stop, + .tx_queue_start = sxe2_tx_queue_start, + .tx_queue_stop = sxe2_tx_queue_stop, .rx_queue_setup = sxe2_rx_queue_setup, - .tx_queue_setup = sxe2_tx_queue_setup, .rx_queue_release = sxe2_rx_queue_release, + .tx_queue_setup = sxe2_tx_queue_setup, .tx_queue_release = sxe2_tx_queue_release, .rxq_info_get = sxe2_rx_queue_info_get, .txq_info_get = sxe2_tx_queue_info_get, + .rx_burst_mode_get = sxe2_rx_burst_mode_get, + .tx_burst_mode_get = sxe2_tx_burst_mode_get, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_queue.c +28 -0
@@ -5,6 +5,8 @@#include "sxe2_ethdev.h" #include "sxe2_queue.h" #include "sxe2_common_log.h" +#include "sxe2_tx.h" +#include "sxe2_rx.h" void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter,struct sxe2_drv_queue_caps *q_caps)
@@ -36,3 +38,29 @@ int32_t sxe2_queues_init(struct rte_eth_dev *dev)return ret; } + +int32_t sxe2_queues_start (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; + + ret =sxe2_txqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); + goto l_end; + } + + ret =sxe2_rxqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); +sxe2_txqs_all_stop (dev); + } +l_end: +return ret; +} + +void sxe2_queues_release (struct rte_eth_dev *dev) +{ +sxe2_all_rxqs_release (dev); + +sxe2_all_txqs_release (dev); +}
drivers/net/sxe2/sxe2_queue.h +4 -0
@@ -188,4 +188,8 @@ void sxe2_sw_queue_ctx_hw_cap_set(struct sxe2_adapter *adapter,int32_t sxe2_queues_init (struct rte_eth_dev *dev); +int32_t sxe2_queues_start (struct rte_eth_dev *dev); + +void sxe2_queues_release (struct rte_eth_dev *dev); +#endif /* __SXE2_QUEUE_H__ */
drivers/net/sxe2/sxe2_txrx.c +165 -49
340 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h +6 -5
@@ -6,16 +6,17 @@#define SXE2_TXRX_H #include <ethdev_driver.h> #include "sxe2_queue.h" -void sxe2_set_common_function (struct rte_eth_dev *dev); +int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, +uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); -void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); - void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); -void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); - +int32_t sxe2_tx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +int32_t sxe2_rx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode);#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c +26 -0
@@ -480,6 +480,32 @@ static inline uint16_t sxe2_tx_pkts_batch(void *tx_queue,return nb_pkts; } +uint16_t sxe2_tx_pkts_simple (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +uint16_t tx_done_num; +uint16_t tx_once_num; +uint16_t tx_need_num; +if (likely (nb_pkts <=SXE2_TX_PKTS_BURST_BATCH_NUM )) { + tx_done_num =sxe2_tx_pkts_batch (tx_queue, + tx_pkts, nb_pkts); + goto l_end; + } + tx_done_num =0 ; +while (nb_pkts) { + tx_need_num =RTE_MIN (nb_pkts,SXE2_TX_PKTS_BURST_BATCH_NUM ); + tx_once_num =sxe2_tx_pkts_batch (tx_queue, + &tx_pkts[tx_done_num], + tx_need_num); + nb_pkts -= tx_once_num; + tx_done_num += tx_once_num; +if (tx_once_num < tx_need_num) +break ; + } +l_end: +return tx_done_num; +} +static inline void sxe2_update_rx_tail (struct sxe2_rx_queue *rxq,uint16_t hold_num,uint16_t rx_id) {
drivers/net/sxe2/sxe2_txrx_poll.h +4 -0
@@ -9,6 +9,10 @@uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +uint16_t sxe2_tx_pkts_simple (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);
drivers/net/sxe2/sxe2_txrx_vec.c new file +201 -0
201 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec.h new file +73 -0
73 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_common.h new file +235 -0
235 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_sse.c new file +549 -0
549 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v16 11/11 net/sxe2: implement Tx done cleanup
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the 'tx_done_cleanup' ethdev ops in the sxe2 PMD. This interface allows applications to explicitly request the driver to release mbufs that have been transmitted and are no longer needed by the hardware.
The implementation iterates through the Tx ring, checking the status of the descriptors starting from the last cleaned tail. It releases the corresponding mbufs back to the mempool until either the requested number of packets are freed or no more completed descriptors are found.
--- drivers/net/sxe2/sxe2_ethdev.c | 1 + drivers/net/sxe2/sxe2_txrx.h | 1 + drivers/net/sxe2/sxe2_txrx_poll.c | 102 ++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+)
drivers/net/sxe2/sxe2_ethdev.c +1 -0
@@ -290,6 +290,7 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .txq_info_get = sxe2_tx_queue_info_get, .rx_burst_mode_get = sxe2_rx_burst_mode_get, .tx_burst_mode_get = sxe2_tx_burst_mode_get, + .tx_done_cleanup = sxe2_tx_done_cleanup, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_txrx.h +1 -0
@@ -12,6 +12,7 @@ int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +int32_t sxe2_tx_done_cleanup (void *txq,uint32_t free_cnt);void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq);void sxe2_rx_mode_func_set (struct rte_eth_dev *dev);
drivers/net/sxe2/sxe2_txrx_poll.c +102 -0
116 lines not on this page · raw message
Signature · 1 line
2.47.3
v17 cover net/sxe2: fix logic errors and address feedback
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v17 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset for mbuf_def in vector init to avoid uninitialized reads.
- Converted pci_map_addr_info to designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updated burst_mode_get to accurately report AVX paths.
- Adjusted SXE2_ETH_OVERHEAD to match actual VLAN capabilities.
Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup
.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 29 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 351 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9202 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Signature · 1 line
2.47.3
PATCH v17 1/11 mailmap: add Jie Liu
From: Jie Liu <[email protected]>
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -739,6 +739,7 @@ Jiawen Wu <[email protected]> Jiayu Hu <[email protected]> <[email protected]> Jie Hai <[email protected]> Jie Liu <[email protected]> +Jie Liu <[email protected]> Jie Pan <[email protected]> Jie Wang <[email protected]> Jie Zhou <[email protected]> <[email protected]>
Signature · 1 line
2.47.3
PATCH v17 2/11 doc: add sxe2 guide and release notes
In reply to [email protected]From: Jie Liu <[email protected]>
Add a new guide for SXE2 PMD in the nics directory. The guide contains driver capabilities, prerequisites, and compilation/usage instructions.
Update the release notes to announce the addition of the sxe2 network driver.
--- doc/guides/nics/features/sxe2.ini | 29 ++++++++++++++++++++++ doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_26_07.rst | 4 +++ 4 files changed, 68 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst
doc/guides/nics/features/sxe2.ini new file +29 -0
@@ -0,0 +1,29 @@ +; +; Supported features of the 'sxe2' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +; A feature with "P" indicates only be supported when non-vector path +; is selected. +; +[Features] +Fast mbuf free = P +Free Tx mbuf on demand = Y +Burst mode info = Y +Queue start/stop = Y +Buffer split on Rx = P +Scattered Rx = Y +CRC offload = Y +VLAN offload = Y +QinQ offload = P +L3 checksum offload = Y +L4 checksum offload = Y +Timestamp offload = P +Inner L3 checksum = P +Inner L4 checksum = P +Rx descriptor status = Y +Tx descriptor status = Y +FreeBSD = Y +Linux = Y +x86-32 = Y +x86-64 = Y
doc/guides/nics/index.rst +1 -0
@@ -68,6 +68,7 @@ Network Interface Controller Drivers rnp sfc_efx softnic + sxe2 tap thunderx txgbe
doc/guides/nics/sxe2.rst new file +34 -0
@@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +SXE2 Poll Mode Driver +====================== + +The sxe2 PMD (**librte_net_sxe2**) provides poll mode driver support for +10/25/50/100 Gbps Network Adapters. +The embedded switch, Physical Functions (PF), +and SR-IOV Virtual Functions (VF) are supported. + +Implementation details +---------------------- + +The sxe2 PMD is designed to operate alongside the sxe2 kernel network driver. +For management and control operations, the PMD communicates with the kernel +driver via ioctl interfaces. These commands are processed by the kernel +driver and subsequently dispatched to the hardware firmware for execution. + +For security and robustness, the driver's data path is optimized to operate +using virtual addresses (IOVA as VA mode). However, to ensure full +compatibility in system environments where an IOMMU is absent or disabled, +the driver also provides an explicit path to support physical addressing +(IOVA as PA mode). + +The hardware is capable of handling the corresponding IOVA addresses (either +VA or PA) directly, as provided by the DPDK memory subsystem. This ensures +that DPDK applications can only access memory segments explicitly allocated +to the current process, preventing unauthorized access to random physical +memory. + +This capability allows the PMD to coexist with kernel network interfaces +which remain functional, although they stop receiving unicast packets as +long as they share the same MAC address.
doc/guides/rel_notes/release_26_07.rst +4 -0
@@ -64,6 +64,10 @@ New Features * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Added Linkdata sxe2 ethernet driver.** + + Added network driver for the Linkdata Network Adapters. + Removed Items -------------
Signature · 1 line
2.47.3
PATCH v17 3/11 common/sxe2: add sxe2 basic structures
In reply to [email protected]From: Jie Liu <[email protected]>
This patch adds the base infrastructure for the sxe2 common library. It includes the mandatory OS abstraction layer (OSAL), common structure definitions, error codes, and the logging system implementation.
Specifically, this commit:
- Implements the logging stream management using RTE_LOG_LINE.
- Defines device-specific error codes and status registers.
- Adds the initial meson build configuration for the common library.
--- drivers/common/sxe2/sxe2_common_log.h | 81 +++ drivers/common/sxe2/sxe2_host_regs.h | 707 ++++++++++++++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 ++ drivers/common/sxe2/sxe2_osal.h | 152 +++++ 4 files changed, 973 insertions(+) create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_osal.h
drivers/common/sxe2/sxe2_common_log.h new file +81 -0
@@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_COMMON_LOG_H__ +#define __SXE2_COMMON_LOG_H__ + +extern int32_t sxe2_common_log; +extern int32_t sxe2_log_init; +extern int32_t sxe2_log_driver; +extern int32_t sxe2_log_rx; +extern int32_t sxe2_log_tx; +extern int32_t sxe2_log_hw; + +#define RTE_LOGTYPE_SXE2_COM sxe2_common_log +#define RTE_LOGTYPE_SXE2_INIT sxe2_log_init +#define RTE_LOGTYPE_SXE2_DRV sxe2_log_driver +#define RTE_LOGTYPE_SXE2_RX sxe2_log_rx +#define RTE_LOGTYPE_SXE2_TX sxe2_log_tx +#define RTE_LOGTYPE_SXE2_HW sxe2_log_hw + +#define SXE2_PMD_LOG (level, log_type, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): ", \ + __func__, __VA_ARGS__) + +#define SXE2_PMD_DRV_LOG (level, log_type, adapter, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): port:%u ", \ + __func__ RTE_LOG_COMMA \ + adapter->dev_port_id, __VA_ARGS__) + +#define PMD_LOG_DEBUG (logtype, fmt, ...) \ + SXE2_PMD_LOG(DEBUG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_INFO (logtype, fmt, ...) \ + SXE2_PMD_LOG(INFO, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_NOTICE (logtype, fmt, ...) \ + SXE2_PMD_LOG(NOTICE, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_WARN (logtype, fmt, ...) \ + SXE2_PMD_LOG(WARNING, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ERR (logtype, fmt, ...) \ + SXE2_PMD_LOG(ERR, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_CRIT (logtype, fmt, ...) \ + SXE2_PMD_LOG(CRIT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ALERT (logtype, fmt, ...) \ + SXE2_PMD_LOG(ALERT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_EMERG (logtype, fmt, ...) \ + SXE2_PMD_LOG(EMERG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_DEBUG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(DEBUG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_INFO (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(INFO, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_NOTICE (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(NOTICE, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_WARN (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(WARNING, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ERR (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ERR, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_CRIT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(CRIT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ALERT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ALERT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_EMERG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(EMERG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>") + +#endif /* __SXE2_COMMON_LOG_H__ */
drivers/common/sxe2/sxe2_host_regs.h new file +707 -0
707 lines not on this page · raw message
drivers/common/sxe2/sxe2_internal_ver.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_INTERNAL_VER_H__ +#define __SXE2_INTERNAL_VER_H__ + +#define SXE2_VER_MAJOR_OFFSET (16) +#define SXE2_MK_VER (major, minor) \ + (major << SXE2_VER_MAJOR_OFFSET | minor) +#define SXE2_MK_VER_MAJOR (ver) (((ver) >> SXE2_VER_MAJOR_OFFSET) & 0xff) +#define SXE2_MK_VER_MINOR (ver) ((ver) & 0xff) + +#define SXE2_ITR_VER_MAJOR_V100 1 +#define SXE2_ITR_VER_MAJOR_V200 2 + +#define SXE2_ITR_VER_MAJOR 1 +#define SXE2_ITR_VER_MINOR 1 +#define SXE2_ITR_VER SXE2_MK_VER(SXE2_ITR_VER_MAJOR, SXE2_ITR_VER_MINOR) + +#define SXE2_CTRL_VER_IS_V100 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V100) +#define SXE2_CTRL_VER_IS_V200 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V200) + +#define SXE2LIB_ITR_VER_MAJOR 1 +#define SXE2LIB_ITR_VER_MINOR 1 +#define SXE2LIB_ITR_VER SXE2_MK_VER(SXE2LIB_ITR_VER_MAJOR, SXE2LIB_ITR_VER_MINOR) + +#define SXE2_DRV_CLI_VER_MAJOR 1 +#define SXE2_DRV_CLI_VER_MINOR 1 +#define SXE2_DRV_CLI_VER \ + SXE2_MK_VER(SXE2_DRV_CLI_VER_MAJOR, SXE2_DRV_CLI_VER_MINOR) + +#endif /* __SXE2_INTERNAL_VER_H__ */
drivers/common/sxe2/sxe2_osal.h new file +152 -0
152 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v17 4/11 drivers: add base driver skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the sxe2 PMD skeleton by implementing the PCI probe and remove functions. This includes the setup and cleanup of a character device used for control path communication between the user space and the hardware.
The character device provides an interface for ioctl-based management operations, supporting device-specific configuration.
--- drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 635 +++++++++++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 +++ drivers/common/sxe2/sxe2_host_regs.h | 226 ++++---- drivers/common/sxe2/sxe2_ioctl_chnl.c | 160 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 44 ++ drivers/meson.build | 1 + 8 files changed, 1183 insertions(+), 113 deletions(-) create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h
drivers/common/sxe2/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Corigine, Inc. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +deps += ['bus_pci', 'net', 'eal', 'ethdev'] + +sources = files( + 'sxe2_common.c', + 'sxe2_ioctl_chnl.c', +)
drivers/common/sxe2/sxe2_common.c new file +635 -0
635 lines not on this page · raw message
drivers/common/sxe2/sxe2_common.h new file +85 -0
85 lines not on this page · raw message
drivers/common/sxe2/sxe2_host_regs.h +113 -113
466 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.c new file +160 -0
160 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.h new file +130 -0
130 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h new file +44 -0
44 lines not on this page · raw message
drivers/meson.build +1 -0
@@ -12,6 +12,7 @@ subdirs = [ 'common/qat', # depends on bus. 'common/sfc_efx', # depends on bus. 'common/zsda', # depends on bus. + 'common/sxe2', # depends on bus. 'mempool', # depends on common and bus. 'dma', # depends on common and bus. 'net', # depends on common, bus, mempool
Signature · 1 line
2.47.3
PATCH v17 5/11 drivers: add base driver probe skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the eth_dev_ops for the sxe2 PMD. This includes the implementation of mandatory ethdev operations such as dev_configure, dev_start, dev_stop, and dev_infos_get.
Set up the basic infrastructure for device initialization to allow the driver to be recognized as a valid ethernet device within the DPDK framework.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 29 +- drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 + drivers/common/sxe2/sxe2_osal.h | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 23 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 +++++++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 ++ drivers/net/sxe2/sxe2_drv_cmd.h | 388 +++++++++++++ drivers/net/sxe2/sxe2_ethdev.c | 613 +++++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 293 ++++++++++ drivers/net/sxe2/sxe2_irq.h | 48 ++ drivers/net/sxe2/sxe2_queue.c | 38 ++ drivers/net/sxe2/sxe2_queue.h | 191 +++++++ drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 16 + drivers/net/sxe2/sxe2_vsi.c | 214 +++++++ drivers/net/sxe2/sxe2_vsi.h | 204 +++++++ 17 files changed, 2967 insertions(+), 1 deletion(-) create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
drivers/common/sxe2/sxe2_ioctl_chnl.c +28 -1
@@ -144,7 +144,7 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)if (ret <0 ) {PMD_LOG_ERR (COM ,"Failed to handshake, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); - ret = -EIO ; + ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock); goto l_end; }
@@ -158,3 +158,30 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev) l_end:return ret; } + +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len) +{ +int32_t ret =0 ; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , + virt, len); + + ret =munmap (virt, len); +if (ret <0 ) { +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , + virt, len,strerror (errno)); + ret = -errno; + goto l_end; + } + +l_end: +return ret; +}
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -37,6 +37,15 @@ __rte_internalint32_t sxe2_drv_dev_handshake (struct sxe2_common_device *cdev); +__rte_internal +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx, +uint64_t len,uint64_t offset); + +__rte_internal +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); + #ifdef __cplusplus }#endif
drivers/common/sxe2/sxe2_osal.h +1 -0
@@ -46,6 +46,7 @@ enum sxe2_itr_idx { };#define SXE2_ETH_ALEN 6 +#define SXE2_BITS_PER_BYTE 8#define BITS_TO_LONGS (nr) SXE2_DIV_ROUND_UP(nr, SXE2_BITS_PER_BYTE * sizeof(unsigned long))#define BITS_TO_U32 (nr) SXE2_DIV_ROUND_UP(nr, 32)
drivers/net/meson.build +1 -0
@@ -58,6 +58,7 @@ drivers = [ 'rnp', 'sfc', 'softnic', + 'sxe2', 'tap', 'thunderx', 'txgbe',
drivers/net/sxe2/meson.build new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +cflags += ['-g'] + +deps += ['common_sxe2', 'hash','cryptodev','security'] + +includes += include_directories('../../common/sxe2') + +sources += files( + 'sxe2_ethdev.c', + 'sxe2_cmd_chnl.c', + 'sxe2_vsi.c', + 'sxe2_queue.c', +) + +allow_internal_get_api = true
drivers/net/sxe2/sxe2_cmd_chnl.c new file +323 -0
323 lines not on this page · raw message
drivers/net/sxe2/sxe2_cmd_chnl.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_CMD_CHNL_H__ +#define __SXE2_CMD_CHNL_H__ + +#include "sxe2_ethdev.h" +#include "sxe2_drv_cmd.h" +#include "sxe2_ioctl_chnl_func.h" + +int32_t sxe2_drv_dev_caps_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_caps_resp *dev_caps); + +int32_t sxe2_drv_dev_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_info_resp *dev_info_resp); + +int32_t sxe2_drv_dev_fw_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_fw_info_resp *dev_fw_info_resp); + +int32_t sxe2_drv_vsi_add (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_vsi_del (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_rxq_switch (struct sxe2_adapter *adapter,struct sxe2_rx_queue *rxq,bool enable); + +int32_t sxe2_drv_txq_switch (struct sxe2_adapter *adapter,struct sxe2_tx_queue *txq,bool enable); + +int32_t sxe2_drv_rxq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_rx_queue *rxq, +uint16_t rxq_cnt); + +int32_t sxe2_drv_txq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_tx_queue *txq, +uint16_t txq_cnt); + +#endif /* __SXE2_CMD_CHNL_H__ */
drivers/net/sxe2/sxe2_drv_cmd.h new file +388 -0
388 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.c new file +613 -0
613 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h new file +293 -0
293 lines not on this page · raw message
drivers/net/sxe2/sxe2_irq.h new file +48 -0
48 lines not on this page · raw message
drivers/net/sxe2/sxe2_queue.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#include "sxe2_ethdev.h" +#include "sxe2_queue.h" +#include "sxe2_common_log.h" + +void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter, +struct sxe2_drv_queue_caps *q_caps) +{ + adapter->q_ctxt.qp_cnt_assign = q_caps->queues_cnt; + adapter->q_ctxt.base_idx_in_pf = q_caps->base_idx_in_pf; +} + +int32_t sxe2_queues_init (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; +uint16_t buf_size; +uint16_t frame_size; +struct sxe2_rx_queue *rxq; +uint16_t nb_rxq; + + frame_size = dev->data->mtu +SXE2_ETH_OVERHEAD ; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; +if (!rxq) +continue ; + + buf_size =rte_pktmbuf_data_room_size (rxq->mb_pool) -RTE_PKTMBUF_HEADROOM ; + rxq->rx_buf_len =RTE_ALIGN_FLOOR (buf_size, (1 <<SXE2_RXQ_CTX_DBUFF_SHIFT )); + rxq->rx_buf_len =RTE_MIN (rxq->rx_buf_len,SXE2_RX_MAX_DATA_BUF_SIZE ); +if (frame_size > rxq->rx_buf_len) + dev->data->scattered_rx =1 ; + } + +return ret; +}
drivers/net/sxe2/sxe2_queue.h new file +191 -0
191 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_common.h new file +540 -0
540 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_poll.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_POLL_H +#define SXE2_TXRX_POLL_H + +#include "sxe2_queue.h" + +uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +#endif /* __SXE2_TXRX_POLL_H__ */
drivers/net/sxe2/sxe2_vsi.c new file +214 -0
214 lines not on this page · raw message
drivers/net/sxe2/sxe2_vsi.h new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v17 6/11 drivers: support PCI BAR mapping
In reply to [email protected]From: Jie Liu <[email protected]>
Implement PCI BAR (Base Address Register) mapping and unmapping logic to enable MMIO (Memory Mapped I/O) access to hardware registers.
The driver retrieves the BAR0 virtual address from the PCI resource during the probing phase. This mapping is used for subsequent register-level operations. Proper cleanup is implemented in the device close path.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 34 +++ drivers/net/sxe2/sxe2_ethdev.c | 326 +++++++++++++++++++++++++- drivers/net/sxe2/sxe2_ethdev.h | 18 ++ 3 files changed, 375 insertions(+), 3 deletions(-)
drivers/common/sxe2/sxe2_ioctl_chnl.c +34 -0
@@ -159,6 +159,40 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)return ret; } +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_mmap) +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx,uint64_t len,uint64_t offset) +{ +int32_t cmd_fd =0 ; +void *virt =NULL ; + +if (cdev->config.kernel_reset) { +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_err; + } + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_err; + } + +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , + bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); + + virt =mmap (NULL , len,PROT_READ |PROT_WRITE , +MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); +if (virt ==MAP_FAILED ) { +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , + cmd_fd, len, offset,strerror (errno)); + goto l_err; + } + +return virt; +l_err: +return NULL ; +} +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) int32_tsxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len)
drivers/net/sxe2/sxe2_ethdev.c +323 -3
380 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +18 -0
@@ -290,4 +290,22 @@ struct sxe2_adapter {#define SXE2_DEV_PRIVATE_TO_ADAPTER (dev) \ ((struct sxe2_adapter *)(dev)->data->dev_private) +#define SXE2_DEV_TO_PCI (eth_dev) \ + RTE_DEV_TO_PCI((eth_dev)->device) + +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type); + +int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); + +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, +uint32_t item_cnt,uint32_t item_base); + +void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type); + +int32_t sxe2_dev_pci_map_init (struct rte_eth_dev *dev); + +void sxe2_dev_pci_map_uinit (struct rte_eth_dev *dev); +#endif /* __SXE2_ETHDEV_H__ */
Signature · 1 line
2.47.3
PATCH v17 7/11 common/sxe2: add ioctl interface for DMA map and unmap
In reply to [email protected]From: Jie Liu <[email protected]>
Implement DMA mapping and unmapping functionality using ioctl calls. This allows the driver to configure the hardware's IOMMU/DMA tables, ensuring the device can safely access memory buffers allocated by the userspace.
The mapping is established during device initialization or queue setup and is revoked during device closure to prevent memory leaks and ensure hardware security.
--- drivers/common/sxe2/sxe2_common.c | 50 +++++++++- drivers/common/sxe2/sxe2_ioctl_chnl.c | 104 +++++++++++++++++++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 ++ 3 files changed, 162 insertions(+), 1 deletion(-)
drivers/common/sxe2/sxe2_common.c +49 -1
@@ -442,7 +442,7 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev) cdev =sxe2_rtedev_to_cdev (&pci_dev->device);if (cdev ==NULL ) { ret = -ENODEV ; -PMD_LOG_ERR (COM ,"Fail to get remove device." ); +PMD_LOG_ERR (COM ,"Fail to get device when remove." ); goto l_end; }
@@ -466,12 +466,60 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev)return ret; } +static int32_t sxe2_common_pci_dma_map (struct rte_pci_device *pci_dev, +void *addr,uint64_t iova,size_t len) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma map." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_map (cdev, (uint64_t )(uintptr_t )addr, iova, len); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to map dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} + +static int32_t sxe2_common_pci_dma_unmap (struct rte_pci_device *pci_dev, + void *addr __rte_unused, uint64_t iova, size_t len __rte_unused) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma unmap." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_unmap (cdev, iova); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to unmap dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} +static struct rte_pci_driver sxe2_common_pci_driver = { .driver = { .name =SXE2_COMMON_PCI_DRIVER_NAME , }, .probe = sxe2_common_pci_probe, .remove = sxe2_common_pci_remove, + .dma_map = sxe2_common_pci_dma_map, + .dma_unmap = sxe2_common_pci_dma_unmap, };static uint32_t sxe2_common_pci_id_table_size_get (const struct rte_pci_id *id_table)
drivers/common/sxe2/sxe2_ioctl_chnl.c +104 -0
107 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -46,6 +46,15 @@ __rte_internalint32_t sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); +__rte_internal +int32_t +sxe2_drv_dev_dma_map (struct sxe2_common_device *cdev,uint64_t vaddr, +uint64_t iova,uint64_t size); + +__rte_internal +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova); + #ifdef __cplusplus }#endif
Signature · 1 line
2.47.3
Re: [PATCH v17 07/11] common/sxe2: add ioctl interface for DMA map and unmap
Quoted 35 lines · On Tue, 19 May 2026 11:01:28 +0800 [email protected] wrote:
drivers/common/sxe2/sxe2_ioctl_chnl.c +35
-0+RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_dma_unmap) +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova) +{ +int32_t ret =0 ; +int32_t cmd_fd =0 ; +struct sxe2_ioctl_iommu_dma_unmap cmd_params; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +if (!cdev->config.support_iommu) + goto l_end; + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { + ret = -EBADF ; +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"fd %d dma unmap iova=0x%" PRIX64 "" , + cmd_fd, iova); + +memset (&cmd_params,0 ,sizeof (struct sxe2_ioctl_iommu_dma_unmap )); + cmd_params.iova = iova; + + (void )pthread_mutex_lock (&cdev->config.lock); + ret =ioctl (cmd_fd,SXE2_COM_CMD_DMA_UNMAP , &cmd_params); +if (ret <0 ) { +PMD_LOG_INFO (COM ,"Failed to dma unmap, fd=%d, ret=%d, err:%s" , + cmd_fd, ret,strerror (errno));
drivers/common/sxe2/sxe2_ioctl_chnl.c sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) · line 325
Quoted 10 lines
drivers/common/sxe2/sxe2_ioctl_chnl.c +10
-0+ ret = -EIO ; + (void )pthread_mutex_unlock (&cdev->config.lock); + goto l_end; + } + (void )pthread_mutex_unlock (&cdev->config.lock); + +l_end: +return ret; +} +
You shouldn't need the cast void cast around pthread_mutex_lock/unlock; other drivers don't do that.
Also, git complains about this when doing merge.
Applying: common/sxe2: add ioctl interface for DMA map and unmap /home/shemminger/DPDK/main/.git/worktrees/sxe2/rebase-apply/patch:192: new blank line at EOF. +
PATCH v17 8/11 net/sxe2: support queue setup and control
In reply to [email protected]From: Jie Liu <[email protected]>
Add support for Rx and Tx queue setup, release, and management. Implement eth_dev_ops callbacks for rx_queue_setup, tx_queue_setup, rx_queue_release, and tx_queue_release.
This includes:
- Allocating memory for hardware ring descriptors.
- Initializing software ring structures and hardware head/tail pointers.
- Implementing proper resource cleanup logic to prevent memory leaks during queue reconfiguration or device close.
--- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 82 +++-- drivers/net/sxe2/sxe2_ethdev.h | 15 +- drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++++++++++++++++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 ++ drivers/net/sxe2/sxe2_tx.c | 420 +++++++++++++++++++++++++ drivers/net/sxe2/sxe2_tx.h | 32 ++ 7 files changed, 1111 insertions(+), 26 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h
drivers/net/sxe2/meson.build +2 -0
@@ -18,6 +18,8 @@ sources += files( 'sxe2_cmd_chnl.c', 'sxe2_vsi.c', 'sxe2_queue.c', + 'sxe2_tx.c', + 'sxe2_rx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +60 -22
127 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +11 -4
@@ -293,14 +293,21 @@ struct sxe2_adapter {#define SXE2_DEV_TO_PCI (eth_dev) \ RTE_DEV_TO_PCI((eth_dev)->device) +void *sxe2_pci_map_addr_get (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type, +uint16_t idx_in_func); +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type); +enum sxe2_pci_map_resource res_type);int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); +enum sxe2_pci_map_resource res_type, +uint64_t org_len,uint64_t org_offset); -int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, -uint32_t item_cnt,uint32_t item_base); +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter, +uint32_t res_type, +uint32_t item_cnt, +uint32_t item_base);void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type);
drivers/net/sxe2/sxe2_rx.c new file +554 -0
554 lines not on this page · raw message
drivers/net/sxe2/sxe2_rx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_RX_H__ +#define __SXE2_RX_H__ + +#include "sxe2_queue.h" + +int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_rxconf *rx_conf, +struct rte_mempool *mp); + +int32_t __rte_cold sxe2_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +void __rte_cold sxe2_rx_queue_mbufs_release(struct sxe2_rx_queue *rxq); + +void __rte_cold sxe2_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_rxq_info *qinfo); + +int32_t __rte_cold sxe2_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int32_t __rte_cold sxe2_rxqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rxqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_RX_H__ */
drivers/net/sxe2/sxe2_tx.c new file +420 -0
420 lines not on this page · raw message
drivers/net/sxe2/sxe2_tx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_TX_H__ +#define __SXE2_TX_H__ +#include "sxe2_queue.h" + +void __rte_cold sxe2_tx_queue_reset(struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id); + +void sxe2_tx_queue_mbufs_release (struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id); + +int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_txconf *tx_conf); + +void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_txq_info *qinfo); + +int32_t __rte_cold sxe2_txqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_txqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_TX_H__ */
Signature · 1 line
2.47.3
PATCH v17 9/11 drivers: add data path for Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
Implement receive and transmit burst functions for sxe2 PMD. Add sxe2_recv_pkts and sxe2_xmit_pkts as the primary data path interfaces.
The implementation includes:
- Efficient descriptor fetching and mbuf allocation for Rx.
- Descriptor setup and checksum offload handling for Tx.
- Buffer recycling and hardware tail pointer updates.
- Performance-oriented loop unrolling and prefetching where applicable.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 8 +- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 11 +- drivers/net/sxe2/sxe2_txrx.c | 246 +++++++ drivers/net/sxe2/sxe2_txrx.h | 21 + drivers/net/sxe2/sxe2_txrx_poll.c | 916 ++++++++++++++++++++++++++ 6 files changed, 1199 insertions(+), 5 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c
drivers/common/sxe2/sxe2_ioctl_chnl.c +4 -4
@@ -177,13 +177,13 @@ void goto l_err; } -PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=%" PRIu64", src=0x%" PRIx64", offset=0x%" PRIx64"" , bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); virt =mmap (NULL , len,PROT_READ |PROT_WRITE ,MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset));if (virt ==MAP_FAILED ) { -PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=%" PRIu64", offset=0x%" PRIx64", err:%s" , cmd_fd, len, offset,strerror (errno)); goto l_err; }
@@ -205,12 +205,12 @@ sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) goto l_end; } -PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%" PRIx64"" , virt, len); ret =munmap (virt, len);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=%" PRIu64", err:%s" , virt, len,strerror (errno)); ret = -errno; goto l_end;
drivers/net/sxe2/meson.build +2 -0
@@ -20,6 +20,8 @@ sources += files( 'sxe2_queue.c', 'sxe2_tx.c', 'sxe2_rx.c', + 'sxe2_txrx_poll.c', + 'sxe2_txrx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +10 -1
@@ -26,6 +26,7 @@#include "sxe2_cmd_chnl.h" #include "sxe2_tx.h" #include "sxe2_rx.h" +#include "sxe2_txrx.h" #include "sxe2_common.h" #include "sxe2_common_log.h" #include "sxe2_host_regs.h"
@@ -137,6 +138,9 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev) goto l_end; } +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); + ret =sxe2_queues_start (dev);if (ret) {PMD_LOG_ERR (INIT ,"enable queues failed" );
@@ -763,10 +767,15 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,PMD_INIT_FUNC_TRACE (); +sxe2_set_common_function (dev); + dev->dev_ops = &sxe2_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); goto l_end; + } ret =sxe2_hw_init (dev);if (ret) {
drivers/net/sxe2/sxe2_txrx.c new file +246 -0
246 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_H +#define SXE2_TXRX_H +#include <ethdev_driver.h> +#include "sxe2_queue.h" + +void sxe2_set_common_function (struct rte_eth_dev *dev); + +uint16_t sxe2_tx_pkts_prepare (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); + +void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); + +#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c new file +916 -0
916 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v17 10/11 net/sxe2: add vectorized Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the vectorized data path for the sxe2 PMD. It utilizes SIMD instructions (e.g., SSE) to process multiple packets simultaneously, significantly improving throughput for small packet processing.
The implementation includes:
* Vectorized Rx burst function for bulk descriptor processing.
* Vectorized Tx burst function with optimized resource cleanup.
* Capability flags update to reflect vectorized path support.
--- drivers/net/sxe2/meson.build | 5 + drivers/net/sxe2/sxe2_ethdev.c | 29 +- drivers/net/sxe2/sxe2_queue.c | 28 ++ drivers/net/sxe2/sxe2_queue.h | 4 + drivers/net/sxe2/sxe2_txrx.c | 203 ++++++--- drivers/net/sxe2/sxe2_txrx.h | 11 +- drivers/net/sxe2/sxe2_txrx_poll.c | 26 ++ drivers/net/sxe2/sxe2_txrx_poll.h | 4 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 +++++++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 +++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 ++++++++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++++++++++++++++ 12 files changed, 1283 insertions(+), 75 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c
drivers/net/sxe2/meson.build +5 -0
@@ -13,6 +13,10 @@ deps += ['common_sxe2', 'hash','cryptodev','security'] includes += include_directories('../../common/sxe2') +if arch_subdir == 'x86' + sources += files('sxe2_txrx_vec_sse.c') +endif + sources += files( 'sxe2_ethdev.c', 'sxe2_cmd_chnl.c',
@@ -22,6 +26,7 @@ sources += files( 'sxe2_rx.c', 'sxe2_txrx_poll.c', 'sxe2_txrx.c', + 'sxe2_txrx_vec.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +8 -21
@@ -107,25 +107,6 @@ static int32_t sxe2_dev_stop(struct rte_eth_dev *dev)return ret; } -static int32_t sxe2_queues_start (struct rte_eth_dev *dev) -{ -int32_t ret =0 ; - ret =sxe2_txqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); - goto l_end; - } - - ret =sxe2_rxqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); -sxe2_txqs_all_stop (dev); - } - -l_end: -return ret; -} -static int32_t sxe2_dev_start (struct rte_eth_dev *dev) {int32_t ret =0 ;
@@ -158,7 +139,7 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev)static int32_t sxe2_dev_close (struct rte_eth_dev *dev) { (void )sxe2_dev_stop (dev); - + (void )sxe2_queues_release (dev);sxe2_vsi_uninit (dev);sxe2_dev_pci_map_uinit (dev);
@@ -296,13 +277,19 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .dev_close = sxe2_dev_close, .dev_infos_get = sxe2_dev_infos_get, + .rx_queue_start = sxe2_rx_queue_start, + .rx_queue_stop = sxe2_rx_queue_stop, + .tx_queue_start = sxe2_tx_queue_start, + .tx_queue_stop = sxe2_tx_queue_stop, .rx_queue_setup = sxe2_rx_queue_setup, - .tx_queue_setup = sxe2_tx_queue_setup, .rx_queue_release = sxe2_rx_queue_release, + .tx_queue_setup = sxe2_tx_queue_setup, .tx_queue_release = sxe2_tx_queue_release, .rxq_info_get = sxe2_rx_queue_info_get, .txq_info_get = sxe2_tx_queue_info_get, + .rx_burst_mode_get = sxe2_rx_burst_mode_get, + .tx_burst_mode_get = sxe2_tx_burst_mode_get, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_queue.c +28 -0
@@ -5,6 +5,8 @@#include "sxe2_ethdev.h" #include "sxe2_queue.h" #include "sxe2_common_log.h" +#include "sxe2_tx.h" +#include "sxe2_rx.h" void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter,struct sxe2_drv_queue_caps *q_caps)
@@ -36,3 +38,29 @@ int32_t sxe2_queues_init(struct rte_eth_dev *dev)return ret; } + +int32_t sxe2_queues_start (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; + + ret =sxe2_txqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); + goto l_end; + } + + ret =sxe2_rxqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); +sxe2_txqs_all_stop (dev); + } +l_end: +return ret; +} + +void sxe2_queues_release (struct rte_eth_dev *dev) +{ +sxe2_all_rxqs_release (dev); + +sxe2_all_txqs_release (dev); +}
drivers/net/sxe2/sxe2_queue.h +4 -0
@@ -188,4 +188,8 @@ void sxe2_sw_queue_ctx_hw_cap_set(struct sxe2_adapter *adapter,int32_t sxe2_queues_init (struct rte_eth_dev *dev); +int32_t sxe2_queues_start (struct rte_eth_dev *dev); + +void sxe2_queues_release (struct rte_eth_dev *dev); +#endif /* __SXE2_QUEUE_H__ */
drivers/net/sxe2/sxe2_txrx.c +154 -49
329 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h +6 -5
@@ -6,16 +6,17 @@#define SXE2_TXRX_H #include <ethdev_driver.h> #include "sxe2_queue.h" -void sxe2_set_common_function (struct rte_eth_dev *dev); +int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, +uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); -void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); - void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); -void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); - +int32_t sxe2_tx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +int32_t sxe2_rx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode);#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c +26 -0
@@ -480,6 +480,32 @@ static inline uint16_t sxe2_tx_pkts_batch(void *tx_queue,return nb_pkts; } +uint16_t sxe2_tx_pkts_simple (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +uint16_t tx_done_num; +uint16_t tx_once_num; +uint16_t tx_need_num; +if (likely (nb_pkts <=SXE2_TX_PKTS_BURST_BATCH_NUM )) { + tx_done_num =sxe2_tx_pkts_batch (tx_queue, + tx_pkts, nb_pkts); + goto l_end; + } + tx_done_num =0 ; +while (nb_pkts) { + tx_need_num =RTE_MIN (nb_pkts,SXE2_TX_PKTS_BURST_BATCH_NUM ); + tx_once_num =sxe2_tx_pkts_batch (tx_queue, + &tx_pkts[tx_done_num], + tx_need_num); + nb_pkts -= tx_once_num; + tx_done_num += tx_once_num; +if (tx_once_num < tx_need_num) +break ; + } +l_end: +return tx_done_num; +} +static inline void sxe2_update_rx_tail (struct sxe2_rx_queue *rxq,uint16_t hold_num,uint16_t rx_id) {
drivers/net/sxe2/sxe2_txrx_poll.h +4 -0
@@ -9,6 +9,10 @@uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +uint16_t sxe2_tx_pkts_simple (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);
drivers/net/sxe2/sxe2_txrx_vec.c new file +201 -0
201 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec.h new file +63 -0
63 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_common.h new file +235 -0
235 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_sse.c new file +549 -0
549 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v17 11/11 net/sxe2: implement Tx done cleanup
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the 'tx_done_cleanup' ethdev ops in the sxe2 PMD. This interface allows applications to explicitly request the driver to release mbufs that have been transmitted and are no longer needed by the hardware.
The implementation iterates through the Tx ring, checking the status of the descriptors starting from the last cleaned tail. It releases the corresponding mbufs back to the mempool until either the requested number of packets are freed or no more completed descriptors are found.
--- drivers/net/sxe2/sxe2_ethdev.c | 1 + drivers/net/sxe2/sxe2_txrx.h | 1 + drivers/net/sxe2/sxe2_txrx_poll.c | 102 ++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+)
drivers/net/sxe2/sxe2_ethdev.c +1 -0
@@ -290,6 +290,7 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .txq_info_get = sxe2_tx_queue_info_get, .rx_burst_mode_get = sxe2_rx_burst_mode_get, .tx_burst_mode_get = sxe2_tx_burst_mode_get, + .tx_done_cleanup = sxe2_tx_done_cleanup, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_txrx.h +1 -0
@@ -12,6 +12,7 @@ int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +int32_t sxe2_tx_done_cleanup (void *txq,uint32_t free_cnt);void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq);void sxe2_rx_mode_func_set (struct rte_eth_dev *dev);
drivers/net/sxe2/sxe2_txrx_poll.c +102 -0
116 lines not on this page · raw message
Signature · 1 line
2.47.3
v18 cover net/sxe2: fix logic errors and address feedback
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v18:
- update sxe2.ini.
v17 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset for mbuf_def in vector init to avoid uninitialized reads.
- Converted pci_map_addr_info to designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updated burst_mode_get to accurately report AVX paths.
- Adjusted SXE2_ETH_OVERHEAD to match actual VLAN capabilities.
Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup
.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 23 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 352 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9197 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Signature · 1 line
2.47.3
PATCH v18 1/11 mailmap: add Jie Liu
From: Jie Liu <[email protected]>
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -739,6 +739,7 @@ Jiawen Wu <[email protected]> Jiayu Hu <[email protected]> <[email protected]> Jie Hai <[email protected]> Jie Liu <[email protected]> +Jie Liu <[email protected]> Jie Pan <[email protected]> Jie Wang <[email protected]> Jie Zhou <[email protected]> <[email protected]>
Signature · 1 line
2.47.3
PATCH v18 2/11 doc: add sxe2 guide and release notes
In reply to [email protected]From: Jie Liu <[email protected]>
Add a new guide for SXE2 PMD in the nics directory. The guide contains driver capabilities, prerequisites, and compilation/usage instructions.
Update the release notes to announce the addition of the sxe2 network driver.
--- doc/guides/nics/features/sxe2.ini | 23 +++++++++++++++++ doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_26_07.rst | 4 +++ 4 files changed, 62 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst
doc/guides/nics/features/sxe2.ini new file +23 -0
@@ -0,0 +1,23 @@ +; +; Supported features of the 'sxe2' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +; A feature with "P" indicates only be supported when non-vector path +; is selected. +; +[Features] +Fast mbuf free = P +Free Tx mbuf on demand = Y +Burst mode info = Y +Queue start/stop = Y +Buffer split on Rx = P +Scattered Rx = Y +CRC offload = Y +L3 checksum offload = Y +L4 checksum offload = Y +Rx descriptor status = Y +Tx descriptor status = Y +Linux = Y +x86-32 = Y +x86-64 = Y
doc/guides/nics/index.rst +1 -0
@@ -68,6 +68,7 @@ Network Interface Controller Drivers rnp sfc_efx softnic + sxe2 tap thunderx txgbe
doc/guides/nics/sxe2.rst new file +34 -0
@@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +SXE2 Poll Mode Driver +====================== + +The sxe2 PMD (**librte_net_sxe2**) provides poll mode driver support for +10/25/50/100 Gbps Network Adapters. +The embedded switch, Physical Functions (PF), +and SR-IOV Virtual Functions (VF) are supported. + +Implementation details +---------------------- + +The sxe2 PMD is designed to operate alongside the sxe2 kernel network driver. +For management and control operations, the PMD communicates with the kernel +driver via ioctl interfaces. These commands are processed by the kernel +driver and subsequently dispatched to the hardware firmware for execution. + +For security and robustness, the driver's data path is optimized to operate +using virtual addresses (IOVA as VA mode). However, to ensure full +compatibility in system environments where an IOMMU is absent or disabled, +the driver also provides an explicit path to support physical addressing +(IOVA as PA mode). + +The hardware is capable of handling the corresponding IOVA addresses (either +VA or PA) directly, as provided by the DPDK memory subsystem. This ensures +that DPDK applications can only access memory segments explicitly allocated +to the current process, preventing unauthorized access to random physical +memory. + +This capability allows the PMD to coexist with kernel network interfaces +which remain functional, although they stop receiving unicast packets as +long as they share the same MAC address.
doc/guides/rel_notes/release_26_07.rst +4 -0
@@ -64,6 +64,10 @@ New Features * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Added Linkdata sxe2 ethernet driver.** + + Added network driver for the Linkdata Network Adapters. + Removed Items -------------
Signature · 1 line
2.47.3
PATCH v18 3/11 common/sxe2: add sxe2 basic structures
In reply to [email protected]From: Jie Liu <[email protected]>
This patch adds the base infrastructure for the sxe2 common library. It includes the mandatory OS abstraction layer (OSAL), common structure definitions, error codes, and the logging system implementation.
Specifically, this commit:
- Implements the logging stream management using RTE_LOG_LINE.
- Defines device-specific error codes and status registers.
- Adds the initial meson build configuration for the common library.
--- drivers/common/sxe2/sxe2_common_log.h | 81 +++ drivers/common/sxe2/sxe2_host_regs.h | 707 ++++++++++++++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 ++ drivers/common/sxe2/sxe2_osal.h | 152 +++++ 4 files changed, 973 insertions(+) create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_osal.h
drivers/common/sxe2/sxe2_common_log.h new file +81 -0
@@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_COMMON_LOG_H__ +#define __SXE2_COMMON_LOG_H__ + +extern int32_t sxe2_common_log; +extern int32_t sxe2_log_init; +extern int32_t sxe2_log_driver; +extern int32_t sxe2_log_rx; +extern int32_t sxe2_log_tx; +extern int32_t sxe2_log_hw; + +#define RTE_LOGTYPE_SXE2_COM sxe2_common_log +#define RTE_LOGTYPE_SXE2_INIT sxe2_log_init +#define RTE_LOGTYPE_SXE2_DRV sxe2_log_driver +#define RTE_LOGTYPE_SXE2_RX sxe2_log_rx +#define RTE_LOGTYPE_SXE2_TX sxe2_log_tx +#define RTE_LOGTYPE_SXE2_HW sxe2_log_hw + +#define SXE2_PMD_LOG (level, log_type, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): ", \ + __func__, __VA_ARGS__) + +#define SXE2_PMD_DRV_LOG (level, log_type, adapter, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): port:%u ", \ + __func__ RTE_LOG_COMMA \ + adapter->dev_port_id, __VA_ARGS__) + +#define PMD_LOG_DEBUG (logtype, fmt, ...) \ + SXE2_PMD_LOG(DEBUG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_INFO (logtype, fmt, ...) \ + SXE2_PMD_LOG(INFO, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_NOTICE (logtype, fmt, ...) \ + SXE2_PMD_LOG(NOTICE, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_WARN (logtype, fmt, ...) \ + SXE2_PMD_LOG(WARNING, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ERR (logtype, fmt, ...) \ + SXE2_PMD_LOG(ERR, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_CRIT (logtype, fmt, ...) \ + SXE2_PMD_LOG(CRIT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ALERT (logtype, fmt, ...) \ + SXE2_PMD_LOG(ALERT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_EMERG (logtype, fmt, ...) \ + SXE2_PMD_LOG(EMERG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_DEBUG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(DEBUG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_INFO (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(INFO, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_NOTICE (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(NOTICE, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_WARN (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(WARNING, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ERR (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ERR, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_CRIT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(CRIT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ALERT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ALERT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_EMERG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(EMERG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>") + +#endif /* __SXE2_COMMON_LOG_H__ */
drivers/common/sxe2/sxe2_host_regs.h new file +707 -0
707 lines not on this page · raw message
drivers/common/sxe2/sxe2_internal_ver.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_INTERNAL_VER_H__ +#define __SXE2_INTERNAL_VER_H__ + +#define SXE2_VER_MAJOR_OFFSET (16) +#define SXE2_MK_VER (major, minor) \ + (major << SXE2_VER_MAJOR_OFFSET | minor) +#define SXE2_MK_VER_MAJOR (ver) (((ver) >> SXE2_VER_MAJOR_OFFSET) & 0xff) +#define SXE2_MK_VER_MINOR (ver) ((ver) & 0xff) + +#define SXE2_ITR_VER_MAJOR_V100 1 +#define SXE2_ITR_VER_MAJOR_V200 2 + +#define SXE2_ITR_VER_MAJOR 1 +#define SXE2_ITR_VER_MINOR 1 +#define SXE2_ITR_VER SXE2_MK_VER(SXE2_ITR_VER_MAJOR, SXE2_ITR_VER_MINOR) + +#define SXE2_CTRL_VER_IS_V100 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V100) +#define SXE2_CTRL_VER_IS_V200 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V200) + +#define SXE2LIB_ITR_VER_MAJOR 1 +#define SXE2LIB_ITR_VER_MINOR 1 +#define SXE2LIB_ITR_VER SXE2_MK_VER(SXE2LIB_ITR_VER_MAJOR, SXE2LIB_ITR_VER_MINOR) + +#define SXE2_DRV_CLI_VER_MAJOR 1 +#define SXE2_DRV_CLI_VER_MINOR 1 +#define SXE2_DRV_CLI_VER \ + SXE2_MK_VER(SXE2_DRV_CLI_VER_MAJOR, SXE2_DRV_CLI_VER_MINOR) + +#endif /* __SXE2_INTERNAL_VER_H__ */
drivers/common/sxe2/sxe2_osal.h new file +152 -0
152 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v18 4/11 drivers: add base driver skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the sxe2 PMD skeleton by implementing the PCI probe and remove functions. This includes the setup and cleanup of a character device used for control path communication between the user space and the hardware.
The character device provides an interface for ioctl-based management operations, supporting device-specific configuration.
--- drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 635 +++++++++++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 +++ drivers/common/sxe2/sxe2_host_regs.h | 226 ++++---- drivers/common/sxe2/sxe2_ioctl_chnl.c | 160 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 44 ++ drivers/meson.build | 1 + 8 files changed, 1183 insertions(+), 113 deletions(-) create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h
drivers/common/sxe2/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Corigine, Inc. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +deps += ['bus_pci', 'net', 'eal', 'ethdev'] + +sources = files( + 'sxe2_common.c', + 'sxe2_ioctl_chnl.c', +)
drivers/common/sxe2/sxe2_common.c new file +635 -0
635 lines not on this page · raw message
drivers/common/sxe2/sxe2_common.h new file +85 -0
85 lines not on this page · raw message
drivers/common/sxe2/sxe2_host_regs.h +113 -113
466 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.c new file +160 -0
160 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.h new file +130 -0
130 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h new file +44 -0
44 lines not on this page · raw message
drivers/meson.build +1 -0
@@ -12,6 +12,7 @@ subdirs = [ 'common/qat', # depends on bus. 'common/sfc_efx', # depends on bus. 'common/zsda', # depends on bus. + 'common/sxe2', # depends on bus. 'mempool', # depends on common and bus. 'dma', # depends on common and bus. 'net', # depends on common, bus, mempool
Signature · 1 line
2.47.3
PATCH v18 5/11 drivers: add base driver probe skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the eth_dev_ops for the sxe2 PMD. This includes the implementation of mandatory ethdev operations such as dev_configure, dev_start, dev_stop, and dev_infos_get.
Set up the basic infrastructure for device initialization to allow the driver to be recognized as a valid ethernet device within the DPDK framework.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 29 +- drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 + drivers/common/sxe2/sxe2_osal.h | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 23 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 +++++++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 ++ drivers/net/sxe2/sxe2_drv_cmd.h | 388 +++++++++++++ drivers/net/sxe2/sxe2_ethdev.c | 613 +++++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 293 ++++++++++ drivers/net/sxe2/sxe2_irq.h | 48 ++ drivers/net/sxe2/sxe2_queue.c | 38 ++ drivers/net/sxe2/sxe2_queue.h | 191 +++++++ drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 16 + drivers/net/sxe2/sxe2_vsi.c | 214 +++++++ drivers/net/sxe2/sxe2_vsi.h | 204 +++++++ 17 files changed, 2967 insertions(+), 1 deletion(-) create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
drivers/common/sxe2/sxe2_ioctl_chnl.c +28 -1
@@ -144,7 +144,7 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)if (ret <0 ) {PMD_LOG_ERR (COM ,"Failed to handshake, fd=%d, ret=%d, err:%s" , cmd_fd, ret,strerror (errno)); - ret = -EIO ; + ret = -errno; (void )pthread_mutex_unlock (&cdev->config.lock); goto l_end; }
@@ -158,3 +158,30 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev) l_end:return ret; } + +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len) +{ +int32_t ret =0 ; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , + virt, len); + + ret =munmap (virt, len); +if (ret <0 ) { +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , + virt, len,strerror (errno)); + ret = -errno; + goto l_end; + } + +l_end: +return ret; +}
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -37,6 +37,15 @@ __rte_internalint32_t sxe2_drv_dev_handshake (struct sxe2_common_device *cdev); +__rte_internal +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx, +uint64_t len,uint64_t offset); + +__rte_internal +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); + #ifdef __cplusplus }#endif
drivers/common/sxe2/sxe2_osal.h +1 -0
@@ -46,6 +46,7 @@ enum sxe2_itr_idx { };#define SXE2_ETH_ALEN 6 +#define SXE2_BITS_PER_BYTE 8#define BITS_TO_LONGS (nr) SXE2_DIV_ROUND_UP(nr, SXE2_BITS_PER_BYTE * sizeof(unsigned long))#define BITS_TO_U32 (nr) SXE2_DIV_ROUND_UP(nr, 32)
drivers/net/meson.build +1 -0
@@ -58,6 +58,7 @@ drivers = [ 'rnp', 'sfc', 'softnic', + 'sxe2', 'tap', 'thunderx', 'txgbe',
drivers/net/sxe2/meson.build new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +cflags += ['-g'] + +deps += ['common_sxe2', 'hash','cryptodev','security'] + +includes += include_directories('../../common/sxe2') + +sources += files( + 'sxe2_ethdev.c', + 'sxe2_cmd_chnl.c', + 'sxe2_vsi.c', + 'sxe2_queue.c', +) + +allow_internal_get_api = true
drivers/net/sxe2/sxe2_cmd_chnl.c new file +323 -0
323 lines not on this page · raw message
drivers/net/sxe2/sxe2_cmd_chnl.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_CMD_CHNL_H__ +#define __SXE2_CMD_CHNL_H__ + +#include "sxe2_ethdev.h" +#include "sxe2_drv_cmd.h" +#include "sxe2_ioctl_chnl_func.h" + +int32_t sxe2_drv_dev_caps_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_caps_resp *dev_caps); + +int32_t sxe2_drv_dev_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_info_resp *dev_info_resp); + +int32_t sxe2_drv_dev_fw_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_fw_info_resp *dev_fw_info_resp); + +int32_t sxe2_drv_vsi_add (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_vsi_del (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_rxq_switch (struct sxe2_adapter *adapter,struct sxe2_rx_queue *rxq,bool enable); + +int32_t sxe2_drv_txq_switch (struct sxe2_adapter *adapter,struct sxe2_tx_queue *txq,bool enable); + +int32_t sxe2_drv_rxq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_rx_queue *rxq, +uint16_t rxq_cnt); + +int32_t sxe2_drv_txq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_tx_queue *txq, +uint16_t txq_cnt); + +#endif /* __SXE2_CMD_CHNL_H__ */
drivers/net/sxe2/sxe2_drv_cmd.h new file +388 -0
388 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.c new file +613 -0
613 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h new file +293 -0
293 lines not on this page · raw message
drivers/net/sxe2/sxe2_irq.h new file +48 -0
48 lines not on this page · raw message
drivers/net/sxe2/sxe2_queue.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#include "sxe2_ethdev.h" +#include "sxe2_queue.h" +#include "sxe2_common_log.h" + +void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter, +struct sxe2_drv_queue_caps *q_caps) +{ + adapter->q_ctxt.qp_cnt_assign = q_caps->queues_cnt; + adapter->q_ctxt.base_idx_in_pf = q_caps->base_idx_in_pf; +} + +int32_t sxe2_queues_init (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; +uint16_t buf_size; +uint16_t frame_size; +struct sxe2_rx_queue *rxq; +uint16_t nb_rxq; + + frame_size = dev->data->mtu +SXE2_ETH_OVERHEAD ; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; +if (!rxq) +continue ; + + buf_size =rte_pktmbuf_data_room_size (rxq->mb_pool) -RTE_PKTMBUF_HEADROOM ; + rxq->rx_buf_len =RTE_ALIGN_FLOOR (buf_size, (1 <<SXE2_RXQ_CTX_DBUFF_SHIFT )); + rxq->rx_buf_len =RTE_MIN (rxq->rx_buf_len,SXE2_RX_MAX_DATA_BUF_SIZE ); +if (frame_size > rxq->rx_buf_len) + dev->data->scattered_rx =1 ; + } + +return ret; +}
drivers/net/sxe2/sxe2_queue.h new file +191 -0
191 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_common.h new file +540 -0
540 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_poll.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_POLL_H +#define SXE2_TXRX_POLL_H + +#include "sxe2_queue.h" + +uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +#endif /* __SXE2_TXRX_POLL_H__ */
drivers/net/sxe2/sxe2_vsi.c new file +214 -0
214 lines not on this page · raw message
drivers/net/sxe2/sxe2_vsi.h new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v18 6/11 drivers: support PCI BAR mapping
In reply to [email protected]From: Jie Liu <[email protected]>
Implement PCI BAR (Base Address Register) mapping and unmapping logic to enable MMIO (Memory Mapped I/O) access to hardware registers.
The driver retrieves the BAR0 virtual address from the PCI resource during the probing phase. This mapping is used for subsequent register-level operations. Proper cleanup is implemented in the device close path.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 34 +++ drivers/net/sxe2/sxe2_ethdev.c | 326 +++++++++++++++++++++++++- drivers/net/sxe2/sxe2_ethdev.h | 18 ++ 3 files changed, 375 insertions(+), 3 deletions(-)
drivers/common/sxe2/sxe2_ioctl_chnl.c +34 -0
@@ -159,6 +159,40 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)return ret; } +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_mmap) +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx,uint64_t len,uint64_t offset) +{ +int32_t cmd_fd =0 ; +void *virt =NULL ; + +if (cdev->config.kernel_reset) { +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_err; + } + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_err; + } + +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , + bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); + + virt =mmap (NULL , len,PROT_READ |PROT_WRITE , +MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); +if (virt ==MAP_FAILED ) { +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , + cmd_fd, len, offset,strerror (errno)); + goto l_err; + } + +return virt; +l_err: +return NULL ; +} +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) int32_tsxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len)
drivers/net/sxe2/sxe2_ethdev.c +323 -3
380 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +18 -0
@@ -290,4 +290,22 @@ struct sxe2_adapter {#define SXE2_DEV_PRIVATE_TO_ADAPTER (dev) \ ((struct sxe2_adapter *)(dev)->data->dev_private) +#define SXE2_DEV_TO_PCI (eth_dev) \ + RTE_DEV_TO_PCI((eth_dev)->device) + +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type); + +int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); + +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, +uint32_t item_cnt,uint32_t item_base); + +void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type); + +int32_t sxe2_dev_pci_map_init (struct rte_eth_dev *dev); + +void sxe2_dev_pci_map_uinit (struct rte_eth_dev *dev); +#endif /* __SXE2_ETHDEV_H__ */
Signature · 1 line
2.47.3
PATCH v18 7/11 common/sxe2: add ioctl interface for DMA map and unmap
In reply to [email protected]From: Jie Liu <[email protected]>
Implement DMA mapping and unmapping functionality using ioctl calls. This allows the driver to configure the hardware's IOMMU/DMA tables, ensuring the device can safely access memory buffers allocated by the userspace.
The mapping is established during device initialization or queue setup and is revoked during device closure to prevent memory leaks and ensure hardware security.
--- drivers/common/sxe2/sxe2_common.c | 50 +++++++++- drivers/common/sxe2/sxe2_ioctl_chnl.c | 104 +++++++++++++++++++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 ++ 3 files changed, 162 insertions(+), 1 deletion(-)
drivers/common/sxe2/sxe2_common.c +49 -1
@@ -442,7 +442,7 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev) cdev =sxe2_rtedev_to_cdev (&pci_dev->device);if (cdev ==NULL ) { ret = -ENODEV ; -PMD_LOG_ERR (COM ,"Fail to get remove device." ); +PMD_LOG_ERR (COM ,"Fail to get device when remove." ); goto l_end; }
@@ -466,12 +466,60 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev)return ret; } +static int32_t sxe2_common_pci_dma_map (struct rte_pci_device *pci_dev, +void *addr,uint64_t iova,size_t len) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma map." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_map (cdev, (uint64_t )(uintptr_t )addr, iova, len); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to map dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} + +static int32_t sxe2_common_pci_dma_unmap (struct rte_pci_device *pci_dev, + void *addr __rte_unused, uint64_t iova, size_t len __rte_unused) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma unmap." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_unmap (cdev, iova); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to unmap dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} +static struct rte_pci_driver sxe2_common_pci_driver = { .driver = { .name =SXE2_COMMON_PCI_DRIVER_NAME , }, .probe = sxe2_common_pci_probe, .remove = sxe2_common_pci_remove, + .dma_map = sxe2_common_pci_dma_map, + .dma_unmap = sxe2_common_pci_dma_unmap, };static uint32_t sxe2_common_pci_id_table_size_get (const struct rte_pci_id *id_table)
drivers/common/sxe2/sxe2_ioctl_chnl.c +104 -0
107 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -46,6 +46,15 @@ __rte_internalint32_t sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); +__rte_internal +int32_t +sxe2_drv_dev_dma_map (struct sxe2_common_device *cdev,uint64_t vaddr, +uint64_t iova,uint64_t size); + +__rte_internal +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova); + #ifdef __cplusplus }#endif
Signature · 1 line
2.47.3
PATCH v18 8/11 net/sxe2: support queue setup and control
In reply to [email protected]From: Jie Liu <[email protected]>
Add support for Rx and Tx queue setup, release, and management. Implement eth_dev_ops callbacks for rx_queue_setup, tx_queue_setup, rx_queue_release, and tx_queue_release.
This includes:
- Allocating memory for hardware ring descriptors.
- Initializing software ring structures and hardware head/tail pointers.
- Implementing proper resource cleanup logic to prevent memory leaks during queue reconfiguration or device close.
--- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 82 +++-- drivers/net/sxe2/sxe2_ethdev.h | 15 +- drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++++++++++++++++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 ++ drivers/net/sxe2/sxe2_tx.c | 420 +++++++++++++++++++++++++ drivers/net/sxe2/sxe2_tx.h | 32 ++ 7 files changed, 1111 insertions(+), 26 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h
drivers/net/sxe2/meson.build +2 -0
@@ -18,6 +18,8 @@ sources += files( 'sxe2_cmd_chnl.c', 'sxe2_vsi.c', 'sxe2_queue.c', + 'sxe2_tx.c', + 'sxe2_rx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +60 -22
127 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +11 -4
@@ -293,14 +293,21 @@ struct sxe2_adapter {#define SXE2_DEV_TO_PCI (eth_dev) \ RTE_DEV_TO_PCI((eth_dev)->device) +void *sxe2_pci_map_addr_get (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type, +uint16_t idx_in_func); +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type); +enum sxe2_pci_map_resource res_type);int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); +enum sxe2_pci_map_resource res_type, +uint64_t org_len,uint64_t org_offset); -int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, -uint32_t item_cnt,uint32_t item_base); +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter, +uint32_t res_type, +uint32_t item_cnt, +uint32_t item_base);void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type);
drivers/net/sxe2/sxe2_rx.c new file +554 -0
554 lines not on this page · raw message
drivers/net/sxe2/sxe2_rx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_RX_H__ +#define __SXE2_RX_H__ + +#include "sxe2_queue.h" + +int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_rxconf *rx_conf, +struct rte_mempool *mp); + +int32_t __rte_cold sxe2_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +void __rte_cold sxe2_rx_queue_mbufs_release(struct sxe2_rx_queue *rxq); + +void __rte_cold sxe2_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_rxq_info *qinfo); + +int32_t __rte_cold sxe2_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int32_t __rte_cold sxe2_rxqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rxqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_RX_H__ */
drivers/net/sxe2/sxe2_tx.c new file +420 -0
420 lines not on this page · raw message
drivers/net/sxe2/sxe2_tx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_TX_H__ +#define __SXE2_TX_H__ +#include "sxe2_queue.h" + +void __rte_cold sxe2_tx_queue_reset(struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id); + +void sxe2_tx_queue_mbufs_release (struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id); + +int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_txconf *tx_conf); + +void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_txq_info *qinfo); + +int32_t __rte_cold sxe2_txqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_txqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_TX_H__ */
Signature · 1 line
2.47.3
PATCH v18 9/11 drivers: add data path for Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
Implement receive and transmit burst functions for sxe2 PMD. Add sxe2_recv_pkts and sxe2_xmit_pkts as the primary data path interfaces.
The implementation includes:
- Efficient descriptor fetching and mbuf allocation for Rx.
- Descriptor setup and checksum offload handling for Tx.
- Buffer recycling and hardware tail pointer updates.
- Performance-oriented loop unrolling and prefetching where applicable.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 8 +- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 11 +- drivers/net/sxe2/sxe2_txrx.c | 246 +++++++ drivers/net/sxe2/sxe2_txrx.h | 21 + drivers/net/sxe2/sxe2_txrx_poll.c | 916 ++++++++++++++++++++++++++ 6 files changed, 1199 insertions(+), 5 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c
drivers/common/sxe2/sxe2_ioctl_chnl.c +4 -4
@@ -177,13 +177,13 @@ void goto l_err; } -PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=%" PRIu64", src=0x%" PRIx64", offset=0x%" PRIx64"" , bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); virt =mmap (NULL , len,PROT_READ |PROT_WRITE ,MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset));if (virt ==MAP_FAILED ) { -PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=%" PRIu64", offset=0x%" PRIx64", err:%s" , cmd_fd, len, offset,strerror (errno)); goto l_err; }
@@ -205,12 +205,12 @@ sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) goto l_end; } -PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%" PRIx64"" , virt, len); ret =munmap (virt, len);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=%" PRIu64", err:%s" , virt, len,strerror (errno)); ret = -errno; goto l_end;
drivers/net/sxe2/meson.build +2 -0
@@ -20,6 +20,8 @@ sources += files( 'sxe2_queue.c', 'sxe2_tx.c', 'sxe2_rx.c', + 'sxe2_txrx_poll.c', + 'sxe2_txrx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +10 -1
@@ -26,6 +26,7 @@#include "sxe2_cmd_chnl.h" #include "sxe2_tx.h" #include "sxe2_rx.h" +#include "sxe2_txrx.h" #include "sxe2_common.h" #include "sxe2_common_log.h" #include "sxe2_host_regs.h"
@@ -137,6 +138,9 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev) goto l_end; } +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); + ret =sxe2_queues_start (dev);if (ret) {PMD_LOG_ERR (INIT ,"enable queues failed" );
@@ -763,10 +767,15 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,PMD_INIT_FUNC_TRACE (); +sxe2_set_common_function (dev); + dev->dev_ops = &sxe2_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); goto l_end; + } ret =sxe2_hw_init (dev);if (ret) {
drivers/net/sxe2/sxe2_txrx.c new file +246 -0
246 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_H +#define SXE2_TXRX_H +#include <ethdev_driver.h> +#include "sxe2_queue.h" + +void sxe2_set_common_function (struct rte_eth_dev *dev); + +uint16_t sxe2_tx_pkts_prepare (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); + +void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); + +#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c new file +916 -0
916 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v18 10/11 net/sxe2: add vectorized Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the vectorized data path for the sxe2 PMD. It utilizes SIMD instructions (e.g., SSE) to process multiple packets simultaneously, significantly improving throughput for small packet processing.
The implementation includes:
* Vectorized Rx burst function for bulk descriptor processing.
* Vectorized Tx burst function with optimized resource cleanup.
* Capability flags update to reflect vectorized path support.
--- drivers/net/sxe2/meson.build | 5 + drivers/net/sxe2/sxe2_ethdev.c | 29 +- drivers/net/sxe2/sxe2_queue.c | 28 ++ drivers/net/sxe2/sxe2_queue.h | 4 + drivers/net/sxe2/sxe2_txrx.c | 204 ++++++--- drivers/net/sxe2/sxe2_txrx.h | 11 +- drivers/net/sxe2/sxe2_txrx_poll.c | 26 ++ drivers/net/sxe2/sxe2_txrx_poll.h | 4 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 +++++++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 +++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 ++++++++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++++++++++++++++ 12 files changed, 1284 insertions(+), 75 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c
drivers/net/sxe2/meson.build +5 -0
@@ -13,6 +13,10 @@ deps += ['common_sxe2', 'hash','cryptodev','security'] includes += include_directories('../../common/sxe2') +if arch_subdir == 'x86' + sources += files('sxe2_txrx_vec_sse.c') +endif + sources += files( 'sxe2_ethdev.c', 'sxe2_cmd_chnl.c',
@@ -22,6 +26,7 @@ sources += files( 'sxe2_rx.c', 'sxe2_txrx_poll.c', 'sxe2_txrx.c', + 'sxe2_txrx_vec.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +8 -21
@@ -107,25 +107,6 @@ static int32_t sxe2_dev_stop(struct rte_eth_dev *dev)return ret; } -static int32_t sxe2_queues_start (struct rte_eth_dev *dev) -{ -int32_t ret =0 ; - ret =sxe2_txqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); - goto l_end; - } - - ret =sxe2_rxqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); -sxe2_txqs_all_stop (dev); - } - -l_end: -return ret; -} -static int32_t sxe2_dev_start (struct rte_eth_dev *dev) {int32_t ret =0 ;
@@ -158,7 +139,7 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev)static int32_t sxe2_dev_close (struct rte_eth_dev *dev) { (void )sxe2_dev_stop (dev); - + (void )sxe2_queues_release (dev);sxe2_vsi_uninit (dev);sxe2_dev_pci_map_uinit (dev);
@@ -296,13 +277,19 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .dev_close = sxe2_dev_close, .dev_infos_get = sxe2_dev_infos_get, + .rx_queue_start = sxe2_rx_queue_start, + .rx_queue_stop = sxe2_rx_queue_stop, + .tx_queue_start = sxe2_tx_queue_start, + .tx_queue_stop = sxe2_tx_queue_stop, .rx_queue_setup = sxe2_rx_queue_setup, - .tx_queue_setup = sxe2_tx_queue_setup, .rx_queue_release = sxe2_rx_queue_release, + .tx_queue_setup = sxe2_tx_queue_setup, .tx_queue_release = sxe2_tx_queue_release, .rxq_info_get = sxe2_rx_queue_info_get, .txq_info_get = sxe2_tx_queue_info_get, + .rx_burst_mode_get = sxe2_rx_burst_mode_get, + .tx_burst_mode_get = sxe2_tx_burst_mode_get, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_queue.c +28 -0
@@ -5,6 +5,8 @@#include "sxe2_ethdev.h" #include "sxe2_queue.h" #include "sxe2_common_log.h" +#include "sxe2_tx.h" +#include "sxe2_rx.h" void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter,struct sxe2_drv_queue_caps *q_caps)
@@ -36,3 +38,29 @@ int32_t sxe2_queues_init(struct rte_eth_dev *dev)return ret; } + +int32_t sxe2_queues_start (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; + + ret =sxe2_txqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); + goto l_end; + } + + ret =sxe2_rxqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); +sxe2_txqs_all_stop (dev); + } +l_end: +return ret; +} + +void sxe2_queues_release (struct rte_eth_dev *dev) +{ +sxe2_all_rxqs_release (dev); + +sxe2_all_txqs_release (dev); +}
drivers/net/sxe2/sxe2_queue.h +4 -0
@@ -188,4 +188,8 @@ void sxe2_sw_queue_ctx_hw_cap_set(struct sxe2_adapter *adapter,int32_t sxe2_queues_init (struct rte_eth_dev *dev); +int32_t sxe2_queues_start (struct rte_eth_dev *dev); + +void sxe2_queues_release (struct rte_eth_dev *dev); +#endif /* __SXE2_QUEUE_H__ */
drivers/net/sxe2/sxe2_txrx.c +155 -49
331 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h +6 -5
@@ -6,16 +6,17 @@#define SXE2_TXRX_H #include <ethdev_driver.h> #include "sxe2_queue.h" -void sxe2_set_common_function (struct rte_eth_dev *dev); +int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, +uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); -void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); - void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); -void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); - +int32_t sxe2_tx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +int32_t sxe2_rx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode);#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c +26 -0
@@ -480,6 +480,32 @@ static inline uint16_t sxe2_tx_pkts_batch(void *tx_queue,return nb_pkts; } +uint16_t sxe2_tx_pkts_simple (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +uint16_t tx_done_num; +uint16_t tx_once_num; +uint16_t tx_need_num; +if (likely (nb_pkts <=SXE2_TX_PKTS_BURST_BATCH_NUM )) { + tx_done_num =sxe2_tx_pkts_batch (tx_queue, + tx_pkts, nb_pkts); + goto l_end; + } + tx_done_num =0 ; +while (nb_pkts) { + tx_need_num =RTE_MIN (nb_pkts,SXE2_TX_PKTS_BURST_BATCH_NUM ); + tx_once_num =sxe2_tx_pkts_batch (tx_queue, + &tx_pkts[tx_done_num], + tx_need_num); + nb_pkts -= tx_once_num; + tx_done_num += tx_once_num; +if (tx_once_num < tx_need_num) +break ; + } +l_end: +return tx_done_num; +} +static inline void sxe2_update_rx_tail (struct sxe2_rx_queue *rxq,uint16_t hold_num,uint16_t rx_id) {
drivers/net/sxe2/sxe2_txrx_poll.h +4 -0
@@ -9,6 +9,10 @@uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +uint16_t sxe2_tx_pkts_simple (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);
drivers/net/sxe2/sxe2_txrx_vec.c new file +201 -0
201 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec.h new file +63 -0
63 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_common.h new file +235 -0
235 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_sse.c new file +549 -0
549 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v18 11/11 net/sxe2: implement Tx done cleanup
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the 'tx_done_cleanup' ethdev ops in the sxe2 PMD. This interface allows applications to explicitly request the driver to release mbufs that have been transmitted and are no longer needed by the hardware.
The implementation iterates through the Tx ring, checking the status of the descriptors starting from the last cleaned tail. It releases the corresponding mbufs back to the mempool until either the requested number of packets are freed or no more completed descriptors are found.
--- drivers/net/sxe2/sxe2_ethdev.c | 1 + drivers/net/sxe2/sxe2_txrx.h | 1 + drivers/net/sxe2/sxe2_txrx_poll.c | 102 ++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+)
drivers/net/sxe2/sxe2_ethdev.c +1 -0
@@ -290,6 +290,7 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .txq_info_get = sxe2_tx_queue_info_get, .rx_burst_mode_get = sxe2_rx_burst_mode_get, .tx_burst_mode_get = sxe2_tx_burst_mode_get, + .tx_done_cleanup = sxe2_tx_done_cleanup, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_txrx.h +1 -0
@@ -12,6 +12,7 @@ int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +int32_t sxe2_tx_done_cleanup (void *txq,uint32_t free_cnt);void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq);void sxe2_rx_mode_func_set (struct rte_eth_dev *dev);
drivers/net/sxe2/sxe2_txrx_poll.c +102 -0
116 lines not on this page · raw message
Signature · 1 line
2.47.3
v19 cover net/sxe2: fix logic errors and address feedback
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 and v18 submissions for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v19 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset for mbuf_def in vector init to avoid uninitialized reads.
- Converted pci_map_addr_info to designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updated burst_mode_get to accurately report AVX paths.
- Adjusted SXE2_ETH_OVERHEAD to match actual VLAN capabilities.
Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup
.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 23 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 352 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9197 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Signature · 1 line
2.47.3
PATCH v19 1/11 mailmap: add Jie Liu
From: Jie Liu <[email protected]>
--- .mailmap | 1 + 1 file changed, 1 insertion(+)
.mailmap +1 -0
@@ -739,6 +739,7 @@ Jiawen Wu <[email protected]> Jiayu Hu <[email protected]> <[email protected]> Jie Hai <[email protected]> Jie Liu <[email protected]> +Jie Liu <[email protected]> Jie Pan <[email protected]> Jie Wang <[email protected]> Jie Zhou <[email protected]> <[email protected]>
Signature · 1 line
2.47.3
PATCH v19 2/11 doc: add sxe2 guide and release notes
In reply to [email protected]From: Jie Liu <[email protected]>
Add a new guide for SXE2 PMD in the nics directory. The guide contains driver capabilities, prerequisites, and compilation/usage instructions.
Update the release notes to announce the addition of the sxe2 network driver.
--- doc/guides/nics/features/sxe2.ini | 23 +++++++++++++++++ doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_26_07.rst | 4 +++ 4 files changed, 62 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst
doc/guides/nics/features/sxe2.ini new file +23 -0
@@ -0,0 +1,23 @@ +; +; Supported features of the 'sxe2' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +; A feature with "P" indicates only be supported when non-vector path +; is selected. +; +[Features] +Fast mbuf free = P +Free Tx mbuf on demand = Y +Burst mode info = Y +Queue start/stop = Y +Buffer split on Rx = P +Scattered Rx = Y +CRC offload = Y +L3 checksum offload = Y +L4 checksum offload = Y +Rx descriptor status = Y +Tx descriptor status = Y +Linux = Y +x86-32 = Y +x86-64 = Y
doc/guides/nics/index.rst +1 -0
@@ -68,6 +68,7 @@ Network Interface Controller Drivers rnp sfc_efx softnic + sxe2 tap thunderx txgbe
doc/guides/nics/sxe2.rst new file +34 -0
@@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +SXE2 Poll Mode Driver +====================== + +The sxe2 PMD (**librte_net_sxe2**) provides poll mode driver support for +10/25/50/100 Gbps Network Adapters. +The embedded switch, Physical Functions (PF), +and SR-IOV Virtual Functions (VF) are supported. + +Implementation details +---------------------- + +The sxe2 PMD is designed to operate alongside the sxe2 kernel network driver. +For management and control operations, the PMD communicates with the kernel +driver via ioctl interfaces. These commands are processed by the kernel +driver and subsequently dispatched to the hardware firmware for execution. + +For security and robustness, the driver's data path is optimized to operate +using virtual addresses (IOVA as VA mode). However, to ensure full +compatibility in system environments where an IOMMU is absent or disabled, +the driver also provides an explicit path to support physical addressing +(IOVA as PA mode). + +The hardware is capable of handling the corresponding IOVA addresses (either +VA or PA) directly, as provided by the DPDK memory subsystem. This ensures +that DPDK applications can only access memory segments explicitly allocated +to the current process, preventing unauthorized access to random physical +memory. + +This capability allows the PMD to coexist with kernel network interfaces +which remain functional, although they stop receiving unicast packets as +long as they share the same MAC address.
doc/guides/rel_notes/release_26_07.rst +4 -0
@@ -64,6 +64,10 @@ New Features * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Added Linkdata sxe2 ethernet driver.** + + Added network driver for the Linkdata Network Adapters. + Removed Items -------------
Signature · 1 line
2.47.3
PATCH v19 3/11 common/sxe2: add sxe2 basic structures
In reply to [email protected]From: Jie Liu <[email protected]>
This patch adds the base infrastructure for the sxe2 common library. It includes the mandatory OS abstraction layer (OSAL), common structure definitions, error codes, and the logging system implementation.
Specifically, this commit:
- Implements the logging stream management using RTE_LOG_LINE.
- Defines device-specific error codes and status registers.
- Adds the initial meson build configuration for the common library.
--- drivers/common/sxe2/sxe2_common_log.h | 81 +++ drivers/common/sxe2/sxe2_host_regs.h | 707 ++++++++++++++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 ++ drivers/common/sxe2/sxe2_osal.h | 152 +++++ 4 files changed, 973 insertions(+) create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_osal.h
drivers/common/sxe2/sxe2_common_log.h new file +81 -0
@@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_COMMON_LOG_H__ +#define __SXE2_COMMON_LOG_H__ + +extern int32_t sxe2_common_log; +extern int32_t sxe2_log_init; +extern int32_t sxe2_log_driver; +extern int32_t sxe2_log_rx; +extern int32_t sxe2_log_tx; +extern int32_t sxe2_log_hw; + +#define RTE_LOGTYPE_SXE2_COM sxe2_common_log +#define RTE_LOGTYPE_SXE2_INIT sxe2_log_init +#define RTE_LOGTYPE_SXE2_DRV sxe2_log_driver +#define RTE_LOGTYPE_SXE2_RX sxe2_log_rx +#define RTE_LOGTYPE_SXE2_TX sxe2_log_tx +#define RTE_LOGTYPE_SXE2_HW sxe2_log_hw + +#define SXE2_PMD_LOG (level, log_type, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): ", \ + __func__, __VA_ARGS__) + +#define SXE2_PMD_DRV_LOG (level, log_type, adapter, ...) \ + RTE_LOG_LINE_PREFIX(level, log_type, "%s(): port:%u ", \ + __func__ RTE_LOG_COMMA \ + adapter->dev_port_id, __VA_ARGS__) + +#define PMD_LOG_DEBUG (logtype, fmt, ...) \ + SXE2_PMD_LOG(DEBUG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_INFO (logtype, fmt, ...) \ + SXE2_PMD_LOG(INFO, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_NOTICE (logtype, fmt, ...) \ + SXE2_PMD_LOG(NOTICE, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_WARN (logtype, fmt, ...) \ + SXE2_PMD_LOG(WARNING, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ERR (logtype, fmt, ...) \ + SXE2_PMD_LOG(ERR, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_CRIT (logtype, fmt, ...) \ + SXE2_PMD_LOG(CRIT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_ALERT (logtype, fmt, ...) \ + SXE2_PMD_LOG(ALERT, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_LOG_EMERG (logtype, fmt, ...) \ + SXE2_PMD_LOG(EMERG, SXE2_##logtype, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_DEBUG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(DEBUG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_INFO (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(INFO, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_NOTICE (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(NOTICE, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_WARN (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(WARNING, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ERR (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ERR, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_CRIT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(CRIT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_ALERT (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(ALERT, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_DEV_LOG_EMERG (adapter, logtype, fmt, ...) \ + SXE2_PMD_DRV_LOG(EMERG, SXE2_##logtype, adapter, fmt, ##__VA_ARGS__) + +#define PMD_INIT_FUNC_TRACE () PMD_LOG_DEBUG(INIT, " >>") + +#endif /* __SXE2_COMMON_LOG_H__ */
drivers/common/sxe2/sxe2_host_regs.h new file +707 -0
707 lines not on this page · raw message
drivers/common/sxe2/sxe2_internal_ver.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_INTERNAL_VER_H__ +#define __SXE2_INTERNAL_VER_H__ + +#define SXE2_VER_MAJOR_OFFSET (16) +#define SXE2_MK_VER (major, minor) \ + (major << SXE2_VER_MAJOR_OFFSET | minor) +#define SXE2_MK_VER_MAJOR (ver) (((ver) >> SXE2_VER_MAJOR_OFFSET) & 0xff) +#define SXE2_MK_VER_MINOR (ver) ((ver) & 0xff) + +#define SXE2_ITR_VER_MAJOR_V100 1 +#define SXE2_ITR_VER_MAJOR_V200 2 + +#define SXE2_ITR_VER_MAJOR 1 +#define SXE2_ITR_VER_MINOR 1 +#define SXE2_ITR_VER SXE2_MK_VER(SXE2_ITR_VER_MAJOR, SXE2_ITR_VER_MINOR) + +#define SXE2_CTRL_VER_IS_V100 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V100) +#define SXE2_CTRL_VER_IS_V200 (ver) (SXE2_MK_VER_MAJOR(ver) == SXE2_ITR_VER_MAJOR_V200) + +#define SXE2LIB_ITR_VER_MAJOR 1 +#define SXE2LIB_ITR_VER_MINOR 1 +#define SXE2LIB_ITR_VER SXE2_MK_VER(SXE2LIB_ITR_VER_MAJOR, SXE2LIB_ITR_VER_MINOR) + +#define SXE2_DRV_CLI_VER_MAJOR 1 +#define SXE2_DRV_CLI_VER_MINOR 1 +#define SXE2_DRV_CLI_VER \ + SXE2_MK_VER(SXE2_DRV_CLI_VER_MAJOR, SXE2_DRV_CLI_VER_MINOR) + +#endif /* __SXE2_INTERNAL_VER_H__ */
drivers/common/sxe2/sxe2_osal.h new file +152 -0
152 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v19 4/11 drivers: add base driver skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the sxe2 PMD skeleton by implementing the PCI probe and remove functions. This includes the setup and cleanup of a character device used for control path communication between the user space and the hardware.
The character device provides an interface for ioctl-based management operations, supporting device-specific configuration.
--- drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 635 +++++++++++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 +++ drivers/common/sxe2/sxe2_host_regs.h | 226 ++++---- drivers/common/sxe2/sxe2_ioctl_chnl.c | 160 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 44 ++ drivers/meson.build | 1 + 8 files changed, 1183 insertions(+), 113 deletions(-) create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h
drivers/common/sxe2/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Corigine, Inc. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +deps += ['bus_pci', 'net', 'eal', 'ethdev'] + +sources = files( + 'sxe2_common.c', + 'sxe2_ioctl_chnl.c', +)
drivers/common/sxe2/sxe2_common.c new file +635 -0
635 lines not on this page · raw message
drivers/common/sxe2/sxe2_common.h new file +85 -0
85 lines not on this page · raw message
drivers/common/sxe2/sxe2_host_regs.h +113 -113
466 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.c new file +160 -0
160 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl.h new file +130 -0
130 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h new file +44 -0
44 lines not on this page · raw message
drivers/meson.build +1 -0
@@ -12,6 +12,7 @@ subdirs = [ 'common/qat', # depends on bus. 'common/sfc_efx', # depends on bus. 'common/zsda', # depends on bus. + 'common/sxe2', # depends on bus. 'mempool', # depends on common and bus. 'dma', # depends on common and bus. 'net', # depends on common, bus, mempool
Signature · 1 line
2.47.3
PATCH v19 5/11 drivers: add base driver probe skeleton
In reply to [email protected]From: Jie Liu <[email protected]>
Initialize the eth_dev_ops for the sxe2 PMD. This includes the implementation of mandatory ethdev operations such as dev_configure, dev_start, dev_stop, and dev_infos_get.
Set up the basic infrastructure for device initialization to allow the driver to be recognized as a valid ethernet device within the DPDK framework.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 27 + drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 + drivers/common/sxe2/sxe2_osal.h | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 23 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 +++++++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 ++ drivers/net/sxe2/sxe2_drv_cmd.h | 388 +++++++++++++ drivers/net/sxe2/sxe2_ethdev.c | 613 +++++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 293 ++++++++++ drivers/net/sxe2/sxe2_irq.h | 48 ++ drivers/net/sxe2/sxe2_queue.c | 38 ++ drivers/net/sxe2/sxe2_queue.h | 191 +++++++ drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 16 + drivers/net/sxe2/sxe2_vsi.c | 214 +++++++ drivers/net/sxe2/sxe2_vsi.h | 204 +++++++ 17 files changed, 2966 insertions(+) create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
drivers/common/sxe2/sxe2_ioctl_chnl.c +27 -0
@@ -158,3 +158,30 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev) l_end:return ret; } + +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len) +{ +int32_t ret =0 ; + +if (cdev->config.kernel_reset) { + ret = -EPERM ; +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_end; + } + +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , + virt, len); + + ret =munmap (virt, len); +if (ret <0 ) { +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , + virt, len,strerror (errno)); + ret = -errno; + goto l_end; + } + +l_end: +return ret; +}
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -37,6 +37,15 @@ __rte_internalint32_t sxe2_drv_dev_handshake (struct sxe2_common_device *cdev); +__rte_internal +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx, +uint64_t len,uint64_t offset); + +__rte_internal +int32_t +sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); + #ifdef __cplusplus }#endif
drivers/common/sxe2/sxe2_osal.h +1 -0
@@ -46,6 +46,7 @@ enum sxe2_itr_idx { };#define SXE2_ETH_ALEN 6 +#define SXE2_BITS_PER_BYTE 8#define BITS_TO_LONGS (nr) SXE2_DIV_ROUND_UP(nr, SXE2_BITS_PER_BYTE * sizeof(unsigned long))#define BITS_TO_U32 (nr) SXE2_DIV_ROUND_UP(nr, 32)
drivers/net/meson.build +1 -0
@@ -58,6 +58,7 @@ drivers = [ 'rnp', 'sfc', 'softnic', + 'sxe2', 'tap', 'thunderx', 'txgbe',
drivers/net/sxe2/meson.build new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. + +if is_windows + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +cflags += ['-g'] + +deps += ['common_sxe2', 'hash','cryptodev','security'] + +includes += include_directories('../../common/sxe2') + +sources += files( + 'sxe2_ethdev.c', + 'sxe2_cmd_chnl.c', + 'sxe2_vsi.c', + 'sxe2_queue.c', +) + +allow_internal_get_api = true
drivers/net/sxe2/sxe2_cmd_chnl.c new file +323 -0
323 lines not on this page · raw message
drivers/net/sxe2/sxe2_cmd_chnl.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_CMD_CHNL_H__ +#define __SXE2_CMD_CHNL_H__ + +#include "sxe2_ethdev.h" +#include "sxe2_drv_cmd.h" +#include "sxe2_ioctl_chnl_func.h" + +int32_t sxe2_drv_dev_caps_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_caps_resp *dev_caps); + +int32_t sxe2_drv_dev_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_info_resp *dev_info_resp); + +int32_t sxe2_drv_dev_fw_info_get (struct sxe2_adapter *adapter, +struct sxe2_drv_dev_fw_info_resp *dev_fw_info_resp); + +int32_t sxe2_drv_vsi_add (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_vsi_del (struct sxe2_adapter *adapter,struct sxe2_vsi *vsi); + +int32_t sxe2_drv_rxq_switch (struct sxe2_adapter *adapter,struct sxe2_rx_queue *rxq,bool enable); + +int32_t sxe2_drv_txq_switch (struct sxe2_adapter *adapter,struct sxe2_tx_queue *txq,bool enable); + +int32_t sxe2_drv_rxq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_rx_queue *rxq, +uint16_t rxq_cnt); + +int32_t sxe2_drv_txq_ctxt_cfg (struct sxe2_adapter *adapter, +struct sxe2_tx_queue *txq, +uint16_t txq_cnt); + +#endif /* __SXE2_CMD_CHNL_H__ */
drivers/net/sxe2/sxe2_drv_cmd.h new file +388 -0
388 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.c new file +613 -0
613 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h new file +293 -0
293 lines not on this page · raw message
drivers/net/sxe2/sxe2_irq.h new file +48 -0
48 lines not on this page · raw message
drivers/net/sxe2/sxe2_queue.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#include "sxe2_ethdev.h" +#include "sxe2_queue.h" +#include "sxe2_common_log.h" + +void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter, +struct sxe2_drv_queue_caps *q_caps) +{ + adapter->q_ctxt.qp_cnt_assign = q_caps->queues_cnt; + adapter->q_ctxt.base_idx_in_pf = q_caps->base_idx_in_pf; +} + +int32_t sxe2_queues_init (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; +uint16_t buf_size; +uint16_t frame_size; +struct sxe2_rx_queue *rxq; +uint16_t nb_rxq; + + frame_size = dev->data->mtu +SXE2_ETH_OVERHEAD ; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; +if (!rxq) +continue ; + + buf_size =rte_pktmbuf_data_room_size (rxq->mb_pool) -RTE_PKTMBUF_HEADROOM ; + rxq->rx_buf_len =RTE_ALIGN_FLOOR (buf_size, (1 <<SXE2_RXQ_CTX_DBUFF_SHIFT )); + rxq->rx_buf_len =RTE_MIN (rxq->rx_buf_len,SXE2_RX_MAX_DATA_BUF_SIZE ); +if (frame_size > rxq->rx_buf_len) + dev->data->scattered_rx =1 ; + } + +return ret; +}
drivers/net/sxe2/sxe2_queue.h new file +191 -0
191 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_common.h new file +540 -0
540 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_poll.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_POLL_H +#define SXE2_TXRX_POLL_H + +#include "sxe2_queue.h" + +uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); + +#endif /* __SXE2_TXRX_POLL_H__ */
drivers/net/sxe2/sxe2_vsi.c new file +214 -0
214 lines not on this page · raw message
drivers/net/sxe2/sxe2_vsi.h new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v19 6/11 drivers: support PCI BAR mapping
In reply to [email protected]From: Jie Liu <[email protected]>
Implement PCI BAR (Base Address Register) mapping and unmapping logic to enable MMIO (Memory Mapped I/O) access to hardware registers.
The driver retrieves the BAR0 virtual address from the PCI resource during the probing phase. This mapping is used for subsequent register-level operations. Proper cleanup is implemented in the device close path.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 34 +++ drivers/net/sxe2/sxe2_ethdev.c | 326 +++++++++++++++++++++++++- drivers/net/sxe2/sxe2_ethdev.h | 18 ++ 3 files changed, 375 insertions(+), 3 deletions(-)
drivers/common/sxe2/sxe2_ioctl_chnl.c +34 -0
@@ -159,6 +159,40 @@ sxe2_drv_dev_handshake(struct sxe2_common_device *cdev)return ret; } +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_mmap) +void +*sxe2_drv_dev_mmap (struct sxe2_common_device *cdev,uint8_t bar_idx,uint64_t len,uint64_t offset) +{ +int32_t cmd_fd =0 ; +void *virt =NULL ; + +if (cdev->config.kernel_reset) { +PMD_LOG_WARN (COM ,"kernel reset, need restart app." ); + goto l_err; + } + + cmd_fd =SXE2_CDEV_TO_CMD_FD (cdev); +if (cmd_fd <0 ) { +PMD_LOG_ERR (COM ,"Failed to exec cmd, fd=%d" , cmd_fd); + goto l_err; + } + +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , + bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); + + virt =mmap (NULL , len,PROT_READ |PROT_WRITE , +MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); +if (virt ==MAP_FAILED ) { +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , + cmd_fd, len, offset,strerror (errno)); + goto l_err; + } + +return virt; +l_err: +return NULL ; +} +RTE_EXPORT_INTERNAL_SYMBOL (sxe2_drv_dev_munmap) int32_tsxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len)
drivers/net/sxe2/sxe2_ethdev.c +323 -3
380 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +18 -0
@@ -290,4 +290,22 @@ struct sxe2_adapter {#define SXE2_DEV_PRIVATE_TO_ADAPTER (dev) \ ((struct sxe2_adapter *)(dev)->data->dev_private) +#define SXE2_DEV_TO_PCI (eth_dev) \ + RTE_DEV_TO_PCI((eth_dev)->device) + +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type); + +int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); + +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, +uint32_t item_cnt,uint32_t item_base); + +void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type); + +int32_t sxe2_dev_pci_map_init (struct rte_eth_dev *dev); + +void sxe2_dev_pci_map_uinit (struct rte_eth_dev *dev); +#endif /* __SXE2_ETHDEV_H__ */
Signature · 1 line
2.47.3
PATCH v19 7/11 common/sxe2: add ioctl interface for DMA map and unmap
In reply to [email protected]From: Jie Liu <[email protected]>
Implement DMA mapping and unmapping functionality using ioctl calls. This allows the driver to configure the hardware's IOMMU/DMA tables, ensuring the device can safely access memory buffers allocated by the userspace.
The mapping is established during device initialization or queue setup and is revoked during device closure to prevent memory leaks and ensure hardware security.
--- drivers/common/sxe2/sxe2_common.c | 50 +++++++++- drivers/common/sxe2/sxe2_ioctl_chnl.c | 104 +++++++++++++++++++++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 9 ++ 3 files changed, 162 insertions(+), 1 deletion(-)
drivers/common/sxe2/sxe2_common.c +49 -1
@@ -442,7 +442,7 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev) cdev =sxe2_rtedev_to_cdev (&pci_dev->device);if (cdev ==NULL ) { ret = -ENODEV ; -PMD_LOG_ERR (COM ,"Fail to get remove device." ); +PMD_LOG_ERR (COM ,"Fail to get device when remove." ); goto l_end; }
@@ -466,12 +466,60 @@ static int32_t sxe2_common_pci_remove(struct rte_pci_device *pci_dev)return ret; } +static int32_t sxe2_common_pci_dma_map (struct rte_pci_device *pci_dev, +void *addr,uint64_t iova,size_t len) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma map." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_map (cdev, (uint64_t )(uintptr_t )addr, iova, len); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to map dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} + +static int32_t sxe2_common_pci_dma_unmap (struct rte_pci_device *pci_dev, + void *addr __rte_unused, uint64_t iova, size_t len __rte_unused) +{ +struct sxe2_common_device *cdev; +int32_t ret =-1 ; + + cdev =sxe2_rtedev_to_cdev (&pci_dev->device); +if (cdev ==NULL ) { + ret = -ENODEV ; +PMD_LOG_ERR (COM ,"Fail to get device when dma unmap." ); + goto l_end; + } + + ret =sxe2_drv_dev_dma_unmap (cdev, iova); +if (ret) { +PMD_LOG_ERR (COM ,"Fail to unmap dma map, ret=%d" , ret); + goto l_end; + } + +l_end: +return ret; +} +static struct rte_pci_driver sxe2_common_pci_driver = { .driver = { .name =SXE2_COMMON_PCI_DRIVER_NAME , }, .probe = sxe2_common_pci_probe, .remove = sxe2_common_pci_remove, + .dma_map = sxe2_common_pci_dma_map, + .dma_unmap = sxe2_common_pci_dma_unmap, };static uint32_t sxe2_common_pci_id_table_size_get (const struct rte_pci_id *id_table)
drivers/common/sxe2/sxe2_ioctl_chnl.c +104 -0
107 lines not on this page · raw message
drivers/common/sxe2/sxe2_ioctl_chnl_func.h +9 -0
@@ -46,6 +46,15 @@ __rte_internalint32_t sxe2_drv_dev_munmap (struct sxe2_common_device *cdev,void *virt,uint64_t len); +__rte_internal +int32_t +sxe2_drv_dev_dma_map (struct sxe2_common_device *cdev,uint64_t vaddr, +uint64_t iova,uint64_t size); + +__rte_internal +int32_t +sxe2_drv_dev_dma_unmap (struct sxe2_common_device *cdev,uint64_t iova); + #ifdef __cplusplus }#endif
Signature · 1 line
2.47.3
PATCH v19 8/11 net/sxe2: support queue setup and control
In reply to [email protected]From: Jie Liu <[email protected]>
Add support for Rx and Tx queue setup, release, and management. Implement eth_dev_ops callbacks for rx_queue_setup, tx_queue_setup, rx_queue_release, and tx_queue_release.
This includes:
- Allocating memory for hardware ring descriptors.
- Initializing software ring structures and hardware head/tail pointers.
- Implementing proper resource cleanup logic to prevent memory leaks during queue reconfiguration or device close.
--- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 82 +++-- drivers/net/sxe2/sxe2_ethdev.h | 15 +- drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++++++++++++++++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 ++ drivers/net/sxe2/sxe2_tx.c | 420 +++++++++++++++++++++++++ drivers/net/sxe2/sxe2_tx.h | 32 ++ 7 files changed, 1111 insertions(+), 26 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h
drivers/net/sxe2/meson.build +2 -0
@@ -18,6 +18,8 @@ sources += files( 'sxe2_cmd_chnl.c', 'sxe2_vsi.c', 'sxe2_queue.c', + 'sxe2_tx.c', + 'sxe2_rx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +60 -22
127 lines not on this page · raw message
drivers/net/sxe2/sxe2_ethdev.h +11 -4
@@ -293,14 +293,21 @@ struct sxe2_adapter {#define SXE2_DEV_TO_PCI (eth_dev) \ RTE_DEV_TO_PCI((eth_dev)->device) +void *sxe2_pci_map_addr_get (struct sxe2_adapter *adapter, +enum sxe2_pci_map_resource res_type, +uint16_t idx_in_func); +struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type); +enum sxe2_pci_map_resource res_type);int32_t sxe2_dev_pci_seg_map (struct sxe2_adapter *adapter, -enum sxe2_pci_map_resource res_type,uint64_t org_len,uint64_t org_offset); +enum sxe2_pci_map_resource res_type, +uint64_t org_len,uint64_t org_offset); -int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter,uint32_t res_type, -uint32_t item_cnt,uint32_t item_base); +int32_t sxe2_dev_pci_res_seg_map (struct sxe2_adapter *adapter, +uint32_t res_type, +uint32_t item_cnt, +uint32_t item_base);void sxe2_dev_pci_seg_unmap (struct sxe2_adapter *adapter,uint32_t res_type);
drivers/net/sxe2/sxe2_rx.c new file +554 -0
554 lines not on this page · raw message
drivers/net/sxe2/sxe2_rx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_RX_H__ +#define __SXE2_RX_H__ + +#include "sxe2_queue.h" + +int32_t __rte_cold sxe2_rx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_rxconf *rx_conf, +struct rte_mempool *mp); + +int32_t __rte_cold sxe2_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +void __rte_cold sxe2_rx_queue_mbufs_release(struct sxe2_rx_queue *rxq); + +void __rte_cold sxe2_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_rxqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_rxq_info *qinfo); + +int32_t __rte_cold sxe2_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int32_t __rte_cold sxe2_rxqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_rxqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_RX_H__ */
drivers/net/sxe2/sxe2_tx.c new file +420 -0
420 lines not on this page · raw message
drivers/net/sxe2/sxe2_tx.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef __SXE2_TX_H__ +#define __SXE2_TX_H__ +#include "sxe2_queue.h" + +void __rte_cold sxe2_tx_queue_reset(struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id); + +void sxe2_tx_queue_mbufs_release (struct sxe2_tx_queue *txq); + +int32_t __rte_cold sxe2_tx_queue_stop(struct rte_eth_dev *dev, uint16_t queue_id); + +int32_t __rte_cold sxe2_tx_queue_setup(struct rte_eth_dev *dev, +uint16_t queue_idx,uint16_t nb_desc,uint32_t socket_id, +const struct rte_eth_txconf *tx_conf); + +void __rte_cold sxe2_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); + +void __rte_cold sxe2_all_txqs_release(struct rte_eth_dev *dev); + +void __rte_cold sxe2_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +struct rte_eth_txq_info *qinfo); + +int32_t __rte_cold sxe2_txqs_all_start(struct rte_eth_dev *dev); + +void __rte_cold sxe2_txqs_all_stop(struct rte_eth_dev *dev); + +#endif /* __SXE2_TX_H__ */
Signature · 1 line
2.47.3
PATCH v19 9/11 drivers: add data path for Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
Implement receive and transmit burst functions for sxe2 PMD. Add sxe2_recv_pkts and sxe2_xmit_pkts as the primary data path interfaces.
The implementation includes:
- Efficient descriptor fetching and mbuf allocation for Rx.
- Descriptor setup and checksum offload handling for Tx.
- Buffer recycling and hardware tail pointer updates.
- Performance-oriented loop unrolling and prefetching where applicable.
--- drivers/common/sxe2/sxe2_ioctl_chnl.c | 8 +- drivers/net/sxe2/meson.build | 2 + drivers/net/sxe2/sxe2_ethdev.c | 11 +- drivers/net/sxe2/sxe2_txrx.c | 246 +++++++ drivers/net/sxe2/sxe2_txrx.h | 21 + drivers/net/sxe2/sxe2_txrx_poll.c | 916 ++++++++++++++++++++++++++ 6 files changed, 1199 insertions(+), 5 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c
drivers/common/sxe2/sxe2_ioctl_chnl.c +4 -4
@@ -177,13 +177,13 @@ void goto l_err; } -PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=0x%zx, src=0x%" PRIx64", offset=0x%" PRIx64"" , +PMD_LOG_DEBUG (COM ,"fd=%d, bar idx=%d, len=%" PRIu64", src=0x%" PRIx64", offset=0x%" PRIx64"" , bar_idx, cmd_fd, len, offset,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset)); virt =mmap (NULL , len,PROT_READ |PROT_WRITE ,MAP_SHARED , cmd_fd,SXE2_COM_PCI_OFFSET_GEN (bar_idx, offset));if (virt ==MAP_FAILED ) { -PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=0x%zx, offset=0x%" PRIx64", err:%s" , +PMD_LOG_ERR (COM ,"Failed mmap, cmd_fd=%d, len=%" PRIu64", offset=0x%" PRIx64", err:%s" , cmd_fd, len, offset,strerror (errno)); goto l_err; }
@@ -205,12 +205,12 @@ sxe2_drv_dev_munmap(struct sxe2_common_device *cdev, void *virt, uint64_t len) goto l_end; } -PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%zx" , +PMD_LOG_DEBUG (COM ,"Munmap virt=%p, len=0x%" PRIx64"" , virt, len); ret =munmap (virt, len);if (ret <0 ) { -PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=0x%zx, err:%s" , +PMD_LOG_ERR (COM ,"Failed to munmap, virt=%p, len=%" PRIu64", err:%s" , virt, len,strerror (errno)); ret = -errno; goto l_end;
drivers/net/sxe2/meson.build +2 -0
@@ -20,6 +20,8 @@ sources += files( 'sxe2_queue.c', 'sxe2_tx.c', 'sxe2_rx.c', + 'sxe2_txrx_poll.c', + 'sxe2_txrx.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +10 -1
@@ -26,6 +26,7 @@#include "sxe2_cmd_chnl.h" #include "sxe2_tx.h" #include "sxe2_rx.h" +#include "sxe2_txrx.h" #include "sxe2_common.h" #include "sxe2_common_log.h" #include "sxe2_host_regs.h"
@@ -137,6 +138,9 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev) goto l_end; } +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); + ret =sxe2_queues_start (dev);if (ret) {PMD_LOG_ERR (INIT ,"enable queues failed" );
@@ -763,10 +767,15 @@ static int32_t sxe2_dev_init(struct rte_eth_dev *dev,PMD_INIT_FUNC_TRACE (); +sxe2_set_common_function (dev); + dev->dev_ops = &sxe2_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) +if (rte_eal_process_type () !=RTE_PROC_PRIMARY ) { +sxe2_rx_mode_func_set (dev); +sxe2_tx_mode_func_set (dev); goto l_end; + } ret =sxe2_hw_init (dev);if (ret) {
drivers/net/sxe2/sxe2_txrx.c new file +246 -0
246 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright (C), 2025, Wuxi Stars Micro System Technologies Co., Ltd. +*/ + +#ifndef SXE2_TXRX_H +#define SXE2_TXRX_H +#include <ethdev_driver.h> +#include "sxe2_queue.h" + +void sxe2_set_common_function (struct rte_eth_dev *dev); + +uint16_t sxe2_tx_pkts_prepare (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); + +void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); + +void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); + +#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c new file +916 -0
916 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v19 10/11 net/sxe2: add vectorized Rx and Tx
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the vectorized data path for the sxe2 PMD. It utilizes SIMD instructions (e.g., SSE) to process multiple packets simultaneously, significantly improving throughput for small packet processing.
The implementation includes:
* Vectorized Rx burst function for bulk descriptor processing.
* Vectorized Tx burst function with optimized resource cleanup.
* Capability flags update to reflect vectorized path support.
--- drivers/net/sxe2/meson.build | 5 + drivers/net/sxe2/sxe2_ethdev.c | 29 +- drivers/net/sxe2/sxe2_queue.c | 28 ++ drivers/net/sxe2/sxe2_queue.h | 4 + drivers/net/sxe2/sxe2_txrx.c | 204 ++++++--- drivers/net/sxe2/sxe2_txrx.h | 11 +- drivers/net/sxe2/sxe2_txrx_poll.c | 26 ++ drivers/net/sxe2/sxe2_txrx_poll.h | 4 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 +++++++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 +++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 ++++++++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++++++++++++++++ 12 files changed, 1284 insertions(+), 75 deletions(-) create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c
drivers/net/sxe2/meson.build +5 -0
@@ -13,6 +13,10 @@ deps += ['common_sxe2', 'hash','cryptodev','security'] includes += include_directories('../../common/sxe2') +if arch_subdir == 'x86' + sources += files('sxe2_txrx_vec_sse.c') +endif + sources += files( 'sxe2_ethdev.c', 'sxe2_cmd_chnl.c',
@@ -22,6 +26,7 @@ sources += files( 'sxe2_rx.c', 'sxe2_txrx_poll.c', 'sxe2_txrx.c', + 'sxe2_txrx_vec.c', ) allow_internal_get_api = true
drivers/net/sxe2/sxe2_ethdev.c +8 -21
@@ -107,25 +107,6 @@ static int32_t sxe2_dev_stop(struct rte_eth_dev *dev)return ret; } -static int32_t sxe2_queues_start (struct rte_eth_dev *dev) -{ -int32_t ret =0 ; - ret =sxe2_txqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); - goto l_end; - } - - ret =sxe2_rxqs_all_start (dev); -if (ret) { -PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); -sxe2_txqs_all_stop (dev); - } - -l_end: -return ret; -} -static int32_t sxe2_dev_start (struct rte_eth_dev *dev) {int32_t ret =0 ;
@@ -158,7 +139,7 @@ static int32_t sxe2_dev_start(struct rte_eth_dev *dev)static int32_t sxe2_dev_close (struct rte_eth_dev *dev) { (void )sxe2_dev_stop (dev); - + (void )sxe2_queues_release (dev);sxe2_vsi_uninit (dev);sxe2_dev_pci_map_uinit (dev);
@@ -296,13 +277,19 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .dev_close = sxe2_dev_close, .dev_infos_get = sxe2_dev_infos_get, + .rx_queue_start = sxe2_rx_queue_start, + .rx_queue_stop = sxe2_rx_queue_stop, + .tx_queue_start = sxe2_tx_queue_start, + .tx_queue_stop = sxe2_tx_queue_stop, .rx_queue_setup = sxe2_rx_queue_setup, - .tx_queue_setup = sxe2_tx_queue_setup, .rx_queue_release = sxe2_rx_queue_release, + .tx_queue_setup = sxe2_tx_queue_setup, .tx_queue_release = sxe2_tx_queue_release, .rxq_info_get = sxe2_rx_queue_info_get, .txq_info_get = sxe2_tx_queue_info_get, + .rx_burst_mode_get = sxe2_rx_burst_mode_get, + .tx_burst_mode_get = sxe2_tx_burst_mode_get, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_queue.c +28 -0
@@ -5,6 +5,8 @@#include "sxe2_ethdev.h" #include "sxe2_queue.h" #include "sxe2_common_log.h" +#include "sxe2_tx.h" +#include "sxe2_rx.h" void sxe2_sw_queue_ctx_hw_cap_set (struct sxe2_adapter *adapter,struct sxe2_drv_queue_caps *q_caps)
@@ -36,3 +38,29 @@ int32_t sxe2_queues_init(struct rte_eth_dev *dev)return ret; } + +int32_t sxe2_queues_start (struct rte_eth_dev *dev) +{ +int32_t ret =0 ; + + ret =sxe2_txqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start tx queue." ); + goto l_end; + } + + ret =sxe2_rxqs_all_start (dev); +if (ret) { +PMD_LOG_ERR (INIT ,"Failed to start rx queue." ); +sxe2_txqs_all_stop (dev); + } +l_end: +return ret; +} + +void sxe2_queues_release (struct rte_eth_dev *dev) +{ +sxe2_all_rxqs_release (dev); + +sxe2_all_txqs_release (dev); +}
drivers/net/sxe2/sxe2_queue.h +4 -0
@@ -188,4 +188,8 @@ void sxe2_sw_queue_ctx_hw_cap_set(struct sxe2_adapter *adapter,int32_t sxe2_queues_init (struct rte_eth_dev *dev); +int32_t sxe2_queues_start (struct rte_eth_dev *dev); + +void sxe2_queues_release (struct rte_eth_dev *dev); +#endif /* __SXE2_QUEUE_H__ */
drivers/net/sxe2/sxe2_txrx.c +155 -49
330 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx.h +6 -5
@@ -6,16 +6,17 @@#define SXE2_TXRX_H #include <ethdev_driver.h> #include "sxe2_queue.h" -void sxe2_set_common_function (struct rte_eth_dev *dev); +int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, +uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); -void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); - void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq); -void sxe2_rx_mode_func_set (struct rte_eth_dev *dev); - +int32_t sxe2_tx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode); +int32_t sxe2_rx_burst_mode_get (struct rte_eth_dev *dev, + __rte_unused uint16_t queue_id, struct rte_eth_burst_mode *mode);#endif /* __SXE2_TXRX_H__ */
drivers/net/sxe2/sxe2_txrx_poll.c +26 -0
@@ -480,6 +480,32 @@ static inline uint16_t sxe2_tx_pkts_batch(void *tx_queue,return nb_pkts; } +uint16_t sxe2_tx_pkts_simple (void *tx_queue, +struct rte_mbuf **tx_pkts,uint16_t nb_pkts) +{ +uint16_t tx_done_num; +uint16_t tx_once_num; +uint16_t tx_need_num; +if (likely (nb_pkts <=SXE2_TX_PKTS_BURST_BATCH_NUM )) { + tx_done_num =sxe2_tx_pkts_batch (tx_queue, + tx_pkts, nb_pkts); + goto l_end; + } + tx_done_num =0 ; +while (nb_pkts) { + tx_need_num =RTE_MIN (nb_pkts,SXE2_TX_PKTS_BURST_BATCH_NUM ); + tx_once_num =sxe2_tx_pkts_batch (tx_queue, + &tx_pkts[tx_done_num], + tx_need_num); + nb_pkts -= tx_once_num; + tx_done_num += tx_once_num; +if (tx_once_num < tx_need_num) +break ; + } +l_end: +return tx_done_num; +} +static inline void sxe2_update_rx_tail (struct sxe2_rx_queue *rxq,uint16_t hold_num,uint16_t rx_id) {
drivers/net/sxe2/sxe2_txrx_poll.h +4 -0
@@ -9,6 +9,10 @@uint16_t sxe2_tx_pkts (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +uint16_t sxe2_tx_pkts_simple (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); + +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t sxe2_rx_pkts_scattered (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);uint16_t sxe2_rx_pkts_scattered_split (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t nb_pkts);
drivers/net/sxe2/sxe2_txrx_vec.c new file +201 -0
201 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec.h new file +63 -0
63 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_common.h new file +235 -0
235 lines not on this page · raw message
drivers/net/sxe2/sxe2_txrx_vec_sse.c new file +549 -0
549 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v19 11/11 net/sxe2: implement Tx done cleanup
In reply to [email protected]From: Jie Liu <[email protected]>
This patch implements the 'tx_done_cleanup' ethdev ops in the sxe2 PMD. This interface allows applications to explicitly request the driver to release mbufs that have been transmitted and are no longer needed by the hardware.
The implementation iterates through the Tx ring, checking the status of the descriptors starting from the last cleaned tail. It releases the corresponding mbufs back to the mempool until either the requested number of packets are freed or no more completed descriptors are found.
--- drivers/net/sxe2/sxe2_ethdev.c | 1 + drivers/net/sxe2/sxe2_txrx.h | 1 + drivers/net/sxe2/sxe2_txrx_poll.c | 102 ++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+)
drivers/net/sxe2/sxe2_ethdev.c +1 -0
@@ -290,6 +290,7 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .txq_info_get = sxe2_tx_queue_info_get, .rx_burst_mode_get = sxe2_rx_burst_mode_get, .tx_burst_mode_get = sxe2_tx_burst_mode_get, + .tx_done_cleanup = sxe2_tx_done_cleanup, }; struct sxe2_pci_map_bar_info *sxe2_dev_get_bar_info(struct sxe2_adapter *adapter,
drivers/net/sxe2/sxe2_txrx.h +1 -0
@@ -12,6 +12,7 @@ int32_t __rte_cold sxe2_tx_simple_batch_support_check(struct rte_eth_dev *dev, uint32_t *batch_flags);uint16_t sxe2_tx_pkts_prepare (void *tx_queue,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +int32_t sxe2_tx_done_cleanup (void *txq,uint32_t free_cnt);void sxe2_tx_mode_func_set (struct rte_eth_dev *dev); void __rte_cold sxe2_rx_queue_reset(struct sxe2_rx_queue *rxq);void sxe2_rx_mode_func_set (struct rte_eth_dev *dev);
drivers/net/sxe2/sxe2_txrx_poll.c +102 -0
116 lines not on this page · raw message
Signature · 1 line
2.47.3
Stephen Hemminger
AppliedRe: [PATCH v19 00/11]net/sxe2: fix logic errors and address feedback
In reply to [email protected]Quoted 101 lines · On Wed, 20 May 2026 10:17:58 +0800 [email protected] wrote:
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 and v18 submissions for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v19 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset formbuf_defin vector init to avoid uninitialized reads.
- Convertedpci_map_addr_infoto designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updatedburst_mode_getto accurately report AVX paths.
- AdjustedSXE2_ETH_OVERHEADto match actual VLAN capabilities.Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 23 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 352 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9197 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h
Quoted 9 lines
create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Applied to next-net with minor merge fixup to release note
Re: [PATCH v19 00/11]net/sxe2: fix logic errors and address feedback
In reply to [email protected]Hello,
20/05/2026 04:17, [email protected]:
Quoted 1 line
common/sxe2: add sxe2 basic structures
Are you planning to add a crypto or compress driver? This is usually the reason to have a common library. If you don't intend to share some code between different driver, then you should not have a common library.
Re: [PATCH v19 00/11]net/sxe2: fix logic errors and address feedback
21/05/2026 17:16, Thomas Monjalon:
Quoted 9 lines
Hello,
20/05/2026 04:17, [email protected]:
Quoted 1 line
common/sxe2: add sxe2 basic structures
Are you planning to add a crypto or compress driver? This is usually the reason to have a common library. If you don't intend to share some code between different driver, then you should not have a common library.
We are curious about your plans for sxe2.
Please, could you reply?
Will you add another driver class to sxe2?
Re: [PATCH v19 00/11]net/sxe2: fix logic errors and address feedback
26/05/2026 16:13, Thomas Monjalon:
Quoted 6 lines
21/05/2026 17:16, Thomas Monjalon:
Quoted 5 lines
Hello,
20/05/2026 04:17, [email protected]:
Quoted 1 line
common/sxe2: add sxe2 basic structures
Quoted 8 lines
Quoted 4 lines
Are you planning to add a crypto or compress driver? This is usually the reason to have a common library. If you don't intend to share some code between different driver, then you should not have a common library.
We are curious about your plans for sxe2.
Please, could you reply?
Will you add another driver class to sxe2?
I see you are submitting patches
but you don't take time to answer questions.
Please stop sending before answering,
we need to communicate, otherwise it won't work.
Re: Re: [PATCH v19 00/11]net/sxe2: fix logic errors and address feedback
In reply to Thomas Monjalon26/05/2026 16:13, Thomas Monjalon:
Quoted 6 lines
21/05/2026 17:16, Thomas Monjalon:
Quoted 5 lines
Hello,
20/05/2026 04:17, [email protected]:
Quoted 1 line
common/sxe2: add sxe2 basic structures
Quoted 8 lines
Quoted 4 lines
Are you planning to add a crypto or compress driver? This is usually the reason to have a common library. If you don't intend to share some code between different driver, then you should not have a common library.
We are curious about your plans for sxe2.
Please, could you reply?
Will you add another driver class to sxe2?
I see you are submitting patches
but you don't take time to answer questions.
Please stop sending before answering,
we need to communicate, otherwise it won't work.
Re: [PATCH v18 00/11] net/sxe2: fix logic errors and address feedback
In reply to [email protected]Quoted 6 lines · On Tue, 19 May 2026 22:47:59 +0800 [email protected] wrote:
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
Great a couple more things to address before merge.
Review of [PATCH v18 00/11] sxe2 PMD
====================================
The v17 addendum issues are addressed in v18:
- sxe2.ini features matrix now matches what the code advertises. VLAN offload, QinQ offload, Timestamp offload, Inner L3 checksum, Inner L4 checksum, and FreeBSD rows are removed. All remaining "Y" / "P" rows correspond to entries in {rx,tx}_offload_capa or registered dev_ops callbacks.
- sxe2_{rx,tx}_desciptor_status renamed to
sxe2_{rx,tx}_descriptor_status throughout.
One new style issue and one general cleanup request:
Patch 09/11: drivers: add data path for Rx and Tx
-------------------------------------------------
Info: blank line added between function signature and opening brace. In the same hunk that renames the function:
static int32_t sxe2_tx_descriptor_status(void *tx_queue, uint16_t offset)
+
{There should be no blank line between the prototype line and the body brace. Looks like an editing artifact in this respin.
All patches: unnecessary (void) casts on void-returning calls
-------------------------------------------------------------
Warning: (void) casts on pthread_mutex_lock / pthread_mutex_unlock.
(void)pthread_mutex_lock(&cdev->config.lock); ... (void)pthread_mutex_unlock(&cdev->config.lock);
These calls do return int, but in practice never fail when the mutex is initialised with pthread_mutex_init(&m, NULL) — the documented errors (EINVAL, EAGAIN, EDEADLK) all require either an uninitialised mutex (programmer bug) or non-default attributes (recursive / error-checking, neither of which is in use here). The cast is redundant noise. Just write:
pthread_mutex_lock(&cdev->config.lock); ... pthread_mutex_unlock(&cdev->config.lock);
This is inconsistently applied even within the same file:sxe2_common_dev_create_by_pci() uses a bare pthread_mutex_unlock() two lines after a (void)-cast pthread_mutex_lock() on the same mutex. Pick one style — bare calls — and apply it everywhere.
DPDK convention for void-returning callers is to call without the (void) cast (see rte_spinlock_lock / rte_pktmbuf_free usage across the tree). The cast adds nothing and visually clutters the lock/unlock pairs that are already busy enough. Please drop all of them.
Series hygiene
--------------
The descriptor-status rename should be folded back into the patch that introduces the function (patch 08), so the function is correctly named at the commit it first appears. Currently patch 08 introduces sxe2_{rx,tx}_descriptor_status (good, fixed from v17) but patch 09 still touches the function and its hunks would have been cleaner if no rename was ever needed. In this case the fix landed in patch 08 already so it's fine — just calling out the pattern.
Re: [PATCH v17 00/11] net/sxe2: fix logic errors and address feedback
In reply to [email protected]Quoted 101 lines · On Tue, 19 May 2026 11:01:21 +0800 [email protected] wrote:
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v17 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset formbuf_defin vector init to avoid uninitialized reads.
- Convertedpci_map_addr_infoto designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updatedburst_mode_getto accurately report AVX paths.
- AdjustedSXE2_ETH_OVERHEADto match actual VLAN capabilities.Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 29 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 554 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 32 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 351 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 63 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9202 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h
Quoted 9 lines
create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Overall I am pleased with this and no AI review feedback. But noticed some discrepancy between documentation and implementation around feature; so asked AI to double check that.
Addendum to v17 review: features matrix vs code
================================================
Patch 02/11: doc: add sxe2 guide and release notes
--------------------------------------------------
The doc/guides/nics/features/sxe2.ini file claims a number of features that the code does not implement. Cross-referencing each "Y"/"P" line against drivers/net/sxe2/sxe2_ethdev.c (sxe2_dev_info_init) and the final dev_ops table:
VLAN offload = Y
Neither RTE_ETH_RX_OFFLOAD_VLAN_STRIP, RTE_ETH_RX_OFFLOAD_VLAN_FILTER, nor RTE_ETH_TX_OFFLOAD_VLAN_INSERT is in dev_info->rx_offload_capa or dev_info->tx_offload_capa. Applications cannot request these offloads. No .vlan_offload_set, .vlan_filter_set, .vlan_strip_queue_set, or .vlan_tpid_set callbacks are registered. The only references to the VLAN offload macros are inside SXE2_RX_VEC_SUPPORT_OFFLOAD / SXE2_TX_VEC_SUPPORT_OFFLOAD (the vector-path allow-list), where they are filtered, not advertised.
QinQ offload = P
No RTE_ETH_RX_OFFLOAD_QINQ_STRIP / RTE_ETH_TX_OFFLOAD_QINQ_INSERT in offload_capa. The Tx path does handle RTE_MBUF_F_TX_QINQ in the descriptor builder, but with no offload-capability advertisement an application has no way to request it.
Timestamp offload = P
RTE_ETH_RX_OFFLOAD_TIMESTAMP is not in rx_offload_capa. No .timesync_enable / disable / read_rx_timestamp / read_tx_timestamp / adjust_time / read_time / write_time callbacks are registered. The only occurrence of the timestamp offload symbol is inside SXE2_RX_VEC_NO_SUPPORT_OFFLOAD (i.e. the list of things the vector path filters out).
FreeBSD = Y
drivers/common/sxe2/meson.build and drivers/net/sxe2/meson.build set "reason = 'only supported on Linux'" when excluding Windows. doc/guides/nics/sxe2.rst states the PMD "is designed to operate alongside the sxe2 kernel network driver" and "communicates with the kernel driver via ioctl interfaces" — that kernel driver exists only for Linux. Either (a) drop "FreeBSD = Y" and gate the meson build with "if not is_linux: build = false", or (b) provide a FreeBSD kernel companion and update the meson reason string.
Inner L3 checksum = P
Inner L4 checksum = P
These could plausibly map to RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM / RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM (which are in tx_offload_capa) plus the TNL_TSO offloads. Worth confirming the mapping is what is intended.
What the matrix gets right (verified):
Fast mbuf free = P -> RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE
advertised in tx_offload_capa.
Free Tx mbuf on demand = Y -> .tx_done_cleanup registered
(patch 11).
Burst mode info = Y -> .rx_burst_mode_get and
.tx_burst_mode_get registered.
Queue start/stop = Y -> .{rx,tx}_queue_{start,stop}
registered.
Buffer split on Rx = P -> RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT
in rx_offload_capa.
Scattered Rx = Y -> sxe2_rx_pkts_scattered{,_split}
burst functions present.
CRC offload = Y -> RTE_ETH_RX_OFFLOAD_KEEP_CRC in
rx_offload_capa.
L3 checksum offload = Y -> IPV4_CKSUM (rx+tx) in offload_capa.
L4 checksum offload = Y -> TCP/UDP_CKSUM (rx+tx) in offload_capa.
Rx descriptor status = Y -> dev->rx_descriptor_status set
(typo'd name "sxe2_rx_desciptor_status" — missing 'r' — but functionally wired up).
Tx descriptor status = Y -> same; sxe2_tx_desciptor_status
with the same typo.
Suggested fix
-------------
For the v18, please either:
(1) Add the missing offload bits (VLAN_STRIP, VLAN_FILTER, VLAN_INSERT, QINQ_STRIP, QINQ_INSERT, RX_TIMESTAMP) to offload_capa and implement the corresponding callbacks; or
(2) Drop the corresponding rows ("VLAN offload", "QinQ offload", "Timestamp offload") from sxe2.ini to "N" or remove them entirely.
Also rename sxe2_{rx,tx}_desciptor_status -> _descriptor_status to match the dev_ops field name, and decide what to do about the FreeBSD / Linux-only contradiction.
Re: [PATCH v16 00/11] net/sxe2: fix logic errors and address feedback
In reply to [email protected]Quoted 101 lines · On Mon, 18 May 2026 17:13:54 +0800 [email protected] wrote:
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
v16 Changes:
- Fixed vector Rx burst function being overwritten by scalar selection.
- Refactored Rx/Tx mode set functions to seed flags from caps first, eliminating tautological checks.
- Added memset formbuf_defin vector init to avoid uninitialized reads.
- Convertedpci_map_addr_infoto designated initializers.
- Removed dead Windows-only code in meson.build.
- Added NULL checks for mbuf free for driver-wide consistency.
- Updatedburst_mode_getto accurately report AVX paths.
- AdjustedSXE2_ETH_OVERHEADto match actual VLAN capabilities.Jie Liu (11):
mailmap: add Jie Liu
doc: add sxe2 guide and release notes common/sxe2: add sxe2 basic structures
drivers: add base driver skeleton
drivers: add base driver probe skeleton
drivers: support PCI BAR mapping
common/sxe2: add ioctl interface for DMA map and unmap net/sxe2: support queue setup and control
drivers: add data path for Rx and Tx net/sxe2: add vectorized Rx and Tx
net/sxe2: implement Tx done cleanup.mailmap | 1 + doc/guides/nics/features/sxe2.ini | 29 + doc/guides/nics/index.rst | 1 + doc/guides/nics/sxe2.rst | 34 + doc/guides/rel_notes/release_26_07.rst | 4 + drivers/common/sxe2/meson.build | 15 + drivers/common/sxe2/sxe2_common.c | 683 +++++++++++++ drivers/common/sxe2/sxe2_common.h | 85 ++ drivers/common/sxe2/sxe2_common_log.h | 81 ++ drivers/common/sxe2/sxe2_host_regs.h | 707 +++++++++++++ drivers/common/sxe2/sxe2_internal_ver.h | 33 + drivers/common/sxe2/sxe2_ioctl_chnl.c | 325 ++++++ drivers/common/sxe2/sxe2_ioctl_chnl.h | 130 +++ drivers/common/sxe2/sxe2_ioctl_chnl_func.h | 62 ++ drivers/common/sxe2/sxe2_osal.h | 153 +++ drivers/meson.build | 1 + drivers/net/meson.build | 1 + drivers/net/sxe2/meson.build | 32 + drivers/net/sxe2/sxe2_cmd_chnl.c | 323 ++++++ drivers/net/sxe2/sxe2_cmd_chnl.h | 37 + drivers/net/sxe2/sxe2_drv_cmd.h | 388 ++++++++ drivers/net/sxe2/sxe2_ethdev.c | 968 ++++++++++++++++++ drivers/net/sxe2/sxe2_ethdev.h | 318 ++++++ drivers/net/sxe2/sxe2_irq.h | 48 + drivers/net/sxe2/sxe2_queue.c | 66 ++ drivers/net/sxe2/sxe2_queue.h | 195 ++++ drivers/net/sxe2/sxe2_rx.c | 559 +++++++++++ drivers/net/sxe2/sxe2_rx.h | 34 + drivers/net/sxe2/sxe2_tx.c | 420 ++++++++ drivers/net/sxe2/sxe2_tx.h | 32 + drivers/net/sxe2/sxe2_txrx.c | 362 +++++++ drivers/net/sxe2/sxe2_txrx.h | 23 + drivers/net/sxe2/sxe2_txrx_common.h | 540 ++++++++++ drivers/net/sxe2/sxe2_txrx_poll.c | 1044 ++++++++++++++++++++ drivers/net/sxe2/sxe2_txrx_poll.h | 20 + drivers/net/sxe2/sxe2_txrx_vec.c | 201 ++++ drivers/net/sxe2/sxe2_txrx_vec.h | 73 ++ drivers/net/sxe2/sxe2_txrx_vec_common.h | 235 +++++ drivers/net/sxe2/sxe2_txrx_vec_sse.c | 549 ++++++++++ drivers/net/sxe2/sxe2_vsi.c | 214 ++++ drivers/net/sxe2/sxe2_vsi.h | 204 ++++ 41 files changed, 9230 insertions(+) create mode 100644 doc/guides/nics/features/sxe2.ini create mode 100644 doc/guides/nics/sxe2.rst create mode 100644 drivers/common/sxe2/meson.build create mode 100644 drivers/common/sxe2/sxe2_common.c create mode 100644 drivers/common/sxe2/sxe2_common.h create mode 100644 drivers/common/sxe2/sxe2_common_log.h create mode 100644 drivers/common/sxe2/sxe2_host_regs.h create mode 100644 drivers/common/sxe2/sxe2_internal_ver.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.c create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl.h create mode 100644 drivers/common/sxe2/sxe2_ioctl_chnl_func.h create mode 100644 drivers/common/sxe2/sxe2_osal.h create mode 100644 drivers/net/sxe2/meson.build create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.c create mode 100644 drivers/net/sxe2/sxe2_cmd_chnl.h create mode 100644 drivers/net/sxe2/sxe2_drv_cmd.h create mode 100644 drivers/net/sxe2/sxe2_ethdev.c create mode 100644 drivers/net/sxe2/sxe2_ethdev.h create mode 100644 drivers/net/sxe2/sxe2_irq.h create mode 100644 drivers/net/sxe2/sxe2_queue.c create mode 100644 drivers/net/sxe2/sxe2_queue.h create mode 100644 drivers/net/sxe2/sxe2_rx.c create mode 100644 drivers/net/sxe2/sxe2_rx.h create mode 100644 drivers/net/sxe2/sxe2_tx.c create mode 100644 drivers/net/sxe2/sxe2_tx.h create mode 100644 drivers/net/sxe2/sxe2_txrx.c create mode 100644 drivers/net/sxe2/sxe2_txrx.h create mode 100644 drivers/net/sxe2/sxe2_txrx_common.h
Quoted 9 lines
create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.c create mode 100644 drivers/net/sxe2/sxe2_txrx_poll.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.c create mode 100644 drivers/net/sxe2/sxe2_txrx_vec.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_common.h create mode 100644 drivers/net/sxe2/sxe2_txrx_vec_sse.c create mode 100644 drivers/net/sxe2/sxe2_vsi.c create mode 100644 drivers/net/sxe2/sxe2_vsi.h
Getting much closer to merge, still time for 26.07.
Review of [PATCH v16 00/11] sxe2 PMD
====================================
Overall comments
----------------
All Error/Warning-level issues from the v15 review are addressed in v16:
- sxe2_tx_done_cleanup(): tx_queue NULL check now runs before
dereferencing txq->vsi->adapter.
- Vector mode probe is still primary-only, but secondaries now inherit the decision via adapter->q_ctxt.{rx,tx}_mode_flags rather than silently falling back to scalar.
- BITS_TO_uint32_t macro renamed to BITS_TO_U32.
- Dead "goto l_end; l_end:" pattern in sxe2_rx_mode_func_set removed in favour of "return;".
- sxe2_drv_dev_handshake function name correctly spelled in the patch that introduces it.
Two new concerns and one carryover:
Patch 09/11: drivers: add data path for Rx and Tx
-------------------------------------------------
Warning: asymmetric secondary-process fallback in sxe2_tx_mode_func_set() versus sxe2_rx_mode_func_set().
Rx (correct):
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
...
adapter->q_ctxt.rx_mode_flags = rx_mode_flags;
} else {
rx_mode_flags = adapter->q_ctxt.rx_mode_flags;
}Tx (overrides primary's decision):
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
...
adapter->q_ctxt.tx_mode_flags = tx_mode_flags;
} else {
tx_mode_flags = adapter->q_ctxt.tx_mode_flags;
if (tx_mode_flags == 0)
tx_mode_flags = SXE2_TX_MODE_SIMPLE_BATCH;
}If the primary genuinely settled on tx_mode_flags = 0 (no vector, no simple-batch — i.e. the full sxe2_tx_pkts / sxe2_tx_pkts_prepare path), the secondary will pick sxe2_tx_pkts_simple instead. Primary and secondary then run different burst functions against the same queue, with different offload-handling semantics. This breaks the multi-process contract.
If the fallback is meant to handle "secondary attached before primary configured anything", that case should be detected explicitly (e.g. a separate "configured" flag). Otherwise just mirror the Rx side: trust whatever the primary put in shared memory.
Warning: SXE2_{RX,TX}_MODE_VEC_SSE bit is never set.
sxe2_{rx,tx}_vec_support_check() always seeds *vec_flags with either SXE2_*_MODE_VEC_SIMPLE or SXE2_*_MODE_VEC_OFFLOAD, both of which are in SXE2_*_MODE_VEC_SET_MASK. In the mode-set function:
tx_mode_flags = vec_flags;
#ifdef RTE_ARCH_X86
if ((tx_mode_flags & SXE2_TX_MODE_VEC_SET_MASK) == 0)
tx_mode_flags |= SXE2_TX_MODE_VEC_SSE;#endif
the condition is already false because vec_flags set at least the SIMPLE bit, so VEC_SSE is never OR'd in. The Rx side has the identical pattern, with the additional dead duplicate "rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128" check that the surrounding if already verified. Either the *_vec_support_check() helpers should seed only the OFFLOAD bit and let the mode-set function pick SSE/AVX2/AVX512 from CPU features, or the dead conditional should be removed.
As-is, the bursts dev->tx_pkt_burst = sxe2_tx_pkts_vec_sse and dev->rx_pkt_burst = sxe2_rx_pkts_scattered_vec_sse_offload get selected purely on the SET_MASK presence — the SSE-specific bit never participates. This works on x86 (it's gated by #ifdef RTE_ARCH_X86), but the VEC_SSE / VEC_AVX2 / VEC_AVX512 / VEC_NEON bit definitions are then misleading: no code path actually distinguishes them.
Series hygiene
--------------
Info: log strings "Open fd=%d to handshark with kernel" and "Failed to handshark, ..." are introduced in patch 03 with the typo, and corrected to "handshake" in patch 05. The function itself is correctly named sxe2_drv_dev_handshake throughout, but the messages inside it disagree with the function name in patches 03 and 04. Two options: fold the typo fix into patch 03, or just write the log strings correctly the first time.
Info: dead "if (ret != 0) PMD_LOG_ERR(...)" check after two void-returning sxe2_{rx,tx}_mode_func_set() calls was added in patch 08 and removed in patch 09 of v15; in v16 the same pattern appears in patch 08 (added) and patch 09 (removed). Same within-series churn as before — please collapse.
Re: [PATCH v15 00/11] net/sxe2: fix logic errors and address feedback
In reply to [email protected]Quoted 6 lines · On Sat, 16 May 2026 15:46:07 +0800 [email protected] wrote:
From: Jie Liu <[email protected]>
This patch set addresses the feedback received on the v10 submission for the sxe2 PMD. The primary focus is on fixing vector path selection, ensuring memory safety during mbuf initialization, and cleaning up redundant logic in the configuration functions.
Driver is in much better shape now.
AI is still finding a few things.
Review of [PATCH v15 00/11] sxe2 PMD
====================================
Overall comments
----------------
Most of the issues called out in the v13 review have been addressed in v15:
- Inverted "if (!ret)" error checks in sxe2_dev_pci_map_init()
are now "if (ret)".
- Non-ASCII characters in sxe2_net_map_addr_info_pf[] removed.
- rte_ticketlock_t around blocking ioctl() replaced with pthread_mutex_t.
- Driver-private u8/s8/u16/... typedefs, __le*/__be* aliases, sxe2_errno.h, STATIC macro, and the reinvented LIST_FOR_EACH_ENTRY / COMPILER_BARRIER / sxe2_*_lock / udelay/mdelay/msleep / __iomem / IS_ERR helpers are gone.
- "MTU update = Y" claim in the features matrix dropped; "Free Tx mbuf on demand = Y" is now backed by the new .tx_done_cleanup callback added in patch 11.
- Redundant queue_idx bounds checks at the top of rx_queue_setup / tx_queue_setup removed.
- "reseted" log-message typo fixed.
What remains:
Patch 11/11: net/sxe2: implement Tx done cleanup
------------------------------------------------
Error: NULL pointer dereference of tx_queue parameter. sxe2_tx_done_cleanup() dereferences txq before checking it for NULL:
int32_t sxe2_tx_done_cleanup(void *tx_queue, uint32_t free_cnt)
{
struct sxe2_tx_queue *txq = (struct sxe2_tx_queue *)tx_queue;
struct sxe2_adapter *adapter = txq->vsi->adapter; /* segfault if txq == NULL */
int32_t ret; if (txq == NULL) { /* too late */
ret = 0;
goto l_end;
}
...The NULL check must run before any field access:
struct sxe2_tx_queue *txq = tx_queue;
struct sxe2_adapter *adapter;
if (txq == NULL)
return 0;
adapter = txq->vsi->adapter;
...Patch 03/10 -> 09/10: vector mode probe gated on RTE_PROC_PRIMARY
-----------------------------------------------------------------
Warning: sxe2_rx_mode_func_set() runs the vector capability probe only in the primary process:
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
ret = sxe2_rx_vec_support_check(dev, &vec_flags);
...
}but sxe2_dev_init() calls sxe2_rx_mode_func_set(dev) and sxe2_tx_mode_func_set(dev) from the secondary-process branch as well. In a secondary, the vector probe is skipped, rx_mode_flags stays 0, and dev->rx_pkt_burst lands on sxe2_rx_pkts_scattered{,_split}. Since dev->rx_pkt_burst is per-rte_eth_dev and re-written by whichever process attaches last, the effective Rx burst mode depends on attach ordering. The same pattern was flagged in v13 and is unchanged in v15.
Either run the same probe in secondaries, or share the primary's decision through rte_eth_dev_data so secondaries inherit it.
Patch 03/10: common/sxe2: add sxe2 basic structures
---------------------------------------------------
Warning: macro identifier BITS_TO_uint32_t in sxe2_osal.h. This is the visible result of a wholesale "u32 -> uint32_t" rename applied to identifier text without manual review. The macro is unused in the rest of the driver (the only mentions are the definition itself and a later rename of the right-hand side), so the cleanest fix is to delete it. If a "bits to 32-bit-word count" macro is wanted later, name it BITS_TO_U32 or use RTE_DIM/RTE_ALIGN_MUL_CEIL idioms.
Patch 09/11: drivers: add data path for Rx and Tx
-------------------------------------------------
Info: in sxe2_tx_pkts() the exit chain remains
l_exit_logic:
if (tx_num == 0)
goto l_end;
goto l_end_of_tx;
l_end_of_tx:
SXE2_PCI_REG_WRITE_WC(...);The unconditional "goto l_end_of_tx;" immediately before the "l_end_of_tx:" label is dead — fall through. The same pattern appears in sxe2_rx_mode_func_set() at the end:
dev->rx_pkt_burst = sxe2_rx_pkts_scattered;
goto l_end;
l_end:
PMD_LOG_DEBUG(...);Both can simply be deleted.
Series hygiene
--------------
Info: several identifiers are introduced with typos in one patch and corrected in a later patch within the same series:
- sxe2_commoin_inited (patch 03) -> sxe2_common_inited (patch 05)
- sxe2_drv_dev_handshark (patch 03) -> sxe2_drv_dev_handshke (patch 04). The renamed form is still a typo (missing 'a' between 'h' and 'k'). Log strings around it were corrected to "handshake" in patch 05; the function name was not.
- Dead "if (ret != 0)" after two void-returning sxe2_{rx,tx}_mode_func_set() calls is added in patch 08 and removed again in patch 09.
Each commit needs to be independently correct so that "git bisect" lands on meaningful states. Renaming an exported internal symbol (RTE_EXPORT_INTERNAL_SYMBOL(sxe2_drv_dev_handshke)) mid-series also churns the auto-generated version map. Please collapse these into the patches that introduce the names, and fix sxe2_drv_dev_handshke -> sxe2_drv_dev_handshake.
Quoted 99 lines · On Thu, 14 May 2026 02:01:52 +0000 <[email protected]> wrote:
From: Pravin M Bathija <[email protected]>
This is version v13 of the patchset and it incorporates the recommendations made by Fengcheng Wen.
Changes made to patch 3/5 and 4/5
* Relocated functionremove_guest_pagesfrom patch 3/5 to 4/5.
* Renamed VhostUserSingleMemReg to VhostUserMemRegMsg andmemory_singleto memreg.This implementation has been extensively tested by doing Read/Write I/O from multiple instances of fio + libblkio (front-end) talking to spdk/dpdk (back-end) based drives. Tested with qemu front-end talking to dpdk testpmd (back-end) performing add/removal of memory regions. Also tested post-copy live migration after doing
add_memory_region.Version Log:
Version v13 (Current version): Incorporate code review suggestions from Fengcheng Wen as described above.
Version v12: Incorporate code review suggestions from Maxime Coquelin and ai-code-review.
Changes made to patch 3/5
Refactoredasync_dma_map()to delegate toasync_dma_map_region(), eliminating code duplication between the two functions. Restored original comments inasync_dma_map_region()explaining why ENODEV and EINVAL errors are ignored (these were stripped in v10) Reverted unnecessary changes tovhost_user_postcopy_register()-- removed thehost_user_addr== 0 checks andreg_msg_indexindirection that were added in v10, since this function is only called fromvhost_user_set_mem_table()where regions are always contiguous.Version v11: Incorporate code review suggestions from Stephen Hemminger. Change made to patch 4/5
Fix incomplete cleanup invhost_user_add_mem_reg()whenvhost_user_mmap_region()fails after the mmap succeeds (e.g.add_guest_pages()realloc failure) realloc failure). The error path now callsremove_guest_pages()andfree_mem_region()to undo the mapping and stale guest-page entries, preventing a leaked mmap and slot reuse corruption. The plain close(fd) path is kept for pre-mmap failures.Version v10: Incorporate code review suggestions from Stephen Hemminger. Change made to patch 4/5
Moveddev_invalidate_vringsafterfree_mem_region, array compaction, and nregions decrement. This ensurestranslate_ring_addressesonly sees surviving memory regions, preventing vring pointers from resolving into a region that is about to be unmapped.Version v9: Incorporate code review suggestions from Stephen Hemminger. Changes made to patch 3/5
Restoredmax_guest_pagesinitial value to hardcoded 8 instead ofVHOST_MEMORY_MAX_NREGIONS, matching upstream semantics. Changes made to patch 4/5
Addedclose(reg->fd)andreg->fd= -1 before gotoclose_msg_fdsin the mmap failure path to fix fd leak after fd was moved from ctx->fds[0]. Converteddev_invalidate_vringsfrom a plain function to a macro + implementation function pair, accepting message ID as a parameter so thestatic_assertreports the correct handler at each call site. Updateddev_invalidate_vringscall inadd_mem_regto passVHOST_USER_ADD_MEM_REGas message ID.
Updateddev_invalidate_vringscall inrem_mem_regto passVHOST_USER_REM_MEM_REGas message ID.Version v8: Incorporate code review suggestions from Stephen Hemminger. rewrite
async_dma_map_regionfunction to iterate guest pages by host address range matching
change functiondev_invalidate_vringsto accept a double pointer to propagate pointer updates
new functionremove_guest_pageswas addedadd_mem_regerror path was narrowed to only clean up the single failed region instead of destroting all existing regionsVersion v7: Incorporate code review suggestions from Maxime Coquelin. Add debug messages to
vhost_postcopy_registerfunction.Version v6: Added the enablement of this feature as a final patch in this patch-set and other code optimizations as suggested by Maxime Coquelin.
Version v5: removed the patch that increased the number of memory regions from 8 to 128. This will be submitted as a separate feature at a later point after incorporating additional optimizations. Also includes code optimizations as suggested by Feng Cheng Wen.
Version v4: code optimizations as suggested by Feng Cheng Wen.
Version v3: code optimizations as suggested by Maxime Coquelin and Thomas Monjalon.
Version v2: code optimizations as suggested by Maxime Coquelin.
Version v1: Initial patch set.
Pravin M Bathija (5):
vhost: add user to mailmap and define to vhost hdr
vhost_user: header defines for add/rem mem region
vhost_user: support function defines for back-end
vhost_user: Function defs for add/rem mem regions
vhost_user: enable configure memory slots
Quoted 6 lines
.mailmap | 1 + lib/vhost/rte_vhost.h | 4 + lib/vhost/vhost_user.c | 418 +++++++++++++++++++++++++++++++++++------ lib/vhost/vhost_user.h | 10 + 4 files changed, 371 insertions(+), 62 deletions(-)
Some useful AI feedback
Review of [PATCH v13 0-5/5] vhost: configure memory slots support
Author: Pravin M Bathija <[email protected]>
This revision addresses essentially every correctness issue raised in the v7-v12 reviews:
- ctx->fds[0] = -1 ownership transfer is now done before mmap, and
the mmap-failure path closes reg->fd explicitly when mmap never
set reg->mmap_addr.
- _dev_invalidate_vrings now takes struct virtio_net **pdev and
writes back *pdev = dev at the end, so a numa_realloc inside
translate_ring_addresses propagates correctly. Both call sites
refresh "dev = *pdev;" afterwards.
- The dev_invalidate_vrings() macro now takes the message id and
uses static_assert(id ## _LOCK_ALL_QPS, ...), matching the
existing VHOST_USER_ASSERT_LOCK pattern. Works for both
VHOST_USER_ADD_MEM_REG and VHOST_USER_REM_MEM_REG call sites.
- Overlap check in vhost_user_add_mem_reg uses guest address
space (guest_user_addr, size / userspace_addr, memory_size),
no longer mmap_size.
- free_new_region undoes only the failed region: async DMA unmap,
remove_guest_pages, free_mem_region(reg), nregions--.
- async_dma_map_region iterates dev->nr_guest_pages and filters
by [reg_start, reg_end), eliminating the prior reg_size
underflow loop.
- The regions array is kept contiguous via memmove on REM_MEM_REG,
so existing iterators that walk mem->nregions remain correct. - max_guest_pages is back to 8 in vhost_user_initialize_memory.
One protocol-level issue remains worth raising.
Patch 4/5 -- vhost_user: Function defs for add/rem mem regions
--------------------------------------------------------------------
Warning: ADD_MEM_REG does not send the host_user_addr reply
Per the vhost-user spec for VHOST_USER_ADD_MEM_REG, the back-end is expected to reply with the same message format and the userspace_addr field replaced by the host userspace address that the region was mapped into. The handler returns RTE_VHOST_MSG_RESULT_OK with no reply constructed, so the dispatcher does not call send_vhost_reply().
For postcopy migration this matters in particular: the original vhost_user_postcopy_register() does two things -- exchange the host_user_addr with the front-end and wait for an ack, then register the regions with userfaultfd. The patch only does the userfaultfd registration via vhost_user_postcopy_region_register(). The in-code comment notes the payload-layout mismatch with vhost_user_postcopy_register() but stops there.
Without the address reply, QEMU will not know the back-end's mapping for regions added via ADD_MEM_REG, so the userfaultfd handling on the QEMU side cannot resolve faults in those regions. Postcopy migration combined with the CONFIGURE_MEM_SLOTS feature will not work.
Suggested fix: construct a memreg-payload reply with region->userspace_addr replaced by reg->host_user_addr and return RTE_VHOST_MSG_RESULT_REPLY. At minimum, refuse ADD_MEM_REG when dev->postcopy_listening is set, so that the combination fails cleanly rather than silently mis-mapping.
Info: vhost_user_rem_mem_reg does not validate ctx->fd_num
The handler is registered with accepts_fd = true and does not call validate_msg_fds(). The trailing close_msg_fds(ctx) cleans up whatever fds were passed, so this is not a leak, but a malformed message with an unexpected fd count is silently accepted. The other accepts_fd handlers in this file validate fd_num explicitly.
Info: vhost_user_get_max_mem_slots cast is unnecessary
ctx->msg.payload.u64 = (uint64_t)max_mem_slots;
max_mem_slots is uint32_t and the assignment widens automatically; the cast can be dropped. Minor.
Reviewed-by would be appropriate once the postcopy reply is addressed (or the combination is rejected). The rest of the series looks correct.
Hi Stephen,
Thank you for your feedback on the patch-set. I have submitted v14 incorporating the changes you suggested. The responses to your comments are inline.
Internal Use - Confidential
Quoted 182 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, May 18, 2026 10:14 AM
To: Bathija, Pravin <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v13 0/5] Support add/remove memory region and get-max- slots[EXTERNAL EMAIL]
Quoted 8 lines · On Thu, 14 May 2026 02:01:52 +0000 <[email protected]> wrote:
From: Pravin M Bathija <[email protected]>
This is version v13 of the patchset and it incorporates the recommendations made by Fengcheng Wen.
Changes made to patch 3/5 and 4/5
* Relocated functionremove_guest_pagesfrom patch 3/5 to 4/5.
* Renamed VhostUserSingleMemReg to VhostUserMemRegMsg and
memory_singleQuoted 90 lines
to memreg.
This implementation has been extensively tested by doing Read/Write I/O from multiple instances of fio + libblkio (front-end) talking to spdk/dpdk (back-end) based drives. Tested with qemu front-end talking to dpdk testpmd (back-end) performing add/removal of memory regions. Also tested post-copy live migration after doing
add_memory_region.Version Log:
Version v13 (Current version): Incorporate code review suggestions from Fengcheng Wen as described above.
Version v12: Incorporate code review suggestions from Maxime Coquelin and ai-code-review.
Changes made to patch 3/5
Refactoredasync_dma_map()to delegate toasync_dma_map_region(), eliminating code duplication between the two functions. Restored original comments inasync_dma_map_region()explaining why ENODEV and EINVAL errors are ignored (these were stripped in v10) Reverted unnecessary changes tovhost_user_postcopy_register()-- removed thehost_user_addr== 0 checks andreg_msg_indexindirection that were added in v10, since this function is only called fromvhost_user_set_mem_table()where regions are always contiguous.Version v11: Incorporate code review suggestions from Stephen Hemminger. Change made to patch 4/5
Fix incomplete cleanup invhost_user_add_mem_reg()whenvhost_user_mmap_region()fails after the mmap succeeds (e.g.add_guest_pages()realloc failure) realloc failure). The error path now callsremove_guest_pages()andfree_mem_region()to undo the mapping and stale guest-page entries, preventing a leaked mmap and slot reuse corruption. The plain close(fd) path is kept for pre-mmap failures.Version v10: Incorporate code review suggestions from Stephen Hemminger. Change made to patch 4/5
Moveddev_invalidate_vringsafterfree_mem_region, array compaction, and nregions decrement. This ensurestranslate_ring_addressesonly sees surviving memory regions, preventing vring pointers from resolving into a region that is about to be unmapped.Version v9: Incorporate code review suggestions from Stephen Hemminger. Changes made to patch 3/5
Restoredmax_guest_pagesinitial value to hardcoded 8 instead ofVHOST_MEMORY_MAX_NREGIONS, matching upstream semantics. Changes made to patch 4/5
Addedclose(reg->fd)andreg->fd= -1 before gotoclose_msg_fdsin the mmap failure path to fix fd leak after fd was moved from ctx->fds[0]. Converteddev_invalidate_vringsfrom a plain function to a macro + implementation function pair, accepting message ID as a parameter so thestatic_assertreports the correct handler at each call site. Updateddev_invalidate_vringscall inadd_mem_regto passVHOST_USER_ADD_MEM_REGas message ID.
Updateddev_invalidate_vringscall inrem_mem_regto passVHOST_USER_REM_MEM_REGas message ID.Version v8: Incorporate code review suggestions from Stephen Hemminger. rewrite
async_dma_map_regionfunction to iterate guest pages by host address range matching change functiondev_invalidate_vringsto accept a double pointer to propagate pointer updates new functionremove_guest_pageswas addedadd_mem_regerror path was narrowed to only clean up the single failed region instead of destroting all existing regionsVersion v7: Incorporate code review suggestions from Maxime Coquelin. Add debug messages to
vhost_postcopy_registerfunction.Version v6: Added the enablement of this feature as a final patch in this patch-set and other code optimizations as suggested by Maxime Coquelin.
Version v5: removed the patch that increased the number of memory regions from 8 to 128. This will be submitted as a separate feature at a later point after incorporating additional optimizations. Also includes code optimizations as suggested by Feng Cheng Wen.
Version v4: code optimizations as suggested by Feng Cheng Wen.
Version v3: code optimizations as suggested by Maxime Coquelin and Thomas Monjalon.
Version v2: code optimizations as suggested by Maxime Coquelin.
Version v1: Initial patch set.
Pravin M Bathija (5):
vhost: add user to mailmap and define to vhost hdr
vhost_user: header defines for add/rem mem region
vhost_user: support function defines for back-end
vhost_user: Function defs for add/rem mem regions
vhost_user: enable configure memory slotsQuoted 7 lines
.mailmap | 1 + lib/vhost/rte_vhost.h | 4 + lib/vhost/vhost_user.c | 418 +++++++++++++++++++++++++++++++++++------ lib/vhost/vhost_user.h | 10 + 4 files changed, 371 insertions(+), 62 deletions(-)Some useful AI feedback
Review of [PATCH v13 0-5/5] vhost: configure memory slots support
Author: Pravin M Bathija <[email protected]>This revision addresses essentially every correctness issue raised in the v7-v12 reviews:
- ctx->fds[0] = -1 ownership transfer is now done before mmap, and
the mmap-failure path closes reg->fd explicitly when mmap never set reg->mmap_addr. - _dev_invalidate_vrings now takes struct virtio_net **pdev and writes back *pdev = dev at the end, so a numa_realloc inside translate_ring_addresses propagates correctly. Both call sites refresh "dev = *pdev;" afterwards. - The dev_invalidate_vrings() macro now takes the message id and uses static_assert(id ## _LOCK_ALL_QPS, ...), matching the existing VHOST_USER_ASSERT_LOCK pattern. Works for both VHOST_USER_ADD_MEM_REG and VHOST_USER_REM_MEM_REG call sites. - Overlap check in vhost_user_add_mem_reg uses guest address space (guest_user_addr, size / userspace_addr, memory_size), no longer mmap_size. - free_new_region undoes only the failed region: async DMA unmap, remove_guest_pages, free_mem_region(reg), nregions--. - async_dma_map_region iterates dev->nr_guest_pages and filters by [reg_start, reg_end), eliminating the prior reg_size underflow loop. - The regions array is kept contiguous via memmove on REM_MEM_REG, so existing iterators that walk mem->nregions remain correct.-
max_guest_pagesis back to 8 invhost_user_initialize_memory.One protocol-level issue remains worth raising.
Patch 4/5 --
vhost_user: Function defs for add/rem mem regions
--------------------------------------------------------------------Warning:
ADD_MEM_REGdoes not send thehost_user_addrreplyPer the vhost-user spec for
VHOST_USER_ADD_MEM_REG, the back-end is expected to reply with the same message format and theuserspace_addrfield replaced by the host userspace address that the region was mapped into. The handler returnsRTE_VHOST_MSG_RESULT_OKwith no reply constructed, so the dispatcher does not callsend_vhost_reply().For postcopy migration this matters in particular: the original
vhost_user_postcopy_register()does two things -- exchange thehost_user_addrwith the front-end and wait for an ack, then register the regions with userfaultfd. The patch only does the userfaultfd registration viavhost_user_postcopy_region_register(). The in-code comment notes the payload-layout mismatch withvhost_user_postcopy_register()but stops there.Without the address reply, QEMU will not know the back-end's mapping for regions added via
ADD_MEM_REG, so the userfaultfd handling on the QEMU side cannot resolve faults in those regions. Postcopy migration combined with theCONFIGURE_MEM_SLOTSfeature will not work.
Quoted 5 lines
Suggested fix: construct a memreg-payload reply with
region->userspace_addrreplaced byreg->host_user_addrand returnRTE_VHOST_MSG_RESULT_REPLY. At minimum, refuseADD_MEM_REGwhendev->postcopy_listeningis set, so that the combination fails cleanly rather than silently mis-mapping.
Fixed, now constructs a memreg reply with host_user_addr and returns RTE_VHOST_MSG_RESULT_REPLY.
Quoted 10 lines
Info:
vhost_user_rem_mem_regdoes not validatectx->fd_numThe handler is registered with
accepts_fd= true and does not callvalidate_msg_fds(). The trailingclose_msg_fds(ctx)cleans up whatever fds were passed, so this is not a leak, but a malformed message with an unexpected fd count is silently accepted. The otheraccepts_fdhandlers in this file validatefd_numexplicitly.
Fixed, added validate_msg_fds(dev, ctx, 0).
Quoted 8 lines
Info:
vhost_user_get_max_mem_slotscast is unnecessaryctx->msg.payload.u64 = (uint64_t)max_mem_slots;
max_mem_slotsisuint32_tand the assignment widens automatically; the cast can be dropped. Minor.
Dropped the cast.
Quoted 4 lines
Reviewed-by would be appropriate once the postcopy reply is addressed (or the combination is rejected). The rest of the series looks correct.
Added the Reviewed-by line in v14