Merge branch 's390-bpf-jit-fixes'

davem330 · davem330 · commit 7a97325191ee · 2017-08-04T11:18:01.000-07:00
Daniel Borkmann says:

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

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

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
@@ -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);
 
diff --git a/tools/build/feature/test-bpf.c b/tools/build/feature/test-bpf.c
@@ -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
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1253,7 +1253,8 @@ static int bpf_jit_prog(struct bpf_jit jit, struct bpf_prog fp)`
`1253`	`1253`	`insn_count = bpf_jit_insn(jit, fp, i);`
`1254`	`1254`	`if (insn_count < 0)`
`1255`	`1255`	`return -1;`
`1256`		`- jit->addrs[i + 1] = jit->prg; /* Next instruction address */`
	`1256`	`+ /* Next instruction address */`
	`1257`	`+ jit->addrs[i + insn_count] = jit->prg;`
`1257`	`1258`	`}`
`1258`	`1259`	`bpf_jit_epilogue(jit);`
`1259`	`1260`