Skip to content

Commit

Permalink
tools: psock_tpacket: block Rx until socket filter has been added and…
Browse files Browse the repository at this point in the history
… socket has been bound to loopback.

Packets from any/all interfaces may be queued up on the PF_PACKET socket
before it is bound to the loopback interface by psock_tpacket, and
when these are passed up by the kernel, they could interfere
with the Rx tests.

Avoid interference from spurious packet by blocking Rx until the
socket filter has been set up, and the packet has been bound to the
desired (lo) interface. The effective sequence is
	socket(PF_PACKET, SOCK_RAW, 0);
	set up ring
	Invoke SO_ATTACH_FILTER
	bind to sll_protocol set to ETH_P_ALL, sll_ifindex for lo
After this sequence, the only packets that will be passed up are
those received on loopback that pass the attached filter.

Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
sowminiv authored and davem330 committed Jan 5, 2017
1 parent ad02c4f commit c1878f7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/testing/selftests/net/psock_tpacket.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static unsigned int total_packets, total_bytes;

static int pfsocket(int ver)
{
int ret, sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
int ret, sock = socket(PF_PACKET, SOCK_RAW, 0);
if (sock == -1) {
perror("socket");
exit(1);
Expand Down Expand Up @@ -239,7 +239,6 @@ static void walk_v1_v2_rx(int sock, struct ring *ring)
bug_on(ring->type != PACKET_RX_RING);

pair_udp_open(udp_sock, PORT_BASE);
pair_udp_setfilter(sock);

memset(&pfd, 0, sizeof(pfd));
pfd.fd = sock;
Expand Down Expand Up @@ -601,7 +600,6 @@ static void walk_v3_rx(int sock, struct ring *ring)
bug_on(ring->type != PACKET_RX_RING);

pair_udp_open(udp_sock, PORT_BASE);
pair_udp_setfilter(sock);

memset(&pfd, 0, sizeof(pfd));
pfd.fd = sock;
Expand Down Expand Up @@ -741,6 +739,8 @@ static void bind_ring(int sock, struct ring *ring)
{
int ret;

pair_udp_setfilter(sock);

ring->ll.sll_family = PF_PACKET;
ring->ll.sll_protocol = htons(ETH_P_ALL);
ring->ll.sll_ifindex = if_nametoindex("lo");
Expand Down

0 comments on commit c1878f7

Please sign in to comment.