From patchwork Sat Dec 17 18:55:34 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: 34250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1636468wrn; Sat, 17 Dec 2022 10:59:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXu4I8/7xdsAYYUm20qZbCD46EE/HWfj7HjV/dT9HRMif1J0E5lHIKFU28KhCUiI6vPwwvvv X-Received: by 2002:a17:907:a092:b0:7e6:bae:fa0f with SMTP id hu18-20020a170907a09200b007e60baefa0fmr5976116ejc.58.1671303540676; Sat, 17 Dec 2022 10:59:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303540; cv=none; d=google.com; s=arc-20160816; b=kxJfvRI7HOXdJqno/qTvfPXHy/04Z/fLPLas/IV7NAMwh64gTiXyxAgarUgqRFqODa keDhx1vV3Dnwfd81kJcH8IPnTC7eXpRaE4v+VTZc2YkpGX9hxJs2cemUJ8iA5QKxcgC4 Gh6Bf3T1NzamV+YiAtZlryBtHlbXZtCLkl2EhEH/2ysBpAouXeYjutHShppr9NeXX4Vq hpCyQGEkHZHJYbV2AhVugzjoCrBV2r0xFETjrDAwJUeik8MSM6fwE4K1678k3je62HET xuPFFbrU0d/YWH3ddFRIBtqaF9MgGPzz6Hm7Kglo3zdgN0VUjUP5kWE+gkkmTjwXpq64 9Ozg== 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=3qqEbo2z0uGyJboC2Y5J4/W6tlDZ63PWcNPiBneyAlk=; b=jik/K0mTrjznbWHlo9PNvl+1M9kTs+5431V1pTlkpGdFYuSTjEh9jwjizXT7noIuvj 49pD6B9mA6IKpgh63wrVNvs7zKApspzKg+Gm25rRkeJpWZfR97CGbwvfETVBS9N7cvPA lx3dYHZdYhGjG/S7Piz9S94tAp8xB7O0Wj296UJ1fjavvKO8X4PAveLcVy4/hpd0gz7k gO+E1UH2IigwYg1XUBamn+0tLpHZX2DYy2Inmjfzwph7HBl51BrD+OXnFGtq7x95/6ly SazOp+BBkr8y7+TmHac8Lx0aRqrM8lt1PFthNZOovaKl4P+UFFNvngF39eT3pT7owvrQ p9iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0bPGqo5P; 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 ji16-20020a170907981000b007c087110276si6034085ejc.151.2022.12.17.10.58.37; Sat, 17 Dec 2022 10:59: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=0bPGqo5P; 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 S230312AbiLQS5p (ORCPT + 99 others); Sat, 17 Dec 2022 13:57:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbiLQSzk (ORCPT ); Sat, 17 Dec 2022 13:55:40 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EEFBF25; Sat, 17 Dec 2022 10:55:39 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303335; 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=3qqEbo2z0uGyJboC2Y5J4/W6tlDZ63PWcNPiBneyAlk=; b=0bPGqo5PkP3XzoOcWO52eimc7GNoyits8Zm0L2mPI6QVZa9Fg8RqMQ+I7tgztRvB8ixjG7 9pxEUlfOr7S27xBcDBca6lXUnmT2RskK3VZ/XDjO0BzLsISDr6imxZRuB6W1qV/UMTO9An 0o908NQ+uezpzO6SBgotpN/NrSQroP6NCFC+jQLZ1m90uklyX3cy/jSRw9BEZ+IVdfUvip FLA4NlLSjsbcTymRToJo9qqNdW/uzYsBRxedWTZrDyGat/bDCmf8pSQQPJ20J3Yj/ra6Dv qePkYUz6adPuPWGCdPzaQT5JIxjOOX/3IDx6PMIWFODhZ2e4ypp+kRn+E7Abdg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303335; 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=3qqEbo2z0uGyJboC2Y5J4/W6tlDZ63PWcNPiBneyAlk=; b=c/TfriQDxsNwmvKuDZo1NFHVOX+oBxa9ApPpPB/FA9UJmQd6L1hlvqohq7gV9grOxrtOUz 1Q68gd20Dbsa/QBg== 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: <167130333490.4906.16809810464935518091.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?1752488781477711182?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 414ebf148cb5c5fa727ec51fdb69c4ab82dccf3b Gitweb: https://git.kernel.org/tip/414ebf148cb5c5fa727ec51fdb69c4ab82dccf3b Author: Peter Zijlstra AuthorDate: Tue, 25 Oct 2022 21:39:43 +02:00 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:26 -08: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