diff options
| author |   Björn Töpel <bjorn.topel@intel.com> | 2018-07-23 11:43:03 +0200 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2018-07-26 02:53:10 +0200 |
| commit | d24458e43b103c7eb7b2fd57bcac392fd7750438 (patch) | |
| tree | d5075e1f336d2568f6b393d8b1d1c501cf1c4c13 /net/xdp/xsk_queue.h | |
| parent | bpf, x32: Fix regression caused by commit 24dea04767e6 (diff) | |
| download | linux-dev-d24458e43b103c7eb7b2fd57bcac392fd7750438.tar.xz linux-dev-d24458e43b103c7eb7b2fd57bcac392fd7750438.zip | |
xsk: fix poll/POLLIN premature returns
Polling for the ingress queues relies on reading the producer/consumer
pointers of the Rx queue.
Prior this commit, a cached consumer pointer could be used, instead of
the actual consumer pointer and therefore report POLLIN prematurely.
This patch makes sure that the non-cached consumer pointer is used
instead.
Reported-by: Qi Zhang <qi.z.zhang@intel.com>
Tested-by: Qi Zhang <qi.z.zhang@intel.com>
Fixes: c497176cb2e4 ("xsk: add Rx receive functions and poll support")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to '')
| -rw-r--r-- | net/xdp/xsk_queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xdp/xsk_queue.h b/net/xdp/xsk_queue.h index 52ecaf770642..8a64b150be54 100644 --- a/net/xdp/xsk_queue.h +++ b/net/xdp/xsk_queue.h @@ -250,7 +250,7 @@ static inline bool xskq_full_desc(struct xsk_queue *q) static inline bool xskq_empty_desc(struct xsk_queue *q) { - return xskq_nb_free(q, q->prod_tail, 1) == q->nentries; + return xskq_nb_free(q, q->prod_tail, q->nentries) == q->nentries; } void xskq_set_umem(struct xsk_queue *q, struct xdp_umem_props *umem_props); |