From patchwork Wed Nov 2 09:12:49 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: 14136 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3504276wru; Wed, 2 Nov 2022 02:15:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5/KQzQjiStnE/M5Uh3COBYer9p8/J3Z5kcruZfY1+atVRRTXd7JW4caSXQ4H8J9JGeA+ZM X-Received: by 2002:a05:6a00:b50:b0:56d:a232:6d9b with SMTP id p16-20020a056a000b5000b0056da2326d9bmr11366958pfo.26.1667380512806; Wed, 02 Nov 2022 02:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667380512; cv=none; d=google.com; s=arc-20160816; b=zo7PWt6f7nqJwGP7W9rdIt2mawvKIJi5HDhUk/Et56ZQNFHjHY6Js0iRvtPxwcY+oQ OfcqmFZgmH4sJ27uPNyU7Fb3+nUI7UmmL04AC7HjyDPDg/uR4RetTBRkemXYQSRqMYEZ Kq/lE+cjc5djl6cpJ84yChr97smB5XL7Zg0fznA1D7TpwJBCROm9Ena4I+bsZfhDDy5Y KvUTqzHadWXkU1KfsEs8lXquX3yzXAHa1SHrD9r6b5zL2WV8/6zPoToWKnd4CQN9zwuH OnZBBKs00Ws/Ui86F3b0GHFacFvZt8ok5U5LpOGWNqH2Y3sMu+1A7h6t9uxOqeHDPCMj Ekag== 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:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=DcwLzVCBmz29JFQ1vIp0KD7wCCpLS+HKSEoCyPXyhAY=; b=jqzueq96h5wG2rasG8E1430YIT8Wg0C53JZQMXdkJp4pgn8mDi6MjxDC/B0osu+rjI spB5rD0xgKuX7jmoxLrPi/F+P04j+2q8H37d9SMoFElFedMhLRqbIgmR47YtilyFlLOO LZIdYCQq1V0H3O9oXdfNEGDJekGhUXYozmGcszXvNDEZIaYYp4n8clut1NND1wtjJmKV 1+D7b8BEmz43Uoj8Ebk0l23arHSWN3eLCiDsdT4XGZDUvOJHNSEpB0SDTfJLqkvj9Kjg mv2Uuy4XGoEAyGECXFiAjBWR9gVruwuU/hkikDGb1TX0uf4JDx+ylO1/at8Pw/atdCfG 0iVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=4lDKa0CT; 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 n9-20020a170902f60900b0017a0c17e47bsi15950491plg.78.2022.11.02.02.14.55; Wed, 02 Nov 2022 02:15:12 -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=4lDKa0CT; 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 S231555AbiKBJOn (ORCPT + 99 others); Wed, 2 Nov 2022 05:14:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231271AbiKBJNR (ORCPT ); Wed, 2 Nov 2022 05:13:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF3EF2934B; Wed, 2 Nov 2022 02:12:52 -0700 (PDT) Date: Wed, 02 Nov 2022 09:12:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667380370; 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: in-reply-to:in-reply-to:references:references; bh=DcwLzVCBmz29JFQ1vIp0KD7wCCpLS+HKSEoCyPXyhAY=; b=4lDKa0CT38FW7LCYVTrSX5zbRVVeZcLaD8zQGeWOnjAxSEfyDj/nq3ibfbu3ufpOmYGPfG wMNekJbXbGM/dEwGRPZmm6FKan4JWmk9Nlr9SKcMa0VimMS5tbg3UjjxXz765BN2CqwHoy kO1xrVL9v+758v+XWAlczHtkbmH2cTxHeyfJHrZcoGbJ2DZhbOsYvNflh7vVbfV7MJ1yI2 IPUYo2ddJVzs5vwkEcOayem+GX6JEIKXUsilvJDAd2KoWjSkGUBLdUEdaQzY95TsIOrSV9 2KXRidcdMuPbvAWqCJb4AkH3g2ZuJkTqBx1aM4TZV9GPa7IslCwCxh9qKmCXKw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667380370; 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: in-reply-to:in-reply-to:references:references; bh=DcwLzVCBmz29JFQ1vIp0KD7wCCpLS+HKSEoCyPXyhAY=; b=y9vVLSIxBwdXWd0rXUTQ886FnwKDhn76JyauQHa+Pi7ynEZuqsIjrriYKEXgiG1f/YGIeQ c6G069hqxtMgDcDw== From: "tip-bot2 for Peter Zijlstra" 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: Do verify W^X at boot up Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221025201058.011279208@infradead.org> References: <20221025201058.011279208@infradead.org> MIME-Version: 1.0 Message-ID: <166738036942.7716.6212112990239698813.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?1747691816882138030?= X-GMAIL-MSGID: =?utf-8?q?1748375188700317295?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 237c7e967566ca7048fd7e74951fccb026f92df0 Gitweb: https://git.kernel.org/tip/237c7e967566ca7048fd7e74951fccb026f92df0 Author: Peter Zijlstra AuthorDate: Tue, 25 Oct 2022 21:39:43 +02:00 Committer: Peter Zijlstra CommitterDate: Tue, 01 Nov 2022 13:43:58 +01:00 x86/mm: Do verify W^X at boot up Straight up revert of commit: a970174d7a10 ("x86/mm: Do not verify W^X at boot up") now that the root cause has been fixed. Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221025201058.011279208@infradead.org --- arch/x86/mm/pat/set_memory.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 2e5a045..97342c4 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -587,10 +587,6 @@ static inline pgprot_t verify_rwx(pgprot_t old, pgprot_t new, unsigned long star { unsigned long end; - /* Kernel text is rw at boot up */ - if (system_state == SYSTEM_BOOTING) - return new; - /* * 32-bit has some unfixable W+X issues, like EFI code * and writeable data being in the same page. Disable