Commit 531a62f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Pull bpf fixes from Alexei Starovoitov:

 - Fix BPF selftests expectations of assembler output and struct layout
   (Song Liu and Yonghong Song)

 - Fix XSK error code when queue is full (Wang Liang)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  selftests/bpf: Fix verifier_private_stack test failure
  selftests/bpf: Fix verifier_bpf_fastcall test
  selftests/bpf: Fix tests after fields reorder in struct file
  xsk: Fix __xsk_generic_xmit() error code when cq is full
parents 5a2b5cb7 3f8ad18f

net/xdp/xsk.c

+4 −1
Original line number Diff line number Diff line
@@ -806,8 +806,11 @@ static int __xsk_generic_xmit(struct sock *sk) 
		 * if there is space in it. This avoids having to implement

		 * any buffering in the Tx path.

		 */

		if (xsk_cq_reserve_addr_locked(xs->pool, desc.addr))

		err = xsk_cq_reserve_addr_locked(xs->pool, desc.addr);

		if (err) {

			err = -EAGAIN;

			goto out;

		}



		skb = xsk_build_skb(xs, &desc);

		if (IS_ERR(skb)) {

tools/testing/selftests/bpf/progs/test_module_attach.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int BPF_PROG(handle_fexit_ret, int arg, struct file *ret) 


	bpf_probe_read_kernel(&buf, 8, ret);

	bpf_probe_read_kernel(&buf, 8, (char *)ret + 256);

	*(volatile long long *)ret;

	*(volatile int *)ret;

	*(volatile int *)&ret->f_mode;

	return 0;

}

tools/testing/selftests/bpf/progs/test_subprogs_extable.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static __u64 test_cb(struct bpf_map *map, __u32 *key, __u64 *val, void *data) 
SEC("fexit/bpf_testmod_return_ptr")

int BPF_PROG(handle_fexit_ret_subprogs, int arg, struct file *ret)

{

	*(volatile long *)ret;

	*(volatile int *)ret;

	*(volatile int *)&ret->f_mode;

	bpf_for_each_map_elem(&test_array, test_cb, NULL, 0);

	triggered++;
@@ -31,7 +31,7 @@ int BPF_PROG(handle_fexit_ret_subprogs, int arg, struct file *ret) 
SEC("fexit/bpf_testmod_return_ptr")

int BPF_PROG(handle_fexit_ret_subprogs2, int arg, struct file *ret)

{

	*(volatile long *)ret;

	*(volatile int *)ret;

	*(volatile int *)&ret->f_mode;

	bpf_for_each_map_elem(&test_array, test_cb, NULL, 0);

	triggered++;
@@ -41,7 +41,7 @@ int BPF_PROG(handle_fexit_ret_subprogs2, int arg, struct file *ret) 
SEC("fexit/bpf_testmod_return_ptr")

int BPF_PROG(handle_fexit_ret_subprogs3, int arg, struct file *ret)

{

	*(volatile long *)ret;

	*(volatile int *)ret;

	*(volatile int *)&ret->f_mode;

	bpf_for_each_map_elem(&test_array, test_cb, NULL, 0);

	triggered++;

tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ SEC("raw_tp") 
__arch_x86_64

__log_level(4) __msg("stack depth 8")

__xlated("4: r5 = 5")

__xlated("5: w0 = ")

__xlated("5: r0 = ")

__xlated("6: r0 = &(void __percpu *)(r0)")

__xlated("7: r0 = *(u32 *)(r0 +0)")

__xlated("8: exit")
@@ -704,7 +704,7 @@ SEC("raw_tp") 
__arch_x86_64

__log_level(4) __msg("stack depth 32+0")

__xlated("2: r1 = 1")

__xlated("3: w0 =")

__xlated("3: r0 =")

__xlated("4: r0 = &(void __percpu *)(r0)")

__xlated("5: r0 = *(u32 *)(r0 +0)")

/* bpf_loop params setup */
@@ -753,7 +753,7 @@ __arch_x86_64 
__log_level(4) __msg("stack depth 40+0")

/* call bpf_get_smp_processor_id */

__xlated("2: r1 = 42")

__xlated("3: w0 =")

__xlated("3: r0 =")

__xlated("4: r0 = &(void __percpu *)(r0)")

__xlated("5: r0 = *(u32 *)(r0 +0)")

/* call bpf_get_prandom_u32 */

tools/testing/selftests/bpf/progs/verifier_private_stack.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ __description("Private stack, single prog") 
__success

__arch_x86_64

__jited("	movabsq	$0x{{.*}}, %r9")

__jited("	addq	%gs:0x{{.*}}, %r9")

__jited("	addq	%gs:{{.*}}, %r9")

__jited("	movl	$0x2a, %edi")

__jited("	movq	%rdi, -0x100(%r9)")

__naked void private_stack_single_prog(void)
@@ -74,7 +74,7 @@ __success 
__arch_x86_64

/* private stack fp for the main prog */

__jited("	movabsq	$0x{{.*}}, %r9")

__jited("	addq	%gs:0x{{.*}}, %r9")

__jited("	addq	%gs:{{.*}}, %r9")

__jited("	movl	$0x2a, %edi")

__jited("	movq	%rdi, -0x200(%r9)")

__jited("	pushq	%r9")
@@ -122,7 +122,7 @@ __jited(" pushq %rbp") 
__jited("	movq	%rsp, %rbp")

__jited("	endbr64")

__jited("	movabsq	$0x{{.*}}, %r9")

__jited("	addq	%gs:0x{{.*}}, %r9")

__jited("	addq	%gs:{{.*}}, %r9")

__jited("	pushq	%r9")

__jited("	callq")

__jited("	popq	%r9")