Commit 64980441 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:
 "Two small fixes to selftests"

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  selftests/bpf: Fix selftest btf_tag/btf_type_tag_percpu_vmlinux_helper failure
  selftests/bpf: Fix bpf selftest build error
parents d2fec01e baa39c16

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

+3 −3
Original line number Diff line number Diff line
@@ -57,15 +57,15 @@ int BPF_PROG(test_percpu_load, struct cgroup *cgrp, const char *path) 
SEC("tp_btf/cgroup_mkdir")

int BPF_PROG(test_percpu_helper, struct cgroup *cgrp, const char *path)

{

	struct cgroup_rstat_cpu *rstat;

	struct css_rstat_cpu *rstat;

	__u32 cpu;



	cpu = bpf_get_smp_processor_id();

	rstat = (struct cgroup_rstat_cpu *)bpf_per_cpu_ptr(

	rstat = (struct css_rstat_cpu *)bpf_per_cpu_ptr(

			cgrp->self.rstat_cpu, cpu);

	if (rstat) {

		/* READ_ONCE */

		*(volatile int *)rstat;

		*(volatile long *)rstat;

	}



	return 0;

tools/testing/selftests/bpf/test_kmods/bpf_testmod.c

+3 −3
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ int bpf_testmod_fentry_ok; 


noinline ssize_t

bpf_testmod_test_read(struct file *file, struct kobject *kobj,

		      struct bin_attribute *bin_attr,

		      const struct bin_attribute *bin_attr,

		      char *buf, loff_t off, size_t len)

{

	struct bpf_testmod_test_read_ctx ctx = {
@@ -465,7 +465,7 @@ ALLOW_ERROR_INJECTION(bpf_testmod_test_read, ERRNO); 


noinline ssize_t

bpf_testmod_test_write(struct file *file, struct kobject *kobj,

		      struct bin_attribute *bin_attr,

		      const struct bin_attribute *bin_attr,

		      char *buf, loff_t off, size_t len)

{

	struct bpf_testmod_test_write_ctx ctx = {
@@ -567,7 +567,7 @@ static void testmod_unregister_uprobe(void) 


static ssize_t

bpf_testmod_uprobe_write(struct file *file, struct kobject *kobj,

			 struct bin_attribute *bin_attr,

			 const struct bin_attribute *bin_attr,

			 char *buf, loff_t off, size_t len)

{

	unsigned long offset = 0;