Commit 7a973251 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-bpf-jit-fixes' 



Daniel Borkmann says:

====================
Two BPF fixes for s390

Found while testing some other work touching JITs.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1aff0c34 bad1926d

arch/s390/net/bpf_jit_comp.c

+2 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,8 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp) 
		insn_count = bpf_jit_insn(jit, fp, i);

		if (insn_count < 0)

			return -1;

		jit->addrs[i + 1] = jit->prg; /* Next instruction address */

		/* Next instruction address */

		jit->addrs[i + insn_count] = jit->prg;

	}

	bpf_jit_epilogue(jit);

tools/build/feature/test-bpf.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#  define __NR_bpf 280

# elif defined(__sparc__)

#  define __NR_bpf 349

# elif defined(__s390__)

#  define __NR_bpf 351

# else

#  error __NR_bpf not defined. libbpf does not support your arch.

# endif

tools/lib/bpf/bpf.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#  define __NR_bpf 280

# elif defined(__sparc__)

#  define __NR_bpf 349

# elif defined(__s390__)

#  define __NR_bpf 351

# else

#  error __NR_bpf not defined. libbpf does not support your arch.

# endif