From patchwork Mon Feb 3 10:18:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 13957195 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 534C4C02192 for ; Mon, 3 Feb 2025 10:20:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 50FEF280018; Mon, 3 Feb 2025 05:20:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A095280017; Mon, 3 Feb 2025 05:20:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2986128001A; Mon, 3 Feb 2025 05:20:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 046E4280017 for ; Mon, 3 Feb 2025 05:20:50 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9AAFFC25E7 for ; Mon, 3 Feb 2025 10:20:22 +0000 (UTC) X-FDA: 83078238684.08.F39BFAF Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id F15DB100012 for ; Mon, 3 Feb 2025 10:20:20 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.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=1738578021; 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=s7RWiBc91Kcnb6ZXaxAa5m0a+mqmeQb+Ok8r2YCJNYY=; b=3714We2I7sK71iShc1F7ygASrXmBiMKdhrBoyB6j7wcNCNRqtBsxJlOXhk9Y/Q1Zdi4K0c NQ8Mmhw2+7LwohAX/D7nnenkDMYYzxMU6fsvsS4PP/i5cNducb285O7H4BWr0vkOrAvQe+ JoFjRW1vTu1Ia/w+Z0TYNt9eFd75KwU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738578021; a=rsa-sha256; cv=none; b=f0yk9vY84Hq2XkVFz4qXpJit75fkSL4eMQuvXs8JxLmqtcwcR6INN0hewZPWlQvjDU3n0D a9weGzhyRfDTH86MLTknQ2Co5ceFFdgRtZxTMrOm4lqJE0qIcORL/mYNfGfct4jjnK0c8p IbFIkYvZtoiPNCyUUsR/YEKYDOs+6hE= 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 AB9A711FB; Mon, 3 Feb 2025 02:20:44 -0800 (PST) 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 B9E8C3F63F; Mon, 3 Feb 2025 02:20:16 -0800 (PST) From: Kevin Brodsky To: linux-hardening@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Kevin Brodsky , Andrew Morton , Mark Brown , Catalin Marinas , Dave Hansen , Jann Horn , Jeff Xu , Joey Gouly , Kees Cook , Linus Walleij , Andy Lutomirski , Marc Zyngier , Peter Zijlstra , Pierre Langlois , Quentin Perret , "Mike Rapoport (IBM)" , Ryan Roberts , Thomas Gleixner , Will Deacon , Matthew Wilcox , Qi Zheng , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, x86@kernel.org Subject: [RFC PATCH v3 10/15] mm: Allow __pagetable_ctor() to fail Date: Mon, 3 Feb 2025 10:18:34 +0000 Message-ID: <20250203101839.1223008-11-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250203101839.1223008-1-kevin.brodsky@arm.com> References: <20250203101839.1223008-1-kevin.brodsky@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: F15DB100012 X-Stat-Signature: ywuat7hrdnj6bee96wun16j4u15s53ke X-Rspam-User: X-HE-Tag: 1738578020-879512 X-HE-Meta: U2FsdGVkX1+OH8m7au2awa7Vy6f/pYISySK3YkWe6Osf7rtqw4729uVt9/GplniBlcIG0A87uNnNepS0/Lkml1oxrhHryFVohaD0VuYX9yPHv0GvkCdi/27dkks8hI0HI6a67L0RISzQeUdsRt8wJSKEh9jTdrglYnhxNhiz4ikfdGu/CGz6ga66DdWLzQOl1g8yZs4KOVCx4WN7UJ4Du0t2pZH6nd884/IMVNJfsbStxP9t3egSvf//EFuj3AfDVFomKDf5+R/QUnBDWUT70bad9W5xgStJX/kYk1RiuWGIZfLbtj0yWkH/dC/LpLzc8zxAnKP1DEL+Or4XvcYcj78np1AHsGElvwhq+aF9EGPXVpWl4GVBjg9RLC0RU7ZefYY8AfTdKtXADQ9yUxE1H18Pl581Di1tG4fbm7qw6+WXf02xV7TSHExAKzMsTvjyWN44MFqSsyVtenN1MLsqWZAY/A5nvNYtjT9OqqmUFG4/nCnatMuXwVb3r9rEFc14qesaKft4N8T+rzBfWJqAUlX/MFEvqXG6dhOXVxA8lVJE1Dc1n5frWbO+N7fVHVMQTZmQddIhADXLqJKHsuXgp0cHO1ZeFtVnbTgBrTbZrtx16X4bpqFHNWvgrqsuDpQu9PVr237Bac7U5UQxuSqT8KyVvog/TUMwfAnYfaGjUbI+hsuOtSgT0oUrEy9IpHaLTZIX6anKrWaQ2YuglqNC0Kgd81EkAIfX2BRbEyGO2ifXh3DDjQcVykKdYxYOWx1WvWz1EGKifnRmxLnF/Bur2NYKh+qL5xRFq/mK37ZOuNeujPS4gukm9AUEHxrkjl+kZJf9aaKWXB9MFS1FWdVGitXAKhABfWgQ7n1X5VkfOFTWH4HFtqCnopkiklj+fq1MWLJH74AXHWMcu0myDm52hvDxamT93VzBQULTf3pmhyF97rUFDXP3etda5+S71t/HuV+iZRGdu7nnhxdvBCr 3IPdTmA+ 1p9L5on/+Ev6T8wwDpk/ImAMKcWZmCqrVY+C6dIRX/yTOzGpPvoD7A7PwTcGnSmcQLqUd51uCeBpHmr1a+LZTSEZ5TyHTTL07GUSLBuOCGE0XX1kPJTDog1PR+x0X/6Ctx2V2TGsYQUafKynLkAJY92WFeTqKJlH2s+Bm66fGWZv7xpK/5IM9VXbzrD+4q/sJgw7E3uaBiB5NXd4= 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 892ece4558a2..9962f7454d0c 100644 --- a/include/asm-generic/pgalloc.h +++ b/include/asm-generic/pgalloc.h @@ -173,7 +173,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__)) @@ -227,7 +230,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__)) @@ -271,7 +277,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 c3998b78f6a5..721e779647f3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2992,12 +2992,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) @@ -3019,8 +3020,7 @@ static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc) { if (!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); @@ -3126,8 +3126,7 @@ static inline bool pagetable_pmd_ctor(struct ptdesc *ptdesc) if (!pmd_ptlock_init(ptdesc)) return false; ptdesc_pmd_pts_init(ptdesc); - __pagetable_ctor(ptdesc); - return true; + return __pagetable_ctor(ptdesc); } /* @@ -3149,19 +3148,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);