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 2544DC7EE23 for ; Tue, 28 Feb 2023 03:17:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 416CE6B0071; Mon, 27 Feb 2023 22:17:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C67A6B0072; Mon, 27 Feb 2023 22:17:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 23F9D6B0073; Mon, 27 Feb 2023 22:17:29 -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 B6EF06B0071 for ; Mon, 27 Feb 2023 22:17:28 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 645B8120E9B for ; Tue, 28 Feb 2023 03:17:27 +0000 (UTC) X-FDA: 80515240134.03.4078D53 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 756D414000A for ; Tue, 28 Feb 2023 03:17:24 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CrxWV0qs; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of guoren@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=guoren@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677554244; 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:dkim-signature; bh=1vjMRmKI+TBWd1PtmbeB8dC277h2UgXpjrJw1+SKcYI=; b=XhXCQzhwKVnPAlAcjE68JYVRgLMYZYfxZKCS4+AjSQidstx3OcLYcgNnK+yAPS5DNuwZYh LR1Knfcty1ofkZqy8X++bvur4UVKWoAixV6KvEj8/yvzvPxQ+FXt6jofIlS/AVv18nONMW PvlkIGJ78zJmkL0x4sA+4r1CKo9VvLc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CrxWV0qs; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of guoren@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=guoren@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677554244; a=rsa-sha256; cv=none; b=OgzmlVmfOCERJMqq2gZa8wA4TX3cuGez6C1UMxt0d2d10u+Fudof7Ll/SRhEJNF8vXOOyX Edkn66b569ogeSURi8YStb6PKaC3Unb2hod1JLdTywl6UE92soALqKuBCYYwdcD3lggOOq FAm6iSNLxec60iLjBXCSMigtE5zYPwA= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6E9CA60F3C for ; Tue, 28 Feb 2023 03:17:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D222AC433D2 for ; Tue, 28 Feb 2023 03:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677554242; bh=NElAjJZryg7JqzKiDR8hC0eEVOkhIJa3SMKpSyMnJPI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=CrxWV0qs/bnkl58pZool2aJVFtKcw/Q0uWRr07irmOendQ/16LRWgXEpQ273LM1XI Yc/MFZGMTq3FqTcvny5OSqZ+uQOgcIgBYSPc6u6+dB/zVuU7lYdLthMuD2+B6fjaKI fZaxsBKEh1GiyyBhexpbZ/YU60Ag+S+r0RxliIk0Us4/6pVHlVlPV50nZPsIYMc0Mf HafcTHfpR1Y1h8GT3dlVZ8UgHuOZJ3Axa1A6G+19K0kAJ+rXN1vjLNNB5ZLrA8BBNh ulEo5kCsRYZv389cHyzPLKBumdjeovZlvDMvAORBYbyh9eiFMPcpRlITKr5bj2FvYF yA8VxA7wXfXpg== Received: by mail-ed1-f54.google.com with SMTP id o12so34275146edb.9 for ; Mon, 27 Feb 2023 19:17:22 -0800 (PST) X-Gm-Message-State: AO0yUKUMMpxtGI+GwgaOQud5Pu7QTOuYRl3tAcmvaBcxTOQRQFujl7i5 DOYN455Wxdrk3vrlz4jyviw0zdvjlWcdyhNmeKs= X-Google-Smtp-Source: AK7set+bzZT0otZA1dOZY7LboCwv3Txnx/Swz/QBYMaC3LUaGbGKhbHB4c/PEyIMCRek7vw859XlE0k3OlADVcOemPk= X-Received: by 2002:a17:906:aac1:b0:87b:fa21:7953 with SMTP id kt1-20020a170906aac100b0087bfa217953mr431807ejb.8.1677554241057; Mon, 27 Feb 2023 19:17:21 -0800 (PST) MIME-Version: 1.0 References: <20230227175741.71216-1-willy@infradead.org> <20230227175741.71216-9-willy@infradead.org> In-Reply-To: <20230227175741.71216-9-willy@infradead.org> From: Guo Ren Date: Tue, 28 Feb 2023 11:17:09 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 08/30] csky: Implement the new page table range API To: "Matthew Wilcox (Oracle)" Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 756D414000A X-Stat-Signature: 6fninwsox3qhm4zzsq3d139k7n46gi6w X-HE-Tag: 1677554244-118094 X-HE-Meta: U2FsdGVkX19uKKimcWSSWlqpAlN9OYxXqeELEKJtFI6ERp/4MUnG+R758l1FmoySxUil+08CfkPn6KlCWHwXfKf/rPI8uQ1LsaYIIVjeNx8KqOwM68UvzkMGIzNAR5In+rb/WGTz0SobR5Z6NzaDJvtYR1+4P+32EmIkRp7s52LGDwygQJ/qxQhSOkEZyWVDZvaUJEbevf3n2zsXu+XJ3RNAsMBxicEZ/ViovW+uU4Y386F3DKGVymMQBnaxg6GUCh2JGLo7iwd5GCoAcwb9Z+KCYOB1mR/zwyyf5514YPqwns/ofKuvBmoeRDERFAFNhbmM0TKjT+Cw/naWg/toUnqvJgfBBQBQZLRNv3EVG/ZNTbpT6exCMcxa3LIlubFj/mLrkLNc+UCRGB/dPZHat+D2A4ytAoocPgLgRzjyOJMFW5330zllN23cubCqOg3d4M+7ZwlFDeFMG8xnLSC//fLK45WtZNRUcSY8yAkRihIBLyXdsTtPrsY9lfGDjPHHQhWe7J9jvTSinaaqjC40pqTAXnIDADAns4B6HceXUYeqJmCoohUYgrT3sdSq5s9MByVLMJXkn5RGdFYN003kSU4rY3ltIW56H1/ous4/tWcUzcK/isSzLk6M9bIh/FKvJG+l49SSattM9wiU6DFinZLTNFdd7sDpctjKJK+nH24tVN8g5pw+ZSiw/gL6LzvptZEpfXBonuax06eDtp0msyTrlS2kuJW+2V1qP1DAQDg2lmLPfv42OHQwmdajuyvjoNmqKuWn+dn2newiUMWRnMfLlbWaaDZkchYABWTYRWO7+66Q+cbGcvzgUY34CPCynIOd0Xytkn6l//PoWBIJSIVeO6b8yH2SyPiss3OPWCTZRPH9iSD23poOw9rT6H5D5g7pfBwuvwYHKiDEU/sI2cUAoVRhEhHJjGVh7YUfFVopMZDr50z2aNPHd70hr/2zZq/OBpOMqglhInPLymA edFTBny6 zx3ou+r0GjOPwzhXBApC0LCusK2qnfmvwbZmjU9r5K7jZMZc7+wUW008D5u8ZPGY3CZRGfZiE9Xo8jUsQBleXsYumdjqzTcK12DyAKpu09U5x0XVbS9dykj8tilGKnh3ufZDlcNH2Nx/KJ4SOu8ApFWtfkpMvStSA6hZXv0iva/GliI28YU008YEAnS5QMp176co+o0gOwnnWbnqQvPk4ZSu4IgmLLsPU146VKl3/IvPA8ogQbraBJIK0ocODyIS/ngGyj4MVjcasQkmt7U84T4wEjklocVeaM9snHek34rGMTtRMb28f8pV3XWV1APm+hEKKV9/gGUz/ubsozibv3KL3wpgWr6OB9+n7jKd5UW7kYh+YmNiCDpn+3ULUIzrjOaOSg83Miw9vLzrHr62+79jjVxehBflDGfa4aqy8S1CSHAQCvV4ymubghw8hnoYpF+VT 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: For csky part Acked-by: Guo Ren On Tue, Feb 28, 2023 at 1:57=E2=80=AFAM Matthew Wilcox (Oracle) wrote: > > Add set_ptes(), update_mmu_cache_range() and flush_dcache_folio(). > Change the PG_dcache_clean flag from being per-page to per-folio. > > Signed-off-by: Matthew Wilcox (Oracle) > Cc: Guo Ren > Cc: linux-csky@vger.kernel.org > --- > arch/csky/abiv1/cacheflush.c | 32 +++++++++++++++++----------- > arch/csky/abiv1/inc/abi/cacheflush.h | 2 ++ > arch/csky/abiv2/cacheflush.c | 30 +++++++++++++------------- > arch/csky/abiv2/inc/abi/cacheflush.h | 10 +++++++-- > arch/csky/include/asm/pgtable.h | 21 +++++++++++++++--- > 5 files changed, 62 insertions(+), 33 deletions(-) > > diff --git a/arch/csky/abiv1/cacheflush.c b/arch/csky/abiv1/cacheflush.c > index fb91b069dc69..ba43f6c26b4f 100644 > --- a/arch/csky/abiv1/cacheflush.c > +++ b/arch/csky/abiv1/cacheflush.c > @@ -14,43 +14,49 @@ > > #define PG_dcache_clean PG_arch_1 > > -void flush_dcache_page(struct page *page) > +void flush_dcache_folio(struct folio *folio) > { > struct address_space *mapping; > > - if (page =3D=3D ZERO_PAGE(0)) > + if (is_zero_pfn(folio_pfn(folio))) > return; > > - mapping =3D page_mapping_file(page); > + mapping =3D folio_flush_mapping(folio); > > - if (mapping && !page_mapcount(page)) > - clear_bit(PG_dcache_clean, &page->flags); > + if (mapping && !folio_mapped(folio)) > + clear_bit(PG_dcache_clean, &folio->flags); > else { > dcache_wbinv_all(); > if (mapping) > icache_inv_all(); > - set_bit(PG_dcache_clean, &page->flags); > + set_bit(PG_dcache_clean, &folio->flags); > } > } > +EXPORT_SYMBOL(flush_dcache_folio); > + > +void flush_dcache_page(struct page *page) > +{ > + flush_dcache_folio(page_folio(page)); > +} > EXPORT_SYMBOL(flush_dcache_page); > > -void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, > - pte_t *ptep) > +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long ad= dr, > + pte_t *ptep, unsigned int nr) > { > unsigned long pfn =3D pte_pfn(*ptep); > - struct page *page; > + struct folio *folio; > > if (!pfn_valid(pfn)) > return; > > - page =3D pfn_to_page(pfn); > - if (page =3D=3D ZERO_PAGE(0)) > + if (is_zero_pfn(pfn)) > return; > > - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) > + folio =3D page_folio(pfn_to_page(pfn)); > + if (!test_and_set_bit(PG_dcache_clean, &folio->flags)) > dcache_wbinv_all(); > > - if (page_mapping_file(page)) { > + if (folio_flush_mapping(folio)) { > if (vma->vm_flags & VM_EXEC) > icache_inv_all(); > } > diff --git a/arch/csky/abiv1/inc/abi/cacheflush.h b/arch/csky/abiv1/inc/a= bi/cacheflush.h > index ed62e2066ba7..0d6cb65624c4 100644 > --- a/arch/csky/abiv1/inc/abi/cacheflush.h > +++ b/arch/csky/abiv1/inc/abi/cacheflush.h > @@ -9,6 +9,8 @@ > > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > extern void flush_dcache_page(struct page *); > +void flush_dcache_folio(struct folio *); > +#define flush_dcache_folio flush_dcache_folio > > #define flush_cache_mm(mm) dcache_wbinv_all() > #define flush_cache_page(vma, page, pfn) cache_wbinv_all() > diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c > index 39c51399dd81..c1cf0d55a2a1 100644 > --- a/arch/csky/abiv2/cacheflush.c > +++ b/arch/csky/abiv2/cacheflush.c > @@ -6,30 +6,30 @@ > #include > #include > > -void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, > - pte_t *pte) > +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long ad= dress, > + pte_t *pte, unsigned int nr) > { > - unsigned long addr; > + unsigned long pfn =3D pte_pfn(*pte); > struct page *page; > + unsigned int i; > > - if (!pfn_valid(pte_pfn(*pte))) > + if (!pfn_valid(pfn) || is_zero_pfn(pfn)) > return; > > - page =3D pfn_to_page(pte_pfn(*pte)); > - if (page =3D=3D ZERO_PAGE(0)) > - return; > + folio =3D page_folio(pfn_to_page(pfn)); > > - if (test_and_set_bit(PG_dcache_clean, &page->flags)) > + if (test_and_set_bit(PG_dcache_clean, &folio->flags)) > return; > > - addr =3D (unsigned long) kmap_atomic(page); > - > - dcache_wb_range(addr, addr + PAGE_SIZE); > + for (i =3D 0; i < folio_nr_pages(folio); i++) { > + unsigned long addr =3D (unsigned long) kmap_local_folio(f= olio, > + i * PAGE_= SIZE); > > - if (vma->vm_flags & VM_EXEC) > - icache_inv_range(addr, addr + PAGE_SIZE); > - > - kunmap_atomic((void *) addr); > + dcache_wb_range(addr, addr + PAGE_SIZE); > + if (vma->vm_flags & VM_EXEC) > + icache_inv_range(addr, addr + PAGE_SIZE); > + kunmap_local((void *) addr); > + } > } > > void flush_icache_deferred(struct mm_struct *mm) > diff --git a/arch/csky/abiv2/inc/abi/cacheflush.h b/arch/csky/abiv2/inc/a= bi/cacheflush.h > index a565e00c3f70..9c728933a776 100644 > --- a/arch/csky/abiv2/inc/abi/cacheflush.h > +++ b/arch/csky/abiv2/inc/abi/cacheflush.h > @@ -18,11 +18,17 @@ > > #define PG_dcache_clean PG_arch_1 > > +static inline void flush_dcache_folio(struct folio *folio) > +{ > + if (test_bit(PG_dcache_clean, &folio->flags)) > + clear_bit(PG_dcache_clean, &folio->flags); > +} > +#define flush_dcache_folio flush_dcache_folio > + > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > static inline void flush_dcache_page(struct page *page) > { > - if (test_bit(PG_dcache_clean, &page->flags)) > - clear_bit(PG_dcache_clean, &page->flags); > + flush_dcache_folio(page_folio(page)); > } > > #define flush_dcache_mmap_lock(mapping) do { } while (0) > diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgta= ble.h > index d4042495febc..a30ae048233e 100644 > --- a/arch/csky/include/asm/pgtable.h > +++ b/arch/csky/include/asm/pgtable.h > @@ -90,7 +90,20 @@ static inline void set_pte(pte_t *p, pte_t pte) > /* prevent out of order excution */ > smp_mb(); > } > -#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval) > + > +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, > + pte_t *ptep, pte_t pte, unsigned int nr) > +{ > + for (;;) { > + set_pte(ptep, pte); > + if (--nr =3D=3D 0) > + break; > + ptep++; > + pte_val(pte) +=3D PAGE_SIZE; > + } > +} > + > +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) > > static inline pte_t *pmd_page_vaddr(pmd_t pmd) > { > @@ -263,8 +276,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t n= ewprot) > extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; > extern void paging_init(void); > > -void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, > - pte_t *pte); > +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long ad= dress, > + pte_t *pte, unsigned int nr); > +#define update_mmu_cache(vma, addr, ptep) \ > + update_mmu_cache_range(vma, addr, ptep, 1) > > #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ > remap_pfn_range(vma, vaddr, pfn, size, prot) > -- > 2.39.1 > --=20 Best Regards Guo Ren