From patchwork Mon Dec 30 09:07:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13923128 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 AB43FE77194 for ; Mon, 30 Dec 2024 09:09:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30FA16B0089; Mon, 30 Dec 2024 04:09:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 298806B008A; Mon, 30 Dec 2024 04:09:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0EAF26B008C; Mon, 30 Dec 2024 04:09:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E47B96B0089 for ; Mon, 30 Dec 2024 04:09:08 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8D7531408BC for ; Mon, 30 Dec 2024 09:09:08 +0000 (UTC) X-FDA: 82951050126.05.038B9B0 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf24.hostedemail.com (Postfix) with ESMTP id 8788A180014 for ; Mon, 30 Dec 2024 09:09:00 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="W/di8uxu"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735549725; 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:dkim-signature; bh=mHzGZQny5JmimEm0kycepUlCOKttN6NXbKtm7VNKgbw=; b=DuD35DHZTUUhkLJpPqNclrFfhP3RZOB6cIqrFdPMJ9eLbeAr79CP1iEcXfFhVX2eVoEHZo 6khYf3bQadio3kfVVx7MK5N9E2E50aUzTaxcKBWdoO/iguVWbHl/xLvc190SnlzR7jqMix CpYJAHRo5F/q6ervTpDshx/uSWT8eFQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735549725; a=rsa-sha256; cv=none; b=3mWNFteFjfRpfTnaGSW4wflArDv2jWvKuC0UAgu7iiU2USXucm73s9yc4IsxtGnEV0q5Yb CJPSP5Iz2ZhJ3v/9Tz4TpTqVW3bdLmLgAG4aLsG57VGfBs7JmYaYpzZ5+FZ7DM6i6LLYt2 HRFmgY0YG4scx+sRitQXUBZsVf++aBA= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="W/di8uxu"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21683192bf9so116587725ad.3 for ; Mon, 30 Dec 2024 01:09:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1735549745; x=1736154545; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mHzGZQny5JmimEm0kycepUlCOKttN6NXbKtm7VNKgbw=; b=W/di8uxumOtkgfFJEkGmqygARwSMQsW/aU4S86083VEoxpRi9+SFQUgb3tp7DKYLR2 gLjJjSjAdCotH4vEFtE/6HNis0LjFzhYaZ08dgHhB9ikI/G/WPQLdQRfU07I+xlZKejS SRlF8T080AJp06CIM03tZtfPqMlbryKVoj12ACeOxiYmv1Gaugp0wvTTt91O0iKgpc3I BHWnolcrB3Z73tQsmB3pvTuJh7bBLBAn32c/cYU6zNbApeE6usz2flkZWXuaGBm6Mxew pKvnx2ss5RtZNpGC4hK15TdsVCMcpeVt88hFdnzE7ZMS4PYwrv2FKlu/DQbq1E/VZkR+ EVwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735549745; x=1736154545; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mHzGZQny5JmimEm0kycepUlCOKttN6NXbKtm7VNKgbw=; b=JxOw6aLKEQbjvn6BWLmF1SY5BnChxpbiwurBmTiOSfgp+KFWypN79LtJ0FilPaxNsZ DF4v3z91Ou5a/UCQMKhkyQJqIlhIkWVJKBAFPvV2pBA6DWW0TP9eYWi3Oy7kK/Ur4yy2 f0brHazcz/VpPzx+794a9V5QoNKRetmLnomR3SF7ZNrumPvgyRMVenWasQ2RtNL1hTnf O27GH8WUGIHl2r8ZpuLHA7UnxCqM24oaFm3G7pQ0bXitNLA1RLTUxu7dFGKDIHBlPBDn DES+Qxv4GJu39UGhsPlNf9+jp46a5u0HgtfC9jzxkZ1YPl5gSkofWYKfpRwntqJlxkN5 91qQ== X-Gm-Message-State: AOJu0YwnCWu9k6p84cHsFCPTaSeHh4I0Xniyd2AINI/jdbdcfWDWGjvG VSnP0upw4Ch7JNb6oX4PJhg8NdtWST7eExRBY8yKdw0HmtYxNe92a4mYjD60mTQ= X-Gm-Gg: ASbGnct+o/vq+Ji/ZKLxzgR4ZVVYgOteZmf6ey6OAiRfKjr7qnk86Yj2OEVoSA6xtRE 6BwE2+ADhdCSpW7CbEvVd5AFpS9KimBVrgAILiXCz0TF0UY3ncCW6jwrV+7iv6WM/a/CFrlU9du aZA8GOXcUdoui+yu72XVpuS3K8yCs5ZmjDuTM83oJPdvtwmUJ1DFY5xDYWzO6HXaJPBWqyumbBK uRJtgT0KH5bjl5YRBhRAwWmV+HujtChcynNWt/N1F/bi5Q+KIhET+huzCUZbb/4MY7yvzCzbyqQ bGwbZIe0JTwpL4BIM1fZVw== X-Google-Smtp-Source: AGHT+IEdmvGR6U/qwRYH5ruA02a+sFRctKWchidIfEBAoumo12DzBepIE5K3QuQVJJ60xG/AvigJ4Q== X-Received: by 2002:a05:6a20:a127:b0:1db:ddba:8795 with SMTP id adf61e73a8af0-1e5e08028cfmr53967973637.36.1735549745320; Mon, 30 Dec 2024 01:09:05 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842aba72f7csm17057841a12.4.2024.12.30.01.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:09:04 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, agordeev@linux.ibm.com, kevin.brodsky@arm.com, palmer@dabbelt.com, tglx@linutronix.de, david@redhat.com, jannh@google.com, hughd@google.com, yuzhao@google.com, willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org, lorenzo.stoakes@oracle.com, akpm@linux-foundation.org, rientjes@google.com, vishal.moola@gmail.com, arnd@arndb.de, will@kernel.org, aneesh.kumar@kernel.org, npiggin@gmail.com, dave.hansen@linux.intel.com, rppt@kernel.org, ryan.roberts@arm.com Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-sh@vger.kernel.org, linux-um@lists.infradead.org, Qi Zheng , Palmer Dabbelt Subject: [PATCH v4 02/15] riscv: mm: Skip pgtable level check in {pud,p4d}_alloc_one Date: Mon, 30 Dec 2024 17:07:37 +0800 Message-Id: <84ddf857508b98a195a790bc6ff6ab8849b44633.1735549103.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: 9urxigxbb6f4e85117pscabhkzf9c3f9 X-Rspamd-Queue-Id: 8788A180014 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1735549740-440514 X-HE-Meta: U2FsdGVkX1/c3ioLPri9QjxFnp0xiCxYXEBIvA+ZthzhkP5OuF2UQnnxGkE1gUVGMzxCShY+l99mwNbE+nmJdMf+ScbgkcZlxgS1FNHbHr6IQZEd2Konwu4pClBm4WmBMjtNK4Z5xwh4EqSj++9UjhdewZPqG9WSKM+3g7+PxOnRPhhyPWOyE0jauyn76DnSAo8CljPhlJJsi03LAhbArJoFl2KJWoOI8JVxqFV5jqlGDKr+lPWrNppcx4m7uG3GMgGKvrl191KQT8WMQiNYtnZnPKZ0Llwq79xaO5qEkM1dFN7X40cB5Wtk2fIknDjVn+klWYCjpm4Y6xT/Mkssj2sI/I36wh+OQMhxLx8DvPdHDvRlwx/TOtIf7bOnUPDH0zo4fb0tET8gu8/iovnDqzG4Q7hUkHYQgAdqgNaBktYUhYc739S1Hz4+uyJokZNKbkPv0VIxNPCqjor6OOFD06OfFzLRVQ+zawFX5XUF9djwNye9sDkjBVwmd57ZG6B69/JhsU4R4JQTvfV18APcVBCNFSmpTmhTarsvM2DjL5SKRMi1pH3n+X8XE78hfjGb3iNdRCn4FzLoZdZkpqY3746rpINFMqx/S4PLqrGLHkq2u+fZuQLSsioG14lc7g5IKmRpnrdJC+9/hwyXXQMKwGmAHbfXD325uu0SSVWZoo1hd5IkXAvLsQI8CxPjrABeGfPBarmSVdxAabcKWv1C2G7DSRAcSiUOe45T9v9dMi2+EeSrXJasZJFM//XvDcOp/B8fx9wC+XEPBo8kCXC3SOpzZEyV4O58Y5FinWIGxk52sQwU9VLQ6cfz8KUXPVXNEsyzDgJZbT537+MVe0AYGPNZhnEwXYKsEqOHzgpICDm4aE4qpprIiasnIFIc17wDqGn4vFghM5sSt6xT9E1O4JvNhoj2vvEa7a8fS6gJH1RdVu5Kvf2cHuy4hYQcu5cFzbv7XykimGajP507C7f qCc+a27f WW2jXOpeR19i5Cu50HzlDDu3ma9j0AZuPut9u5Ce50Yq91vlgRLOFiMEx0dqPZ8gJX9NC/zs1DI5Ae2Rnh6ddNEi7zn4/BXl6hFOd3fBAwpad52kQWLeKH5sa7NibOHc8d3NezS2fYLH3S1GerUMs68IaGtAiDr3lUjsF2F6M2gnqE4Di8WSRtwzXM4lms32CMDI8oJfl4VfKRKgO0G2IYBnckxK8tHcf8YWSYlxWMjYPYggrj0NxbjSTgtLfE3YdrPgrj/MG0dxPY2yhGEnvWFGIRn26Qm+QbuA8woRwyBAUnBDcvLVHdmUy7f9im+FggH+v5GfYOLqVRiy2egaJbLLeIc6NMHpycl3W8GtdL2LZaMoY5IujAd6X2W74j5ZplunJnYTJmECZQes8cm2WopZRVU4+GFeZgnHfa6scyeUbAwNt/kaqGttzLZcWyHWw74lgVE8ago8qH7rzrTOekSXC8WPOfe+1Gau3TAQetlqH4Bntls1x8Nl2e5QmGBtj12TBPNAyh0Ga00QcrN9byXx1mH8l5ZhpUCRZZCIVtshhWrPoi+9YdfOGgTzZfW8sW0CP 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: From: Kevin Brodsky {pmd,pud,p4d}_alloc_one() is never called if the corresponding page table level is folded, as {pmd,pud,p4d}_alloc() already does the required check. We can therefore remove the runtime page table level checks in {pud,p4d}_alloc_one. The PUD helper becomes equivalent to the generic version, so we remove it altogether. This is consistent with the way arm64 and x86 handle this situation (runtime check in p4d_free() only). Signed-off-by: Kevin Brodsky Acked-by: Dave Hansen Signed-off-by: Qi Zheng Acked-by: Palmer Dabbelt Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgalloc.h | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h index f52264304f772..8ad0bbe838a24 100644 --- a/arch/riscv/include/asm/pgalloc.h +++ b/arch/riscv/include/asm/pgalloc.h @@ -12,7 +12,6 @@ #include #ifdef CONFIG_MMU -#define __HAVE_ARCH_PUD_ALLOC_ONE #define __HAVE_ARCH_PUD_FREE #include @@ -88,15 +87,6 @@ static inline void pgd_populate_safe(struct mm_struct *mm, pgd_t *pgd, } } -#define pud_alloc_one pud_alloc_one -static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) -{ - if (pgtable_l4_enabled) - return __pud_alloc_one(mm, addr); - - return NULL; -} - #define pud_free pud_free static inline void pud_free(struct mm_struct *mm, pud_t *pud) { @@ -118,15 +108,11 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, #define p4d_alloc_one p4d_alloc_one static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr) { - if (pgtable_l5_enabled) { - gfp_t gfp = GFP_PGTABLE_USER; - - if (mm == &init_mm) - gfp = GFP_PGTABLE_KERNEL; - return (p4d_t *)get_zeroed_page(gfp); - } + gfp_t gfp = GFP_PGTABLE_USER; - return NULL; + if (mm == &init_mm) + gfp = GFP_PGTABLE_KERNEL; + return (p4d_t *)get_zeroed_page(gfp); } static inline void __p4d_free(struct mm_struct *mm, p4d_t *p4d)