Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43bcf707 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf: fix _htons occurences in test_progs 



Dave reported that on sparc test_progs generates buggy swapped
eth->h_proto protocol comparisons:

  10: (15) if r3 == 0xdd86 goto pc+9
   R0=imm2,min_value=2,max_value=2 R1=pkt(id=0,off=0,r=14) R2=pkt_end R3=inv
   R4=pkt(id=0,off=14,r=14) R5=inv56 R10=fp

This is due to the unconditional ...

  #define htons __builtin_bswap16
  #define ntohs __builtin_bswap16

... in test_progs that causes this. Make use of asm/byteorder.h
and use __constant_htons() where possible and only perform the
bswap16 when on little endian in non-constant case.

Fixes: 6882804c ("selftests/bpf: add a test for overlapping packet range checks")
Fixes: 37821613 ("selftests/bpf: add l4 load balancer test based on sched_cls")
Reported-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d24f7c7f

tools/testing/selftests/bpf/bpf_util.h

+19 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,25 @@ 
#include <string.h>

#include <string.h>

#include <errno.h>

#include <errno.h>





#include <asm/byteorder.h>



#if __BYTE_ORDER == __LITTLE_ENDIAN

# define __bpf_ntohs(x)		__builtin_bswap16(x)

# define __bpf_htons(x)		__builtin_bswap16(x)

#elif __BYTE_ORDER == __BIG_ENDIAN

# define __bpf_ntohs(x)		(x)

# define __bpf_htons(x)		(x)

#else

# error "Fix your __BYTE_ORDER?!"

#endif



#define bpf_htons(x)				\

	(__builtin_constant_p(x) ?		\

	 __constant_htons(x) : __bpf_htons(x))

#define bpf_ntohs(x)				\

	(__builtin_constant_p(x) ?		\

	 __constant_ntohs(x) : __bpf_ntohs(x))



static inline unsigned int bpf_num_possible_cpus(void)

static inline unsigned int bpf_num_possible_cpus(void)

{

{

	static const char *fcpu = "/sys/devices/system/cpu/possible";

	static const char *fcpu = "/sys/devices/system/cpu/possible";

tools/testing/selftests/bpf/test_l4lb.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -19,9 +19,8 @@ 
#include <linux/udp.h>

#include <linux/udp.h>

#include "bpf_helpers.h"

#include "bpf_helpers.h"

#include "test_iptunnel_common.h"

#include "test_iptunnel_common.h"

#include "bpf_util.h"





#define htons __builtin_bswap16

#define ntohs __builtin_bswap16

int _version SEC("version") = 1;

int _version SEC("version") = 1;





static inline __u32 rol32(__u32 word, unsigned int shift)

static inline __u32 rol32(__u32 word, unsigned int shift)
@@ -355,7 +354,7 @@ static __always_inline int process_packet(void *data, __u64 off, void *data_end, 
		iph_len = sizeof(struct ipv6hdr);

		iph_len = sizeof(struct ipv6hdr);

		protocol = ip6h->nexthdr;

		protocol = ip6h->nexthdr;

		pckt.proto = protocol;

		pckt.proto = protocol;

		pkt_bytes = ntohs(ip6h->payload_len);

		pkt_bytes = bpf_ntohs(ip6h->payload_len);

		off += iph_len;

		off += iph_len;

		if (protocol == IPPROTO_FRAGMENT) {

		if (protocol == IPPROTO_FRAGMENT) {

			return TC_ACT_SHOT;

			return TC_ACT_SHOT;
@@ -377,7 +376,7 @@ static __always_inline int process_packet(void *data, __u64 off, void *data_end, 




		protocol = iph->protocol;

		protocol = iph->protocol;

		pckt.proto = protocol;

		pckt.proto = protocol;

		pkt_bytes = ntohs(iph->tot_len);

		pkt_bytes = bpf_ntohs(iph->tot_len);

		off += IPV4_HDR_LEN_NO_OPT;

		off += IPV4_HDR_LEN_NO_OPT;





		if (iph->frag_off & PCKT_FRAGMENTED)

		if (iph->frag_off & PCKT_FRAGMENTED)
@@ -464,9 +463,9 @@ int balancer_ingress(struct __sk_buff *ctx) 
	if (data + nh_off > data_end)

	if (data + nh_off > data_end)

		return TC_ACT_SHOT;

		return TC_ACT_SHOT;

	eth_proto = eth->eth_proto;

	eth_proto = eth->eth_proto;

	if (eth_proto == htons(ETH_P_IP))

	if (eth_proto == bpf_htons(ETH_P_IP))

		return process_packet(data, nh_off, data_end, false, ctx);

		return process_packet(data, nh_off, data_end, false, ctx);

	else if (eth_proto == htons(ETH_P_IPV6))

	else if (eth_proto == bpf_htons(ETH_P_IPV6))

		return process_packet(data, nh_off, data_end, true, ctx);

		return process_packet(data, nh_off, data_end, true, ctx);

	else

	else

		return TC_ACT_SHOT;

		return TC_ACT_SHOT;

tools/testing/selftests/bpf/test_pkt_access.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <linux/tcp.h>

#include <linux/tcp.h>

#include <linux/pkt_cls.h>

#include <linux/pkt_cls.h>

#include "bpf_helpers.h"

#include "bpf_helpers.h"

#include "bpf_util.h"





#define _htons __builtin_bswap16

#define barrier() __asm__ __volatile__("": : :"memory")

#define barrier() __asm__ __volatile__("": : :"memory")

int _version SEC("version") = 1;

int _version SEC("version") = 1;
@@ -32,7 +32,7 @@ int process(struct __sk_buff *skb) 
	if (eth + 1 > data_end)

	if (eth + 1 > data_end)

		return TC_ACT_SHOT;

		return TC_ACT_SHOT;





	if (eth->h_proto == _htons(ETH_P_IP)) {

	if (eth->h_proto == bpf_htons(ETH_P_IP)) {

		struct iphdr *iph = (struct iphdr *)(eth + 1);

		struct iphdr *iph = (struct iphdr *)(eth + 1);





		if (iph + 1 > data_end)

		if (iph + 1 > data_end)
@@ -40,7 +40,7 @@ int process(struct __sk_buff *skb) 
		ihl_len = iph->ihl * 4;

		ihl_len = iph->ihl * 4;

		proto = iph->protocol;

		proto = iph->protocol;

		tcp = (struct tcphdr *)((void *)(iph) + ihl_len);

		tcp = (struct tcphdr *)((void *)(iph) + ihl_len);

	} else if (eth->h_proto == _htons(ETH_P_IPV6)) {

	} else if (eth->h_proto == bpf_htons(ETH_P_IPV6)) {

		struct ipv6hdr *ip6h = (struct ipv6hdr *)(eth + 1);

		struct ipv6hdr *ip6h = (struct ipv6hdr *)(eth + 1);





		if (ip6h + 1 > data_end)

		if (ip6h + 1 > data_end)

tools/testing/selftests/bpf/test_progs.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -30,8 +30,6 @@ typedef __u16 __sum16; 
#include "test_iptunnel_common.h"

#include "test_iptunnel_common.h"

#include "bpf_util.h"

#include "bpf_util.h"





#define _htons __builtin_bswap16



static int error_cnt, pass_cnt;

static int error_cnt, pass_cnt;





#define MAGIC_BYTES 123

#define MAGIC_BYTES 123
@@ -42,10 +40,10 @@ static struct { 
	struct iphdr iph;

	struct iphdr iph;

	struct tcphdr tcp;

	struct tcphdr tcp;

} __packed pkt_v4 = {

} __packed pkt_v4 = {

	.eth.h_proto = _htons(ETH_P_IP),

	.eth.h_proto = bpf_htons(ETH_P_IP),

	.iph.ihl = 5,

	.iph.ihl = 5,

	.iph.protocol = 6,

	.iph.protocol = 6,

	.iph.tot_len = _htons(MAGIC_BYTES),

	.iph.tot_len = bpf_htons(MAGIC_BYTES),

	.tcp.urg_ptr = 123,

	.tcp.urg_ptr = 123,

};

};
@@ -55,9 +53,9 @@ static struct { 
	struct ipv6hdr iph;

	struct ipv6hdr iph;

	struct tcphdr tcp;

	struct tcphdr tcp;

} __packed pkt_v6 = {

} __packed pkt_v6 = {

	.eth.h_proto = _htons(ETH_P_IPV6),

	.eth.h_proto = bpf_htons(ETH_P_IPV6),

	.iph.nexthdr = 6,

	.iph.nexthdr = 6,

	.iph.payload_len = _htons(MAGIC_BYTES),

	.iph.payload_len = bpf_htons(MAGIC_BYTES),

	.tcp.urg_ptr = 123,

	.tcp.urg_ptr = 123,

};

};