From mboxrd@z Thu Jan 1 00:00:00 1970 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 0C37AE77197 for ; Tue, 7 Jan 2025 11:58:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6325D6B00AA; Tue, 7 Jan 2025 06:58:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E0626B00AC; Tue, 7 Jan 2025 06:58:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 481666B00AD; Tue, 7 Jan 2025 06:58:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 280776B00AA for ; Tue, 7 Jan 2025 06:58:21 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CE304140858 for ; Tue, 7 Jan 2025 11:58:20 +0000 (UTC) X-FDA: 82980507960.20.5A00EFE Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf16.hostedemail.com (Postfix) with ESMTP id D7425180002 for ; Tue, 7 Jan 2025 11:58:18 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf16.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736251099; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TGGJkJPzJ/ul/QAPsmtmQeMD95tQCTIq4WEnha2ywd0=; b=1a+aapeOzBgTN+ZINQVe2/+P/LcdDcFD2vEvFSuaKaDIqeT8FuMjv4FRLiyeX6mlCNBrYP UKhGwgx9m8iX7fS6uCGN18SPc9XxF/ViFMdqVhatYZHQnypszBmRqKzy/FmQUFEGnlWHY2 aaKhfmy4hSTLjOvZWeRg2fJ9mcd3xjs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736251099; a=rsa-sha256; cv=none; b=C+h7VnFgDjLhBhCu14Eu/6boVMzQuBY0LV2dqSlXYdqZXBuQ4L/+lu19leqNcFOPYiduNz 1mNbOVMiN4O0A9Bsc2okTI/wh7B1IFg6tFsDpJTyIw2kFFi8tVWpr69VOv2oeYHuczVXy+ hfejrGTE3Fua86OFG1PXR6j8vY9nkVk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf16.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com 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 E9DC6143D; Tue, 7 Jan 2025 03:58:45 -0800 (PST) Received: from [10.44.160.93] (e126510-lin.lund.arm.com [10.44.160.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 187FC3F673; Tue, 7 Jan 2025 03:58:09 -0800 (PST) Message-ID: <4a0b5edb-6fc7-4df4-93d9-ca834e6a760b@arm.com> Date: Tue, 7 Jan 2025 12:58:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 10/15] riscv: pgtable: move pagetable_dtor() to __tlb_remove_table() To: Qi Zheng Cc: agordeev@linux.ibm.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, 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, 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, peterz@infradead.org, akpm@linux-foundation.org References: <0e8f0b3835c15e99145e0006ac1020ae45a2b166.1735549103.git.zhengqi.arch@bytedance.com> <1b09335c-f0b6-4ccb-9800-5fb22f7e8083@arm.com> <7e2c26c8-f5df-4833-a93f-3409b00b58fd@arm.com> <31e1a033-00a7-4953-81e7-0caedd0227a9@bytedance.com> <07e0c05f-cb69-4263-885d-6d20d4442152@bytedance.com> Content-Language: en-GB From: Kevin Brodsky In-Reply-To: <07e0c05f-cb69-4263-885d-6d20d4442152@bytedance.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: qqf9yc8ysaqixndwf8jozddp94xwoih6 X-Rspamd-Queue-Id: D7425180002 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1736251098-299854 X-HE-Meta: U2FsdGVkX18SMNax3srBZlfy5bq/bu1B/owd2tFSpANTDfLzMd+OBZ0zuduwoUA5xsqbHtdHcZuoYFiHZiXRoC4q32btW59na0pBFoTvQKF4YF/JPjQl4igxSeSf9ICeFC+hvDXsEGJPt/NReUxI7+Wda4zMU8YZHmx+4GH2V8bUDiHqmEupX8TR5T+ZFeJlF5llygsLSxiZ59OG4AH6GcspvLqrwXB1mpZ1DuhIKelJ8YbdM2kJohCj/y0dmIeuGeny2hvEmpkJ0zJgU8hQM7IvvEg/e1dcTNMSoEgMJqvfFTyRDz/7/Gh20zyTFtwR0txyFfa+UHBYF6BaJOv+3JcmJZg+/slHUcK18Xl5nBwxSlr+bRUcTgyVMx6EVrwV380DVkYAqc2qychyCu7Fs3ENN6vkXvSO7kEiOljiLYYeKw+XR5b61Ov3Frt2X76Sh3h9AxIiL+xRtyAMTkO5JeBrX/3BfJvF66HPBQRcBP81Y4eECiYNEG++NIU9TKz6SSjsKFfOEuHnqSctm6tIm3HjgWXShhIUOuQgkegPaw/Am2ORAFg5fsH2Jb2ABzTVik7TaaguQDnVntkk107/kc3lXtj4Vksn7jaupSTiP+qUlfaci/Mr0USCTD1FZsh1Q76QLkt+4nXJpAXnd3zlrQVagAFmfBQDsxPgcs4uesrvKDOvErB+00nC0AA1UpNf+ItnVRi9oR7HThUtNqgkl0ES85xLqosT9VucvTluwth0hgOzs//GTe93A/gbziai57dsqQccSqhtj1G9D3qADWorGVTTkz1RxXcIhZsIFLGEuKEnxWF9vrnMg4Qm769vpPcvkprYaN+wnoBJwxsIMlzQPkyoD2Axid/bgN9xToDEHnGXlHzxVdxgvQkWUTpNwC4fmG0fRcLXEqYnsbkTAhZ+qnpu0hFNKJXg6KNP2pk3MP1lEZ9N+VoezlKNSyqWg0oT4dx5z3SiyLDteAB S8bBQPqx uqiLYM9RMgYVy4rGoTwDMnIxrTcKn1FyDizFWmA3iC7K+V7kmc7nCs5PHETYSHZa6XXZt+bymwvJyN0s0ogxGoaZn/lJVQQeXhfeRULkQaRN/luHuXl5xjiM1n9J0NpGqyw90ob3uaeNDTttXvEufFSkG7IxjwBO/HOFfNVLd2B3oGUu3glFCAI3wU9dgtFD2fQUfDFC0CtE1CE/wAqlx011HOzEZdcxvYM2+d37IyzgOf9J6HcUyesIUabx+awHvDoPs5lrmIaf4J4x1cs4LHhAJ5pO0mP16PHG7B/PPoBwZR+YIWp5S845pVQ== 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: On 07/01/2025 11:51, Qi Zheng wrote: > [...] > > Author: Qi Zheng > Date:   Fri Dec 13 17:13:48 2024 +0800 > >     mm: pgtable: completely move pagetable_dtor() to generic > tlb_remove_table() > >     For the generic tlb_remove_table(), it is implemented in the > following two >     forms: > >     1) CONFIG_MMU_GATHER_TABLE_FREE is enabled > >     tlb_remove_table >     --> generic __tlb_remove_table() > >     2) CONFIG_MMU_GATHER_TABLE_FREE is disabled > >     tlb_remove_table >     --> tlb_remove_page > >     For case 1), the pagetable_dtor() has already been moved to generic >     __tlb_remove_table(). > >     For case 2), now only arm will call > tlb_remove_table()/tlb_remove_ptdesc() >     when CONFIG_MMU_GATHER_TABLE_FREE is disabled. Let's move > pagetable_dtor() >     completely to generic tlb_remove_table(), so that the > architectures can >     follow more easily. > >     Signed-off-by: Qi Zheng > > diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h > index b8eebdb598631..ea4fbe7b17f6f 100644 > --- a/arch/arm/include/asm/tlb.h > +++ b/arch/arm/include/asm/tlb.h > @@ -34,10 +34,6 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t > pte, unsigned long addr) >  { >         struct ptdesc *ptdesc = page_ptdesc(pte); > > -#ifndef CONFIG_MMU_GATHER_TABLE_FREE > -       pagetable_dtor(ptdesc); > -#endif I guess this hunk will disappear since this call isn't present to start with. > - >  #ifndef CONFIG_ARM_LPAE >         /* >          * With the classic ARM MMU, a pte page has two corresponding pmd > diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h > index 69de47c7ef3c5..53ae7748f555b 100644 > --- a/include/asm-generic/tlb.h > +++ b/include/asm-generic/tlb.h > @@ -220,14 +220,20 @@ static inline void __tlb_remove_table(void *table) > >  extern void tlb_remove_table(struct mmu_gather *tlb, void *table); > > -#else /* !CONFIG_MMU_GATHER_HAVE_TABLE_FREE */ > +#else /* !CONFIG_MMU_GATHER_TABLE_FREE */ Good catch! > > +static inline void tlb_remove_page(struct mmu_gather *tlb, struct > page *page); Nit: might be better to move the declaration up, e.g. above #ifdef CONFIG_MMU_GATHER_TABLE_FREE. >  /* >   * Without MMU_GATHER_TABLE_FREE the architecture is assumed to have > page based >   * page directories and we can use the normal page batching to free > them. >   */ > -#define tlb_remove_table(tlb, page) tlb_remove_page((tlb), (page)) > +static inline void tlb_remove_table(struct mmu_gather *tlb, void *table) > +{ > +       struct page *page = (struct page *)table; > > +       pagetable_dtor(page_ptdesc(page)); > +       tlb_remove_page(tlb, page); > +} >  #endif /* CONFIG_MMU_GATHER_TABLE_FREE */ > >  #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE Looks good to me otherwise. - Kevin