From patchwork Thu Jul 4 06:30:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13723292 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 422F9C3065C for ; Thu, 4 Jul 2024 06:30:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C84A56B00B1; Thu, 4 Jul 2024 02:30:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE5B56B00B2; Thu, 4 Jul 2024 02:30:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A607D6B00B3; Thu, 4 Jul 2024 02:30:21 -0400 (EDT) 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 8B7B26B00B1 for ; Thu, 4 Jul 2024 02:30:21 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2000D160BC0 for ; Thu, 4 Jul 2024 06:30:21 +0000 (UTC) X-FDA: 82301095842.13.0DF4782 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf19.hostedemail.com (Postfix) with ESMTP id 0D47A1A000A for ; Thu, 4 Jul 2024 06:30:18 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720074594; 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=kXLlm6Wxr7Bxgj5fGzNjy34TkL5KXYwxij6j6SAa8vo=; b=YEvoot6HzNoPzW2PB4ycYvBv+0Okiv+qSWlkemUScwiPM2ZgtQjsDGkP2B6g1z9vvH2nF9 a+k5imJUC8sBDy6m3hlbDXmoF22ofjWY+YY1MKjNXZJnmyhjH/eGYyzMbKIQCj5byMbbat U7Ye4HUWCcj80Hog6351UIugxg+pzXE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720074594; a=rsa-sha256; cv=none; b=NcTzpu70zCtmJ5eYvgHFDhhypfne5U/mNT6KLJYSxix6kR3fZn3NSMtKfKzswlSSJ8toWJ SuvAZc7ma4OEPAeY4QdiuRKiiBHuDnuBq7+VQqvTpv5pIXoe4qD07I4iQEc6xjKuIgQkM1 bvrHhK/peexezIB9RTSjgVVh1E/42Bg= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4WF6Ft4fTfz9sSC; Thu, 4 Jul 2024 08:30:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tc2KK6SMybGZ; Thu, 4 Jul 2024 08:30:10 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4WF6Fs0MGQz9sS8; Thu, 4 Jul 2024 08:30:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EB9B48B775; Thu, 4 Jul 2024 08:30:08 +0200 (CEST) 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 FnvUhWgoWsbX; Thu, 4 Jul 2024 08:30:08 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.202.46]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3BDF78B764; Thu, 4 Jul 2024 08:30:08 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Arnd Bergmann Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, linux-riscv@lists.infradead.org, Oscar Salvador , Tong Tiangen Subject: [PATCH 2/3] mm: Remove pud_user() from asm-generic/pgtable-nopmd.h Date: Thu, 4 Jul 2024 08:30:04 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1720074605; l=1658; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=P+XptGl9DFkWiOOf5gEDy59BT6RaK29b7Gl+mTkrxXs=; b=2RfhmzjlUmgXQ8XQSHQ5dag9Musd8qAx6KQfnrol8V1giJeiO0XXF0qdIX3ZkEHvWqbqqFz4q PEMjcm8RqozAQms57Vznm8NgN2zBt49jTKt2LV/y96A1vqTBkJERY8e X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Stat-Signature: wtx8bqctr4b4mt596ggwnytxzn731htc X-Rspamd-Queue-Id: 0D47A1A000A X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1720074618-753456 X-HE-Meta: U2FsdGVkX1+HgaoGn7Db/7fVmyeHTasga3Tdi0cB/4D0dCKA66QH/uC9eNyta+zNMcaCc7YwiUwqkELRFQrb1WejE1dGD9pIoRHn6HlYgPl9W2h0Lrj+hB3Er9XnyMoI8wo8gDhh3HW1nXb9j4Vg1huVVfAECQOv0nTROrHkhNaKe7CguxnJ0m55HZmxfcMmz0DBrSsrMM1F0V5ojcyeFSjUU9C9an4qS8CNNR4hrt7Ii8QNVnCCGAa6X0MtF8vpErIpX/s5D/y9ML7vFimW4+lNrUNBzJ8P6ux9jPBKtzAnKFDa2RROE9iee7Y5oPTYhULBsWM4XD1rNJAD5TDYACcBU7PqXyQcajebHlT3o8XUPQxgRzmbEJkF/Km1XZymzJ7e97klz7XSOg+AB2Hhrk28f6d/XLnn2IRDrXJC/UhhkYKQael+hqULWJP2R02EqdwEud+hZmxSJd75epja/3pCcvMzvLT0o72lb9jjNUD401QPkHCxYFYsFsGJya+K8ittpgiM4iXcmckUuysrNuxmRzDH8rtIOOYi4Rd100u/m85siRB2nSFf0jQa8DVA/4UbPtbH/j+msPuq9kKk3EmGOlDl5tIEY7l1xKkQkQuCC2dYHKcAtubhT+Loz7QBsUcFMCfS1uDOI6VQhvIKN+f0ykIroe3AkE7o1sEmJHndNdSsCgFQKJ/Iqq7ukMA7sLZ6JtPqUFLOaAUiJGz15Bcy58fEimhNZLXL1IHDV8iDIvgD4AFhynKIZOqfNbCPGL0bpFI2M7buuICQq8CbjeUwCYX3HNiX9NWCz85FXn2siLdpWCmVzTiH+DAqWARalQeTwYKGrg8JFfZcs+ihTGvjkuyAj2IcSobX9dEmcAFo7RvCOvO2H7iyuUjSA1360pkSniPAr+tVi54EyARlnWt7Y1Arh66oL3qi8QfOL/SbEibwXhUpE7a1qiqRpLD11yg+ULJIIvELHYm1b5O b7ZQ054J NACvMmTJrzz4eL37TkJ+VEY/y/AkBMYvaDROCDEZscfl/no7GEgQ6bvpEr5xbh3HSDGcInZef/LjL3L8nZO1X7pufiLuZAtYZ6SEpCMaqTFpTxW7Re1enKjlgZsyKh+iCipSOg/5EFD5QyuI206CnLSmpjjN1fMTomVGbKjizg6ixLg0= 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: Commit 2c8a81dc0cc5 ("riscv/mm: fix two page table check related issues") added pud_user() in include/asm-generic/pgtable-nopmd.h But pud_user() only exists on ARM64 and RISCV and is not expected by any part of MM. Add the missing definition in arch/riscv/include/asm/pgtable-32.h and remove it from asm-generic/pgtable-nopmd.h Signed-off-by: Christophe Leroy --- arch/riscv/include/asm/pgtable-32.h | 5 +++++ include/asm-generic/pgtable-nopmd.h | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/pgtable-32.h b/arch/riscv/include/asm/pgtable-32.h index 00f3369570a8..37878ef37466 100644 --- a/arch/riscv/include/asm/pgtable-32.h +++ b/arch/riscv/include/asm/pgtable-32.h @@ -36,4 +36,9 @@ static const __maybe_unused int pgtable_l4_enabled; static const __maybe_unused int pgtable_l5_enabled; +static inline int pud_user(pud_t pud) +{ + return 0; +} + #endif /* _ASM_RISCV_PGTABLE_32_H */ diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h index 8ffd64e7a24c..b01349a312fa 100644 --- a/include/asm-generic/pgtable-nopmd.h +++ b/include/asm-generic/pgtable-nopmd.h @@ -30,7 +30,6 @@ typedef struct { pud_t pud; } pmd_t; static inline int pud_none(pud_t pud) { return 0; } static inline int pud_bad(pud_t pud) { return 0; } static inline int pud_present(pud_t pud) { return 1; } -static inline int pud_user(pud_t pud) { return 0; } static inline int pud_leaf(pud_t pud) { return 0; } static inline void pud_clear(pud_t *pud) { } #define pmd_ERROR(pmd) (pud_ERROR((pmd).pud))