Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 15 Sep 2022 09:37:08 -0700
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the mm tree
Message-ID: <YyNUtA1vRASOE4+M@monkey>
References: <20220915170758.71068f92@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220915170758.71068f92@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6GGPBaz4HlK9kS40vIzDQrdGk9iF3j4yoBG38G5NhaTwsZeufc9GkBZyNs8v?=
 =?us-ascii?Q?XK3BMGgH+0nDERa6QoyaWDH9CT9F+MAYoohQ0rjFyQlXrpw2dZFNqJzYTb4J?=
 =?us-ascii?Q?ufUA4jgp7eEhJhpZC95PB9eGpUm2tIeKTE56aEolyfwwkcCRqmB4jFdhjSo+?=
 =?us-ascii?Q?wl8Dc948peVd5EHy8gkHjiWFBOJeY1+kALhhu4nh8osP2OLQfh1FH3Et+43+?=
 =?us-ascii?Q?Ec73vJrs2p922te/VcJm7HvykF/0OYi3Ngz+BDyke/YeZ7NNL7mEP9ezitj6?=
 =?us-ascii?Q?oOd5KAN3F9PieUnt6JAJCDsVNi79qsYd/6d2ZnJ6OHjKb05yxTiV5C3Dm4IK?=
 =?us-ascii?Q?98Gv6HV8HU5VG0MZOZzO36xmphz87re4BlcCjJ0M31P/+FfeIltNiy7bMLR5?=
 =?us-ascii?Q?Qc3HFAFr1Fx9ipoVBjTkm6ma8J7+BCxnCqS/zQX/4YMZNUQoufaxsXcos3ex?=
 =?us-ascii?Q?HB2QdUp8pxgtNiVqwBjKm7ab1NJ0IXbxWMskM4VFkmibwItzno4HzzHp9OrM?=
 =?us-ascii?Q?A+N5HcI76UMRVfuCVGQq2ujQVb8h+jp1AMrG9ZcYzsLx/OHzUUECQ2eh5SOJ?=
 =?us-ascii?Q?Kyrn/BwFxYk4SfPBRE4GDYAVheetX1dgVdNp/N0DhBL89vjr3iKR+PJ7opnZ?=
 =?us-ascii?Q?PIeMQgbQHf+pCJVHXhp7GP5dXUid9uX1MiVICttxDeCauvsguJiPTotLbaYr?=
 =?us-ascii?Q?lnOjIb/5tt8LX9rApgDo00hGWWp3C+0Tcr55T7AI3WIDmbydzrA1+oobEtFX?=
 =?us-ascii?Q?ZjWrsuVRjW8vRDm1Uv8hVbUcBSYgBgsBxVPG0BhlTi4F+V1AFeERt70LmQ+L?=
 =?us-ascii?Q?nZEcp2M+AdvMf7fBAk+RWo7O32lWjSW+NljClUXqrABb01IuIQ8Imqktv5iw?=
 =?us-ascii?Q?UZ5GRrmIx0lo1HFQdesPhcv0OLJ0y3m3kNxdWTaB6PBXJp+EXwaat638x8/n?=
 =?us-ascii?Q?QuBzDLEGen4TbeKKYGk4HD5B5JBSpCexAUWVEjSyEfXgrMlRBGGjOO3eo6+X?=
 =?us-ascii?Q?dSkQtUBRhOwyS23TLUAVQ8o2g8TSCrzZiHTOZ72XfSiI7uQqXYoQj2+FC55N?=
 =?us-ascii?Q?WO/Xw0fHbgPFR0/iVSlNId1eg6ZM2898U37wbw0U34npkcHkExNxrU7XGjYx?=
 =?us-ascii?Q?07WitB5sCpJnSjrvCmXdot17E/JDn96x8TEhL1FeUZA8k7niw1V/Dg2/qFWO?=
 =?us-ascii?Q?2dsiMqWD6nE6WVRI/q7fyIzqaAieND8ibxcF78BkGf1ThOFkxdUmoQSIsMFn?=
 =?us-ascii?Q?nJvDkfNc0IsB7aJ3XXmw3w880VDjtJQRBQk7LROVyh6GOt3Fz/JzZUXUrC9T?=
 =?us-ascii?Q?Dt6bsXYvlC0OrT/NGeX4ijxw/4iuHkbj6HArW6PSMbvsJWwAtblvPAwQX4qD?=
 =?us-ascii?Q?UQS6OKVcSKzr1sa5b3qMfaaXKDdE+WTHpshPMiAs1kha9nzMxIWRdCWwGXwL?=
 =?us-ascii?Q?4CupxiRPzkT2vuWgaMkZDkHvuDXBTVDTJHm+35Y4lF9L0PMeOwKu5T0qXHCX?=
 =?us-ascii?Q?MS7insX0GfrNaHsSr5vWoqijGJA0Rh1yP4Ql8YjhccXxgSVZa8rJUqNHN1hI?=
 =?us-ascii?Q?YvR6Wtm5+b36CHO3moAVLecCtftcSKH+66BuefsmVAJmOFshmFGSnGXVxtBG?=
 =?us-ascii?Q?1g=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5f18c5a0-cd76-4e59-6f71-08da9738897a
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 16:37:10.7747
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1HgGH8Fd7zHilnbjw3OMlZMEqLIioG2g2tUvSuIJ98avULN1Tq/PLse3T7m4E8bSdDSlISG8PpHhZtCJygy3xA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6233
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-09-15_10,2022-09-14_04,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 bulkscore=0 phishscore=0 spamscore=0 suspectscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2208220000 definitions=main-2209150099
X-Proofpoint-ORIG-GUID: RUVKpTp4eUGzvJTpCboBz1Joyi9n1u8Y
X-Proofpoint-GUID: RUVKpTp4eUGzvJTpCboBz1Joyi9n1u8Y
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 09/15/22 17:07, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the mm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ld: warning: discarding dynamic section .glink
> ld: warning: discarding dynamic section .plt
> ld: linkage table error against `hugetlb_vma_lock_release'
> ld: stubs don't match calculated size
> ld: can not build stubs: bad value
> ld: fs/hugetlbfs/inode.o: in function `.remove_inode_hugepages':
> inode.c:(.text+0x2538): undefined reference to `.hugetlb_vma_lock_release'
> ld: inode.c:(.text+0x25f4): undefined reference to `.hugetlb_vma_lock_release'
> 
> Caused by commits
> 
>   d56100904028 ("hugetlb: use new vma_lock for pmd sharing synchronization")
>   47bc61e7caf9 ("hugetlb: add vma based lock for pmd sharing")
> 
> The definition of hugetlb_vma_lock_release() is guarded by
> CONFIG_ARCH_WANT_HUGE_PMD_SHARE, but the usage in fs/hugetlbfs/inode.c
> is not.

Sorry about that!  When thinking about the need for a stub, I only
considered the !CONFIG_HUGETLB_PAGE case.  :(

Andrew, the following change to 47bc61e7caf9 ("hugetlb: add vma based lock for
pmd sharing") will fix the issue.  Would you like to just add the fix, or
would you like another version of 47bc61e7caf9, or perhaps another version of
the series?  Happy to do whatever is easier for you.

From 8b3031350154e8e401ccfbc5e71cb95ef654d017 Mon Sep 17 00:00:00 2001
From: Mike Kravetz <mike.kravetz@oracle.com>
Date: Thu, 15 Sep 2022 09:33:44 -0700
Subject: [PATCH] hugetlb: fix build issue for missing hugetlb_vma_lock_release

Add a stub for hugetlb_vma_lock_release to build in the case
CONFIG_HUGETLB_PAGE && !CONFIG_ARCH_WANT_HUGE_PMD_SHARE.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 mm/hugetlb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 2207300791e5..cc7877da18d7 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -7008,6 +7008,10 @@ void hugetlb_vma_assert_locked(struct vm_area_struct *vma)
 {
 }
 
+void hugetlb_vma_lock_release(struct kref *kref)
+{
+}
+
 static void hugetlb_vma_lock_free(struct vm_area_struct *vma)
 {
 }
-- 
2.37.2