From patchwork Fri Nov 11 21:58:35 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: 19020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp989593wru; Fri, 11 Nov 2022 14:09:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf6B0KW3wREfTE7Qzz07lqkOMbEjSpxv+K24XVPoojhV/CY/E+/mDlRo7g80DyU1yLeNIkvW X-Received: by 2002:a63:1042:0:b0:43c:1cb8:73ba with SMTP id 2-20020a631042000000b0043c1cb873bamr3386706pgq.11.1668204540077; Fri, 11 Nov 2022 14:09:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668204540; cv=none; d=google.com; s=arc-20160816; b=PptNvOUYWV7ATsY0PkXp08FxM+5/n1Nqy+hI0pngB6kTayLST39mlsI8y641+JcGVA HsnLspO6lPgfp2jhWhWwViiFGhi0ziiGApB81xZj9NxmhXU7lSB+WVpSJ94BWgKebfyz +Zpb0JHTa6MSxx1/jDwFUjLC21w5aeATkbWtvvz42TDRbpRdBI+mIq7ovHGuUbRLEXfc m1hrRoialWLHA9RTBgyQ+dx4EcvGAR9JFCUL4TWhim3OHfJ2lGgotRGeYvcW8Wwkk3eT OD52SBDgSwGJjUKdM3dii9kPty0Byx7ddCer0IbjyAFj7rDJE5F8C6lfRPI7coMSOr8+ cChg== 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=Dm3F/pc3L7kD0HxaMff9m19vgp7Mx8YPppLwcgrMjtA=; b=k0cLwLnnnW6xprgfpVjHFPYOFooZE6PVG9cFaOTvacJ3H1X6LLzaovEabFH6iicOcx PjAztJSnYOq3RyWMAgmnEPiMwP2c2RMCC5G6pKnUlbft7QQOuNFvBsfmYaDpuitgLZWq hek7vKToZqzlulb1aKv9UBPxeTb95sb3V4fuL39Q6ignVrBeImuHFgbL8bi+xPk1DHuS Rgq3cnwrGzaVpVokO4srkTMRpyaXSY3RKWOC1v/pwmhxD48SOTg97TggnYS56H0Syld+ PI80Zul6pD5Ahb8W9aWfZ+s+UwLgBMjsYF/TNi/vcwSp3TXYaSoYhxAcCtm7R2/cI0zq kFLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=KlTKIKdt; dkim=neutral (no key) header.i=@linutronix.de header.b="4nYdnUz/"; 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 k7-20020a056a00134700b0056301324a24si4033862pfu.133.2022.11.11.14.08.43; Fri, 11 Nov 2022 14:09:00 -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=KlTKIKdt; dkim=neutral (no key) header.i=@linutronix.de header.b="4nYdnUz/"; 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 S234248AbiKKV7a (ORCPT + 99 others); Fri, 11 Nov 2022 16:59:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234312AbiKKV6z (ORCPT ); Fri, 11 Nov 2022 16:58:55 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCEAC26AFA; Fri, 11 Nov 2022 13:58:37 -0800 (PST) Date: Fri, 11 Nov 2022 21:58:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668203916; 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=Dm3F/pc3L7kD0HxaMff9m19vgp7Mx8YPppLwcgrMjtA=; b=KlTKIKdt46pFlP1c1wmV/+z3amYeYYaRGCKGpG1f64hFvvFcwrPkDVgXDKOlznPPrSNaL+ PVaJm37E526nhCumfg2UbktKfpeACFmF8g6Z7t/VfkIRU1P791PyuAUpCiIO/p5qVLqJLH Awr1rI+c/ZA04QUcFSUSl/W55ABHFU/OGiy2RC20Rz6BKzrqdyp9Up7lcCcDIVC6pxhqCg Nid5xKw4Lk+CE7aaT1qIxJH2q3S6j9lsJspk3YCdm1X6pi1242pDrAU3dx4ip+k1GXXl1O ebNw8Y7o1sddp+iGMkpq6bmXYSJ9kqa2pP4W24/OKpZupulLSnELNc7H88t6yw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668203916; 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=Dm3F/pc3L7kD0HxaMff9m19vgp7Mx8YPppLwcgrMjtA=; b=4nYdnUz/HrQP2rwxZcZmYvd3dpRFcLKjTctwU+QyU4J8khxb1AOZzVJV2eSMDNGqIpAgD8 B7+Bq6ZcuL7AeRCA== From: "tip-bot2 for Kirill A. Shutemov" 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: Fix CR3_ADDR_MASK Cc: "Kirill A. Shutemov" , Dave Hansen , Rick Edgecombe , Alexander Potapenko , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <166820391515.4906.8308006042078958731.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?1749239244115438921?= X-GMAIL-MSGID: =?utf-8?q?1749239244115438921?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 4cb94f188d3a0bc0c6e72c07ce2fe304611ebcf4 Gitweb: https://git.kernel.org/tip/4cb94f188d3a0bc0c6e72c07ce2fe304611ebcf4 Author: Kirill A. Shutemov AuthorDate: Wed, 09 Nov 2022 19:51:25 +03:00 Committer: Dave Hansen CommitterDate: Fri, 11 Nov 2022 13:28:06 -08:00 x86/mm: Fix CR3_ADDR_MASK The mask must not include bits above physical address mask. These bits are reserved and can be used for other things. Bits 61 and 62 are used for Linear Address Masking. Signed-off-by: Kirill A. Shutemov Signed-off-by: Dave Hansen Reviewed-by: Rick Edgecombe Reviewed-by: Alexander Potapenko Acked-by: Peter Zijlstra (Intel) Tested-by: Alexander Potapenko Link: https://lore.kernel.org/all/20221109165140.9137-2-kirill.shutemov%40linux.intel.com --- arch/x86/include/asm/processor-flags.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h index 02c2cbd..a7f3d91 100644 --- a/arch/x86/include/asm/processor-flags.h +++ b/arch/x86/include/asm/processor-flags.h @@ -35,7 +35,7 @@ */ #ifdef CONFIG_X86_64 /* Mask off the address space ID and SME encryption bits. */ -#define CR3_ADDR_MASK __sme_clr(0x7FFFFFFFFFFFF000ull) +#define CR3_ADDR_MASK __sme_clr(PHYSICAL_PAGE_MASK) #define CR3_PCID_MASK 0xFFFull #define CR3_NOFLUSH BIT_ULL(63)