From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9CEEC433E0 for ; Thu, 4 Feb 2021 03:53:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68C5664F3C for ; Thu, 4 Feb 2021 03:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbhBDDxJ (ORCPT ); Wed, 3 Feb 2021 22:53:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231175AbhBDDxB (ORCPT ); Wed, 3 Feb 2021 22:53:01 -0500 Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 266BCC0613ED for ; Wed, 3 Feb 2021 19:52:21 -0800 (PST) Received: by mail-yb1-xb2f.google.com with SMTP id e132so1819528ybh.8 for ; Wed, 03 Feb 2021 19:52:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DTbQuqDgftJHyEjgUZ53qqE2GLvug2RthYORKONmJnA=; b=fKFmn6G4Gfcvpduh4jqVWeOKN+SFpsRhlVPOm6PDL8uJ4neFU13Qr37PqAiAKwknxr M3/axZFZaSNRvW2AoAkWw/pdu2JAEIy4U7Cxs8WuHXtv+Ket5yS9QE3QuoUUxEEIP0Mu ux7PvimGsRNvNxfYt4qnv7p5IiAJ/Kd80haGbuh6BfCH5eTRhj0peYdPSoGw3+HHsot3 sVzeQN2gMxpwCLZo1Du+HlAQxmJjmyDkxbnJkPccM4bugHS+NKzUhYztHvBvZw4zQqFH 6BtW4naZohotxE+Vk8xzPj25pwFuGtN38BsgadZn4vM0Pdgu1QXFpDONGGI+Uh4RpZma 4bjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DTbQuqDgftJHyEjgUZ53qqE2GLvug2RthYORKONmJnA=; b=dGflN07r26OaJTEDfZX+3UXXkX9W5zbZeCtPLhpRwibCKc/asQU+WY6YjQ8eqhKpto t4HQx3iVUVVYz3/TQARu2eXsV5EwuCqWyXsFtWsmVN/tfjDY1qNnfBk3dP7ra/CZ8N/s WvU0Qnx/EoiA5kZeRt6MTKjJo9/AZnE80ouLMit54TumRjMQoJ01byyfeGJ5dhVY15+g dRG5kdTGzSpxGRFNeQUcUoq4KYwOwxBlsT7ptSygwl7HsHboTM4nl9JhnMlhTGpgJBLa iMyEQWuwnuz3EC6GIE1nOsV1s7QmgaBdrdiOYUYUFbY/sVh5gaHRFGhoU8DODsMVlueW VV4w== X-Gm-Message-State: AOAM531x5GdZafnax/T6j7F6V+a04WK5a9vkv4q5DzzfLBQmEGXAMtvp qTt4QgQCKldihTfdyChVi/gg/vdSSTTyHo0t2zCxQw== X-Google-Smtp-Source: ABdhPJyrNWC8Z23u1QzxD8RKdn2OmMWUinNwzXsyuQIyMMWnQAyqlUiGmylA0J6AAajpbdZqAu71xsery3qJ/sAVDA4= X-Received: by 2002:a25:244:: with SMTP id 65mr9660395ybc.511.1612410739666; Wed, 03 Feb 2021 19:52:19 -0800 (PST) MIME-Version: 1.0 References: <20210204123331.21e4598b@canb.auug.org.au> In-Reply-To: <20210204123331.21e4598b@canb.auug.org.au> From: Brian Vazquez Date: Wed, 3 Feb 2021 19:52:08 -0800 Message-ID: Subject: Re: linux-next: build failure after merge of the net-next tree To: Stephen Rothwell Cc: David Miller , Networking , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi Stephen, thanks for the report. I'm having trouble trying to compile for ppc, but I believe this should fix the problem, could you test this patch, please? Thanks! diff --git a/include/linux/indirect_call_wrapper.h b/include/linux/indirect_call_wrapper.h index 54c02c84906a..077f96be65c6 100644 --- a/include/linux/indirect_call_wrapper.h +++ b/include/linux/indirect_call_wrapper.h @@ -36,6 +36,7 @@ #define INDIRECT_CALLABLE_DECLARE(f) f #define INDIRECT_CALLABLE_SCOPE +#define INDIRECT_CALLABLE_EXPORT(f) EXPORT_SYMBOL(f) #else #define INDIRECT_CALL_1(f, f1, ...) f(__VA_ARGS__) @@ -44,6 +45,7 @@ #define INDIRECT_CALL_4(f, f4, f3, f2, f1, ...) f(__VA_ARGS__) #define INDIRECT_CALLABLE_DECLARE(f) #define INDIRECT_CALLABLE_SCOPE static +#define INDIRECT_CALLABLE_EXPORT(f) #endif /* diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 9e6537709794..9dd8ff3887b7 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1206,7 +1206,7 @@ INDIRECT_CALLABLE_SCOPE struct dst_entry *ipv4_dst_check(struct dst_entry *dst, return NULL; return dst; } -EXPORT_SYMBOL(ipv4_dst_check); +INDIRECT_CALLABLE_EXPORT(ipv4_dst_check); static void ipv4_send_dest_unreach(struct sk_buff *skb) { @@ -1337,7 +1337,7 @@ INDIRECT_CALLABLE_SCOPE unsigned int ipv4_mtu(const struct dst_entry *dst) return mtu - lwtunnel_headroom(dst->lwtstate, mtu); } -EXPORT_SYMBOL(ipv4_mtu); +INDIRECT_CALLABLE_EXPORT(ipv4_mtu); static void ip_del_fnhe(struct fib_nh_common *nhc, __be32 daddr) { diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f447f82e6819..75d6a0db1fa6 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2644,7 +2644,7 @@ INDIRECT_CALLABLE_SCOPE struct dst_entry *ip6_dst_check(struct dst_entry *dst, return dst_ret; } -EXPORT_SYMBOL(ip6_dst_check); +INDIRECT_CALLABLE_EXPORT(ip6_dst_check); static struct dst_entry *ip6_negative_advice(struct dst_entry *dst) { @@ -3115,7 +3115,7 @@ INDIRECT_CALLABLE_SCOPE unsigned int ip6_mtu(const struct dst_entry *dst) return mtu - lwtunnel_headroom(dst->lwtstate, mtu); } -EXPORT_SYMBOL(ip6_mtu); +INDIRECT_CALLABLE_EXPORT(ip6_mtu); /* MTU selection: * 1. mtu on route is locked - use it On Wed, Feb 3, 2021 at 5:33 PM Stephen Rothwell wrote: > > Hi all, > > After merging the net-next tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > ERROR: modpost: "ip6_dst_check" [vmlinux] is a static EXPORT_SYMBOL > ERROR: modpost: "ipv4_dst_check" [vmlinux] is a static EXPORT_SYMBOL > ERROR: modpost: "ipv4_mtu" [vmlinux] is a static EXPORT_SYMBOL > ERROR: modpost: "ip6_mtu" [vmlinux] is a static EXPORT_SYMBOL > > Caused by commits > > f67fbeaebdc0 ("net: use indirect call helpers for dst_mtu") > bbd807dfbf20 ("net: indirect call helpers for ipv4/ipv6 dst_check functions") > > I have used the net-next tree from next-20210203 fot today. > > -- > Cheers, > Stephen Rothwell