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 62DE8C61DA4 for ; Wed, 15 Mar 2023 05:14:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 901528E0007; Wed, 15 Mar 2023 01:14:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 884BC8E0001; Wed, 15 Mar 2023 01:14:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FCFE8E0005; Wed, 15 Mar 2023 01:14:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4DCC08E0003 for ; Wed, 15 Mar 2023 01:14:52 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E490B810FB for ; Wed, 15 Mar 2023 05:14:51 +0000 (UTC) X-FDA: 80569967982.05.F059AC1 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf19.hostedemail.com (Postfix) with ESMTP id 240061A0009 for ; Wed, 15 Mar 2023 05:14:49 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=E7wCVp6A; spf=none (imf19.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678857290; 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=Yd+AtF2yaSW+xFWRTFWRTibzPJkXOZuPq6P0eIAoL8o=; b=8oaigrJ6zpVIgtSAywPG9y4UZDD+k6dD06W44ImXwoqRq/oaYszWzBo+itlWUIm5cuLaFg o3nna/l80Q6IzGJzUzITYeLuvpVde3OKe/rrjmR26AU/ucYkW9g7CL3L4P3smajo0YHv4w 99vDINtPeXoW/jU7c9goLitr6CQekYI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=E7wCVp6A; spf=none (imf19.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678857290; a=rsa-sha256; cv=none; b=PDE3T9QPCWJ0CPwnlwAzJ51X66jzzouTx+f3rot+m7ZyXBdGX1p4El0qLdXHVBxuVmaxDx xp7d1ttJz+nOePMLd6S8qcCd77CdtD6JncDkRvwbohkKGuEf459KXNxfwEvGXyDSFOanTr qiI9S1ux0cndM1BXqBC38XNSJ2PY/xI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Yd+AtF2yaSW+xFWRTFWRTibzPJkXOZuPq6P0eIAoL8o=; b=E7wCVp6Av4GD+zoZ7c/7S3/z7v PqwgtPzVyguptcupNJIssZCLUPLp5Xw+CuqWT+4cXLmYW8Q1ctUd3oUeLnOLNBjKQff7JvkJJyAXV rxp3gOKcK5YxVsb0uSj2xHh49BmvUoa7kRqXBVCnPmdW9FVFt65+c/Wi0GQqp7avqmgLCiNAIf8g9 asA7o7ZAWgPz0K1pzc/drQlelkUazhsDQYKSiy+8VVS0RsELplplySzgwbYax53YpqLDJgZzme7VG H7V02ate6ZbGczXZ4FDoY3Y3daTqxK7TM/vm0+oBBTPiIDjjnN8qk1zrU9Y7d6rU3ko33cD+9Qu3f 9c2el6XQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTM-00DYBv-3Q; Wed, 15 Mar 2023 05:14:48 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Michal Simek Subject: [PATCH v4 15/36] microblaze: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:23 +0000 Message-Id: <20230315051444.3229621-16-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: fmhrcqnc697xx13ijnwsw7qhxnfti9zz X-Rspam-User: X-Rspamd-Queue-Id: 240061A0009 X-Rspamd-Server: rspam06 X-HE-Tag: 1678857289-40141 X-HE-Meta: U2FsdGVkX18XkrFotWHoitZLe7QZxl7hUqR9zF9P6N+oTcR/R+3t6ZNl+YJE/0tWhzS3n7/MtYxuJE+Qg8npuuCistmMTytQgzNL5KAB6FSjhBpZA9eSBPAZYTZGt0xLgUo0JLT6tk9/N/BRfeDhA+GXHxwaT+89a9Q4cQ8WZSxA5sqivcI0X/w+cd0F+lNu6UmLCy5xwfnrXDWnIRgx7jhS61a1N4/T+CYbICI2vqnBiPjlj0TsKyNix8tkqOY11RFWs8YrK8g3PlCgB9C6aJlQFMjKXh79kuphBuigAmmWQ0/w/17yUgfJmBmQ1QerZ7aLn41WQrDHzAnwEcDB00lZ7mQpVfbNJMa69TMex6SGYDVxLMNlCultBtOvgfQ56zl8NO1odnUvoPrdK84ngUkGzb9zJFtmzVSqHSfSEESgq93ZbNoGO4U4PeDsV0wkhQm3rAYlPOBgg4zRMX9QN6w9BtkeJ3U+wUtjOft4t+kYytvSwiMxuSBV/cMVw0y6FOZA/mr+zHafYYmBIFUbQFOMqQT4qzs+ynqnBadY4XZ/gxCGg/bMvaLSyG0Q87gePhpaYeSzVTIA4QDL7ScXDkbMqfYhuhaIcI1D/CvJn4Ky1/Mxwc4xpEbUSVHVXu5AgVq+ZwpHOMIlouqs+KwyJjV/q23pzDuF/2KWTXdYXKeiOgD2i8O1bYWz/YUuTpZ1zCCI9uZHFRA3mv5mc95PGnQmqvj9yyCBFgF7ZYaoRzbNuwD8ihW4khdZ/cY7/9EUFs0kAAaxfO5KGMkKhV0zVmTAwQ0PdM6MGaVw+aOm3udW4PmSPpW1TUlLYM9AFUaaNpodeipT/lBOpgjCZdbQkGV0ODEnWX1j8VcCKiYeXsnzW+ims3Xl4HOz4FXBOv3Ii1Q3O4lOTa+S+9SuU1bcSsxI6VQP4IgHvHXY9D5wFD1vAVO+4ntq+S4XvBymqU5hunj18ACeSl9NrlORTre wY5tYi45 ge0lIw816xpqCwGFNgc9tVvSNwo2IJ87sT7CuU6+VTsBkbMmO63UAI9p8YT1LB09egMwrVr6UqvoQ+SMZpYjpzjpriyiokB3qH4rDnZUU78NAJ67v5HIsUbKDUuvTJOLycmrpL1LR2OTrM8sHeXUK1XccfTdQlAwOGUpXBODYdcBqLPW5j56YsFL+h4GMHRlChsPAkijxp0qXl55zU4Wptel5UkKoa5XsOesupaQKdppO4AdN+pqCTAZqSceSpwzrTgCy 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: Rename PFN_SHIFT_OFFSET to PTE_PFN_SHIFT. Change the calling convention for set_pte() to be the same as other architectures. Add update_mmu_cache_range(), flush_icache_pages() and flush_dcache_folio(). Signed-off-by: Matthew Wilcox (Oracle) Cc: Michal Simek --- arch/microblaze/include/asm/cacheflush.h | 8 ++++++++ arch/microblaze/include/asm/pgtable.h | 15 ++++----------- arch/microblaze/include/asm/tlbflush.h | 4 +++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/arch/microblaze/include/asm/cacheflush.h b/arch/microblaze/include/asm/cacheflush.h index 39f8fb6768d8..e6641ff98cb3 100644 --- a/arch/microblaze/include/asm/cacheflush.h +++ b/arch/microblaze/include/asm/cacheflush.h @@ -74,6 +74,14 @@ do { \ flush_dcache_range((unsigned) (addr), (unsigned) (addr) + PAGE_SIZE); \ } while (0); +static void flush_dcache_folio(struct folio *folio) +{ + unsigned long addr = folio_pfn(folio) << PAGE_SHIFT; + + flush_dcache_range(addr, addr + folio_size(folio)); +} +#define flush_dcache_folio flush_dcache_folio + #define flush_cache_page(vma, vmaddr, pfn) \ flush_dcache_range(pfn << PAGE_SHIFT, (pfn << PAGE_SHIFT) + PAGE_SIZE); diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index d1b8272abcd9..19fcd7f8517e 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -230,12 +230,12 @@ extern unsigned long empty_zero_page[1024]; #define pte_page(x) (mem_map + (unsigned long) \ ((pte_val(x) - memory_start) >> PAGE_SHIFT)) -#define PFN_SHIFT_OFFSET (PAGE_SHIFT) +#define PTE_PFN_SHIFT PAGE_SHIFT -#define pte_pfn(x) (pte_val(x) >> PFN_SHIFT_OFFSET) +#define pte_pfn(x) (pte_val(x) >> PTE_PFN_SHIFT) #define pfn_pte(pfn, prot) \ - __pte(((pte_basic_t)(pfn) << PFN_SHIFT_OFFSET) | pgprot_val(prot)) + __pte(((pte_basic_t)(pfn) << PTE_PFN_SHIFT) | pgprot_val(prot)) #ifndef __ASSEMBLY__ /* @@ -330,14 +330,7 @@ static inline unsigned long pte_update(pte_t *p, unsigned long clr, /* * set_pte stores a linux PTE into the linux page table. */ -static inline void set_pte(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) -{ - *ptep = pte; -} - -static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) +static inline void set_pte(pte_t *ptep, pte_t pte) { *ptep = pte; } diff --git a/arch/microblaze/include/asm/tlbflush.h b/arch/microblaze/include/asm/tlbflush.h index 2038168ed128..1b179e5e9062 100644 --- a/arch/microblaze/include/asm/tlbflush.h +++ b/arch/microblaze/include/asm/tlbflush.h @@ -33,7 +33,9 @@ static inline void local_flush_tlb_range(struct vm_area_struct *vma, #define flush_tlb_kernel_range(start, end) do { } while (0) -#define update_mmu_cache(vma, addr, ptep) do { } while (0) +#define update_mmu_cache_range(vma, addr, ptep, nr) do { } while (0) +#define update_mmu_cache(vma, addr, pte) \ + update_mmu_cache_range(vma, addr, ptep, 1) #define flush_tlb_all local_flush_tlb_all #define flush_tlb_mm local_flush_tlb_mm -- 2.39.2