From patchwork Tue Jan 9 12:14:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13514853 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 3C217C46CD2 for ; Tue, 9 Jan 2024 12:15:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCF766B0093; Tue, 9 Jan 2024 07:15:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C7E2E6B0095; Tue, 9 Jan 2024 07:15:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1FC06B0096; Tue, 9 Jan 2024 07:15:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A1ECB6B0093 for ; Tue, 9 Jan 2024 07:15:07 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7C0391A08B7 for ; Tue, 9 Jan 2024 12:15:07 +0000 (UTC) X-FDA: 81659667054.23.7A74DB3 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf04.hostedemail.com (Postfix) with ESMTP id 5B1D240022 for ; Tue, 9 Jan 2024 12:15:05 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf04.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=1704802505; 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=izlm1H+MKRgUj2l8DcDs92GC+N0/E9JUWZ0WFcLtG00=; b=iA0wA4NcrNKgbp9KcTj/Ox79YJLdN88/CmTqIIMj5OebYMkgXY/iKiGtdEgwNfD9zcyCmF EYGHRrY5e9SyWosXP6SsNApXF3NwpOyg2+kanAFTaquO9XY2Gi2DXGT1BhbL0XYf6f74gB +pO0lYoX6cPOUqNpMB/5KjUtJka2yQg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf04.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=1704802505; a=rsa-sha256; cv=none; b=00GUYGrw86Q80vS9DCgrfHL/Ca7Is9QMXgW7JTvc7lj89Is6ltknrXQuuMspfnaLMLuqYS C6tRWGkBA97GdTzoiOSRDby2uq2i4MMXw525OkbOe0oa6eCU/32oyJ/SHt5hHqiGD0lhAi DFAAMelIMW8wIp4aU3wmMwIW0H3d2rk= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4T8VHS157Qz9v6Y; Tue, 9 Jan 2024 13:15:00 +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 jdK_Jc1jqNjy; Tue, 9 Jan 2024 13:15:00 +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 4T8VHS0HC2z9v2V; Tue, 9 Jan 2024 13:15:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F1DFE8B77D; Tue, 9 Jan 2024 13:14:59 +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 7pM4OD5n-ewz; Tue, 9 Jan 2024 13:14:59 +0100 (CET) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.126]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 26ACE8B774; Tue, 9 Jan 2024 13:14:58 +0100 (CET) From: Christophe Leroy To: linux-hardening@vger.kernel.org, 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 , Andrew Morton , Kees Cook Cc: Christophe Leroy , 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 1/4] arm: ptdump: Rename CONFIG_DEBUG_WX to CONFIG_ARM_DEBUG_WX Date: Tue, 9 Jan 2024 13:14:35 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1704802473; l=1302; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=SZmJpW4kyN4zUs+MdMT6CDyMhbW9dyNyADl5ScxgQbU=; b=ZRUK6aNuwLf82oScWI/2o5V02OBwPHgNwHRpA6tH0OpUPTRtOVcXbXukUs0gIeW4L5Tm9Mi8E t1ySRzRI5ipD9FZVb5uHd+bEWidm7yIlzdJbDqOzk/F2uTz/mSpvamx X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5B1D240022 X-Stat-Signature: qm11fhedtsoweswjyt8uidapskej6uim X-HE-Tag: 1704802505-224243 X-HE-Meta: U2FsdGVkX1+/ldef9hsipirPVyTAURyKf5zhj+6gsTDEzbhJC4+SrT3uGPR69H3LQnrGImK/aE0ik6tHdrjn70/WDGeJXMxcDCWD0PxyI5+a21GiVnKKcumSHWz2tm7yxR7Eghe8YAxF+guZ22siOPdyPzh9nH/b0Qgseb0wvFVrbPKfyGnhEvwS+54wMZpKeFoflrCXV+XDMxWM7nY9HSKOf3bVpvufc1paae7YGEBzMBidEpLtdlrlq9BPOfUjH2Md8iJ3Utfw4leP7prLYnEEY+p0QoAnXiyIQEWdUDyIphvyMyMiKSoSZIeddNNDYFLUlhQ3lvKNBtpFeAosWvDDEXbUk0670HlkLlmg816+5RCYl31aspD4dvlZf53U466h5QYpHQNVkKzMWm11BWPbhOVM9pm3pswc158tsbJ1PbGJnC81PUVppxp/g4WbUi2gvQQUl47GkFUNAQ4QimXp1XR06RST62RisR1HUHjG2QlTmGLiSMqBxC6juFbyVe5zQ8scTuoQ0lrN3WxRcYHfjWxL9w0vojO0JfWhxD2yMBrr1bYgzUFrdnZ2+lbelrqLFcOIw8e+5JxMxBddlUNZkyZn1M4u+sJNPIb54NdIs1qTqWg5u7oir6uZVnUkfmc+0uTNJqAmNX7tC5i8fQQjF4gG2XIg/6BuUu6hsmQ3buOwK6dTyqAT2GYQ+wsC7fQFIlUr5KtjeO1Pv6Hrcf0CGFmNFJOF+DMDmggOJVAxb2bhH47BijQo+txoPf14sl/kRQ4cmauKxzXdAy5R004Qb3yEv8T0nZWUrVL3A1lIi/f79E1gxEOKE3hy52yU8HpthHp+irl3Q04Z4BVKj4OviuMHDgUt3fE+sYd1wMkhwov3l6I0NNWwazZhjyZN//50F0mU21Ts5ao2i6qwI29/TRLOEUJ9bwZkJlbCGBc8XV7z8qy5OuGqXESiDAL9V93NeiO7OwVFXpYIbj0 gHkFhjnR LTat/WTJeBZmxgD2UAAkCeVmnUMD8HTvxBZfugRVr3HMTuVkWzIznyAbDOiZ2wrJsNLrqDJyYI713uWrtyQUu7p/LvMf2EVnnW03Q3gVPq/oJ0QQ4+VVSAnK24yOgWT+xPfpjOLr8uQpEAw8YRHgskgc+LpZLmz3zvg+nRs0PjrRloN2r2jTfGt2pRMPbgRFOvMDDt0k67yT6WUN5IfRT44JjICak9YfAQm6rc61kXO8RJvyewvtgnh/AkA== 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 --- arch/arm/Kconfig.debug | 2 +- arch/arm/include/asm/ptdump.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index fc2b41d41447..141151d632f6 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/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 */