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 65BF8C54E58 for ; Sat, 23 Mar 2024 15:16:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 850EF6B0082; Sat, 23 Mar 2024 11:16:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 801486B0083; Sat, 23 Mar 2024 11:16:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C8F96B0085; Sat, 23 Mar 2024 11:16:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5CCD26B0082 for ; Sat, 23 Mar 2024 11:16:57 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 277E41401A7 for ; Sat, 23 Mar 2024 15:16:57 +0000 (UTC) X-FDA: 81928656474.20.45A11F4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 0F303C0022 for ; Sat, 23 Mar 2024 15:16:53 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TTVCGkUC; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711207015; 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: references:dkim-signature; bh=HVVxUd0Zld9xbU0wa229w8cCSBmfZ2i7ESIOSMDwyXg=; b=p80wNMQEAWKMRbg6GVfeX2cG6CRK4Yx7E42+5QzDPJdUuFSTE238xacVXHHv//frt8kNnq NtleRgHoKcEtiHBsT7TQMtQwcdlWXaywSv73oNsxanh9gXzqctklKO5nY9Il9e6Q4K+3sH dnkFjhC/rCntVwT94WNvUs8xMy7bxx4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711207015; a=rsa-sha256; cv=none; b=y+sv10rVXe4t+Tb5rxo3KdiISxRbdOr2VE863HFAR1zGNQPwyIopDHPQitIgA+BfAlccbf YA48pUkNVQ8gjM/C+30hnSnX/Rby0pN/xlbloi/AmM3iOINhi8WlImxLV4uJzXr1FZfvvQ tyqqGjUJlqU5EPVZ7GXOmvdd2dKfEr0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TTVCGkUC; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711207013; h=from:from: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; bh=HVVxUd0Zld9xbU0wa229w8cCSBmfZ2i7ESIOSMDwyXg=; b=TTVCGkUCViPmvR75lQh3ILjai0YuJayPFJ1e+bCMxUQBEw314g4GpsE4G1wgiqi990MouR Sp1oSpdWdrOlYhSKCLRCEzB2cPLwNcKlq2fyyDNiXCoAUL5VFzSG9SnucKSqdbtaI37HAn GBN93LSJT0s2ZE+cgL/gyZp5jQRmuIE= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-330-prM4FMdINkyny1RW0RkJog-1; Sat, 23 Mar 2024 11:16:46 -0400 X-MC-Unique: prM4FMdINkyny1RW0RkJog-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-69120b349c9so6925256d6.1 for ; Sat, 23 Mar 2024 08:16:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711207006; x=1711811806; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HVVxUd0Zld9xbU0wa229w8cCSBmfZ2i7ESIOSMDwyXg=; b=oh6gm8aNDj4MdlFfcSHLJqIt0IrJOd0UufWIFmBo4xGMOo0des/IkEjO4SJytaBiFt 0n/mFMhEr2GzmWMaoxES4O8OQOH6nrbzqD11+w3Ae0lA/HALiarfhrCfaKdXYkMaEQp0 MBeFgf8YxBL1YyDud5QYCsK65VL60OMrmS9R16GwrDu/YqzesHpUoNRYZMwAP0AwXELs AHdbyAWRy5SSgJAKzGjkAftQcZ3J4Y8DT+vN+5Yb65HTJY7g6yUMxXdhleoF7yvKNCTd cRreQVFo/DZ6TsqifMy4b2l58EpgVVSuz3yYRl7Bl2wHb7bEyBq9lNkqvnuI/ktte+V7 LS4w== X-Forwarded-Encrypted: i=1; AJvYcCXfrIW8gTMvMN9RTN7kGJvK3FOVkZKy3l0rKSRlQiwIC89dqrA2UfNngZ5Fw4X4wt1nBmPQqr0y5j3STvDOy/3rh0k= X-Gm-Message-State: AOJu0YyNVJDbwCgO9ojOjYq8IEQ2QQhf4HwaimQRGxV/zs/dwSoj9sqT cfAzS/NJg4R68m6LFarlDOokY4UG6AcnNf9Clx4ueoM4bHX15Heg30su9B6cH2GD5MH/6q+e/IK eRrTH/JlB1NmSboaQOXxeEcIoKk8f6KPlVbbG9R4xI2gks90z X-Received: by 2002:a05:6214:5d81:b0:690:c64d:c2 with SMTP id mf1-20020a0562145d8100b00690c64d00c2mr2601809qvb.2.1711207006045; Sat, 23 Mar 2024 08:16:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFt47SYAwH97tZePGJd4B1bbJ1slye2vSOQirjRSTPcAdv3shZNMWsbvi27EJpRwkH6JEhrfQ== X-Received: by 2002:a05:6214:5d81:b0:690:c64d:c2 with SMTP id mf1-20020a0562145d8100b00690c64d00c2mr2601777qvb.2.1711207005505; Sat, 23 Mar 2024 08:16:45 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id dm2-20020ad44e22000000b0069675bc7182sm1064916qvb.36.2024.03.23.08.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 08:16:45 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: peterx@redhat.com, SeongJae Park , Andrew Morton , Jason Gunthorpe , Mike Rapoport , Matthew Wilcox , kernel test robot Subject: [PATCH] mm/arch: Provide pud_pfn() fallback Date: Sat, 23 Mar 2024 11:16:43 -0400 Message-ID: <20240323151643.1047281-1-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 0F303C0022 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 1amgywd4usimi7f875n9rkhxuma1by6t X-HE-Tag: 1711207013-522392 X-HE-Meta: U2FsdGVkX19fC2eqYmKbm+uXiszRTOSqF96Gh0ytWJpuxoAkwwUylAi9G1oQT/55ZqUM4MRiBUDdCu7Lg8j534i3s4v+Oq7Km9+NXmQEbhwIrqb/u75k62Vty1r+2ZGJGaSEzg2ZGutT0YcqpTgOY6MltXJ8R7HNLWpQnQ9s6PXVajcqWe5yglrqoLmyFApkoFCwErWKJrCJ6VbUdzrQO/Icqkq7658jop3CUT48IeeS8jhPrRcBObO2OOET0xW22uV7p6SC12EYwiYr8O9b3SHee9XRqyv0toG9V2EIuKMzfskz8iLpM6v6b9lK0t3G9SC8ZYlEQ/EIXSusu3GcuSFxc4De3JXAEJEjPb0EnhdIK6T4DX9tFyW9zuofh6hgLVsuF0Fz6mHtP2PQWfNhoHXJgbNL/y/4bhUuh2opkghEuJNtA70bJZdPDNdeM1cq/xzDDM1Cq4g98hCOhFFtv/LZO34z+MkYBgAjlVND6OOIUBT0yCEwGBbxSQRy1LAQznarQirDNLykyDI+7SBWHDZLU1UY4f4znUUM5io4oI7He4rnhrkrlIeu4sucY7EZVv7u0aaTc1BwQ8J4OYdHRRaGxNZEG1AUHNvhEPkVdmqpMTg/nLKzWGDePiHew+HstPzB2B8QpK/j0hJURoweJAQ8vSC5DVT2mQfRnS6qDCuygLtxvuJ4cMPZ3Jn8Zuc3El9yequPFr2DnLPhLzd1keQkEOeoqhBe0kRrF140I9ftjxvGwNPw9jslJy+G2GxWnmBoyhs9/Z9LCWbHdhcOXclK2Dm0isl2Ja7mWhUT0knQ8XosZEJr/U6oEndcncnxQ2v+Osg7csj+PghcoCOFaJb2moltVP5U69WfOkMAYeiVdzm+JZBm/S7TClXcrVPlD0zYsu5P1NnIMX9eaz/hqyyUR7jHOGMOWvnW5f4ps9E4y5QlIkIFPhJwg8odn4iFlZi4MpKBLAXgq3JQheg KNKvECGX VlomjPu4eDia67m5WUkygAaAd2CgbjHkO6dGuwndVBRVWm6PqksBIEimXJDdhJJLRsPpkGFoe3R893b0P+qXRnGyza99TtgrcIeeBW/h6jIZE1UzyeElmMExu7jmuYJ2WZNgM4/0qPBFJRKYpnaMptgaJgU+TAg7Q+h6CxmWEe3kBpr7YTIuhuTxbwq11JzmD2Z7uYTVxFVFQ2fim7u0/jXiyZ10kqUnQDL11sl4qzz7kDu83G+frrZBx3djkTX6FQQKMD3Q1BS1BsG649I1HL0uQGY+1qcJt6Q7Gh8CtKHCsbxFUqEeBg9dmCAIwurpVglg80IhDuVqwJnv3ipZYd/LpSamhlCmpP2jvf+QVcO0g7eRv7T6A0I+YfbIiVdHdq7IheeJNOj1/op6w1+H1gLfxrCswBiwJbHY8fwe5A+3MyKDmOVsV5t2Ws31sWtBHFEHnRgcjCrKTyBNzEbyvgTs4pByBsRabhM2UmXIrBV4RxeKbE915vQZ5C04B/SguW+GMgiMI2QqqwMRMLGpYtrmyAHThyIdbbib8XSILB8c2G+lSGnFCP78PYoUTlzS2kU1lK79ctgjE3P20nGDBQXBGFSCqYiEVSjIT9mLfLytw1Q6f9kFYek8Cgw== 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: List-Subscribe: List-Unsubscribe: From: Peter Xu The comment in the code explains the reasons. We took a different approach comparing to pmd_pfn() by providing a fallback function. Another option is to provide some lower level config options (compare to HUGETLB_PAGE or THP) to identify which layer an arch can support for such huge mappings. However that can be an overkill. Cc: Mike Rapoport (IBM) Cc: Matthew Wilcox Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202403231529.HRev1zcD-lkp@intel.com/ Signed-off-by: Peter Xu --- Andrew, If we care about per-commit build errors (and if it is ever feasible to reorder), we can move this patch to be before the patch "mm/gup: handle huge pud for follow_pud_mask()" in mm-unstable to unbreak build on that commit. Thanks, --- arch/riscv/include/asm/pgtable.h | 1 + arch/s390/include/asm/pgtable.h | 1 + arch/sparc/include/asm/pgtable_64.h | 1 + arch/x86/include/asm/pgtable.h | 1 + include/linux/pgtable.h | 10 ++++++++++ 5 files changed, 14 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 20242402fc11..0ca28cc8e3fa 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -646,6 +646,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd) #define __pud_to_phys(pud) (__page_val_to_pfn(pud_val(pud)) << PAGE_SHIFT) +#define pud_pfn pud_pfn static inline unsigned long pud_pfn(pud_t pud) { return ((__pud_to_phys(pud) & PUD_MASK) >> PAGE_SHIFT); diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 1a71cb19c089..6cbbe473f680 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1414,6 +1414,7 @@ static inline unsigned long pud_deref(pud_t pud) return (unsigned long)__va(pud_val(pud) & origin_mask); } +#define pud_pfn pud_pfn static inline unsigned long pud_pfn(pud_t pud) { return __pa(pud_deref(pud)) >> PAGE_SHIFT; diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 4d1bafaba942..26efc9bb644a 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -875,6 +875,7 @@ static inline bool pud_leaf(pud_t pud) return pte_val(pte) & _PAGE_PMD_HUGE; } +#define pud_pfn pud_pfn static inline unsigned long pud_pfn(pud_t pud) { pte_t pte = __pte(pud_val(pud)); diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index cefc7a84f7a4..273f7557218c 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -234,6 +234,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd) return (pfn & pmd_pfn_mask(pmd)) >> PAGE_SHIFT; } +#define pud_pfn pud_pfn static inline unsigned long pud_pfn(pud_t pud) { phys_addr_t pfn = pud_val(pud); diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 2a1c044ae467..deae9e50f1a8 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1817,6 +1817,16 @@ typedef unsigned int pgtbl_mod_mask; #define pte_leaf_size(x) PAGE_SIZE #endif +/* + * We always define pmd_pfn for all archs as it's used in lots of generic + * code. Now it happens too for pud_pfn (and can happen for larger + * mappings too in the future; we're not there yet). Instead of defining + * it for all archs (like pmd_pfn), provide a fallback. + */ +#ifndef pud_pfn +#define pud_pfn(x) ({ BUILD_BUG(); 0; }) +#endif + /* * Some architectures have MMUs that are configurable or selectable at boot * time. These lead to variable PTRS_PER_x. For statically allocated arrays it -- 2.44.0