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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C25ECC77B73 for ; Mon, 8 May 2023 04:53:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 979596B0078; Mon, 8 May 2023 00:53:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 928F76B007D; Mon, 8 May 2023 00:53:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F16C6B007E; Mon, 8 May 2023 00:53:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6C3B66B0078 for ; Mon, 8 May 2023 00:53:13 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 17CBF80B3E for ; Mon, 8 May 2023 04:53:13 +0000 (UTC) X-FDA: 80765868666.15.B5D9B7A Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by imf08.hostedemail.com (Postfix) with ESMTP id 277AB160004 for ; Mon, 8 May 2023 04:53:10 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="G/3XOrDA"; spf=pass (imf08.hostedemail.com: domain of lukas.bulwahn@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=lukas.bulwahn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683521591; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tj282JyJVQUgRutNdXOQYurEIFEN0tNVyi4CZOQ3wIM=; b=VWFkd9E7pmqXvpifLGTo8Gl0tc4URMHc66mSbVe+Y79kbCmVKEZFORROIM1W5K5khbPU9K Qi1xG4U4lh6DFk/MhZTOcFFwMKiQxv1jVG+9ehGTnHkza/nPgRO5JkWyyk0722+sOduQFj e/dPHEuQPNzRmY126ajmf8D1BhtmZGE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="G/3XOrDA"; spf=pass (imf08.hostedemail.com: domain of lukas.bulwahn@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=lukas.bulwahn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683521591; a=rsa-sha256; cv=none; b=Blt7HKJsZZYEUiUfWsuBQIFaXA3rfhu+AtKO8gqCMj24r9cTlLTNC5+BLhhDdPUBBsQqFe xLvxc8yik27J7odEhzS7RkMTjGqJsvD0Z8CgjaAskmqqVmIFxJrEXL1d/Yo3RHCDbKKy3Y oMENBrIlJTR6IhBuLk0ldAg15g9/rSs= Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-50bc1612940so7780194a12.2 for ; Sun, 07 May 2023 21:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683521589; x=1686113589; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=tj282JyJVQUgRutNdXOQYurEIFEN0tNVyi4CZOQ3wIM=; b=G/3XOrDA/b6w37PRj/w1YQKfSatKaHvpnfAp9lE9NyC61Q36cK+VV9xC6ev1D3boZY D2ORv2EjmUiGKqkpi73/IUbMglDluyQuc3km+gVAAqmH/OdXNlqKOCINb06cdW6JK1Pg 60ENB4zGDGAFuFnp1bTVht5+V4tUQMS1IpEswdNj6KW8btKwrEfF73FEou7F3WzGV87y jqe1EcqKFsHYZtA0gvuIJSoD/cMnH/jVTiUfjY7vTDgF/we/cgsGZwVwUhd6WdSp/jL7 mQlDwCCGKBD9eKKHDhtix6o8xGAXTm8GJQdx1Wxw0iqMlqL1KsRi5TZPiSUDt61SNfK7 YpBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683521589; x=1686113589; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tj282JyJVQUgRutNdXOQYurEIFEN0tNVyi4CZOQ3wIM=; b=kWPVEZjWpAmyqvkTl2UvS+TZwtiqwjBy8zTGqc6Y53Xkt6lr8mTeF4SIWaXPqM0OoR vG6sAyxjNPRKDdC10aSo/kgcLBsSiRBepAP06ekUvZ+yXB/IvkwhEWDYBxve+mWFTQAc PEK7SMsSdIkg2p+JRX8pCtXqHwEzfJCMtKaXmB+egJ4FOpA0lDBLPyAmQ7ND1sSeIAj7 KzbWhIyP1YUkPic0XgNh8GVSfTRs1GI3ebWtv4/U3BWk3KWlFNi9UY41ya8BI7xncGCs AnHlOlUqq52j2QWOzQQcaqKLMQvUajNkSbS5nayhQZQxapn67gShBcJ0Y3i6xBMPTvvZ cmfQ== X-Gm-Message-State: AC+VfDzspq1Cg9F6YNmdqVnksk9j2xyPSkWFp8VNbNSRw/PrC84XiZFn wqSQ++IKgerJvxesWAG9947FydwUPh67mEMwpZA= X-Google-Smtp-Source: ACHHUZ6BwAPhomteCeBltcZmEsbA/mGMQbj0BYwkXjY/2amuBNCqHy5iRGTfDOHRx3rr1LiNDsIKhORiWyAsJrJ4uRg= X-Received: by 2002:a17:907:31c9:b0:94f:6627:22b5 with SMTP id xf9-20020a17090731c900b0094f662722b5mr7060809ejb.47.1683521589347; Sun, 07 May 2023 21:53:09 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Lukas Bulwahn Date: Mon, 8 May 2023 06:52:58 +0200 Message-ID: Subject: Re: In-flight collision: ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP renaming To: Guo Ren Cc: Guo Ren , Palmer Dabbelt , linux-riscv@lists.infradead.org, Linux-MM , kernel-janitors , Muchun Song , Andrew Jones , "Aneesh Kumar K.V" , Andrew Morton Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 277AB160004 X-Stat-Signature: y71pr1rybex7apcp7ufi353er31rdoqd X-HE-Tag: 1683521590-206483 X-HE-Meta: U2FsdGVkX18l52fxcY+G/ZuhwRiSIEtIZR9lmNywetXaKw3/RyGt5RC+U06fEEFa9exDjeYaukbOmrZfnvRIOUuCyD60mk8LgE+qk3WdM8ojLXKEytgVN/FcIG4Fu7YVhPMQr7E/gfF9OvJ50c94cR3Dy/VucqTLk912xWVvmxaGG4XxhD+wDuURINgmHGccIq5YQPWvt4mMLjfhsnBg6m3tr7AkXeiHimh5kVaVnv5oxJ06fTOqTSvCdM0839nvzuIfOxzxpfzB06guTCkAp0MRfA2r7aVinEgzfav/ep/rTGSVvwkWXAjg5q/A3dDMaHrvllQllrB4jaTieO5M0M2CF/IntkUd8CJr4ljK9uj+LIH4dIacSoqwlsH0ynPyibNutQwOI+hQV3aw3n1CeNvhO+Hd1nJ0h949aqJaN47RqIKzBqMgl0/WZZlG2d50Ibhl6LWi/UoHYhGwoqX8LJ5pjKIxTVYzdZjKAvx/vvEayM5dTM9yk9XtYZ0M8k4iZCRUT8sfoBIWHMn5ARllMengQCIHGwKh0uC4LgdkH/mTf9yQioR742K2Yt+7jU8mocpPUNvxIsTUavIwZdbCNMurkaFsvpwVxfaFVBgPGhhrIHvSuX1Ks2gYreoY1V/hl29Kaqud/VvdGpqaM2t1WQxit44O/O9nD68I60Si3vZbiMqqMnQAodssCOimgAFXFK8NkhtEGlu9FhTyLi3aB3SwVFTVaeq1+F5leGi+yWnTTzmK5+BUm/SPnHwHlatWvnBjDjWUQrnJ8Jeqv7Di56WsJMVDEEr6EaQPIlkkIhcTJB3E36+/ZdvK7ZS2CfW7RagOECLjv2dpEY3MLWJs6sB/2LldpwGt5Ov1+5BYeB4Dxohntk/8Jd4GbDXCPeJ8RotIWnL4VsTYbIP+mLAmXKoWHbniQ1xptzAPT2Oopj1rj7CajUAdQmKD9l20prpLkowyyWHa35+RoOZQBdv fOuMbw55 j+FZXh7hYa7risNIekwyn6Jw7LEoLYBooKeFb0Mu/rYETETxVN+SixiCi9v4tM/chL4LJnOVFsFXFNGdrO+PKhIZQH24K8ciJx9TnJRPaumcWHN+2x9sZLss8JQbVehWBmieHmS8meTVr6OfNlj10g2nR9DALdH8zcNtKF772L/yql1KOg3McBpLTMF48DYk2PTCUPJK+CF7fAiUaZj2DLqYrxKh4f/mQjFo8eRt95eJOOJTFqorKiKjHP6b2MJS1ORi21UR2k09Hu22RNhUlcb6o/wOnuDefXLpYaU7TBZ9taNJTNyfWw+FrojODXNOBmsrXZQ5UGhqwxwGZHSIDDQNYsnNQ2Etx34zlDL1kPnA+Qr15gzKf0gjybv5mVa0BJC+YPcjlzz1oS8qIryeEE9UgPQWjre7wsvNxGEdFX0SsqFeTEqm2APr6c3xsqC3f/pJDnACVSheUS85+gmoDEzGeXhNNphZArZcOojNDR9XPqcgWiN1VrH3a+byMqtduRh8S X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, May 5, 2023 at 8:16=E2=80=AFAM Guo Ren wrote: > > On Mon, Apr 24, 2023 at 5:40=E2=80=AFPM Lukas Bulwahn wrote: > > > > Dear Guo Ren, dear Palmer, > > > > on linux-next, I have noticed that you have submitted and added the > > commit a3c7d6b642e4 ("riscv: mm: hugetlb: Enable > > ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP"), that adds the select > > ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP to the RISCV config. As it > > seems, Aneesh Kumar K.V has concurrently renamed this config > > throughout the tree with commit 215218dddd25 ("mm/hugetlb_vmemmap: > > rename ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP"), but your commit was > > not visible to that renaming. When both commits are merged in a common > > tree---as happens with linux-next, and will soon happen with Linus' > > tree, your commit a3c7d6b642e4 will do nothing (select no existing > > config anymore). > > > > It is easy to fix, adjust this one line to the renaming and 'select > > ARCH_WANT_OPTIMIZE_VMEMMAP'. For now, I am just reporting to let you > > know; probably, it is best to get a quick fix-up patch with -rc2, once > > all the changes landed in -rc1. > Thx for taking care; please fix that. > Just for the record: Conor Dooley sent a patch after the merge of the two trees, addressing the issue. This patch is included in v6.4-rc1 as commit 26b0812f4cf8 ("RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename") So, the issue is resolved. Lukas