From patchwork Fri Apr 11 09:16:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14047910 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 B9324C36010 for ; Fri, 11 Apr 2025 09:17:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F3392801A1; Fri, 11 Apr 2025 05:17:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A2FC28019B; Fri, 11 Apr 2025 05:17:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41DD22801A1; Fri, 11 Apr 2025 05:17:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2199C28019B for ; Fri, 11 Apr 2025 05:17:48 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BC110142236 for ; Fri, 11 Apr 2025 09:17:48 +0000 (UTC) X-FDA: 83321210616.28.882100C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf12.hostedemail.com (Postfix) with ESMTP id 2909340009 for ; Fri, 11 Apr 2025 09:17:46 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744363067; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nv2oqsrFF3oYfOvHVkuk73o0k7HCEGakiogCU9B9JNg=; b=BL5Km1kDnGn2ee0dBiEMZ+9nMVmT0q+tn0rc7xgR8qo4HspAwBU0cNhuTfhvqutT0q6AQ2 pjZfw4TXJqpNYISoCSG4gRu3bEuoj7Xpda39reYm2PzKd3BQRrM7cmYRPva0pbECVA0glf mDr53nv0ST2cdrEwe0QQDAkBOpP8m90= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744363067; a=rsa-sha256; cv=none; b=QF5GvlkwoUseThVJT18OVI40E2BKoGw9frVwm3iXpMUnJ9YD84SDcAVOHPb2tPF7HOUSAJ vPG92NG5oy6hKAC2tPHlaCDtluN5aqsip/gHxXjDHZ5dzcERIZoTNt/NOv32tez3IWOXHn bM2i5oud8fOdASnVp0lnqzUh+mS37fg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 30AA31596; Fri, 11 Apr 2025 02:17:46 -0700 (PDT) Received: from e123572-lin.arm.com (e123572-lin.cambridge.arm.com [10.1.194.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9E54D3F6A8; Fri, 11 Apr 2025 02:17:42 -0700 (PDT) From: Kevin Brodsky To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Kevin Brodsky , Andrew Morton , Mark Brown , Catalin Marinas , Dave Hansen , David Hildenbrand , Ira Weiny , Jann Horn , Jeff Xu , Joey Gouly , Kees Cook , Linus Walleij , Andy Lutomirski , Marc Zyngier , Peter Zijlstra , Pierre Langlois , Quentin Perret , Rick Edgecombe , "Mike Rapoport (IBM)" , Ryan Roberts , Thomas Gleixner , Will Deacon , Matthew Wilcox , Qi Zheng , linux-arm-kernel@lists.infradead.org, x86@kernel.org Subject: [RFC PATCH v4 12/18] mm: Allow __pagetable_ctor() to fail Date: Fri, 11 Apr 2025 10:16:25 +0100 Message-ID: <20250411091631.954228-13-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250411091631.954228-1-kevin.brodsky@arm.com> References: <20250411091631.954228-1-kevin.brodsky@arm.com> MIME-Version: 1.0 X-Stat-Signature: 1sgx6tw5omgrf5affp4j4hiqxjgo5g3a X-Rspam-User: X-Rspamd-Queue-Id: 2909340009 X-Rspamd-Server: rspam08 X-HE-Tag: 1744363066-517676 X-HE-Meta: U2FsdGVkX1/4fTu7t5h2Rmt5kQJSSlcyvKFI24sowwqXoyX3zeCZu3xpVaRf07MKkUhHreR42LmtEtgQt4FsJOpdpu0e4pNdlpGAsDFxy4zPrbikofsL2Z8bpgdxXEH/WyOtBTINcT04tk/Asmqf339oPGwfHCMuQnNLRyNP4BfQKFWxSLZzxr24qumic2C7KDLENj6ZX24cuWTEriejpNPp3ff7nFKUPJZmmyjqATZPQ2jG6zPekJmn4Y2eX9D4U5xiKC31zkjXEi/rBJ+NfLnLmJbqIYLenT64bKKDYLzjte2qZfSwDpT5HEAJaVodWyx9E0KUXzPy5o+C1rrMQSaeUV78XQKHfuf6SOe1Ea8PUCNtB0MmH+czS1eqRpKzpS2nUmrXp/yaA3jH2WGtLPL9tHXW56A/sq88HMKvdM422319jgsbRPU6NNIoZ2UwxwX4G0SG6Iaf5dHmufGTGCkh9gkxpfBJZSweGD7xxGJQ3KFakVdGpJF2crX/21FjKAzmGX8kgBYjIfxpkRv4oisbgr2VG9ZKMEY5uqj2EPtd7nB0zwKgu19I5EZ94gbMEDh7TuittC8MVUW7JSL3Kx+uYXyxi2E4r/saZLrHOpYK7Uo0LCKMlJlWJI1BKbDwYODNdQZctEV7zAeiB78dUKkdeiL1YulJGSaJoDzGr2QauXaCzYGP2ebtf+QvEkzxe/3MfZ3M56FnAxsEIlOfuc4+kcOLKCRBO0wUs4yf2EDvlykWs5k8ML+kcJ63Gz6fWiBtetpJ6Y6BoVz7bfdgsngud7Yc60BuvrY2jMy5i1LYzZsh9N0Esto2KvviSlhjZq1ptO77tfFcBaB50yUvD89aiByDyUgoGteJCHN61S6aeSCCVP1WqZ+OXbHsfg5qHLmnhXW2WCA4SZReEkoTx3N9eLTv9CBeSmIUQiscfREwMFs1EjdXp2qQTGcnUC/SDxlhS9+1gOfoGN7mT/L z94ejgo5 tm5KqsW5vMIdZynvUQ51FwslQsIbMYgZPogjVJ7mBuxQTvZ7JV1cGw4S71FI0RxHTR1YukCZZMcWFNXnieMQuBHSQDe+YQpIcrUh5Dx6U32/HK6eKJC2l6Cj4gy8gWlpjTgJaKIQxXLKf1cewsQUu8M3WexZLYWXVnDuXbUZMCNErcQ4oE+jaAcXS3plsDb9Q+NP+cSRBJOQ3PG4= 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: In preparation for adding construction hooks (that may fail) to __pagetable_ctor(), make __pagetable_ctor() return a bool, propagate it to pagetable_*_ctor() and handle failure in the generic {pud,p4d,pgd}_alloc. Signed-off-by: Kevin Brodsky --- include/asm-generic/pgalloc.h | 15 ++++++++++++--- include/linux/mm.h | 21 ++++++++++----------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h index 3c8ec3bfea44..3e184f3ca37a 100644 --- a/include/asm-generic/pgalloc.h +++ b/include/asm-generic/pgalloc.h @@ -178,7 +178,10 @@ static inline pud_t *__pud_alloc_one_noprof(struct mm_struct *mm, unsigned long if (!ptdesc) return NULL; - pagetable_pud_ctor(ptdesc); + if (!pagetable_pud_ctor(ptdesc)) { + pagetable_free(ptdesc); + return NULL; + } return ptdesc_address(ptdesc); } #define __pud_alloc_one(...) alloc_hooks(__pud_alloc_one_noprof(__VA_ARGS__)) @@ -232,7 +235,10 @@ static inline p4d_t *__p4d_alloc_one_noprof(struct mm_struct *mm, unsigned long if (!ptdesc) return NULL; - pagetable_p4d_ctor(ptdesc); + if (!pagetable_p4d_ctor(ptdesc)) { + pagetable_free(ptdesc); + return NULL; + } return ptdesc_address(ptdesc); } #define __p4d_alloc_one(...) alloc_hooks(__p4d_alloc_one_noprof(__VA_ARGS__)) @@ -276,7 +282,10 @@ static inline pgd_t *__pgd_alloc_noprof(struct mm_struct *mm, unsigned int order if (!ptdesc) return NULL; - pagetable_pgd_ctor(ptdesc); + if (!pagetable_pgd_ctor(ptdesc)) { + pagetable_free(ptdesc); + return NULL; + } return ptdesc_address(ptdesc); } #define __pgd_alloc(...) alloc_hooks(__pgd_alloc_noprof(__VA_ARGS__)) diff --git a/include/linux/mm.h b/include/linux/mm.h index dd1b918dc294..43e35d41b850 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3077,12 +3077,13 @@ static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } static inline void ptlock_free(struct ptdesc *ptdesc) {} #endif /* defined(CONFIG_SPLIT_PTE_PTLOCKS) */ -static inline void __pagetable_ctor(struct ptdesc *ptdesc) +static inline bool __pagetable_ctor(struct ptdesc *ptdesc) { struct folio *folio = ptdesc_folio(ptdesc); __folio_set_pgtable(folio); lruvec_stat_add_folio(folio, NR_PAGETABLE); + return true; } static inline void pagetable_dtor(struct ptdesc *ptdesc) @@ -3105,8 +3106,7 @@ static inline bool pagetable_pte_ctor(struct mm_struct *mm, { if (mm != &init_mm && !ptlock_init(ptdesc)) return false; - __pagetable_ctor(ptdesc); - return true; + return __pagetable_ctor(ptdesc); } pte_t *___pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp); @@ -3213,8 +3213,7 @@ static inline bool pagetable_pmd_ctor(struct mm_struct *mm, if (mm != &init_mm && !pmd_ptlock_init(ptdesc)) return false; ptdesc_pmd_pts_init(ptdesc); - __pagetable_ctor(ptdesc); - return true; + return __pagetable_ctor(ptdesc); } /* @@ -3236,19 +3235,19 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) return ptl; } -static inline void pagetable_pud_ctor(struct ptdesc *ptdesc) +static inline bool pagetable_pud_ctor(struct ptdesc *ptdesc) { - __pagetable_ctor(ptdesc); + return __pagetable_ctor(ptdesc); } -static inline void pagetable_p4d_ctor(struct ptdesc *ptdesc) +static inline bool pagetable_p4d_ctor(struct ptdesc *ptdesc) { - __pagetable_ctor(ptdesc); + return __pagetable_ctor(ptdesc); } -static inline void pagetable_pgd_ctor(struct ptdesc *ptdesc) +static inline bool pagetable_pgd_ctor(struct ptdesc *ptdesc) { - __pagetable_ctor(ptdesc); + return __pagetable_ctor(ptdesc); } extern void __init pagecache_init(void);