Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933189AbbDOB0D (ORCPT ); Tue, 14 Apr 2015 21:26:03 -0400 Received: from ozlabs.org ([103.22.144.67]:54475 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932303AbbDOBZz (ORCPT ); Tue, 14 Apr 2015 21:25:55 -0400 Date: Wed, 15 Apr 2015 11:25:49 +1000 From: Stephen Rothwell To: Daniel Borkmann , davem@davemloft.net Cc: Alexei Starovoitov , 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 , Subject: Re: linux-next: build failure after merge of the tip tree Message-ID: <20150415112549.173f49ab@canb.auug.org.au> In-Reply-To: <20150408150327.313be6a3@canb.auug.org.au> 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> <552435DD.5040802@iogearbox.net> <20150408150327.313be6a3@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/GNefAMD9wSJcs.WOzYElYKP"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3753 Lines: 105 --Sig_/GNefAMD9wSJcs.WOzYElYKP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 8 Apr 2015 15:03:27 +1000 Stephen Rothwell w= rote: > > Hi all, >=20 > On Tue, 07 Apr 2015 21:54:05 +0200 Daniel Borkmann = wrote: > > > > 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 !=3D BPF_PROG_TYPE_KPROBE) { > > >>>>>> ^ > > >>>>>> > > >>>>>> Caused by commit 2541517c32be ("tracing, perf: Implement BPF pro= grams > > >>>>>> attached to kprobes"). > > >>>>> > > >>>>> Note, this must be some (rarely triggered) aspect of the ppc64 > > >>>>> defconfig that neither x86 randconfigs nor most other arch defcon= figs > > >>>>> 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 sh= rink > > >>>> bpf_prog_aux"). I believe that is why it didn't trigger on tip tre= e. > > >>>> > > >>>> You should be able to resolve it in linux-next by changing the tes= t to: > > >>>> > > >>>> if (prog->prog_type !=3D BPF_PROG_TYPE_KPROBE) { > > >>> > > >>> Thanks Daniel, I will do that tomorrow. Someone will have to remem= ber > > >>> 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 !=3D BPF_PROG_TYPE_KPROBE) { > > > + if (prog->type !=3D BPF_PROG_TYPE_KPROBE) { > > > instead of 'prog->prog_type' > >=20 > > Yes, absolutely, thanks! >=20 > So I have applied that as a merge fix patch. This patch is now needed when the net-next tree is merged with Linus' tree. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/GNefAMD9wSJcs.WOzYElYKP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVLb4hAAoJEMDTa8Ir7ZwVNIwP/RMbTqat1w8CyidQYHpIar8N 7vVcB5NXwRK14Sv7ftXU1lG5pJz9c6jP5mZJVSFR6RJCZuJdyab/1JPkMbPbi+m0 b18an+L5GwdJYhSKlei0rHqJLt70YrMoGHN30NMzJwk2EHaGKXd/+ldxMQ8uhKyA ftd4jwrkKEDOA8Ufxc1STZknO1WBB6+j4XO1bwnt2g9qBohS/TKoCV0USRIkdFtF wb4ljdZEf98Hnh+igoMk7igoQbxMxFgzLatq8yYGQNCLJBA8qnhNW4Y+hbqnKXSJ +I6Rn9mDU3cVDE4IUvL8/Gbh1leG7CtWaIZRNAVlo8RMwYxhq1Taz/Itrq9V2RSJ aJxf/4rhv3vImOsTQntLoWjyOQVZWLl4D0m472/X3/JNX9x1mLfFEQNn5CuMG8At z6JDelRi8LTMxxSXxUGZLTChdc65hUJ6g5usXc9EHpqB4gzIn91TxuFprP+CIVkg SJLRtIjcoOnbcp/oTG3NgGngUnHd5Y75wSPdLbTV0voGwa0xWKb9Ml/yf6lOs6GF rzCmgmUX5ccr483YfOynqmbOnkAXOZY/47IY7wf2FsFZUY0jw2A1yvskZDcYYyRO 79Gnu8Drg5YQQNTyyW+COV+GPo1cbUTCwwqnWceJtz2tIe7OEPKuysPciQQ7wOUh khAc6rIqom6pGHPUI+GW =hG+b -----END PGP SIGNATURE----- --Sig_/GNefAMD9wSJcs.WOzYElYKP-- -- 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/