From patchwork Wed Jul 19 22:47:42 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: 122915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2771648vqt; Wed, 19 Jul 2023 16:28:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlGtShgMvq3nBlMSGL2F8+jcn5EUsxeL6/0GqvxrMIVPnI9e7P/1iuofa8vapw9HBCmUd1h2 X-Received: by 2002:a17:902:6b87:b0:1b8:36a8:faf9 with SMTP id p7-20020a1709026b8700b001b836a8faf9mr487869plk.38.1689809301358; Wed, 19 Jul 2023 16:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689809301; cv=none; d=google.com; s=arc-20160816; b=LsYRehotbeZ+f3tWiwyeCqTb1CAdkBuS1KPJMYK/T9TMeHhubZUiNf9OH1n6LgTumR ubCzKzmPJRfNrsNrZK84yWjqoxFoP23stmZ4m2HUnJBQqTH9hxkAl7ihYhCnEJInNpdY ogu+2TvjbLGrnEGxhAh4aNIpppbaRPi0AJtmwi/q+MEN8G47nuJFPckIuBJgf7Zol+Xl Zs/Nx1S6on55ocEue5VhZOrtEaCgYpIRuqsMUWX8AJ3qrXWXi9r39M+vqL8hfea7wJQ5 4QOC5HxpGie3LwnljTWQa4dXxd9FJxgm06QQUTpAGwBdyLLjKzKF+6ujMuO5JHHoWjQ3 /N+A== 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=McIINoN2Zzl0rumlI+oWtUhdgZB318fvnA01t2xoQgo=; fh=/IJjVp0H6ueWVaIhRw7w1k7LVfcyDuE33C3IotlnYqI=; b=RmqPnBNxNy990KKyfy/lwV17fPI3bEG7hJ+lRAxRyir44QhAzhkCPu/b7BZovS38mA +siMHiDTo2CjWTnpBkVdffSDofnS2rvupnhF/dXqYIDPkfuvU/khspEpFUm+foFia0pv jG5I4g7Iz5qJeNNFcHIcvevjVEoBt1CDq/ccTiDZ6yIX8qdJM7HYw70ZT3se//hTvyC2 V2rkvPZS/f0DTqMJ/cSdY30JN1G5xXmkMh7343Pf00BtIH4oNRNhPZOmHcmjaxg+btsO uG5VR7XhDdOOfVXwUOYYllF8DyvgmmrNsrgKQg4EJpb2qKIct2TbVgUcQtw6m3XRjl7H Bl3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=t50QpBv+; 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 i3-20020a17090332c300b001b89b63b877si4584670plr.446.2023.07.19.16.28.08; Wed, 19 Jul 2023 16:28:21 -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=t50QpBv+; 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 S231418AbjGSWty (ORCPT + 99 others); Wed, 19 Jul 2023 18:49:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231312AbjGSWr5 (ORCPT ); Wed, 19 Jul 2023 18:47:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2059E2102; Wed, 19 Jul 2023 15:47:45 -0700 (PDT) Date: Wed, 19 Jul 2023 22:47:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689806862; 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=McIINoN2Zzl0rumlI+oWtUhdgZB318fvnA01t2xoQgo=; b=t50QpBv+kepWZVvm9AmY/ibuqu2KoIctmvL2ufNE/8jeDE6ATpfx8NTIfL7EHT7mTyeTwu MGHNpAigeWv+Moqg34PjQwrlqNO8ecO781aD2vrpDPCwG3yxxOo+e/ON7oWvvAyQt2jAzg tJaTzlcHo+IlrEpoZ/VVJi7M0r1MDs+lYOCfirgD2QgBhDHNgOFJmEseD5h5sW1xmbug81 /74D8bTZZGtxZPPVdgs1xwX6C8DgZj+iaIXDRaWY8DB2TaVNRN/NfwluE3lXxGK0pOjaof zHUb4cVLPBJQ3YDRp+MRwOmd91GGtOv/DYLZp0wgKLXtEcCDU7MK4we/ByVvJg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689806862; 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=McIINoN2Zzl0rumlI+oWtUhdgZB318fvnA01t2xoQgo=; b=q6pilhhn+nQ0WfwcH452a7hgTJpfE5p+rQH0egLxWc/7GyVIUWElyGKy3M3PlqzP5BLTlS nvfwtKKHUhj0phCw== 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: <168980686210.28540.5448033149665984047.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, 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: INBOX X-GMAIL-THRID: 1771893478074783570 X-GMAIL-MSGID: 1771893478074783570 The following commit has been merged into the x86/shstk branch of tip: Commit-ID: fb47a799cc5ccc469c63e9174f2ad555a21ba2a1 Gitweb: https://git.kernel.org/tip/fb47a799cc5ccc469c63e9174f2ad555a21ba2a1 Author: Yu-cheng Yu AuthorDate: Mon, 12 Jun 2023 17:10:31 -07:00 Committer: Rick Edgecombe CommitterDate: Tue, 11 Jul 2023 14:12:18 -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 f9a627c..82990f3 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