Patchwork [net-next] selftests: psock_tpacket: fix status check

login
register
mail settings
Submitter Daniel Borkmann
Date April 25, 2013, 9:08 a.m.
Message ID <1366880880-3207-1-git-send-email-dborkman@redhat.com>
Download mbox | patch
Permalink /patch/239433/
State Accepted
Delegated to: David Miller
Headers show

Comments

Daniel Borkmann - April 25, 2013, 9:08 a.m.
Testing like this for TP_STATUS_AVAILABLE clearly is a stupid bug
since it always returns true. Fix this by only checking for flags
where the kernel owns the packet and negate this result, since we
also could run into the non-zero status TP_STATUS_WRONG_FORMAT
and need to reclaim frames.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 This is only for net-next, since net does not contain networking
 selftests yet.

 tools/testing/selftests/net/psock_tpacket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
David Miller - April 29, 2013, 4:27 p.m.
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu, 25 Apr 2013 11:08:00 +0200

> Testing like this for TP_STATUS_AVAILABLE clearly is a stupid bug
> since it always returns true. Fix this by only checking for flags
> where the kernel owns the packet and negate this result, since we
> also could run into the non-zero status TP_STATUS_WRONG_FORMAT
> and need to reclaim frames.
> 
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/tools/testing/selftests/net/psock_tpacket.c b/tools/testing/selftests/net/psock_tpacket.c
index a8d7ffa..c41b586 100644
--- a/tools/testing/selftests/net/psock_tpacket.c
+++ b/tools/testing/selftests/net/psock_tpacket.c
@@ -300,7 +300,7 @@  static void walk_v1_v2_rx(int sock, struct ring *ring)
 
 static inline int __v1_tx_kernel_ready(struct tpacket_hdr *hdr)
 {
-	return ((hdr->tp_status & TP_STATUS_AVAILABLE) == TP_STATUS_AVAILABLE);
+	return !(hdr->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING));
 }
 
 static inline void __v1_tx_user_ready(struct tpacket_hdr *hdr)
@@ -311,7 +311,7 @@  static inline void __v1_tx_user_ready(struct tpacket_hdr *hdr)
 
 static inline int __v2_tx_kernel_ready(struct tpacket2_hdr *hdr)
 {
-	return ((hdr->tp_status & TP_STATUS_AVAILABLE) == TP_STATUS_AVAILABLE);
+	return !(hdr->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING));
 }
 
 static inline void __v2_tx_user_ready(struct tpacket2_hdr *hdr)