From patchwork Sat Dec 17 18:55:28 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: 34224 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1635860wrn; Sat, 17 Dec 2022 10:56:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf77VRbeoxqZbLhGgebS0PzbOlfieb6jn956mpiAa7VE097L2ZcIX7Ulc137FhKfw8Gtgkwg X-Received: by 2002:aa7:c844:0:b0:461:9faf:6895 with SMTP id g4-20020aa7c844000000b004619faf6895mr31128739edt.16.1671303390396; Sat, 17 Dec 2022 10:56:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303390; cv=none; d=google.com; s=arc-20160816; b=uqTfc7cFD8CKgXAWQjZ/Z/yGzx27rLAnCklA0L8a0PhXMGvYpHXmAXVQJ8rPVZR7b9 9Gsp49BDQLLa2/x68oKXmT536j28vlw43/AuaVb9pLAYXtCAWbAcEeLsAo3wIVB0t7y/ 9rhiny5Zg/8rXGJUnDcnkHLLNM7k6O/98XOvd4WyWyoqaUOy9zIMLeSyzzq8BclHIBhg bnZJwSsSr02I4KJiY/nXHywIg+xdQtlUJp0rOnt4yDOGpgxKHqKpdVXmHDtSj3CpUEud aOeEW1AbeOYRYd3YCz+i0ohjW/FEH/oOnNE7dRulBe6tpqKyKQvtHzaTDGbjEaRBFGkL uxhg== 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=J97gzZkGGDfW+0G87Kan1UFe3sC+UvKIsskpcpsByDU=; b=r8tbtacPytvilqAfLx5PPSl4S5hFNGVVLZ+boviImjEyWVo//tQz7NKDyDRxap73JG 2XYfQf6hRHrKtVPUg1o+FjpqXSEpJQq3LSQMgG5dtH4IYrYojU/ps7OfZ/IXNCaakr+3 c0yZL9IuA4zrAoS0kzmlROfOA4J+2zjhrqSB7FRLr7YvyS34BSew6OILwFOltLfl9sRd jRiOoUskiFIT9tT8WHlRfP91FR/d+0jnHQXH1QRfotD2K1044izDrwF7KpzAWjcsF8Ei cPxdbsRMyLqIV8yoPB/M4WC+GW865HEPmZW/GFeswmcRJkOEdY7Z6razHKWufbDXQ3rD SIqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=44yjMEec; 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 l9-20020a056402028900b004595af54eacsi4778729edv.226.2022.12.17.10.56.07; Sat, 17 Dec 2022 10:56:30 -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=44yjMEec; 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 S229991AbiLQSzf (ORCPT + 99 others); Sat, 17 Dec 2022 13:55:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbiLQSzd (ORCPT ); Sat, 17 Dec 2022 13:55:33 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E7EE10B79; Sat, 17 Dec 2022 10:55:32 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303330; 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=J97gzZkGGDfW+0G87Kan1UFe3sC+UvKIsskpcpsByDU=; b=44yjMEecL9/m6r6NhUNBP9jQGnW86TiWWX45+kULfqzwDd6sDu3fNAL9JmtyUW3Oe5YX+Q /O4MtHURNZhyBrrDMuOyJGRJgf2u9qZo7mwswaUDfP8Aa08MhbEtAF/DwYcPz1C2CRsRV+ u+XFl7Am/AE8XS4+gdWvj3DSsLa88DGd+noJY1G1qvTOUUWc7aV6AwfOuThjJg8TaQ6Cba ecBCJZtECbXZ9lv3FHrH4A60kkXYyfGTwqf9EWwiHjUfSEsTjjfya44QxEikX77cw93Im7 Sbb6n6/fhYUdfjln2jd26qMzsKmUVImhol5lF6JykIAEhI/t4ppZW7EBRR+UiQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303330; 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=J97gzZkGGDfW+0G87Kan1UFe3sC+UvKIsskpcpsByDU=; b=WZJGtSzVPARtkk0/5cqakGaXtPwDm3P0yF9is8AqTcKI5l2bAXFlLUwtrQK8L2RVrOSAPS gKJUIRpdmpj64/CQ== From: "tip-bot2 for Dave Hansen" 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: Ensure forced page table splitting Cc: Dave Hansen , Marco Elver , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167130332907.4906.11081622547115559561.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?1752488624184162459?= X-GMAIL-MSGID: =?utf-8?q?1752488624184162459?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 3e844d842d49cdbe61a4b338bdd512654179488a Gitweb: https://git.kernel.org/tip/3e844d842d49cdbe61a4b338bdd512654179488a Author: Dave Hansen AuthorDate: Fri, 18 Nov 2022 07:16:16 -08:00 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00 x86/mm: Ensure forced page table splitting There are a few kernel users like kfence that require 4k pages to work correctly and do not support large mappings. They use set_memory_4k() to break down those large mappings. That, in turn relies on cpa_data->force_split option to indicate to set_memory code that it should split page tables regardless of whether the need to be. But, a recent change added an optimization which would return early if a set_memory request came in that did not change permissions. It did not consult ->force_split and would mistakenly optimize away the splitting that set_memory_4k() needs. This broke kfence. Skip the same-permission optimization when ->force_split is set. Fixes: 127960a05548 ("x86/mm: Inhibit _PAGE_NX changes from cpa_process_alias()") Signed-off-by: Dave Hansen Tested-by: Marco Elver Cc: Peter Zijlstra (Intel) Link: https://lore.kernel.org/all/CA+G9fYuFxZTxkeS35VTZMXwQvohu73W3xbZ5NtjebsVvH6hCuA@mail.gmail.com/ --- arch/x86/mm/pat/set_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 220361c..0db6951 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1727,7 +1727,8 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int primary) /* * No changes, easy! */ - if (!(pgprot_val(cpa->mask_set) | pgprot_val(cpa->mask_clr))) + if (!(pgprot_val(cpa->mask_set) | pgprot_val(cpa->mask_clr)) && + !cpa->force_split) return ret; while (rempages) {