From patchwork Fri Jun 16 19:17:05 2023 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: 109338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1570877vqr; Fri, 16 Jun 2023 12:35:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gULMvN0TYAxeTiv1QMh2EMoxrj2D292u/55yml57xbCyq3DETj2WESYnocT6gdEDiSrj8 X-Received: by 2002:a17:902:cecf:b0:1b2:74e:84cb with SMTP id d15-20020a170902cecf00b001b2074e84cbmr3272246plg.9.1686944132736; Fri, 16 Jun 2023 12:35:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686944132; cv=none; d=google.com; s=arc-20160816; b=dNi8NSwolXdp/7r64c2/XilEbggLSHTW6beE03ow8GiYXZCmUHpLGZnbzl2YcfoRl1 7RMuogLFUD0x4hyBeYyQWve3nuyqOKdwY0CnKEL98hEWJJZq3yqGC5/fB2QV4gApumkg 7uCSiaKTGN71YUV6I9pRyP3Mk36EfIB1vxMAg86WfIzJyZiVAFUZS5mWm6uTcnuOF/QB dSWIHQztGFXwZSY5ut/vMzs/NPn7noeY3UJlt4/jPMvhH9XOyD8QK7ZSnIVoSFecHPXr 6pW5a0xyQ+WvVtPA4peciXKhqlU+kF+wICLuPYQG13vQRg/oen5fCObYzCDKf1nG6Aw6 lugQ== 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=/hAFkO4NOEoER8CL9Q/AGPB5LbRC/8Ycn9rCGt2ZoqY=; b=cWyDWkVSaCm5Oq4htfnx2xP/4Wh2pTthyFfBDrzHoxhgRR/KYAT6IJL/yZ7InaUlMU WPuCjp8j4XwTpDzOgl33H1vWK5vU27JaTjiDL1QrYR3EGedHR3FYnvHBYMRrttQ3KmaU fP1zH+C1V9lSdOptqz8z0lTHCjWV0T2O7LEvSKchr8A8xw+k5aq+a5NrD6uL7yxP3kTB Q+i0eLa0JJ+B9LglwvXWN5Q98vb+ORPtCsiUrT8UIQsebjqP79Krewc7Q4rl5/Po1IiH 3LgBLh2GvH+kIwqjAbwpkVhNqC3VgY4gRO9ai9yziYVhtcs4raetocTzDjcgtaD9RSFm VeXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xsOE2Sf5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=+ZwxYiT7; 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 h12-20020a170902680c00b001b045d65aedsi1641366plk.228.2023.06.16.12.35.17; Fri, 16 Jun 2023 12:35:32 -0700 (PDT) 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=xsOE2Sf5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=+ZwxYiT7; 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 S1346207AbjFPTTm (ORCPT + 99 others); Fri, 16 Jun 2023 15:19:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346032AbjFPTRR (ORCPT ); Fri, 16 Jun 2023 15:17:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDE4F3C0C; Fri, 16 Jun 2023 12:17:07 -0700 (PDT) Date: Fri, 16 Jun 2023 19:17:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686943026; 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=/hAFkO4NOEoER8CL9Q/AGPB5LbRC/8Ycn9rCGt2ZoqY=; b=xsOE2Sf5w8kZAw22ij4qb4/pI8OICio0+mQZ/qylFhGsUcLQZe48nw3ZhoJXE8iXPXcbi7 Yopbg1I5XVgOPbC8NxOv3DDaEVWQdysjPRi7cLhZ/rLaKpPzYyAjXEhHYCptQgsFkpqB03 s9U9rEBSiqvrT6cAMsRDzQLmtISL3fXvGMdw9XtHPeKas6IYIshz8ET33vbl1yD7YQzpW3 fJp3/HOOLDtgz7IcWbOpPGQIrOBibbe4OJjooOSRR2bM9XQQQ7bdS9Zhg6M2UZTZ+5eFgk 6pLi4iEB0/bADEYKLoUxm35i3ltoSvF7Nj0oMJB1a8jEFAegT/QR51gILwEmJw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686943026; 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=/hAFkO4NOEoER8CL9Q/AGPB5LbRC/8Ycn9rCGt2ZoqY=; b=+ZwxYiT7TlI5fLF3t5QBMPCATdL1h0J3DKA83I2mGonRz2Ng/A8UhI06mQrs38X3kKVlDA HikyIg7zijxsrUAw== From: "tip-bot2 for Yu-cheng Yu" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] mm: Move VM_UFFD_MINOR_BIT from 37 to 38 Cc: "Yu-cheng Yu" , Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , Axel Rasmussen , "Mike Rapoport (IBM)" , Peter Xu , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168694302574.404.15745410316250224679.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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1768889131031069200?= X-GMAIL-MSGID: =?utf-8?q?1768889131031069200?= The following commit has been merged into the x86/shstk branch of tip: Commit-ID: da6031de051337fc7ace0738553d509fd26cc85c Gitweb: https://git.kernel.org/tip/da6031de051337fc7ace0738553d509fd26cc85c Author: Yu-cheng Yu AuthorDate: Mon, 12 Jun 2023 17:10:31 -07:00 Committer: Dave Hansen CommitterDate: Thu, 15 Jun 2023 16:31:00 -07:00 mm: Move VM_UFFD_MINOR_BIT from 37 to 38 The x86 Control-flow Enforcement Technology (CET) feature includes a new type of memory called shadow stack. This shadow stack memory has some unusual properties, which requires some core mm changes to function properly. Future patches will introduce a new VM flag VM_SHADOW_STACK that will be VM_HIGH_ARCH_BIT_5. VM_HIGH_ARCH_BIT_1 through VM_HIGH_ARCH_BIT_4 are bits 32-36, and bit 37 is the unrelated VM_UFFD_MINOR_BIT. For the sake of order, make all VM_HIGH_ARCH_BITs stay together by moving VM_UFFD_MINOR_BIT from 37 to 38. This will allow VM_SHADOW_STACK to be introduced as 37. Co-developed-by: Rick Edgecombe Signed-off-by: Yu-cheng Yu Signed-off-by: Rick Edgecombe Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) Reviewed-by: Kees Cook Reviewed-by: Axel Rasmussen Acked-by: Mike Rapoport (IBM) Acked-by: Peter Xu Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/all/20230613001108.3040476-6-rick.p.edgecombe%40intel.com --- include/linux/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 9ec20cb..6f52c1e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -370,7 +370,7 @@ extern unsigned int kobjsize(const void *objp); #endif #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR -# define VM_UFFD_MINOR_BIT 37 +# define VM_UFFD_MINOR_BIT 38 # define VM_UFFD_MINOR BIT(VM_UFFD_MINOR_BIT) /* UFFD minor faults */ #else /* !CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ # define VM_UFFD_MINOR VM_NONE