From patchwork Fri Sep 13 08:44:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 13803150 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 2571EFA3730 for ; Fri, 13 Sep 2024 08:44:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A73676B00C5; Fri, 13 Sep 2024 04:44:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A26E36B00C7; Fri, 13 Sep 2024 04:44:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89D186B00C8; Fri, 13 Sep 2024 04:44:57 -0400 (EDT) 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 678A56B00C5 for ; Fri, 13 Sep 2024 04:44:57 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DCC1DAB662 for ; Fri, 13 Sep 2024 08:44:56 +0000 (UTC) X-FDA: 82559079792.05.D993DEC Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 35BD91A0003 for ; Fri, 13 Sep 2024 08:44:55 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726217089; a=rsa-sha256; cv=none; b=PSzaiCHeCL64kwLLnqWoYVhD1pYlLmcmdR07TxOyLLHyuFlQ8utJLW26zAvEH3NgpPcVM/ Nz2GCMz9CC51tvwls6xlQEXy7F0EG8W0bn7A5h7dgkhv2zmu3X3AXdeBzsTRhtcAH9EZ6k r3207D6s3Q768gHvKhMqpfRcxYMXqHw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726217089; 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=Kn07Ym9hhDgRqPs48mMML14pP1evt7IA1E+5MprmDiw=; b=0mht913TlFlODM1Dr095HmcsVJqZa0yzuwBZB6V9fMc3L7WY5Qb1TLUMd3mWt0u6n/OJgG vKM69HD1b2n9mCCmhoaswAr2d3cAyGqAlXQZBp+vmh+evC1cl6thpcTEd32gehv4KGM9ll 3TlmXfLT1nfVxgjFQ5EEFmbLaY3+wvg= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F22991477; Fri, 13 Sep 2024 01:45:23 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.16.84]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BA6A33F73B; Fri, 13 Sep 2024 01:44:49 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org Cc: Anshuman Khandual , Andrew Morton , David Hildenbrand , Ryan Roberts , "Mike Rapoport (IBM)" , Arnd Bergmann , x86@kernel.org, linux-m68k@lists.linux-m68k.org, linux-fsdevel@vger.kernel.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Subject: [PATCH 2/7] x86/mm: Drop page table entry address output from pxd_ERROR() Date: Fri, 13 Sep 2024 14:14:28 +0530 Message-Id: <20240913084433.1016256-3-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240913084433.1016256-1-anshuman.khandual@arm.com> References: <20240913084433.1016256-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: nuh9yaxk5fap7ndeomarxah6wzj8r3kf X-Rspamd-Queue-Id: 35BD91A0003 X-Rspamd-Server: rspam02 X-HE-Tag: 1726217095-590863 X-HE-Meta: U2FsdGVkX1/CCWfp/ErCE5rYFSCxbdRCpSyakkrN+7hVjAZLAL6gnURJ/53JhWpPKr/E45eSAGP8fRPKLZpB94r+cfOcpqbl1FgbmBixxaH0Qlu6pEClVTGzt/6p+vQT0bAAgnIDdTAZYBd4HNbyhHTLKpgf2zwBkPcppr0VRDa1FgiNCSFf8fzA5rhVjE1NkQgV6F9n3LWkBpH4QhsdVw/QQwdznHr/oWWoM1z3sOZ3h7S1TcEK1PmlQ3sfhw4+0Wk0RrnTUdulEN9dylHNQxgVMIrFmknCZmUwhIvnxyjoMeOwehRPqv+MGjKe4E24/EoUjkf386iCuKEpHvWcFas02tiNcNGrrLaJnl310UutuHsm7dA4Qd16mUzbvg+gY4rVatr2bXGXpGc4D04DoScJQxxb0iOaLB98B/vcf/TgaapWDRgAZQOmXlAAvKwI6nSfoAUiZs+2h3aFOSUXGK2Cmt0gSz8xjoDIhkXzuwdSaX2nDIpC0/1NHXcU46dUszZAwxXtOpRn0RXQbZZuQzgkCWu5fPpM9mx2EjyT+paTW9Q+VVzSXfCpMOa/BJ7Ul1IIPV/HpbH45/WAR5+el/bwEXVLp4tPncqa7JxYOIrmkZEj1AlTCR10BnDyXeFa7Poz5pjXA/Aag1OCg6na3E5agTIjUgEMiusu25KoSWRbx2h44U4/pKCbmFb2/fIX9v6XNFkh5qAJppnT5zXRhHz3T8imRBqvQVrHyZyqtRMO3TW2bSwNd58sFB8jTNuefkU9k3FQZgywrAWBKrcLZVD7y9rzVlCBnAkG66Hjdm5/hULxMeLNK+/Vf329+q55Hz52zRdkVFE6V5iCZblTKR7lVEsSaLAPxM1fPoRBIMcvNbz+RU10ECCmtyHnu3o/ZYF251YxVtE+vgnBgd83MFW1VItz8kfnf+xLxeOu9IejQ3hbz/em9t7nXjEr6BPI+qD5a8rd1lhOBthx+BS YftQq4q8 dMGlgdO1CClG6Vg3DT9qN8nq0Xvd3jQ+rZNj/Qar6D/kMVGY+aFZO6xmUcq0rMSQswrSWZnAwQHN0j8ttIZ03EVY94xJgE6R6KWH7lUBnEhUbXVHA1kHsdxewnYNXNjCzCwNquPWGtSsP/IxcYIWVdVi8u+GrQK/cZAFHFLCdMMTiC7ygXvdNJj55r2FEenkG3Qj/b/Zbl65zv4qiUrR9mTDhehTCL3406mbW4kKCcv2vECkyd1UgjU1nTJlM4Iv7q3PIDdJqz4X3Kuk= 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: This drops page table entry address output from all pxd_ERROR() definitions which now matches with other architectures. This also prevents build issues while transitioning into pxdp_get() based page table entry accesses. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- arch/x86/include/asm/pgtable-3level.h | 12 ++++++------ arch/x86/include/asm/pgtable_64.h | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index dabafba957ea..e1fa4dd87753 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -10,14 +10,14 @@ */ #define pte_ERROR(e) \ - pr_err("%s:%d: bad pte %p(%08lx%08lx)\n", \ - __FILE__, __LINE__, &(e), (e).pte_high, (e).pte_low) + pr_err("%s:%d: bad pte (%08lx%08lx)\n", \ + __FILE__, __LINE__, (e).pte_high, (e).pte_low) #define pmd_ERROR(e) \ - pr_err("%s:%d: bad pmd %p(%016Lx)\n", \ - __FILE__, __LINE__, &(e), pmd_val(e)) + pr_err("%s:%d: bad pmd (%016Lx)\n", \ + __FILE__, __LINE__, pmd_val(e)) #define pgd_ERROR(e) \ - pr_err("%s:%d: bad pgd %p(%016Lx)\n", \ - __FILE__, __LINE__, &(e), pgd_val(e)) + pr_err("%s:%d: bad pgd (%016Lx)\n", \ + __FILE__, __LINE__, pgd_val(e)) #define pxx_xchg64(_pxx, _ptr, _val) ({ \ _pxx##val_t *_p = (_pxx##val_t *)_ptr; \ diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 3c4407271d08..4e462c825cab 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -32,24 +32,24 @@ extern void paging_init(void); static inline void sync_initial_page_table(void) { } #define pte_ERROR(e) \ - pr_err("%s:%d: bad pte %p(%016lx)\n", \ - __FILE__, __LINE__, &(e), pte_val(e)) + pr_err("%s:%d: bad pte (%016lx)\n", \ + __FILE__, __LINE__, pte_val(e)) #define pmd_ERROR(e) \ - pr_err("%s:%d: bad pmd %p(%016lx)\n", \ - __FILE__, __LINE__, &(e), pmd_val(e)) + pr_err("%s:%d: bad pmd (%016lx)\n", \ + __FILE__, __LINE__, pmd_val(e)) #define pud_ERROR(e) \ - pr_err("%s:%d: bad pud %p(%016lx)\n", \ - __FILE__, __LINE__, &(e), pud_val(e)) + pr_err("%s:%d: bad pud (%016lx)\n", \ + __FILE__, __LINE__, pud_val(e)) #if CONFIG_PGTABLE_LEVELS >= 5 #define p4d_ERROR(e) \ - pr_err("%s:%d: bad p4d %p(%016lx)\n", \ - __FILE__, __LINE__, &(e), p4d_val(e)) + pr_err("%s:%d: bad p4d (%016lx)\n", \ + __FILE__, __LINE__, p4d_val(e)) #endif #define pgd_ERROR(e) \ - pr_err("%s:%d: bad pgd %p(%016lx)\n", \ - __FILE__, __LINE__, &(e), pgd_val(e)) + pr_err("%s:%d: bad pgd (%016lx)\n", \ + __FILE__, __LINE__, pgd_val(e)) struct mm_struct;