Skip to content

Commit 6b08365

Browse files
mfijalkoborkmann
authored andcommitted
xsk: Bump xsk_queue::queue_empty_descs in xp_can_alloc()
We have STAT_FILL_EMPTY test case in xskxceiver that tries to process traffic with fill queue being empty which currently fails for zero copy ice driver after it started to use xsk_buff_can_alloc() API. That is because xsk_queue::queue_empty_descs is currently only increased from alloc APIs and right now if driver sees that xsk_buff_pool will be unable to provide the requested count of buffers, it bails out early, skipping calls to xsk_buff_alloc{_batch}(). Mentioned statistic should be handled in xsk_buff_can_alloc() from the very beginning, so let's add this logic now. Do it by open coding xskq_cons_has_entries() and bumping queue_empty_descs in the middle when fill queue currently has no entries. Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Magnus Karlsson <magnus.karlsson@intel.com> Link: https://lore.kernel.org/bpf/20240904162808.249160-1-maciej.fijalkowski@intel.com
1 parent 5d16228 commit 6b08365

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

net/xdp/xsk_buff_pool.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,17 @@ EXPORT_SYMBOL(xp_alloc_batch);
656656

657657
bool xp_can_alloc(struct xsk_buff_pool *pool, u32 count)
658658
{
659+
u32 req_count, avail_count;
660+
659661
if (pool->free_list_cnt >= count)
660662
return true;
661-
return xskq_cons_has_entries(pool->fq, count - pool->free_list_cnt);
663+
664+
req_count = count - pool->free_list_cnt;
665+
avail_count = xskq_cons_nb_entries(pool->fq, req_count);
666+
if (!avail_count)
667+
pool->fq->queue_empty_descs++;
668+
669+
return avail_count >= req_count;
662670
}
663671
EXPORT_SYMBOL(xp_can_alloc);
664672

net/xdp/xsk_queue.h

-5
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,6 @@ static inline u32 xskq_cons_nb_entries(struct xsk_queue *q, u32 max)
306306
return entries >= max ? max : entries;
307307
}
308308

309-
static inline bool xskq_cons_has_entries(struct xsk_queue *q, u32 cnt)
310-
{
311-
return xskq_cons_nb_entries(q, cnt) >= cnt;
312-
}
313-
314309
static inline bool xskq_cons_peek_addr_unchecked(struct xsk_queue *q, u64 *addr)
315310
{
316311
if (q->cached_prod == q->cached_cons)

0 commit comments

Comments
 (0)