* [PATCH bpf] xsk: fix poll/POLLIN premature returns
@ 2018-07-23 9:43 Björn Töpel
2018-07-25 17:00 ` Daniel Borkmann
0 siblings, 1 reply; 2+ messages in thread
From: Björn Töpel @ 2018-07-23 9:43 UTC (permalink / raw)
To: bjorn.topel, magnus.karlsson, ast, daniel, netdev
Cc: Björn Töpel, qi.z.zhang
From: Björn Töpel <bjorn.topel@intel.com>
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>
---
net/xdp/xsk_queue.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH bpf] xsk: fix poll/POLLIN premature returns
2018-07-23 9:43 [PATCH bpf] xsk: fix poll/POLLIN premature returns Björn Töpel
@ 2018-07-25 17:00 ` Daniel Borkmann
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2018-07-25 17:00 UTC (permalink / raw)
To: Björn Töpel, magnus.karlsson, ast, netdev
Cc: Björn Töpel, qi.z.zhang
On 07/23/2018 11:43 AM, Björn Töpel wrote:
> From: Björn Töpel <bjorn.topel@intel.com>
>
> 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>
Applied thanks, Björn!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-25 18:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-23 9:43 [PATCH bpf] xsk: fix poll/POLLIN premature returns Björn Töpel
2018-07-25 17:00 ` Daniel Borkmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.