Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753338AbbDGTyx (ORCPT ); Tue, 7 Apr 2015 15:54:53 -0400 Received: from www62.your-server.de ([213.133.104.62]:44441 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753018AbbDGTyv (ORCPT ); Tue, 7 Apr 2015 15:54:51 -0400 Message-ID: <552435DD.5040802@iogearbox.net> Date: Tue, 07 Apr 2015 21:54:05 +0200 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Alexei Starovoitov , Stephen Rothwell CC: Ingo Molnar , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Masami Hiramatsu , davem@davemloft.net Subject: Re: linux-next: build failure after merge of the tip tree References: <20150407171858.2ad46594@canb.auug.org.au> <20150407084829.GA9577@gmail.com> <55239BAD.6040304@iogearbox.net> <20150407190527.1633a186@canb.auug.org.au> <5523BBE0.8030400@iogearbox.net> <55240342.9050900@plumgrid.com> In-Reply-To: <55240342.9050900@plumgrid.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2052 Lines: 52 On 04/07/2015 06:18 PM, Alexei Starovoitov wrote: > On 4/7/15 4:13 AM, Daniel Borkmann wrote: >> [ Cc'ing Dave, fyi ] >> >> On 04/07/2015 11:05 AM, Stephen Rothwell wrote: >>> On Tue, 07 Apr 2015 10:56:13 +0200 Daniel Borkmann >>> wrote: >>>> On 04/07/2015 10:48 AM, Ingo Molnar wrote: >>>>> * Stephen Rothwell wrote: >>>>> >>>>>> After merging the tip tree, today's linux-next build (powerpc >>>>>> ppc64_defconfig) failed like this: >>>>>> >>>>>> kernel/events/core.c: In function 'perf_event_set_bpf_prog': >>>>>> kernel/events/core.c:6732:15: error: 'struct bpf_prog_aux' has no >>>>>> member named 'prog_type' >>>>>> if (prog->aux->prog_type != BPF_PROG_TYPE_KPROBE) { >>>>>> ^ >>>>>> >>>>>> Caused by commit 2541517c32be ("tracing, perf: Implement BPF programs >>>>>> attached to kprobes"). >>>>> >>>>> Note, this must be some (rarely triggered) aspect of the ppc64 >>>>> defconfig that neither x86 randconfigs nor most other arch defconfigs >>>>> expose? >>>> >>>> Note, this is a merge conflict with the work that went via net-next >>>> tree, >>>> i.e. 24701ecea76b ("ebpf: move read-only fields to bpf_prog and shrink >>>> bpf_prog_aux"). I believe that is why it didn't trigger on tip tree. >>>> >>>> You should be able to resolve it in linux-next by changing the test to: >>>> >>>> if (prog->prog_type != BPF_PROG_TYPE_KPROBE) { >>> >>> Thanks Daniel, I will do that tomorrow. Someone will have to remember >>> to tell Linus. >> >> Yes, indeed, depending which tree is merged first. > > Daniel analysis is correct, but the fix for kernel/events/core.c > should be: > - if (prog->aux->prog_type != BPF_PROG_TYPE_KPROBE) { > + if (prog->type != BPF_PROG_TYPE_KPROBE) { > instead of 'prog->prog_type' Yes, absolutely, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/