From patchwork Tue Sep 6 13:10:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101858 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp540680qgf; Tue, 6 Sep 2016 06:10:56 -0700 (PDT) X-Received: by 10.66.163.129 with SMTP id yi1mr6682180pab.47.1473167456189; Tue, 06 Sep 2016 06:10:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tj3si35407358pab.171.2016.09.06.06.10.55; Tue, 06 Sep 2016 06:10:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756062AbcIFNKy (ORCPT + 27 others); Tue, 6 Sep 2016 09:10:54 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:62968 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754857AbcIFNKw (ORCPT ); Tue, 6 Sep 2016 09:10:52 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MHpBF-1beFSk2wLV-003cV9; Tue, 06 Sep 2016 15:10:07 +0200 From: Arnd Bergmann To: "David S . Miller" , netdev@vger.kernel.org Cc: Alexei Starovoitov , Arnd Bergmann , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Alexei Starovoitov , linux-kernel@vger.kernel.org Subject: [PATCH, net-next] perf, bpf: fix conditional call to bpf_overflow_handler Date: Tue, 6 Sep 2016 15:10:22 +0200 Message-Id: <20160906131033.1784262-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:l2inFBxQG8TA1WlhJgTtATyb07vFYYBQ3vLrB/FRMxN2O//h6/d KX20M//rzPCkUwhQbUkFXQ9YZ0pziPLMRyRsAUaQ3ejcWXDy8XE9BfE5Ta9AH2e8ftUMtfe BwqTF3vpE/jvwpbLwXi9wKgexYjF+Hm18MaadG2fkxr5PEbmq2m7z4/u8EfH15YswIuTeJX 8t5BLcXyHp5ClfQvqdx4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y3K8iR/B0zw=:los9VkV2KJ+nCjZDfETF/J K9d2WcTu2jTF8nlwBBQqvgjr+FOvmrmXChCqUK6g8EXBOshivJPyHKM1klKl3TeP4O65CQ1Ev hMTaJmBG5RB3RrScoc8uA5TSBmxT1NLS8U9N4e//+HXgbdyZWfrmfIFOkrNiWABKpB+csPGu9 vhRfvOeuMnRZOsxa5fvy0MG7KuJT6c7CS0JVpVUbFWxuFNHx0OWaDPczzpOXc2rDuxzbh31ao vrooHaJXrBDaRWBYjTapwV8IHkCnIuE6ELvN99Wm4Ytd0reR0sWVGAM/ORbbr0G4LkPbA/wvU qV8CUi0K/JpPg87zbXDOrgb5wJaUkLp067B117ZncvULT/JIFeXeBKo42c7KvHv3GoGO3JDxO 6X3/qHoEDXC/y91lBBDUXw7DuGxj6H+nIrmB+/jX2gC4InncZcFTqRCl71SZdaEh5pFKIgQys cuknTlaIdE0PY1Cf4UewiqyY+5vomqbtAI5jq5KzjXWjdlEVxiZfdJhKxvTj1wJAOisrCL73u NPOjgNnNjrKEyapc73DoIz/A51PWorN7LBA+pQZEENZSlxiXIFbEE1UMoJBFltasyQvyhUPTr Vdouw6OuEux+n8Kkdx7ArcjBcRr/TcRDKLgif3rWURPCXHcqV/qu1NiZK0sHF/F6u736c5+CZ Vg7i7oupGpcXF5hU698CBPmu/kx9aNtDL2oETn6bf8pQOnw77EpnafMROfHHvqm59BP8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added bpf_overflow_handler function is only built of both CONFIG_EVENT_TRACING and CONFIG_BPF_SYSCALL are enabled, but the caller only checks the latter: kernel/events/core.c: In function 'perf_event_alloc': kernel/events/core.c:9106:27: error: 'bpf_overflow_handler' undeclared (first use in this function) This changes the caller so we also skip this call if CONFIG_EVENT_TRACING is disabled entirely. Signed-off-by: Arnd Bergmann Fixes: aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs") --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I'm not entirely sure if this is the correct solution, please check before applying -- 2.9.0 diff --git a/kernel/events/core.c b/kernel/events/core.c index 73d0c6ddfd5b..d3f6374326d8 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9110,7 +9110,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, if (!overflow_handler && parent_event) { overflow_handler = parent_event->overflow_handler; context = parent_event->overflow_handler_context; -#ifdef CONFIG_BPF_SYSCALL +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_EVENT_TRACING) if (overflow_handler == bpf_overflow_handler) { struct bpf_prog *prog = bpf_prog_inc(parent_event->prog);