From patchwork Sat Dec 17 18:55:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 34238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1636201wrn; Sat, 17 Dec 2022 10:57:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf6BbHef0h1VvDvl0FNbqDXKxBVZIx6c7WSpzWPPJOlf7GaVjhxWrOZL11RwK0Dpovozh3AG X-Received: by 2002:a17:907:98f0:b0:7c0:98d0:f433 with SMTP id ke16-20020a17090798f000b007c098d0f433mr29559170ejc.75.1671303475364; Sat, 17 Dec 2022 10:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303475; cv=none; d=google.com; s=arc-20160816; b=ZNACBtIGrfCjoFgamq8y0LU7XWk4aWV6S45IyWkM0h9iXzt42Gr1Wu3VleT3HSq670 iv7pN+uKL/JhovoqxjEBkkYsAphEnvMDMmUJukyihgQUmNPLUNLreN/2V2HIaZTyfm2x dK6MhioOw7Fho+hHy/H1UGH7rfHo8tzt+HHY8K1eqMywUnchGinFdCO4tG7414hfJWZr 5tGReNGqnwZGKnM/5s5vkzMfV23qLQ5TAHPO4jRtg42eyBe2NQqVyW4yTnHBZbMZpXsy jxr3cWBsvC5PIeTtFIupjZU8ijj++tLjFuVxS0YLjZuWVPFrTPHrNCvAvpI3fHtP7Zuj 3SKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=wKtqd1EdbC51guVZ8hPdSDdIhuF7SYx99kyd5XYQNbg=; b=t3QLewd8VZGK93j0JW9UviBBg9yYvFB/K9DiU2fqI5QZxfpLTkMqDlfOfTdxkaVNXX 8vtQjDTsbyNCKBrgPxrT2ODUbQ4f9qR/31P7Pbk7AvXgdT9tq4FGs219DExYJp1R4pMH QhHmESCQ2jcIj0O728ZNkMMKAAhAaCkcVtTcnBx8GZydOyyvLIMu2vBVC3d/gR6DvYfN FyIX09+RjGty9ZaeIaXpWHmDx8lG2udYSP12RRZbTLgRfNptpoW5fgIoKYmMkK89YLdB CCHVZnvg5gfiRbkPjyjHa4R9pQRzM4TYX4F49hoYTc+1Wlf0yqswd/htAjA7wkfQAnHz 6+PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MgvvSw6h; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i18-20020a1709064fd200b007bedd130080si5852510ejw.231.2022.12.17.10.57.32; Sat, 17 Dec 2022 10:57:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MgvvSw6h; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbiLQS43 (ORCPT + 99 others); Sat, 17 Dec 2022 13:56:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230019AbiLQSzg (ORCPT ); Sat, 17 Dec 2022 13:55:36 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BFCF10B6A; Sat, 17 Dec 2022 10:55:35 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303331; h=from:from:sender:sender:reply-to: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=wKtqd1EdbC51guVZ8hPdSDdIhuF7SYx99kyd5XYQNbg=; b=MgvvSw6hZjUwPug+IGqCfCPE8wt0fDqsXOXeAwxgqltYmMYyWgO9pQs9njou4ORqSuPKJN OesvSvjkwxn4DtjeNk6lgrL+pOZ/oYIsC/G5tlRmwQ28sjJ54RhYg+UobwectH5kxYpshS coiR1ScFJqyyVnDhagK+q/AP8b7UgZavQjPghlMnA17vw2aeviMq1N7ea8+ns/A0Lt2/h1 ozY1x4GUKzqSrjG7N0eejW9j5Ktedht+VQtIxJgtmYhKChGtUvMZsySm4A6WXEHXziVuRU rYSwUGioteUeHF9gdyHJCPJuqH4jrGbIR589sj1nPJnh5SgSroOrbLi+R1Qp3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303331; h=from:from:sender:sender:reply-to: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=wKtqd1EdbC51guVZ8hPdSDdIhuF7SYx99kyd5XYQNbg=; b=rVjgihaRHcvlERtpVsZC462XZF0MTw55CuR68kbXasI6PA3J3MyDWoH5oNnCN0y+PrtCCT lFAkjjdwImA/2zCw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/mm: Untangle __change_page_attr_set_clr(.checkalias) Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167130333087.4906.17380343026267717502.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752488713138373559?= X-GMAIL-MSGID: =?utf-8?q?1752488713138373559?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: ef9ab81af6e1f7b7ff589aa1504434aa5915c1df Gitweb: https://git.kernel.org/tip/ef9ab81af6e1f7b7ff589aa1504434aa5915c1df Author: Peter Zijlstra AuthorDate: Thu, 10 Nov 2022 13:33:54 +01:00 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00 x86/mm: Untangle __change_page_attr_set_clr(.checkalias) The .checkalias argument to __change_page_attr_set_clr() is overloaded and serves two different purposes: - it inhibits the call to cpa_process_alias() -- as suggested by the name; however, - it also serves as 'primary' indicator for __change_page_attr() ( which in turn also serves as a recursion terminator for cpa_process_alias() ). Untangle these by extending the use of CPA_NO_CHECK_ALIAS to all callsites that currently use .checkalias=0 for this purpose. Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221110125544.527267183%40infradead.org --- arch/x86/mm/pat/set_memory.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 50f81ea..4943f6c 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1727,7 +1727,7 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias) if (ret) goto out; - if (checkalias) { + if (checkalias && !(cpa->flags & CPA_NO_CHECK_ALIAS)) { ret = cpa_process_alias(cpa); if (ret) goto out; @@ -1801,18 +1801,12 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, cpa.numpages = numpages; cpa.mask_set = mask_set; cpa.mask_clr = mask_clr; - cpa.flags = 0; + cpa.flags = in_flag; cpa.curpage = 0; cpa.force_split = force_split; - if (in_flag & (CPA_ARRAY | CPA_PAGES_ARRAY)) - cpa.flags |= in_flag; - /* No alias checking for _NX bit modifications */ checkalias = (pgprot_val(mask_set) | pgprot_val(mask_clr)) != _PAGE_NX; - /* Has caller explicitly disabled alias checking? */ - if (in_flag & CPA_NO_CHECK_ALIAS) - checkalias = 0; ret = __change_page_attr_set_clr(&cpa, checkalias); @@ -2067,11 +2061,9 @@ int set_memory_np(unsigned long addr, int numpages) int set_memory_np_noalias(unsigned long addr, int numpages) { - int cpa_flags = CPA_NO_CHECK_ALIAS; - return change_page_attr_set_clr(&addr, numpages, __pgprot(0), __pgprot(_PAGE_PRESENT), 0, - cpa_flags, NULL); + CPA_NO_CHECK_ALIAS, NULL); } int set_memory_4k(unsigned long addr, int numpages) @@ -2288,7 +2280,7 @@ static int __set_pages_p(struct page *page, int numpages) .numpages = numpages, .mask_set = __pgprot(_PAGE_PRESENT | _PAGE_RW), .mask_clr = __pgprot(0), - .flags = 0}; + .flags = CPA_NO_CHECK_ALIAS }; /* * No alias checking needed for setting present flag. otherwise, @@ -2296,7 +2288,7 @@ static int __set_pages_p(struct page *page, int numpages) * mappings (this adds to complexity if we want to do this from * atomic context especially). Let's keep it simple! */ - return __change_page_attr_set_clr(&cpa, 0); + return __change_page_attr_set_clr(&cpa, 1); } static int __set_pages_np(struct page *page, int numpages) @@ -2307,7 +2299,7 @@ static int __set_pages_np(struct page *page, int numpages) .numpages = numpages, .mask_set = __pgprot(0), .mask_clr = __pgprot(_PAGE_PRESENT | _PAGE_RW), - .flags = 0}; + .flags = CPA_NO_CHECK_ALIAS }; /* * No alias checking needed for setting not present flag. otherwise, @@ -2315,7 +2307,7 @@ static int __set_pages_np(struct page *page, int numpages) * mappings (this adds to complexity if we want to do this from * atomic context especially). Let's keep it simple! */ - return __change_page_attr_set_clr(&cpa, 0); + return __change_page_attr_set_clr(&cpa, 1); } int set_direct_map_invalid_noflush(struct page *page) @@ -2386,7 +2378,7 @@ int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address, .numpages = numpages, .mask_set = __pgprot(0), .mask_clr = __pgprot(~page_flags & (_PAGE_NX|_PAGE_RW)), - .flags = 0, + .flags = CPA_NO_CHECK_ALIAS, }; WARN_ONCE(num_online_cpus() > 1, "Don't call after initializing SMP"); @@ -2399,7 +2391,7 @@ int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address, cpa.mask_set = __pgprot(_PAGE_PRESENT | page_flags); - retval = __change_page_attr_set_clr(&cpa, 0); + retval = __change_page_attr_set_clr(&cpa, 1); __flush_tlb_all(); out: @@ -2429,12 +2421,12 @@ int __init kernel_unmap_pages_in_pgd(pgd_t *pgd, unsigned long address, .numpages = numpages, .mask_set = __pgprot(0), .mask_clr = __pgprot(_PAGE_PRESENT | _PAGE_RW), - .flags = 0, + .flags = CPA_NO_CHECK_ALIAS, }; WARN_ONCE(num_online_cpus() > 1, "Don't call after initializing SMP"); - retval = __change_page_attr_set_clr(&cpa, 0); + retval = __change_page_attr_set_clr(&cpa, 1); __flush_tlb_all(); return retval;