From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751490AbdBMXdS (ORCPT ); Mon, 13 Feb 2017 18:33:18 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:59587 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751143AbdBMXdP (ORCPT ); Mon, 13 Feb 2017 18:33:15 -0500 Subject: Re: linux-next: build failure after merge of the net tree To: Stephen Rothwell , David Miller , Networking References: <20170214091250.57d054b2@canb.auug.org.au> CC: , , "Peter Zijlstra" , Ingo Molnar , "Arnaldo Carvalho de Melo" , Alexander Shishkin , Daniel Borkmann , Wang Nan , From: Alexei Starovoitov Message-ID: <58A241EC.8050400@fb.com> Date: Mon, 13 Feb 2017 15:31:56 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <20170214091250.57d054b2@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [2620:10d:c090:180::1:2d1] X-ClientProxiedBy: BN6PR1401CA0016.namprd14.prod.outlook.com (10.174.237.154) To BL2PR15MB0961.namprd15.prod.outlook.com (10.167.116.23) X-MS-Office365-Filtering-Correlation-Id: f5425330-55e1-4ae5-39a1-08d454688362 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BL2PR15MB0961; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB0961;3:wqKAmnnKD60Ic0CbBo9jNoSoGyKiN316W0zlvWQv/44iDDdQQ6uSJW0FEVNa3KCzzk1CkaceJLBLmayyDbbw4ghQ9MsaozHIdDPgGd26AqWi16YssZnow9LbRYbsA3xiq93uVXppy1mrciEQOTwG7ZGafQXE4o9sPeaIX1LkYJyywa1yLOJql4JCqck4EIsD7Hmj7ncKCWQbTaCY3CZ4O/cm3XOcS72xQFfdiDFz4MFLi481cMwY91n7NtlsNoqClz1Y6Cz6Zf1pRnNzdKJ5yw==;25:lAOcV5+s4TldrJFzDeXUcoiHbrYDaKQuvrm0t4vwBQMTpVHh2eZehhMd4zqp3aQP9UCZX0ZtVHWaDPMcoYbwveYvG/pIUlSvEVXCB0tlwVhXGCBJoAPyNZV7BuD6DNROXmNGxCQ1ecnU0SDU4gYmBilnmLfv/xtlRBJN+8bhceV979CLrYNquzwIrqWFu/Jyj34VMjHZTow6c9SKNluycpEpuUnkUJKt5MXrtb9fsXYEDB7uOy1WmSKiMS7Ii5pk5rK5ZTuwhRDYdTE5l1R+fmUmGN8AZdwLVphz/cxwH5rsZJk3TpL1HP7WbAWRkEYCE90zTBUc01YLNcPh6ERCsdke1yV1SlUB2s2hY4BEhBWEXmAKwv/oZxQjuA514PcwfrUTLb/eGStWidno84uoAIotFIe3TFdrxhAUNva3fYgnvf4mKiVDT793tq0CiCQv712B6+loQHfdEy7FVbiXfw== X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB0961;31:atAwC7OHETJ3meZGxPjxUHJlv27tpzPH9zmMV/cJk9LDKUu3lzQ5D4viI5J5SG5sj86h7VOgeFL3s7yxjR5LlVQ8hkZx1D/H5m/IP5J4rUUgsyOFjXTR5f6/vAhChopkdlNPvc3WCBiL1nljlqq401CNIZ8XMh7BohTeiHuTBB9SyWNsGPtIsq29Rgp7HSSBP87Bs2hkfY8B+064b9JTyNZRRdSV5ugC8IcsU9o2TWbmLJsYOWQMnkzZuJHTkwb3FS0mnSKfJGvBq8Vo4sxbsUTMNS3vj4FzVedquY0n1ns=;20:L5VVYkaJDxgpchtzz/7dOKGWY7M8Uttpo+ybPhjiiqNyvAWYS+/ut7CZ5uKRT5XYCWyU/NjJtf4ga3mrhBAkloPMibwoRe+qNksGX8nri/Jl2j8+BAw2JzpJ2Mls4JahH+pHPFRypukN/6OdQeuTl7tlLpE/92xe/3959av+J09I5pg+hqN8fiEn/2NEFlqgulaUyHbv9gaZw9arAHuxj2fw7XhHC3BX6LMjMvOGj2HFeFflzXQo5//2xXVBFxh6qo0Rt3t3ofVsvR4rtP8/INMUgIu7pCj11eDVRZHtLNaiYrSuWtuyB+9VC/EiZaYPxR8I2FugxePUVieLnxGESljvuMqk4MWtkEzcyVGo07klbww8LQZsCrhlmlN2BUpF5aDKJ42HZIXt09CrKquVSIiibCVDuBKFP6SnFlZYHb2sSfkfCtUyXTaroKEQMKBNlBV1m5BQtxsJZ8LsiaEH3GbQ2sVOIxB9O5dL2qNP/z3OH0tSLfMwC5dVPAPOelQ1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(20161123558025)(6072148);SRVR:BL2PR15MB0961;BCL:0;PCL:0;RULEID:;SRVR:BL2PR15MB0961; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB0961;4:FN0d6Kmor/zoDz8eDiublgldn89skS/diCmVkH7fdEryiBLcBXi1a4I3LWK4V3TVTAeorLOrzwV1twMOh3gNPnss+CCBgG2mf7OP24v74LwGCxnwNMbnm39+pKw54T1FgSOcDBqro73ux7Ek0hhDQ46ebKRGNJpQVrkvNznMRCXviJ80WYDcZ16B1TpyVi5QqV5iSNsGjIMpIPFIa7TX6GHz28mmghi09+EUl4t6oeuh6ZJfqs4I82txicAcKcmqmzsZUKv+yQsyAQY9jOOmiBiePy3SRJjOidCeFB5a00deVjOOG58Hb5WTulSAFyF2vcrcYTn9JQlbQyijWQvlaWclW/KNhTGF8Sq+4NjP0MlLxgi/TbepvbU+eA5eqJhYRqIPVaRgyIFP+2cC+lGPGAbOCU80VY/XugG+YVVEKnnB50jHqZD439fMwame03zU+5l10BsucQHU0w3jXjWGrFnebIeUjSeMA6LI4b46TaA3rSJdO7zTTzwZ+PlwM+IUJ+YGQJ8HEdonRIRVSkyCDfRkHA0RKGKlapQBvgmr4a+o2niFM4HnDeMW/rz3NL3RJgO7hLimEbk1swAqqafMBOfp9eDjbxzan9VdWis5fiI= X-Forefront-PRVS: 02176E2458 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(189002)(53754006)(377454003)(199003)(76114002)(51914003)(24454002)(101416001)(4326007)(50466002)(5890100001)(65806001)(25786008)(8676002)(2906002)(230700001)(54906002)(42186005)(6486002)(229853002)(6116002)(59896002)(87266999)(65816999)(50986999)(54356999)(76176999)(5660300001)(92566002)(64126003)(106356001)(105586002)(53936002)(81166006)(305945005)(575784001)(86362001)(68736007)(6666003)(97736004)(7736002)(6246003)(53546003)(65956001)(36756003)(47776003)(38730400002)(7416002)(23746002)(80316001)(189998001)(2950100002)(4001350100001)(81156014)(1706002)(83506001)(33656002)(81003)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB0961;H:[IPv6:2620:10d:c081:1110::10f9];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;BL2PR15MB0961;23:AYN8q1Wd0Xz8V6XfjRxgVTrIDZy/DWMKfuXSY?= =?Windows-1252?Q?tq1sajqG17JoQYKa8NVYzztl2pYQzNHIY0XM9XXPRv7t+fVL3Ar4N4ES?= =?Windows-1252?Q?vbAyXkufNE7gJ5/jDL4Ag/jtL736I/LDFfaU4tdUImuWNLJVJhJOuqf/?= =?Windows-1252?Q?fIvyA7l6copj67dnOQaLuShi/EXGtDUOiwimkVCQfaouCiHDZvi3S0Ja?= =?Windows-1252?Q?qMESpKU5uu+mqOW2UX9vUgP02K8bjVtEe8lVV8BMqPd1xr0YjzanB1Kb?= =?Windows-1252?Q?4Np6nci5VIehMY26JWvRRqn2rgbiu8koUA8GFY47iZunV044h1rK1sVb?= =?Windows-1252?Q?TXImUsZWqR4gXQ1sC7OjyL8YzqUyx7mYuVKJBlmn6IHgCd3qu3aBmRYP?= =?Windows-1252?Q?45XROYhg95ClHjJMQSTYNVpzJ+b2fZ1q1jjvb+bDouMaAWfoUfq4myH8?= =?Windows-1252?Q?srXC/FWWE3c9G+vQXm+fqOwUx4rMMiwju9x8Nr9frw302vuKemVtgX/6?= =?Windows-1252?Q?SX6aU8YqhQQYkcznRj7HQApqilW9aZn9LzmFyI4lkkJzHfej0wF4Hl7d?= =?Windows-1252?Q?/t/9TnhGWpRKecr7jSPJc3OqAu0osIKXtj6PSlk3HLv9Kjaa7pMdNGuD?= =?Windows-1252?Q?cz1/ZiL2D++IFqrEz0VjDJzAw+BIaBVSMLy2qA7DqnGv8Db10/MgEyGW?= =?Windows-1252?Q?X/prRck3jwQPEljvy5D6dIvxj5Rqpte2dvIbmcn1HW9a6xBfDmuLRwaV?= =?Windows-1252?Q?+/4byD+UTHcU28/RGGlqjWifX9xQkeFMkL8d8mZgKBSiGlMsjPsbIIBW?= =?Windows-1252?Q?qqpV18RQcVMeHJqCp7qxOXcFUUftHA6R+sKlQTo0r3VGscizG5I5sOmj?= =?Windows-1252?Q?jNhNJYiGM8EvBxW31xgMATRDGENCYDj2OhBPK1ExlcKeXjFAtoBVUO9R?= =?Windows-1252?Q?tgISzbbetIW51PaKXaU11aG1sPH/pi1UzuzUqKOtnqpNt0a7QDrF2EMb?= =?Windows-1252?Q?4HOcIMfgDRvvrWdD+1e3Nd4bAFlyIfJ4H5Gxgu5IRtiJ8pW/XvdKZ8Sj?= =?Windows-1252?Q?4MWCE7hLImODZ/S9ouelOzLXRPraoN45N8AT5FhgjedGVOIywXFy5b0q?= =?Windows-1252?Q?QZ7g2rbGj1dNl3CTEi6JCp1YUXuov8uL2uLaOiZko1SdJ/t+vp1pQs4L?= =?Windows-1252?Q?RqrpjKA6ALyZD2MJWcYtVNFf1JpU3al8g3pgPVe/KGYh7xvQrsj2MDw3?= =?Windows-1252?Q?MWyJ7M8TUTErb5a8Mciiq65yVexDAy5PAS4qZSIZGbjODx3fybZpYDV3?= =?Windows-1252?Q?CZmIvEcZDesQ1Kn2KsnGvdryEXxvGDZVJIXBAiAb5g3tEws1pL4Ksyjz?= =?Windows-1252?Q?pbfk8IHtLOwHqRmK8/RGPc/lBb4gVITHSKO0J6JVbchvhcU3vdwaRVBx?= =?Windows-1252?Q?gitlhth6AhIMHkPn0P4UWuCv22766ou980Jagl+sk44D30dYNipgIo+D?= =?Windows-1252?Q?vTIE6gBFOsm7UXg5T6ujNFMx+MUkLh1UCSTXvR2cNqpd7ANHv7QvRthj?= =?Windows-1252?Q?zwBYNW/vgYIOI24Y95tprRyaAl19Q7Gn97zXOT89lPMMwSgyMldPG8B6?= =?Windows-1252?B?QT09?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB0961;6:Y1kPIWJ1WEl6NF0ufM7to0jrNHSrzq9BzZn363QBUC9cP9B1/Lo/fNDgdlXpUyQgdKJeg3+fm3rb+BK/+zbZYTGHg1RbID3Xvvz4Vs/qD/eUmkblXlmNBTsH4wlxhuS1vZnRhNT4PrU1SrINH61TrevbZGnswQHuwiLvniYA/GabnIWs28yd8D4RbpmY52g5L3ghvaAjN/2Ac/itaGvqXqujW8iFjQ96M6xESYRo52bg1NNW5qC5vFujLUJ+qFiyRMP7gBzh2se94xHmXT4Z/7TcfEZEvvXgTSedCGPbUtb49WaS1NknSkUWgoZlawcMGgZNo9rxMKKBZWYBkEtUWMKlXRtDm1fSeXb6zT2OSiF/Q04CPJa56QcK7zG7Ky7Ghryw3jJd99MnR4pqQ/wuEA==;5:WjY2tGwRLxNgI8zUhUituIQJ1hIZSArMXc1DUKf8t5k5WwqNfXFP4oVDRQK/g4xPFAZaXENErArLnOoro9bP5LgfnkJf+XM7BijNErN0rJaykeWeMSp5r1yMjXMN7lK7pvXlogF04TMS0Fr+aw7YLA==;24:i+0PR8IMcxObl7+q2/tJLDDaD+j0uzcmk1m54SKcvoHzoS7pj9m8N9wXG2dmKbIdNIoRRSIUwaIjpSEgBocFQD4MDUg1Fsa4xkInQ77WFGk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB0961;7:SaoI9LaP/R7bUL9bv0iFhmAkOo2VhPZ+7YNZqpu7H8Cr2udKCFcpORU+EldbD9go5hoN6k9/9Qa9Eu2QV+aL5Pq2kSA7zAwn3VcVyvxlSEzsPgPiY5fl+/Xejmm5qzmGYubxjCh7fjActftOPX33R4yjZEH1k7DlzJZn5P+4PaFP18mXRM3DjvIPW9Xx8k+IBeuGZeDBL9LkXpEwGLHFOVk/uJ4bX01atNRtKLOrcLF88K1g8GaQAVT3qAbYV7ZYxSU+5Etac/nBIypExcIJzQtN0R7TABG+WI3iuPdoItZgse1sKU5mvk477kTCidjA+xft/7gk4cDhP5kCwNabo0Mu/lzd9OxjsehAeRH4ffHtA4QNwuLEd0Ni31Xc4Kq4uYN1e9jKMw7DuKmJZW1jBuFw5luJ3i1fzOamCflqluraVwj+sh01jNxJL/Tdb+VJz8Iwgp/Fv2P1BiOWa+CX79jwdNnXQYFCtGckM7Gb/W5nBC0+0yeEmojuChhiICXwzVSZXyO8uY3gP+bVyBCCng==;20:FBoqUykLdaTIEBMMtaggsAK1z5Gqq8xONS99I6bIgHSVDCgSgGsNOPKfN0dkGhvAh6M7UcQtdW6JwP0LBhSG0zxGs7LPWfUFCID2R0gQmS8k5bHB8Nbkmgeb3x48sR6jylRH7jO62eVaxLsF5vKEcYURSNSadmLvSM+bvnnFNwI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2017 23:32:00.5632 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB0961 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-13_12:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/13/17 2:12 PM, Stephen Rothwell wrote: > Hi all, > > After merging the net tree, today's linux-next build (powerpc64le perf) > failed like this: > > Warning: tools/include/uapi/linux/bpf.h differs from kernel > bpf.c: In function 'bpf_prog_attach': > bpf.c:180:6: error: 'union bpf_attr' has no member named 'attach_flags'; did you mean 'map_flags'? > attr.attach_flags = flags; > ^ > > Caused by commit > > 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag") > > Unfortunately, the perf header files are kept separate from the kernel > header files proper and are not automatically copied over :-( > > I have applied the following build fix patch for today. Yes. Thanks for the fix. It's more than a merge conflict. I should have added it in the first place. Now we have both perf and samples/bpf depend on tools/lib/bpf and I simply forgot about this dependency, since building perf is not my typical workflow. Joe, can you think of a way to make tools/lib/bpf to use tools/include only? Right now we just pull tools/lib/bpf/bpf.o in samples/bpf/Makefile and that's a hack that caused this issue. samples/bpf/ needs to depend on libbpf.a properly. For the patch: Acked-by: Alexei Starovoitov Dave, can you apply it to 'net' tree, since the patch properly made it into patchwork ? or I can resubmit it. Thanks! > From: Stephen Rothwell > Date: Tue, 14 Feb 2017 08:22:20 +1100 > Subject: [PATCH] bpf: kernel header files need to be copied into the tools directory > > Signed-off-by: Stephen Rothwell > --- > tools/include/uapi/linux/bpf.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h > index 0eb0e87dbe9f..d2b0ac799d03 100644 > --- a/tools/include/uapi/linux/bpf.h > +++ b/tools/include/uapi/linux/bpf.h > @@ -116,6 +116,12 @@ enum bpf_attach_type { > > #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE > > +/* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command > + * to the given target_fd cgroup the descendent cgroup will be able to > + * override effective bpf program that was inherited from this cgroup > + */ > +#define BPF_F_ALLOW_OVERRIDE (1U << 0) > + > #define BPF_PSEUDO_MAP_FD 1 > > /* flags for BPF_MAP_UPDATE_ELEM command */ > @@ -171,6 +177,7 @@ union bpf_attr { > __u32 target_fd; /* container object to attach to */ > __u32 attach_bpf_fd; /* eBPF program to attach */ > __u32 attach_type; > + __u32 attach_flags; > }; > } __attribute__((aligned(8))); > >