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 B8FEEC7EE37 for ; Mon, 27 Feb 2023 17:57:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A2416B0087; Mon, 27 Feb 2023 12:57:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 527816B009D; Mon, 27 Feb 2023 12:57:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D203B6B0092; Mon, 27 Feb 2023 12:57:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 692A06B0096 for ; Mon, 27 Feb 2023 12:57:49 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4A1EA1C3219 for ; Mon, 27 Feb 2023 17:57:49 +0000 (UTC) X-FDA: 80513829858.14.7B238CB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 8B97012001A for ; Mon, 27 Feb 2023 17:57:47 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ltONIFmG; spf=none (imf29.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=1677520667; 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=jco2/brYdWe0hU6YkAHAWSfRYtcsxYQg52X9PqtqDX0=; b=jF1EI+qRWlwv+gGnmqoSun6GuB9evO1VBTgumPcnJaICgB6GUThO+fAQ+5xgcj26GEJjkX HIa194z82fvHRJd8OtXcAmn73jzxbczhMEckNDtbdJHn2k32m8idIb1BlOriBSU5RXCKWu jgfm7YGoRyBCPZJoHyZRrgU43hkSgsk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ltONIFmG; spf=none (imf29.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=1677520667; a=rsa-sha256; cv=none; b=dkHgk9+IPyMcQ82HNL1Jc/1IDvvUAsTiFXkN+yieDSsgjafoV22NbOVxPnBY9HQqhGPnW0 8RrnckcInwpBr6Z0aZEnOIbdIFSw5RCGcWclobfRis4GTfpO1VPahvZM9FuzVgQVu+kJru wQeXsGuSOEhOvYkA8gvRrEoIxUr0SfU= 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=jco2/brYdWe0hU6YkAHAWSfRYtcsxYQg52X9PqtqDX0=; b=ltONIFmGp2DL+cwnqaDAtcnTF7 yZr9xg5m9G/HNIelkbXZt2N7Euxuzfpo4qmALcQ5ECJs4EiYndJZmi1vr7HlIyQ8WiMBDh+xtgUJk w6T5tJ3XhoYOT+/SxiJoJRVzYOTqXzjfOOfsY67/FqNBpsGzTSkIBApq1UJeUlXT4J+iXmRWkVKWv kT7NZjGS7yWHUI7xWMHZ7AkjSJ69dU/gsFulUF7QL3UuhK+UTYQK8h24WGtakSKwttfXo1GnVJDZZ GatgVC5/3PeSvKXMUrgd/xhvE9ze64jgEBPIvcAsPnAw0LRmlBt8PP5/98dvRjrrKrPxPVlhzfmwc pPTM0pwQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhku-000IXY-OL; Mon, 27 Feb 2023 17:57:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Michal Simek Subject: [PATCH v2 13/30] microblaze: Implement the new page table range API Date: Mon, 27 Feb 2023 17:57:24 +0000 Message-Id: <20230227175741.71216-14-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230227175741.71216-1-willy@infradead.org> References: <20230227175741.71216-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: cxjjtic64gwmddg98a5mj6rhpmb1uspf X-Rspamd-Queue-Id: 8B97012001A X-HE-Tag: 1677520667-411429 X-HE-Meta: U2FsdGVkX1/cXRa5wdGu6DJhR504qGqYZE+GCJozoIWo/71AAxJ7DLmMJq1Lo0HaFPh59+su+wOf0UglA42CvoIJw9Qu9eIdh6hVI+h6vopsvkNSs7otmhKVfnXOjQww+Npzq50stAyph2aT5NLs/F21Cm2u7atIT5J0+a8h9yQyKQvNYobzz1lKXsHbrprjFWcBWMvoiEZWjjaKDiJgkis1pkuarQAOyfpXHevs3Md8bxlL36ipgfnrws4IkhAejC07dlOx8P1/GTdAIuagX5M1SOnHOgmLcyFNLHz2XwXOCZoKehCP8HKIdc9k8S0WtIrF/ZPz1CgumTVRtZVrJq9iTbKtUzvD+UCxL7cIe/OB8DWsSGy6p473aRNwILT+tSygJBuL9ZAB1D42sOIibJzS8CpXtEcsm0Ccik9uhGWgur16mwnXMVai5DzQNdbl1lA5w9KFxdbToxX7tSDp14vo8ltQympyw7wIjUYlOhcBZ/B1bSalDXNfs2Npn+GhaCVi2R8LuAI1j8SOty1kCQKiEvfrOS00IEej968Es82VJbCbPU4HVTKNiyYOtCZy+PWcS4kP2dqNzdSpQh/hFl46J9DBpgY+y9UrDacO2au93I4ZU/sxStYgh3KMzkBj7gabQ3W8AiEunQ0m7bPFz2AC2G9lRSi/s9rCt7DSkdFNp70yZXgGwB7nCazuhaAgz6wybVaGBqrwNSkfjTgEunuVHzbRTUj/mFSSfILIpCve+v46PeXaBTfVmof2EIliSdQZ7EYT12gY+heXm+HWe/keUQL3s3EB4FnjkqLyj7DTu2xywRghyimqOf0Gpx++AYGnaGgEMiADtUgG0GzDNdnktV7blJf/co/rjGaeWASN2fQPVFqVJozhcL5dFCukMQfi7v1dxUcriPqU0sZC+bVcpfEGkPGby5MY+6mWNyinfa1CxkAk+ohU1eZ/k3wPIpq7FnJTnwrRnI7xjj7 lYXlSFXn b25eHr980kqDiSkIwE6CQ/C/PAvowGq2tseO33SLc58Helx8HmqwGj5mbPzFY0ZrHoIAxTWfwsr7p5On6E1xi2NKV18MfP6D+0eHJs7h9dz60RpM3bnxfwSCUBUAs6mJsIHPSxXupg2dQpZeMW4u+ve/evY0Zir2euDafolaGkO/AlSjmIqBJyv3cY6P/9QtrXzsfhJ/6z7hEqPhv3c5g++2ZVBilofhHl0xQ06QycfNurvDtHxZS1ll8wcEqJ9t+xUF9 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: Add set_ptes(), update_mmu_cache_range(), flush_icache_pages() and flush_dcache_folio(). Also change the calling convention for set_pte() to be the same as other architectures. Signed-off-by: Matthew Wilcox (Oracle) Cc: Michal Simek --- arch/microblaze/include/asm/cacheflush.h | 8 ++++++++ arch/microblaze/include/asm/pgtable.h | 17 ++++++++++++----- arch/microblaze/include/asm/tlbflush.h | 4 +++- 3 files changed, 23 insertions(+), 6 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..a01e1369b486 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -330,18 +330,25 @@ 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) +static inline void set_pte(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_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) { - *ptep = pte; + for (;;) { + set_pte(ptep, pte); + if (--nr == 0) + break; + ptep++; + pte_val(pte) += 1 << PFN_SHIFT_OFFSET; + } } +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) + #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long address, pte_t *ptep) 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.1