xsk: Use pool->dma_pages to check for DMA
Subsystems (4)
PATCH 1/1 xsk: Use pool->dma_pages to check for DMA
Compare pool->dma_pages instead of pool->dma_pages_cnt to check for an active DMA mapping. pool->dma_pages needs to be read anyway to access the map so this compiles to more efficient code.
--- include/net/xsk_buff_pool.h | 2 +- net/xdp/xsk_buff_pool.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
include/net/xsk_buff_pool.h +1 -1
@@ -180,7 +180,7 @@ static inline bool xp_desc_crosses_non_contig_pg(struct xsk_buff_pool *pool,if (likely (!cross_pg))return false; -return pool->dma_pages_cnt && +return pool->dma_pages && !(pool->dma_pages[addr >>PAGE_SHIFT ] &XSK_NEXT_PG_CONTIG_MASK ); }
net/xdp/xsk_buff_pool.c +4 -3
@@ -350,7 +350,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs) {struct xsk_dma_map *dma_map; -if (pool->dma_pages_cnt ==0 ) +if (!pool->dma_pages)return ; dma_map =xp_find_dma_map (pool);
@@ -364,6 +364,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs)__xp_dma_unmap (dma_map, attrs);kvfree (pool->dma_pages); + pool->dma_pages =NULL ; pool->dma_pages_cnt =0 ; pool->dev =NULL ; }
@@ -503,7 +504,7 @@ static struct xdp_buff_xsk *__xp_alloc(struct xsk_buff_pool *pool)if (pool->unaligned) { xskb = pool->free_heads[--pool->free_heads_cnt];xp_init_xskb_addr (xskb, pool, addr); -if (pool->dma_pages_cnt) +if (pool->dma_pages)xp_init_xskb_dma (xskb, pool, pool->dma_pages, addr); }else { xskb = &pool->heads[xp_aligned_extract_idx (pool, addr)];
@@ -569,7 +570,7 @@ static u32 xp_alloc_new_from_fq(struct xsk_buff_pool *pool, struct xdp_buff **xdif (pool->unaligned) { xskb = pool->free_heads[--pool->free_heads_cnt];xp_init_xskb_addr (xskb, pool, addr); -if (pool->dma_pages_cnt) +if (pool->dma_pages)xp_init_xskb_dma (xskb, pool, pool->dma_pages, addr); }else { xskb = &pool->heads[xp_aligned_extract_idx (pool, addr)];
Signature · 1 line
2.39.2
Quoted 6 lines · Kal Conley
Compare
pool->dma_pagesinstead ofpool->dma_pages_cntto check for an active DMA mapping.pool->dma_pagesneeds to be read anyway to access the map so this compiles to more efficient code.Signed-off-by Kal Conley <[email protected]>Acked-by Magnus Karlsson <[email protected]>
Quoted 60 lines
--- include/net/xsk_buff_pool.h | 2 +- net/xdp/xsk_buff_pool.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)include/net/xsk_buff_pool.h +1
-1@@ -180,7 +180,7 @@ static inline bool xp_desc_crosses_non_contig_pg(struct xsk_buff_pool *pool,if (likely (!cross_pg))return false; -return pool->dma_pages_cnt && +return pool->dma_pages && !(pool->dma_pages[addr >>PAGE_SHIFT ] &XSK_NEXT_PG_CONTIG_MASK ); }net/xdp/xsk_buff_pool.c +4
-4@@ -350,7 +350,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs) {struct xsk_dma_map *dma_map; -if (pool->dma_pages_cnt ==0 ) +if (!pool->dma_pages)return ; dma_map =xp_find_dma_map (pool);@@ -364,6 +364,7 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs)__xp_dma_unmap (dma_map, attrs);kvfree (pool->dma_pages); + pool->dma_pages =NULL ; pool->dma_pages_cnt =0 ; pool->dev =NULL ; }@@ -503,7 +504,7 @@ static struct xdp_buff_xsk *__xp_alloc(struct xsk_buff_pool *pool)if (pool->unaligned) { xskb = pool->free_heads[--pool->free_heads_cnt];xp_init_xskb_addr (xskb, pool, addr); -if (pool->dma_pages_cnt) +if (pool->dma_pages)xp_init_xskb_dma (xskb, pool, pool->dma_pages, addr); }else { xskb = &pool->heads[xp_aligned_extract_idx (pool, addr)];@@ -569,7 +570,7 @@ static u32 xp_alloc_new_from_fq(struct xsk_buff_pool *pool, struct xdp_buff **xdif (pool->unaligned) { xskb = pool->free_heads[--pool->free_heads_cnt];xp_init_xskb_addr (xskb, pool, addr); -if (pool->dma_pages_cnt) +if (pool->dma_pages)xp_init_xskb_dma (xskb, pool, pool->dma_pages, addr); }else { xskb = &pool->heads[xp_aligned_extract_idx (pool, addr)]; --2.39.2
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 8 lines · On Sun, 23 Apr 2023 20:01:56 +0200 you wrote:
Compare
pool->dma_pagesinstead ofpool->dma_pages_cntto check for an active DMA mapping.pool->dma_pagesneeds to be read anyway to access the map so this compiles to more efficient code.Signed-off-by Kal Conley <[email protected]>Acked-by Magnus Karlsson <[email protected]>[...]
Here is the summary with links:
- [bpf-next] xsk: Use pool->dma_pages to check for DMA
https://git.kernel.org/bpf/bpf-next/c/6ec7be9a2d2b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html