perf: stop using deprecated bpf APIs

.github/actions/debian/action.yml

@@ -0,0 +1,16 @@
+name: 'debian'
+description: 'Build'
+inputs:
+  target:
+    description: 'Run target'
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        source /tmp/ci_setup
+        bash -x $CI_ROOT/managers/debian.sh SETUP
+        bash -x $CI_ROOT/managers/debian.sh ${{ inputs.target }}
+        bash -x $CI_ROOT/managers/debian.sh CLEANUP
+      shell: bash
+

.github/actions/get_scripts/action.yml

@@ -0,0 +1,35 @@
+name: 'get_scripts'
+description: 'Partially checkout CI files onto build dir'
+inputs:
+  branch:
+    description: 'Branch'
+    required: false
+    default: 'master'
+  repo:
+    description: 'Repo'
+    required: false
+    default: 'https://github.com/libbpf/ci'
+  files:
+    description: 'Files to copy separated with space'
+    required: false
+    default: 'custom-workflows travis-ci'
+  destdir:
+    description: 'Destination of checkout'
+    required: false
+    default: './'
+runs:
+  using: "composite"
+  steps:
+    - name: Clone
+      run: |
+         # using nested actions not implemented https://github.com/actions/runner/pull/612
+         # so just plaint git clone
+         git clone -b ${{ inputs.branch }} ${{ inputs.repo }} /tmp/_temp_get_scripts
+      shell: bash
+    - name: Copy files
+      run: |
+        for f in ${{ inputs.files }};
+          do cp -a /tmp/_temp_get_scripts/$f ${{ inputs.destdir }}
+        done
+        rm -rf /tmp/_temp_get_scripts
+      shell: bash

.github/actions/setup/action.yml

@@ -0,0 +1,23 @@
+name: 'setup'
+description: 'setup env, create /tmp/ci_setup'
+runs:
+  using: "composite"
+  steps:
+    - id: variables
+      run: |
+        export REPO_ROOT=$GITHUB_WORKSPACE
+        export CI_ROOT=$REPO_ROOT/travis-ci
+        # this is somewhat ugly, but that is the easiest way to share this code with
+        # arch specific docker
+        echo 'echo ::group::Env setup' > /tmp/ci_setup
+        echo export DEBIAN_FRONTEND=noninteractive >> /tmp/ci_setup
+        echo sudo apt-get update >> /tmp/ci_setup
+        echo sudo apt-get install -y aptitude qemu-kvm zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev >> /tmp/ci_setup
+        echo export PROJECT_NAME='libbpf' >> /tmp/ci_setup
+        echo export AUTHOR_EMAIL="$(git log -1 --pretty=\"%aE\")" >> /tmp/ci_setup
+        echo export REPO_ROOT=$GITHUB_WORKSPACE >> /tmp/ci_setup
+        echo export CI_ROOT=$REPO_ROOT/travis-ci >> /tmp/ci_setup
+        echo export VMTEST_ROOT=$CI_ROOT/vmtest >> /tmp/ci_setup
+        echo 'echo ::endgroup::' >> /tmp/ci_setup
+      shell: bash
+

.github/actions/vmtest/action.yml

@@ -0,0 +1,36 @@
+name: 'vmtest'
+description: 'Build + run vmtest'
+inputs:
+  kernel:
+    description: 'kernel version or LATEST'
+    required: true
+    default: 'LATEST'
+  kernel-rev:
+    description: 'CHECKPOINT or rev/tag/branch'
+    required: true
+    default: 'CHECKPOINT'
+  kernel-origin:
+    description: 'kernel repo'
+    required: true
+    default: 'https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git'
+  pahole:
+    description: 'pahole rev/tag/branch'
+    required: true
+    default: 'master'
+  pahole-origin:
+    description: 'pahole repo'
+    required: true
+    default: 'https://git.kernel.org/pub/scm/devel/pahole/pahole.git'
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        find ./ | grep travis
+        source /tmp/ci_setup
+        export KERNEL=${{ inputs.kernel }}
+        export KERNEL_BRANCH=${{ inputs.kernel-rev }}
+        export KERNEL_ORIGIN=${{ inputs.kernel-origin }}
+        export PAHOLE_BRANCH=${{ inputs.pahole }}
+        export PAHOLE_ORIGIN=${{ inputs.pahole-origin }}
+        $CI_ROOT/vmtest/run_vmtest.sh
+      shell: bash

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: bpf-ci
+
+on:
+  pull_request:
+
+concurrency: 
+  group: ci-test-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  vmtest:
+    runs-on: ubuntu-latest
+    name: Kernel ${{ matrix.kernel }} + selftests
+    env:
+      CHECKOUT_KERNEL: 0
+      SELFTEST_REPO_PATH: "."
+      SOURCE_FULLCOPY: 0
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - kernel: 'LATEST'
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+      - uses: ./.github/actions/setup
+        name: Setup
+      - uses: ./.github/actions/vmtest
+        name: vmtest
+        with:
+          kernel: ${{ matrix.kernel }}

custom-workflows/bpf/test.yml

@@ -0,0 +1,31 @@
+name: bpf-ci
+
+on:
+  pull_request:
+
+concurrency: 
+  group: ci-test-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  vmtest:
+    runs-on: ubuntu-latest
+    name: Kernel ${{ matrix.kernel }} + selftests
+    env:
+      CHECKOUT_KERNEL: 0
+      SELFTEST_REPO_PATH: "."
+      SOURCE_FULLCOPY: 0
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - kernel: 'LATEST'
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+      - uses: ./.github/actions/setup
+        name: Setup
+      - uses: ./.github/actions/vmtest
+        name: vmtest
+        with:
+          kernel: ${{ matrix.kernel }}

tools/perf/tests/bpf.c

@@ -281,28 +281,22 @@ static int __test__bpf(int idx)
 
 static int check_env(void)
 {
+	LIBBPF_OPTS(bpf_prog_load_opts, opts);
 	int err;
-	unsigned int kver_int;
 	char license[] = "GPL";
 
 	struct bpf_insn insns[] = {
 		BPF_MOV64_IMM(BPF_REG_0, 1),
 		BPF_EXIT_INSN(),
 	};
 
-	err = fetch_kernel_version(&kver_int, NULL, 0);
+	err = fetch_kernel_version(&opts.kern_version, NULL, 0);
 	if (err) {
 		pr_debug("Unable to get kernel version\n");
 		return err;
 	}
-
-/* temporarily disable libbpf deprecation warnings */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	err = bpf_load_program(BPF_PROG_TYPE_KPROBE, insns,
-			       ARRAY_SIZE(insns),
-			       license, kver_int, NULL, 0);
-#pragma GCC diagnostic pop
+	err = bpf_prog_load(BPF_PROG_TYPE_KPROBE, NULL, license, insns,
+			    ARRAY_SIZE(insns), &opts);
 	if (err < 0) {
 		pr_err("Missing basic BPF support, skip this test: %s\n",
 		       strerror(errno));

tools/perf/util/bpf-event.c

@@ -33,6 +33,19 @@ struct btf * __weak btf__load_from_kernel_by_id(__u32 id)
        return err ? ERR_PTR(err) : btf;
 }
 
+int __weak bpf_prog_load(enum bpf_prog_type prog_type,
+			 const char *prog_name __maybe_unused,
+			 const char *license,
+			 const struct bpf_insn *insns, size_t insn_cnt,
+			 const struct bpf_prog_load_opts *opts)
+{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+	return bpf_load_program(prog_type, insns, insn_cnt, license,
+				opts->kern_version, opts->log_buf, opts->log_size);
+#pragma GCC diagnostic pop
+}
+
 struct bpf_program * __weak
 bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)
 {