From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1D20C4321E for ; Sat, 3 Dec 2022 02:38:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 618EF6B0074; Fri, 2 Dec 2022 21:38:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A26D6B0080; Fri, 2 Dec 2022 21:38:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41EAF6B0081; Fri, 2 Dec 2022 21:38:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 31A5F6B0074 for ; Fri, 2 Dec 2022 21:38:34 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 051F1120BD3 for ; Sat, 3 Dec 2022 02:38:33 +0000 (UTC) X-FDA: 80199436548.26.7772E06 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf07.hostedemail.com (Postfix) with ESMTP id 9790C4000C for ; Sat, 3 Dec 2022 02:38:33 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=augaWf6G; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf07.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.173 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670035113; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gY59Fkmvz/8ABweO9p7GPk5PRE6er0EUBOixMOBIZII=; b=oh6/CiA7Bnp2mjDYv0TC+16P8N/PqpOYeeo/GDlrd8F/J87LUvrNh9bpPLYul9hRgYVHtT HC83nczReE2rAGp9tccxL/5F6nZBxXtJoZimqoOTzjzLJTw9ZR1Mcx/s9lINb7TiI1DtQY 4BsmgutfOX+dHoMNAkKnLZOgRkEMRb8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=augaWf6G; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf07.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.173 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670035113; a=rsa-sha256; cv=none; b=wCQou13yM9ghGnTcxTx/w0gqFc3PvEJR8cgQn9dLvVV0AMGjOGU/jP/zKV97QcLYSpBs0Y pQi5s4AUhUI0Mh/qkSLVKrTemTdhKa0vHSPla/4D2R/qql0utXNCpwJYxdeYLpdDj3DtC+ Fmr2VuJL7APwbp0wtMZvwZQdhAW6Ez0= Received: by mail-pf1-f173.google.com with SMTP id 130so6529030pfu.8 for ; Fri, 02 Dec 2022 18:38:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=gY59Fkmvz/8ABweO9p7GPk5PRE6er0EUBOixMOBIZII=; b=augaWf6GXd9U6BdDDe7DQtiyBUROf4u8aSOBMTvbdV9soqeHINlVqORoAlWlcSnFIJ A6G/rau+z3mESfnnELYgyGtAiSBOoqnQRoNFR81xieE0Lun+vc/zzKgMALA5H3YgRR+h uPPpnIPsKxYgFZlcIItboAh8jK9HLc9g/yUos= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gY59Fkmvz/8ABweO9p7GPk5PRE6er0EUBOixMOBIZII=; b=4pRbzBNQsdalTdFPJAYbfgQz+N0o+2pxy1Qt/Dgyb1bVxVPzQMDz8CgWH1xxLAe/5d a0ynoAlwrgxe7E6fUYKckJWExjB3cmfaigtwUkPS1/Z++3hNH5s2JQRjcVlBmjMP3CFF 1XiCaIIz4H/12LoyaMUmOBBl5fiY6rv9JrSIXKmY49LeIOkEtJb1fOfF1NHF2M4BXedB VTSZOWKgpyN9jPoKYV74WBNFXFFOl6jfDAoFzwCsmwKbmnyLbSZEqWiR1Fy8UxLst0y8 FAZOXw9hfJMoraZLLpsfWarLql8QwH4lJCGKCaANuWRiupKB+sezaxGXeiqHyP7ZW/ng bnTw== X-Gm-Message-State: ANoB5pkDsIGYE5+2RCLUrgiAg/t4oXXBuM9798M6O1zxDWtEta9QVyvQ dDQVwqi6Yk/naLkwyS+T4NNalw== X-Google-Smtp-Source: AA0mqf6WTehuBNCmz0UyKCIFRRqKtrKxlHeTLSUldJI0j/UdtIvxFRjDpcmmJNpeC3TH41FOco9P2g== X-Received: by 2002:a63:f506:0:b0:470:14fa:a294 with SMTP id w6-20020a63f506000000b0047014faa294mr47726112pgh.361.1670035112600; Fri, 02 Dec 2022 18:38:32 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y25-20020aa79af9000000b0055f209690c0sm5739192pfp.50.2022.12.02.18.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 18:38:32 -0800 (PST) Date: Fri, 2 Dec 2022 18:38:31 -0800 From: Kees Cook To: Rick Edgecombe Cc: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, Yu-cheng Yu Subject: Re: [PATCH v4 21/39] mm/mprotect: Exclude shadow stack from preserve_write Message-ID: <202212021838.E8645AD@keescook> References: <20221203003606.6838-1-rick.p.edgecombe@intel.com> <20221203003606.6838-22-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221203003606.6838-22-rick.p.edgecombe@intel.com> X-Spamd-Result: default: False [2.51 / 9.00]; BAYES_HAM(-3.59)[93.77%]; SORBS_IRL_BL(3.00)[209.85.210.173:from]; SUSPICIOUS_RECIPS(1.50)[]; SUBJECT_HAS_UNDERSCORES(1.00)[]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[39]; ARC_NA(0.00)[]; R_DKIM_ALLOW(0.00)[chromium.org:s=google]; MIME_TRACE(0.00)[0:+]; TAGGED_RCPT(0.00)[]; DMARC_POLICY_ALLOW(0.00)[chromium.org,none]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; DKIM_TRACE(0.00)[chromium.org:+]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 9790C4000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: p3kyng7tt3now1zywpmxfunmr4iw4ezk X-HE-Tag: 1670035113-824056 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Dec 02, 2022 at 04:35:48PM -0800, Rick Edgecombe wrote: > From: Yu-cheng Yu > > 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. > > In change_pte_range(), when a PTE is changed for prot_numa, _PAGE_RW is > preserved to avoid the additional write fault after the NUMA hinting fault. > However, pte_write() now includes both normal writable and shadow stack > (Write=0, Dirty=1) PTEs, but the latter does not have _PAGE_RW and has no > need to preserve it. > > Exclude shadow stack from preserve_write test, and apply the same change to > change_huge_pmd(). > > Tested-by: Pengfei Xu > Tested-by: John Allen > Signed-off-by: Yu-cheng Yu Reviewed-by: Kees Cook -- Kees Cook