From patchwork Tue Jan 30 10:34:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13537191 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 05762C46CD2 for ; Tue, 30 Jan 2024 10:36:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85FA76B0081; Tue, 30 Jan 2024 05:36:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 80C946B0082; Tue, 30 Jan 2024 05:36:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AD6B6B0085; Tue, 30 Jan 2024 05:36:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5CBFF6B0081 for ; Tue, 30 Jan 2024 05:36:37 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0B897A0A46 for ; Tue, 30 Jan 2024 10:36:37 +0000 (UTC) X-FDA: 81735623634.23.9DCA3AF Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf09.hostedemail.com (Postfix) with ESMTP id C28F714001F for ; Tue, 30 Jan 2024 10:36:34 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf09.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706610995; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dGYjE4o6MUQJibJzzOY90HA9ftrfV8EaFGhkbHx5+dE=; b=6IPzowpgeMNzcbo8yL4uiJ4ALHV0fQCCd+bJxKDNdzN11ogRsDAfIIlTXRzG39xjKcb1lK Yr8LuXlKSEG2EgpiAWZFXQ8Td+eaqg4p7TPzVgTpkI6w/hvg3a3pLn+Z5yTcVVmKL7WW2w PU1yNmT2+6ebBh8TKcoEfSSoE5CSqbM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf09.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706610995; a=rsa-sha256; cv=none; b=UD6zG0PIJV13j8dUVO4t15GCV6zkEIHYX3y33sJHd3WkbVYt8CCAPsfea63WyL6xiSmTyx nR/4CZ9sfQY7qHJvp0lE0mouc2zUo+4F4QHUncyJhLTvXCDG6WM9qRPqyZNdQdBou88DbJ SHZqqk8dOkmcGyy8sH4fdlPFHY95jZs= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4TPM6473Twz9sCk; Tue, 30 Jan 2024 11:36:28 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vvJSyJCgcG_B; Tue, 30 Jan 2024 11:36:28 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4TPM4T10z0z9vFr; Tue, 30 Jan 2024 11:35:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 18A1C8B76C; Tue, 30 Jan 2024 11:35:05 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id nKiNczyoyHZd; Tue, 30 Jan 2024 11:35:04 +0100 (CET) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.232.134]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 91DDE8B76D; Tue, 30 Jan 2024 11:35:03 +0100 (CET) From: Christophe Leroy To: Andrew Morton , Kees Cook Cc: Christophe Leroy , Russell King , Catalin Marinas , Will Deacon , Michael Ellerman , Nicholas Piggin , "Aneesh Kumar K.V" , "Naveen N. Rao" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-mm@kvack.org, steven.price@arm.com, Phong Tran , mark.rutland@arm.com, Greg KH Subject: [PATCH v2 1/5] arm: ptdump: Rename CONFIG_DEBUG_WX to CONFIG_ARM_DEBUG_WX Date: Tue, 30 Jan 2024 11:34:32 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1706610876; l=2817; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=QmuRLYanqkqd6xSNOGiFGga1t8t/c6NljZiedRJBwPI=; b=g81FwyS7zti2ruoaUhxUSuzPsw5HpSfIlCY4oQ1NTkvQpTXA2xsMuADC0BH0QgZEr2/l/J3ix J+FpAWf8ERMCsda1rh9tv/mv27RLjAtsKIaQFX8QXy6defhUmKE6s+X X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Queue-Id: C28F714001F X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: dqdizoqpgsos1ad84ydonpmts6j1mr8g X-HE-Tag: 1706610994-754477 X-HE-Meta: U2FsdGVkX18EqQyPwW2PYx0pImn9fE21kc8zYiNIos7kIMyIPAXxbu1Vok5G8wnhy/SBTlFG198noK2pW1LCsRmONluKesk+bQtzFX1CEUCArRm8eFd330EhL+++/K7zc+ptURYx3/osfel27tJIYF+CXUHmTe2XHfc2GSNHp/+yQZXFozOFkILwIr5IR5+vMGw0tOGdcWFhdnPz44jfWlHBb3BMut2q/1hXMi9j0wp93m+27lSKbIWJ0emd3zbW9SKJD+wV3NffH+lHZTPIq2fLPZs8ku1Y7V/ha18p6HopKreUVNRg8SPLksB058E7NagU01zA49tEkM+LKvv0Ye/VH424b2EwDX5+ylLAEy/uVu0AvLoMqe6Yn0RHEESZiUzl6u+w4SUKmIiGOfOxzbCyB/cIEu8Eqdk8Ss4jDOS63256Tqb5qoyNY42or/uHNlWebgnVj+fF/H6/eeotLSq/rtI3aCXZv0YYTIGKuKMjp5JBLmzxgdnCELcyW55rq8wHhJsLZ/0+D2AvEd3XKvEj2MaXyP+7yj10gDkZklMrE5qpe1XJPTvOMBj2UGb3jUGpFxjnPU9xW2RZqlglQ4ahFbwnbytmUjsMf6RiuHJ9K4Q2o6Qa4H3+ZCLxFUcuHtN6QfkzouoE5PpJJAYAZNFIBiEP1JFQUUZ+apJRY8yObdzwbLAgFPoQXWm+TtUTHs2aENA+9rOk/7srcHET6J1oJ713raUQGluBbQCmXC+y1oZiFLuQOcWmnkXtFnnL08qXrC9XhfvEeF8w2PDp1yWcLTZrMpMLGCh6vARpRbHxUixD5WBCxEP/uX3FmMwYChR4XIX0HngJmGGXagI55FpE3T+JLLAQUFnxrmJ518wjmLO/eYg2s5nfzI5H8e70Jn/SlgKp3kaq2Sch8k9e0mAy12M8lyXqR9cjYNr8QVoLMSzYXtrN98Kcq0FNq5c2fwjdUUu+LeNzOiimKUB jtWGQgl5 PARcr2/qhFXL2IskFEyNQQQw/5n8q2C4mSk5oRN0kEiCsMQLgXW8MduH92widQrux+2+IzoTj1GZg/zRH0c4dJmg/K2WZtJ5x3pz+pQfCblDTA0HIMBMHo84U3p7/7Bi6mWseKW99kpmIm82s+gKgl/orBLGO4IBYY5UhJERHuUcjDnRgERZadzgKdQ== 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: List-Subscribe: List-Unsubscribe: CONFIG_DEBUG_WX is a core option defined in mm/Kconfig.debug To avoid any future conflict, rename ARM version into CONFIG_ARM_DEBUG_WX. Signed-off-by: Christophe Leroy --- v2: Fixed left-over debug_checkwx() in mark_rodata_ro() and updated defconfigs --- arch/arm/Kconfig.debug | 2 +- arch/arm/configs/aspeed_g4_defconfig | 2 +- arch/arm/configs/aspeed_g5_defconfig | 2 +- arch/arm/include/asm/ptdump.h | 6 +++--- arch/arm/mm/init.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 5fbbac1b708b..f1fc278081d0 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -17,7 +17,7 @@ config ARM_PTDUMP_DEBUGFS kernel. If in doubt, say "N" -config DEBUG_WX +config ARM_DEBUG_WX bool "Warn on W+X mappings at boot" depends on MMU select ARM_PTDUMP_CORE diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index b3dc0465796f..28b724d59e7e 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig @@ -252,7 +252,7 @@ CONFIG_DEBUG_INFO_REDUCED=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_WX=y +CONFIG_ARM_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index 3fdf4dbfdea5..61cee1e7ebea 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig @@ -302,7 +302,7 @@ CONFIG_DEBUG_INFO_REDUCED=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_WX=y +CONFIG_ARM_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 diff --git a/arch/arm/include/asm/ptdump.h b/arch/arm/include/asm/ptdump.h index aad1d034136c..46a4575146ee 100644 --- a/arch/arm/include/asm/ptdump.h +++ b/arch/arm/include/asm/ptdump.h @@ -32,10 +32,10 @@ void ptdump_check_wx(void); #endif /* CONFIG_ARM_PTDUMP_CORE */ -#ifdef CONFIG_DEBUG_WX -#define debug_checkwx() ptdump_check_wx() +#ifdef CONFIG_ARM_DEBUG_WX +#define arm_debug_checkwx() ptdump_check_wx() #else -#define debug_checkwx() do { } while (0) +#define arm_debug_checkwx() do { } while (0) #endif #endif /* __ASM_PTDUMP_H */ diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index a42e4cd11db2..4c3d78691279 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -458,7 +458,7 @@ static int __mark_rodata_ro(void *unused) void mark_rodata_ro(void) { stop_machine(__mark_rodata_ro, NULL, NULL); - debug_checkwx(); + arm_debug_checkwx(); } #else