Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754574AbbDGQSO (ORCPT ); Tue, 7 Apr 2015 12:18:14 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:33891 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753058AbbDGQSL (ORCPT ); Tue, 7 Apr 2015 12:18:11 -0400 Message-ID: <55240342.9050900@plumgrid.com> Date: Tue, 07 Apr 2015 09:18:10 -0700 From: Alexei Starovoitov User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Daniel Borkmann , 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> In-Reply-To: <5523BBE0.8030400@iogearbox.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1944 Lines: 52 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' Thanks Stephen! -- 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/