From patchwork Thu Feb 15 10:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13557867 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 5073BC48BEB for ; Thu, 15 Feb 2024 10:33:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D403E8D0023; Thu, 15 Feb 2024 05:33:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CC8858D000E; Thu, 15 Feb 2024 05:33:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF4FB8D0023; Thu, 15 Feb 2024 05:33:20 -0500 (EST) 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 98F038D000E for ; Thu, 15 Feb 2024 05:33:20 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7ACC8120F15 for ; Thu, 15 Feb 2024 10:33:20 +0000 (UTC) X-FDA: 81793676160.06.F48F580 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id E68F914000A for ; Thu, 15 Feb 2024 10:33:18 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@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=1707993199; 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=PAVJHyGMAUnF7AjViDJ+K3AaQu9PJj0R+gebBFLO5LA=; b=GyN/hYixhActmGzhoJvRdSLk9jBYO/D66e8F0xUFrFYiGZrBqPvZ7JdnbYbZAnJdkqPXwv U4w7ifmCVOPMW+okhA+yyz7XA4zlHa/nEohgaT16i0bmj1P/rh4nmzSWV593KobwCndemr h9ioCVQ7EAgXNgtfwKJQRdQRDvCfwNU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707993199; a=rsa-sha256; cv=none; b=UH34bsajCi5VNsjUAxMMMYCJih6R/doa4PZbH2ryaTM79hXojiaYrInW8iOLHBe+4f44cG KDveUiAkviZMWeyLtPxL1mVq94uCekIgTJVUZnuIlPuJoFn/5wZWcov7TtZmst8ltI48wk T+2nfg5V5aWviu3AIulSpDILN36lCCc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@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 EBA3215DB; Thu, 15 Feb 2024 02:33:58 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E26CB3F7B4; Thu, 15 Feb 2024 02:33:14 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , Mark Rutland , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 17/18] arm64/mm: __always_inline to improve fork() perf Date: Thu, 15 Feb 2024 10:32:04 +0000 Message-Id: <20240215103205.2607016-18-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240215103205.2607016-1-ryan.roberts@arm.com> References: <20240215103205.2607016-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Stat-Signature: fgqt4tdys8crip1zeqxziesmgub5ofgs X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E68F914000A X-Rspam-User: X-HE-Tag: 1707993198-722197 X-HE-Meta: U2FsdGVkX19DS5oa3qzJ5LAhEbutmBMGbC2W4PXfCJ1nm/cCRUwqeuaKGtHvoWkQAdEyNOQ23RZQZiBgrrSPdUQ5Jx3qjqdX8d8tQWjnGec5YRJgy06h5+PiiXb/3sKEcrB8dvpFOer+rB/ZKvTTDQRf1S6WAoByKaPGoceJYW3wcvcq+L/e1lS8/KO4K2ADgLizEPxiuBxX2tlq/mMwGaXAXIKvNBBbPGMjLajC7WmJXlHXZVTmTReTOoKyZNQNj18uKrsTVrsDk31iPvTT1GJJRC06fv0MR2dEX9ZjlHdnPR9un7aEYQSg6B0UrYLjOqmRe8RyzeS3abNPcURT+v4k6lC9EKdWNJeWnI1mw641Y4jDIFRoiZjnomtNw11p2YufRDc1JJZFc8CSFhkiyP04UmWymEj1td4Ht+FEM0ct/xesOLqgjyk+0IBFSJyrSeiTVh5NWrdw2uKPlnp6gux1IOX8ImL1qLllpXRgRtRdXsjJKDwrx6lkNnuPQx84DHgIpJYgE2Gt72ton8GCDNmjoAvUDDEB4J7kNguwx4BwhiMHeauGGLGV/ri8FNZGxORh1VLoQ/LRT9SxdWsuQUf5+SwYobZHSXJv+C33ymNenb9KmvRq+6kbLlCNn2jRHePE8zljD9E69a8s5gGQglvWbKlm9/8/9jlPdUQ7vghitpI7gZja9lt+x8MIReOP11gPGJuN2fNWIv053etSP+DQXLxZdgOdpOOpxilyC42u7yMwvhZ8xBFK0R8LDEa8FjfOl01ehAO1qR13lLtDtInaQv/PqncBlEJrwFrf8ZZYc5j68B8hqbdi+UegrXvDHeFS909d4jPCORuJSHmH5Sl5uOQCKQWe3mocdymcTNYEnOP1Nj8ErN7ov8sWWjJmJ/a9a4Xs3PMedyLKZs4rPxK/Wvhgek+n0afXEK/36LaCfEHo3c0RNPBXPVl8xeobbNlQYcoDzsrlr8ahdGK pL1+ZUMl FYumG7kOEEDrk7F+g+bYErk4lMT7MRiRJddCX+KGdVfRgS/CvVKXkLiWG4IoY5WYIFdBRnHWLU6kEEO+q8f6JLRIDk2KfqCZ3GtJ8pkNiQWZyGjv3YdWy1f3f2CazwvCuSWoF541EA1gYfA94wI6Li81zNv2XUMr3XKYU3nIT0QytoeHaZCJin7pK5jQ0ycnri/2lqhWM1ENKpHN95vE0GJL1LyNcXSCrfJjysN+4k0lZLsMKpSru8rzoT9dxag6icrpeq5f9+ecDCWMuUaFcOftpZg== 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: As set_ptes() and wrprotect_ptes() become a bit more complex, the compiler may choose not to inline them. But this is critical for fork() performance. So mark the functions, along with contpte_try_unfold() which is called by them, as __always_inline. This is worth ~1% on the fork() microbenchmark with order-0 folios (the common case). Acked-by: Mark Rutland Signed-off-by: Ryan Roberts Acked-by: Catalin Marinas --- arch/arm64/include/asm/pgtable.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index d759a20d2929..8310875133ff 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1206,8 +1206,8 @@ extern int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty); -static inline void contpte_try_unfold(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) +static __always_inline void contpte_try_unfold(struct mm_struct *mm, + unsigned long addr, pte_t *ptep, pte_t pte) { if (unlikely(pte_valid_cont(pte))) __contpte_try_unfold(mm, addr, ptep, pte); @@ -1278,7 +1278,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte) } #define set_ptes set_ptes -static inline void set_ptes(struct mm_struct *mm, unsigned long addr, +static __always_inline void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned int nr) { pte = pte_mknoncont(pte); @@ -1360,8 +1360,8 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, } #define wrprotect_ptes wrprotect_ptes -static inline void wrprotect_ptes(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, unsigned int nr) +static __always_inline void wrprotect_ptes(struct mm_struct *mm, + unsigned long addr, pte_t *ptep, unsigned int nr) { if (likely(nr == 1)) { /*