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

Commit 5082dfb7 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

PPC: net: bpf_jit_comp: add VLAN instructions for BPF JIT 



This patch is a follow-up for patch "net: filter: add vlan tag access"
to support the new VLAN_TAG/VLAN_TAG_PRESENT accessors in BPF JIT.

Signed-off-by: default avatarDaniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
Cc: Matt Evans <matt@ozlabs.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarMatt Evans <matt@ozlabs.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02871903

arch/powerpc/net/bpf_jit_comp.c

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <asm/cacheflush.h>

#include <linux/netdevice.h>

#include <linux/filter.h>

#include <linux/if_vlan.h>



#include "bpf_jit.h"



#ifndef __BIG_ENDIAN
@@ -89,6 +91,8 @@ static void bpf_jit_build_prologue(struct sk_filter *fp, u32 *image, 
	case BPF_S_ANC_IFINDEX:

	case BPF_S_ANC_MARK:

	case BPF_S_ANC_RXHASH:

	case BPF_S_ANC_VLAN_TAG:

	case BPF_S_ANC_VLAN_TAG_PRESENT:

	case BPF_S_ANC_CPU:

	case BPF_S_ANC_QUEUE:

	case BPF_S_LD_W_ABS:
@@ -382,6 +386,16 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image, 
			PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,

							  rxhash));

			break;

		case BPF_S_ANC_VLAN_TAG:

		case BPF_S_ANC_VLAN_TAG_PRESENT:

			BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);

			PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,

							  vlan_tci));

			if (filter[i].code == BPF_S_ANC_VLAN_TAG)

				PPC_ANDI(r_A, r_A, VLAN_VID_MASK);

			else

				PPC_ANDI(r_A, r_A, VLAN_TAG_PRESENT);

			break;

		case BPF_S_ANC_QUEUE:

			BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,

						  queue_mapping) != 2);