packet: packet fanout rollover during socket overload
Subsystems (4)
PATCH v3 1/1 packet: packet fanout rollover during socket overload
Changes:
v3->v2: rebase (no other changes)
passes selftest
v2->v1: read f->num_members only once
fix bug: test rollover mode + flag
Minimize packet drop in a fanout group. If one socket is full, roll over packets to another from the group. Maintain flow affinity during normal load using an rxhash fanout policy, while dispersing unexpected traffic storms that hit a single cpu, such as spoofed-source DoS flows. Rollover breaks affinity for flows arriving at saturated sockets during those conditions.
The patch adds a fanout policy ROLLOVER that rotates between sockets, filling each socket before moving to the next. It also adds a fanout flag ROLLOVER. If passed along with any other fanout policy, the primary policy is applied until the chosen socket is full. Then, rollover selects another socket, to delay packet drop until the entire system is saturated.
Probing sockets is not free. Selecting the last used socket, as rollover does, is a greedy approach that maximizes chance of success, at the cost of extreme load imbalance. In practice, with sufficiently long queues to absorb bursts, sockets are drained in parallel and load balance looks uniform in top.
To avoid contention, scales counters with number of sockets and accesses them lockfree. Values are bounds checked to ensure correctness.
Tested using an application with 9 threads pinned to CPUs, one socket per thread and sufficient busywork per packet operation to limits each thread to handling 32 Kpps. When sent 500 Kpps single UDP stream packets, a FANOUT_CPU setup processes 32 Kpps in total without this patch, 270 Kpps with the patch. Tested with read() and with a packet ring (V1). Also, passes unit test (perhaps for selftests) at
http://kernel.googlecode.com/files/psock_fanout.c
--- include/uapi/linux/if_packet.h | 2 + net/packet/af_packet.c | 109 ++++++++++++++++++++++++++++++++--------- net/packet/internal.h | 3 +- 3 files changed, 90 insertions(+), 24 deletions(-)
include/uapi/linux/if_packet.h +2 -0
@@ -55,6 +55,8 @@ struct sockaddr_ll {#define PACKET_FANOUT_HASH 0#define PACKET_FANOUT_LB 1#define PACKET_FANOUT_CPU 2 +#define PACKET_FANOUT_ROLLOVER 3 +#define PACKET_FANOUT_FLAG_ROLLOVER 0x1000#define PACKET_FANOUT_FLAG_DEFRAG 0x8000struct tpacket_stats {
net/packet/af_packet.c +86 -23
200 lines not on this page · raw message
net/packet/internal.h +2 -1
@@ -77,10 +77,11 @@ struct packet_fanout {unsigned int num_members;u16 id;u8 type; -u8 defrag; +u8 flags;atomic_t rr_cur;struct list_head list;struct sock *arr[PACKET_FANOUT_MAX ]; +int next[PACKET_FANOUT_MAX ];spinlock_t lock;atomic_t sk_ref;struct packet_type prot_hook____cacheline_aligned_in_smp ;
Signature · 1 line
1.8.1.3
Quoted 38 lines · Willem de Bruijn
Changes:
v3->v2: rebase (no other changes)
passes selftest
v2->v1: readf->num_membersonly once
fix bug: test rollover mode + flagMinimize packet drop in a fanout group. If one socket is full, roll over packets to another from the group. Maintain flow affinity during normal load using an rxhash fanout policy, while dispersing unexpected traffic storms that hit a single cpu, such as spoofed-source DoS flows. Rollover breaks affinity for flows arriving at saturated sockets during those conditions.
The patch adds a fanout policy ROLLOVER that rotates between sockets, filling each socket before moving to the next. It also adds a fanout flag ROLLOVER. If passed along with any other fanout policy, the primary policy is applied until the chosen socket is full. Then, rollover selects another socket, to delay packet drop until the entire system is saturated.
Probing sockets is not free. Selecting the last used socket, as rollover does, is a greedy approach that maximizes chance of success, at the cost of extreme load imbalance. In practice, with sufficiently long queues to absorb bursts, sockets are drained in parallel and load balance looks uniform in
top.To avoid contention, scales counters with number of sockets and accesses them lockfree. Values are bounds checked to ensure correctness.
Tested using an application with 9 threads pinned to CPUs, one socket per thread and sufficient busywork per packet operation to limits each thread to handling 32 Kpps. When sent 500 Kpps single UDP stream packets, a
FANOUT_CPUsetup processes 32 Kpps in total without this patch, 270 Kpps with the patch. Tested withread()and with a packet ring (V1). Also, passes unit test (perhaps for selftests) at
http://kernel.googlecode.com/files/psock_fanout.c
Quoted 6 lines
Signed-off-by Willem de Bruijn <[email protected]>--- include/uapi/linux/if_packet.h | 2 + net/packet/af_packet.c | 109 ++++++++++++++++++++++++++++++++--------- net/packet/internal.h | 3 +- 3 files changed, 90 insertions(+), 24 deletions(-)
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Tue, 19 Mar 2013 13:37:17 -0700
Quoted 6 lines · Willem de Bruijn
Quoted 5 lines
Changes:
v3->v2: rebase (no other changes)
passes selftest
v2->v1: readf->num_membersonly once
fix bug: test rollover mode + flag
...
Quoted 1 line
Quoted 1 line
Signed-off-by Willem de Bruijn <[email protected]>
...
Quoted 1 line
Reviewed-by Eric Dumazet <[email protected]>
Applied, and I added the selftest too, but it fails for me on my 128-cpu sparc64 machine:
make[1]: Entering directory `/home/davem/src/GIT/net-next/tools/testing/selftests/net-afpacket'
--------------------
running psock_fanout test
--------------------
test: control single socket
test: control multiple sockets
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,20, expect=15,5
ERROR: incorrect queue lengths
[FAIL]
Quoted 9 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Tue, 19 Mar 2013 13:37:17 -0700Quoted 6 lines · Willem de Bruijn
Quoted 5 lines
Changes:
v3->v2: rebase (no other changes)
passes selftest
v2->v1: readf->num_membersonly once
fix bug: test rollover mode + flag
Quoted 6 lines
...
Quoted 1 line
Quoted 1 line
Signed-off-by Willem de Bruijn <[email protected]>...
Quoted 1 line
Reviewed-by Eric Dumazet <[email protected]>Applied, and I added the selftest too
Thanks!
Quoted 13 lines
, but it fails for me on my
128-cpu sparc64 machine:make[1]: Entering directory `/home/davem/src/GIT/net-next/tools/testing/selftests/net-afpacket'
--------------------
runningpsock_fanouttest
--------------------
test: control single socket
test: control multiple sockets
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,20, expect=15,5
ERROR: incorrect queue lengths
I'm looking into it. The test needs the packet sockets to be able to hold an exact number of test packets and then overflow. Queue length configured in bytes (SO_RCVBUF) was arrived at by experimentation. My best hunch so far is that this differs between platforms/nic, if skb->truesize does. If queue length is the problem, I'll switch to a packet ring. Booting another machine right now.
Quoted 1 line
[FAIL]
Quoted 33 lines · Willem de Bruijn
Quoted 9 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Tue, 19 Mar 2013 13:37:17 -0700Quoted 6 lines · Willem de Bruijn
Quoted 5 lines
Changes:
v3->v2: rebase (no other changes)
passes selftest
v2->v1: readf->num_membersonly once
fix bug: test rollover mode + flagQuoted 6 lines
...
Quoted 1 line
Quoted 1 line
Signed-off-by Willem de Bruijn <[email protected]>...
Quoted 1 line
Reviewed-by Eric Dumazet <[email protected]>Applied, and I added the selftest too
Thanks!
Quoted 13 lines
, but it fails for me on my
128-cpu sparc64 machine:make[1]: Entering directory `/home/davem/src/GIT/net-next/tools/testing/selftests/net-afpacket'
--------------------
runningpsock_fanouttest
--------------------
test: control single socket
test: control multiple sockets
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,20, expect=15,5
ERROR: incorrect queue lengths
Quoted 6 lines
I'm looking into it. The test needs the packet sockets to be able to hold an exact number of test packets and then overflow. Queue length configured in bytes (
SO_RCVBUF) was arrived at by experimentation. My best hunch so far is that this differs between platforms/nic, ifskb->truesizedoes. If queue length is the problem, I'll switch to a packet ring. Booting another machine right now.
I was able to reproduce this. The issue is not queue length, but an rxhash collision. The test either passes or fails consistently between reboots. Rebooting to get a different hashrnd seed may change the test outcome.
Before finding this, I had already updated the patch to use a packet ring (still better than the estimated queue length) and added testcases for the LB and CPU modes. I may need to clean it up, but I will send the current patch to see if it resolves the bug.
Quoted 1 line
Quoted 1 line
[FAIL]
PATCH 1/1 net: fix psock_fanout selftest hash collision
Fix flaky results with PACKET_FANOUT_HASH depending on whether the two flows hash into the same packet socket or not.
Also adds tests for PACKET_FANOUT_LB and PACKET_FANOUT_CPU and replaces the counting method with a packet ring.
--- .../testing/selftests/net-afpacket/psock_fanout.c | 160 +++++++++++++++------ 1 file changed, 120 insertions(+), 40 deletions(-)
tools/testing/selftests/net-afpacket/psock_fanout.c +120 -40
@@ -16,11 +16,11 @@* The test currently runs for * - PACKET_FANOUT_HASH * - PACKET_FANOUT_HASH with PACKET_FANOUT_FLAG_ROLLOVER +* - PACKET_FANOUT_LB +* - PACKET_FANOUT_CPU * - PACKET_FANOUT_ROLLOVER * * Todo: -* - datapath: PACKET_FANOUT_LB -* - datapath: PACKET_FANOUT_CPU * - functionality: PACKET_FANOUT_FLAG_DEFRAG * * License (GPLv2):
@@ -39,18 +39,23 @@* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#define _GNU_SOURCE/* for sched_setaffinity */ +#include <arpa/inet.h> #include <errno.h> +#include <fcntl.h> #include <linux/filter.h> #include <linux/if_packet.h> #include <net/ethernet.h> #include <netinet/ip.h> #include <netinet/udp.h> -#include <fcntl.h> +#include <poll.h> +#include <sched.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/mman.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/types.h>
@@ -58,6 +63,8 @@#define DATA_LEN 100#define DATA_CHAR 'a' +#define RING_NUM_FRAMES 20 +#define PORT_BASE 8000static void pair_udp_open (int fds[],uint16_t port) {
@@ -162,37 +169,55 @@ static int sock_fanout_open(uint16_t typeflags, int num_packets)return -1 ; } - val =sizeof (struct iphdr ) +sizeof (struct udphdr ) +DATA_LEN ; - val *= num_packets; -/* hack: apparently, the above calculation is too small (TODO: fix) */ - val *=3 ; -if (setsockopt (fd,SOL_SOCKET ,SO_RCVBUF , &val,sizeof (val))) { -perror ("setsockopt SO_RCVBUF" ); -exit (1 ); - } -sock_fanout_setfilter (fd);return fd; } -static void sock_fanout_read (int fds[],const int expect[]) +static char *sock_fanout_open_ring (int fd) { -struct tpacket_stats stats; -socklen_t ssize; -int ret[2 ]; +struct tpacket_req req = { + .tp_block_size =getpagesize (), + .tp_frame_size =getpagesize (), + .tp_block_nr =RING_NUM_FRAMES , + .tp_frame_nr =RING_NUM_FRAMES , + }; +char *ring; - ssize =sizeof (stats); -if (getsockopt (fds[0 ],SOL_PACKET ,PACKET_STATISTICS , &stats, &ssize)) { -perror ("getsockopt statistics 0" ); +if (setsockopt (fd,SOL_PACKET ,PACKET_RX_RING , (void *) &req, +sizeof (req))) { +perror ("packetsock ring setsockopt" );exit (1 ); } - ret[0 ] = stats.tp_packets - stats.tp_drops; - ssize =sizeof (stats); -if (getsockopt (fds[1 ],SOL_PACKET ,PACKET_STATISTICS , &stats, &ssize)) { -perror ("getsockopt statistics 1" ); + + ring =mmap (0 , req.tp_block_size * req.tp_block_nr, +PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 ); +if (!ring) { +fprintf (stderr,"packetsock ring mmap\n" );exit (1 ); } - ret[1 ] = stats.tp_packets - stats.tp_drops; + +return ring; +} + +static int sock_fanout_read_ring (int fd,void *ring) +{ +struct tpacket_hdr *header = ring; +int count =0 ; + +while (header->tp_status &TP_STATUS_USER && count <RING_NUM_FRAMES ) { + count++; + header = ring + (count *getpagesize ()); + } + +return count; +} + +static int sock_fanout_read (int fds[],char *rings[],const int expect[]) +{ +int ret[2 ]; + + ret[0 ] =sock_fanout_read_ring (fds[0 ], rings[0 ]); + ret[1 ] =sock_fanout_read_ring (fds[1 ], rings[1 ]);fprintf (stderr,"info: count=%d,%d, expect=%d,%d\n" , ret[0 ], ret[1 ], expect[0 ], expect[1 ]);
@@ -200,8 +225,10 @@ static void sock_fanout_read(int fds[], const int expect[])if ((!(ret[0 ] == expect[0 ] && ret[1 ] == expect[1 ])) && (!(ret[0 ] == expect[1 ] && ret[1 ] == expect[0 ]))) {fprintf (stderr,"ERROR: incorrect queue lengths\n" ); -exit (1 ); +return 1 ; } + +return 0 ; }/* Test illegal mode + flag combination */
@@ -253,11 +280,12 @@ static void test_control_group(void) } } -static void test_datapath (uint16_t typeflags, -const int expect1[],const int expect2[]) +static int test_datapath (uint16_t typeflags,int port_off, +const int expect1[],const int expect2[]) {const int expect0[] = {0 ,0 }; -int fds[2 ], fds_udp[2 ][2 ]; +char *rings[2 ]; +int fds[2 ], fds_udp[2 ][2 ], ret;fprintf (stderr,"test: datapath 0x%hx\n" , typeflags);
@@ -267,41 +295,93 @@ static void test_datapath(uint16_t typeflags,fprintf (stderr,"ERROR: failed open\n" );exit (1 ); } -pair_udp_open (fds_udp[0 ],8000 ); -pair_udp_open (fds_udp[1 ],8002 ); -sock_fanout_read (fds, expect0); + rings[0 ] =sock_fanout_open_ring (fds[0 ]); + rings[1 ] =sock_fanout_open_ring (fds[1 ]); +pair_udp_open (fds_udp[0 ],PORT_BASE ); +pair_udp_open (fds_udp[1 ],PORT_BASE + port_off); +sock_fanout_read (fds, rings, expect0);/* Send data, but not enough to overflow a queue */ pair_udp_send (fds_udp[0 ],15 );pair_udp_send (fds_udp[1 ],5 ); -sock_fanout_read (fds, expect1); + ret =sock_fanout_read (fds, rings, expect1);/* Send more data, overflow the queue */ pair_udp_send (fds_udp[0 ],15 );/* TODO: ensure consistent order between expect1 and expect2 */ -sock_fanout_read (fds, expect2); + ret |=sock_fanout_read (fds, rings, expect2); +if (munmap (rings[1 ],RING_NUM_FRAMES *getpagesize ()) || +munmap (rings[0 ],RING_NUM_FRAMES *getpagesize ())) { +fprintf (stderr,"close rings\n" ); +exit (1 ); + }if (close (fds_udp[1 ][1 ]) ||close (fds_udp[1 ][0 ]) ||close (fds_udp[0 ][1 ]) ||close (fds_udp[0 ][0 ]) ||close (fds[1 ]) ||close (fds[0 ])) {fprintf (stderr,"close datapath\n" );exit (1 ); } + +return ret; +} + +static int set_cpuaffinity (int cpuid) +{ +cpu_set_t mask; + +CPU_ZERO (&mask); +CPU_SET (cpuid, &mask); +if (sched_setaffinity (0 ,sizeof (mask), &mask)) { +if (errno !=EINVAL ) { +fprintf (stderr,"setaffinity %d\n" , cpuid); +exit (1 ); + } +return 1 ; + } + +return 0 ; }int main (int argc,char **argv) { -const int expect_hash[2 ][2 ] = { {15 ,5 }, {5 ,0 } }; -const int expect_hash_rb[2 ][2 ] = { {15 ,5 }, {5 ,10 } }; -const int expect_rb[2 ][2 ] = { {20 ,0 }, {0 ,15 } }; +const int expect_hash[2 ][2 ] = { {15 ,5 }, {20 ,5 } }; +const int expect_hash_rb[2 ][2 ] = { {15 ,5 }, {20 ,15 } }; +const int expect_lb[2 ][2 ] = { {10 ,10 }, {18 ,17 } }; +const int expect_rb[2 ][2 ] = { {20 ,0 }, {20 ,15 } }; +const int expect_cpu0[2 ][2 ] = { {20 ,0 }, {20 ,0 } }; +const int expect_cpu1[2 ][2 ] = { {0 ,20 }, {0 ,20 } }; +int port_off =2 , tries =5 , ret;test_control_single ();test_control_group (); -test_datapath (PACKET_FANOUT_HASH , expect_hash[0 ], expect_hash[1 ]); -test_datapath (PACKET_FANOUT_HASH |PACKET_FANOUT_FLAG_ROLLOVER , - expect_hash_rb[0 ], expect_hash_rb[1 ]); -test_datapath (PACKET_FANOUT_ROLLOVER , expect_rb[0 ], expect_rb[1 ]); +/* find a set of ports that do not collide onto the same socket */ + ret =test_datapath (PACKET_FANOUT_HASH , port_off, + expect_hash[0 ], expect_hash[1 ]); +while (ret && tries--) { +fprintf (stderr,"info: trying alternate ports (%d)\n" , tries); + ret =test_datapath (PACKET_FANOUT_HASH , ++port_off, + expect_hash[0 ], expect_hash[1 ]); + } + + ret |=test_datapath (PACKET_FANOUT_HASH |PACKET_FANOUT_FLAG_ROLLOVER , + port_off, expect_hash_rb[0 ], expect_hash_rb[1 ]); + ret |=test_datapath (PACKET_FANOUT_LB , + port_off, expect_lb[0 ], expect_lb[1 ]); + ret |=test_datapath (PACKET_FANOUT_ROLLOVER , + port_off, expect_rb[0 ], expect_rb[1 ]); + +set_cpuaffinity (0 ); + ret |=test_datapath (PACKET_FANOUT_CPU , port_off, + expect_cpu0[0 ], expect_cpu0[1 ]); +if (!set_cpuaffinity (1 )) +/* TODO: test that choice alternates with previous */ + ret |=test_datapath (PACKET_FANOUT_CPU , port_off, + expect_cpu1[0 ], expect_cpu1[1 ]); + +if (ret) +return 1 ;printf ("OK. All tests passed\n" );return 0 ;
Signature · 1 line
1.8.1.3
David Miller
maintainerRe: [PATCH net-next] net: fix psock_fanout selftest hash collision
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400
Quoted 7 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Signed-off-by Willem de Bruijn <[email protected]>
Applied, thanks. I'll retest on my sparc64 box later today.
David Miller
maintainerRe: [PATCH net-next] net: fix psock_fanout selftest hash collision
From: David Miller <[email protected]>
Date: Wed, 20 Mar 2013 12:33:44 -0400 (EDT)
Quoted 6 lines
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400Quoted 3 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.
Quoted 6 lines
Quoted 4 lines
Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Signed-off-by Willem de Bruijn <[email protected]>Applied, thanks. I'll retest on my sparc64 box later today.
Unfortunately, it's still broken there:
--------------------
running psock_fanout test
--------------------
test: control single socket
test: control multiple sockets
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (4)
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (3)
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (2)
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (1)
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (0)
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
test: datapath 0x1000
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,15
ERROR: incorrect queue lengths
test: datapath 0x1
info: count=0,0, expect=0,0
info: count=0,0, expect=10,10
ERROR: incorrect queue lengths
info: count=0,0, expect=18,17
ERROR: incorrect queue lengths
test: datapath 0x3
info: count=0,0, expect=0,0
info: count=0,0, expect=20,0
ERROR: incorrect queue lengths
info: count=0,0, expect=20,15
ERROR: incorrect queue lengths
test: datapath 0x2
info: count=0,0, expect=0,0
info: count=0,0, expect=20,0
ERROR: incorrect queue lengths
info: count=0,0, expect=20,0
ERROR: incorrect queue lengths
test: datapath 0x2
info: count=0,0, expect=0,0
info: count=0,0, expect=0,20
ERROR: incorrect queue lengths
info: count=0,0, expect=0,20
ERROR: incorrect queue lengths [FAIL]
Re: [PATCH net-next] net: fix psock_fanout selftest hash collision
Quoted 9 lines · David Miller
From: David Miller <[email protected]>
Date: Wed, 20 Mar 2013 12:33:44 -0400 (EDT)Quoted 6 lines
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400Quoted 3 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Signed-off-by Willem de Bruijn <[email protected]>Applied, thanks. I'll retest on my sparc64 box later today.
Unfortunately, it's still broken there:
This looks like a new problem. Now the counters all stay zero.
I am looking into it. I have not been able to reproduce this on my x86_64 so far, so just brought a sparc32 up in qemu. Had less luck with sparc64, but impressive that it works at all. Come to think of it, is this a 64-bit kernel with 32-bit userland? Perhaps that affects packet ring memory layout.
Quoted 77 lines
--------------------
runningpsock_fanouttest
--------------------
test: control single socket
test: control multiple sockets
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (4)
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (3)
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (2)
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (1)
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (0)
test: datapath0x0
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,5
ERROR: incorrect queue lengths
test: datapath0x1000
info: count=0,0, expect=0,0
info: count=0,0, expect=15,5
ERROR: incorrect queue lengths
info: count=0,0, expect=20,15
ERROR: incorrect queue lengths
test: datapath0x1
info: count=0,0, expect=0,0
info: count=0,0, expect=10,10
ERROR: incorrect queue lengths
info: count=0,0, expect=18,17
ERROR: incorrect queue lengths
test: datapath0x3
info: count=0,0, expect=0,0
info: count=0,0, expect=20,0
ERROR: incorrect queue lengths
info: count=0,0, expect=20,15
ERROR: incorrect queue lengths
test: datapath0x2
info: count=0,0, expect=0,0
info: count=0,0, expect=20,0
ERROR: incorrect queue lengths
info: count=0,0, expect=20,0
ERROR: incorrect queue lengths
test: datapath0x2
info: count=0,0, expect=0,0
info: count=0,0, expect=0,20
ERROR: incorrect queue lengths
info: count=0,0, expect=0,20
ERROR: incorrect queue lengths [FAIL]
David Miller
maintainerRe: [PATCH net-next] net: fix psock_fanout selftest hash collision
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 20:07:21 -0400
Quoted 2 lines
Come to think of it, is this a 64-bit kernel with 32-bit userland? Perhaps that affects packet ring memory layout.
Yes, it is.
Re: [PATCH net-next] net: fix psock_fanout selftest hash collision
In reply to Willem de BruijnQuoted 19 lines · Willem de Bruijn
Quoted 9 lines · David Miller
From: David Miller <[email protected]>
Date: Wed, 20 Mar 2013 12:33:44 -0400 (EDT)Quoted 6 lines
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400Quoted 3 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Signed-off-by Willem de Bruijn <[email protected]>Applied, thanks. I'll retest on my sparc64 box later today.
Unfortunately, it's still broken there:
Quoted 7 lines
This looks like a new problem. Now the counters all stay zero.
I am looking into it. I have not been able to reproduce this on my
x86_64so far, so just brought a sparc32 up in qemu. Had less luck with sparc64, but impressive that it works at all. Come to think of it, is this a 64-bit kernel with 32-bit userland? Perhaps that affects packet ring memory layout.
That can affect the ring buffer in case of TPACKET_V1, which is default if not specified otherwise. See Documentation/networking/packet_mmap.txt +514
Re: [PATCH net-next] net: fix psock_fanout selftest hash collision
Quoted 34 lines · Daniel Borkmann
Quoted 24 lines · Willem de Bruijn
Quoted 13 lines · David Miller
From: David Miller <[email protected]>
Date: Wed, 20 Mar 2013 12:33:44 -0400 (EDT)Quoted 9 lines
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400Quoted 6 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Willem de Bruijn <[email protected]>Applied, thanks. I'll retest on my sparc64 box later today.
Unfortunately, it's still broken there:
Quoted 7 lines
This looks like a new problem. Now the counters all stay zero.
I am looking into it. I have not been able to reproduce this on my
x86_64so far, so just brought a sparc32 up in qemu. Had less luck with sparc64, but impressive that it works at all. Come to think of it, is this a 64-bit kernel with 32-bit userland? Perhaps that affects packet ring memory layout.
Quoted 3 lines
That can affect the ring buffer in case of
TPACKET_V1, which is default if not specified otherwise. SeeDocumentation/networking/packet_mmap.txt+514
Thanks, Daniel. In that case, the following should fix it. Unfortunately, I don't have the hardware to verify, but it still passes on my platforms. Let me know if you prefer it as a regular patch instead of inline.
(quoted diff) +0 -0
b/tools/testing/selftests/net/psock_fanout.c
index 226e5e3..59bd636 100644
tools/testing/selftests/net/psock_fanout.c +7 -1
@@ -182,7 +182,13 @@ static char *sock_fanout_open_ring(int fd) .tp_frame_nr = RING_NUM_FRAMES, };char *ring; +int val =TPACKET_V2 ; +if (setsockopt (fd,SOL_PACKET ,PACKET_VERSION , (void *) &val, +sizeof (val))) { +perror ("packetsock ring setsockopt version" ); +exit (1 ); + }if (setsockopt (fd,SOL_PACKET ,PACKET_RX_RING , (void *) &req,sizeof (req))) {perror ("packetsock ring setsockopt" );
@@ -201,7 +207,7 @@ static char *sock_fanout_open_ring(int fd)static int sock_fanout_read_ring (int fd,void *ring) { -struct tpacket_hdr *header = ring; +struct tpacket2_hdr *header = ring;int count =0 ;while (header->tp_status &TP_STATUS_USER && count <RING_NUM_FRAMES ) {
David Miller
maintainerRe: [PATCH net-next] net: fix psock_fanout selftest hash collision
From: Willem de Bruijn <[email protected]>
Date: Thu, 21 Mar 2013 13:27:51 -0400
Quoted 2 lines
Unfortunately, I don't have the hardware to verify, but it still passes on my platforms.
I think you do, simply build your test program with "gcc -m32" and run it on your x86_64 machine.
But in any event I'll test your change too.
Re: [PATCH net-next] net: fix psock_fanout selftest hash collision
In reply to Willem de BruijnQuoted 31 lines · Willem de Bruijn
Quoted 30 lines · Daniel Borkmann
Quoted 27 lines · Willem de Bruijn
Quoted 10 lines · David Miller
From: David Miller <[email protected]>
Date: Wed, 20 Mar 2013 12:33:44 -0400 (EDT)Quoted 6 lines
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400Quoted 3 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Signed-off-by Willem de Bruijn <[email protected]>Applied, thanks. I'll retest on my sparc64 box later today.
Unfortunately, it's still broken there:
This looks like a new problem. Now the counters all stay zero.
I am looking into it. I have not been able to reproduce this on my
x86_64so far, so just brought a sparc32 up in qemu. Had less luck with sparc64, but impressive that it works at all. Come to think of it, is this a 64-bit kernel with 32-bit userland? Perhaps that affects packet ring memory layout.
Quoted 8 lines
Quoted 3 lines
That can affect the ring buffer in case of
TPACKET_V1, which is default if not specified otherwise. SeeDocumentation/networking/packet_mmap.txt+514Thanks, Daniel. In that case, the following should fix it. Unfortunately, I don't have the hardware to verify, but it still passes on my platforms. Let me know if you prefer it as a regular patch instead of inline.
I can only tell you about x86_64: [PASS], although two ERRORs:
running psock_fanout test
--------------------
test: control single socket
test: control multiple sockets
test: datapath 0x0
info: count=0,0, expect=0,0
info: count=20,0, expect=15,5
ERROR: incorrect queue lengths
info: count=20,0, expect=20,5
ERROR: incorrect queue lengths
info: trying alternate ports (4)
test: datapath 0x0
[...]
OK. All tests passed
[PASS]
Re: [PATCH net-next] net: fix psock_fanout selftest hash collision
Quoted 47 lines · Daniel Borkmann
Quoted 46 lines · Willem de Bruijn
Quoted 41 lines · Daniel Borkmann
Quoted 26 lines · Willem de Bruijn
Quoted 14 lines · David Miller
From: David Miller <[email protected]>
Date: Wed, 20 Mar 2013 12:33:44 -0400 (EDT)Quoted 9 lines
From: Willem de Bruijn <[email protected]>
Date: Wed, 20 Mar 2013 02:42:44 -0400Quoted 6 lines
Fix flaky results with
PACKET_FANOUT_HASHdepending on whether the two flows hash into the same packet socket or not.Also adds tests for
PACKET_FANOUT_LBandPACKET_FANOUT_CPUand replaces the counting method with a packet ring.Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Willem de Bruijn <[email protected]>Applied, thanks. I'll retest on my sparc64 box later today.
Unfortunately, it's still broken there:
Quoted 7 lines
This looks like a new problem. Now the counters all stay zero.
I am looking into it. I have not been able to reproduce this on my
x86_64so far, so just brought a sparc32 up in qemu. Had less luck with sparc64, but impressive that it works at all. Come to think of it, is this a 64-bit kernel with 32-bit userland? Perhaps that affects packet ring memory layout.That can affect the ring buffer in case of
TPACKET_V1, which is default if not specified otherwise. SeeDocumentation/networking/packet_mmap.txt+514
Quoted 7 lines
Quoted 4 lines
Thanks, Daniel. In that case, the following should fix it. Unfortunately, I don't have the hardware to verify, but it still passes on my platforms. Let me know if you prefer it as a regular patch instead of inline.
I can only tell you about
x86_64: [PASS],
Thanks for testing.
Quoted 1 line
although two ERRORs:
That is due to a workaround for probing sockets whose rxhashes map onto different packet sockets in the test. The current approach tries up to N (is 5) times until we find a pair of connections that map onto the different queues. These ERRORS are from a previous try that failed. Warning would be a better name.
But the whole workaround is not very good, as it only reduces flaky failures, not fix them. Worst case, if the hash is uniformly random, then for two packet sockets there's a 1/2 chance on every try that the two connections hit the same socket, so a 1/(2^N) chance that the test gives up and fails. I haven't found a better solution yet to generate a pair of sockets that always hash onto the different sockets.
Quoted 17 lines
running
psock_fanouttest
--------------------
test: control single socket
test: control multiple sockets
test: datapath0x0
info: count=0,0, expect=0,0
info: count=20,0, expect=15,5
ERROR: incorrect queue lengths
info: count=20,0, expect=20,5ERROR: incorrect queue lengths
info: trying alternate ports (4)
test: datapath0x0
[...]
OK. All tests passed
[PASS]
David Miller
maintainerRe: [PATCH net-next] net: fix psock_fanout selftest hash collision
In reply to Willem de BruijnFrom: Willem de Bruijn <[email protected]>
Date: Thu, 21 Mar 2013 13:27:51 -0400
tools/testing/selftests/net/psock_fanout.c static char *sock_fanout_open_ring(int fd) · line 187
Quoted 7 lines
tools/testing/selftests/net/psock_fanout.c +2
-0@@ -182,7 +182,13 @@ static char *sock_fanout_open_ring(int fd) .tp_frame_nr = RING_NUM_FRAMES, };char *ring; +int val =TPACKET_V2 ; + if (setsockopt(fd, SOL_PACKET, PACKET_VERSION, (void *) &val,
This whole patch is whitespace damaged.
David Miller
maintainerRe: [PATCH net-next] net: fix psock_fanout selftest hash collision
From: David Miller <[email protected]>
Date: Thu, 21 Mar 2013 13:49:14 -0400 (EDT)
Quoted 9 lines
From: Willem de Bruijn <[email protected]>
Date: Thu, 21 Mar 2013 13:27:51 -0400Quoted 6 lines
tools/testing/selftests/net/psock_fanout.c +1
-0@@ -182,7 +182,13 @@ static char *sock_fanout_open_ring(int fd) .tp_frame_nr = RING_NUM_FRAMES, };char *ring; +int val =TPACKET_V2 ;
Quoted 3 lines
tools/testing/selftests/net/psock_fanout.c static char *sock_fanout_open_ring(int fd) · line 187
Quoted 1 line
tools/testing/selftests/net/psock_fanout.c +1
-0+ if (setsockopt(fd, SOL_PACKET, PACKET_VERSION, (void *) &val,This whole patch is whitespace damaged.
I hand applied this patch and it makes the test pass on sparc64.
Please submit this formally, thanks.
Re: [PATCH net-next] net: fix psock_fanout selftest hash collision
Quoted 15 lines · David Miller
From: David Miller <[email protected]>
Date: Thu, 21 Mar 2013 13:49:14 -0400 (EDT)Quoted 12 lines
From: Willem de Bruijn <[email protected]>
Date: Thu, 21 Mar 2013 13:27:51 -0400tools/testing/selftests/net/psock_fanout.c static char *sock_fanout_open_ring(int fd) · line 187
Quoted 7 lines
tools/testing/selftests/net/psock_fanout.c +2
-0@@ -182,7 +182,13 @@ static char *sock_fanout_open_ring(int fd) .tp_frame_nr = RING_NUM_FRAMES, };char *ring; +int val =TPACKET_V2 ; + if (setsockopt(fd, SOL_PACKET, PACKET_VERSION, (void *) &val,This whole patch is whitespace damaged.
Sorry. I did not know that that happened with cut and paste into gmail.
Quoted 1 line
I hand applied this patch and it makes the test pass on sparc64.
Great. Thanks for testing.
Quoted 1 line
Please submit this formally, thanks.
Will follow up right away.
PATCH 1/1 net: fix psock_fanout on sparc64
The packetsocket fanout test uses a packet ring. Use TPACKET_V2 instead of TPACKET_V1 to work around a known 32/64 bit issue in the older ring that manifests on sparc64.
--- tools/testing/selftests/net/psock_fanout.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/testing/selftests/net/psock_fanout.c +7 -1
@@ -182,7 +182,13 @@ static char *sock_fanout_open_ring(int fd) .tp_frame_nr = RING_NUM_FRAMES, };char *ring; +int val =TPACKET_V2 ; +if (setsockopt (fd,SOL_PACKET ,PACKET_VERSION , (void *) &val, +sizeof (val))) { +perror ("packetsock ring setsockopt version" ); +exit (1 ); + }if (setsockopt (fd,SOL_PACKET ,PACKET_RX_RING , (void *) &req,sizeof (req))) {perror ("packetsock ring setsockopt" );
@@ -201,7 +207,7 @@ static char *sock_fanout_open_ring(int fd)static int sock_fanout_read_ring (int fd,void *ring) { -struct tpacket_hdr *header = ring; +struct tpacket2_hdr *header = ring;int count =0 ;while (header->tp_status &TP_STATUS_USER && count <RING_NUM_FRAMES ) {
Signature · 1 line
1.8.1.3
Re: [PATCH net-next] net: fix psock_fanout on sparc64
From: Willem de Bruijn <[email protected]>
Date: Thu, 21 Mar 2013 14:10:03 -0400
Quoted 5 lines
The packetsocket fanout test uses a packet ring. Use
TPACKET_V2instead ofTPACKET_V1to work around a known 32/64 bit issue in the older ring that manifests on sparc64.Signed-off-by Willem de Bruijn <[email protected]>
Applied, thanks.