From patchwork Wed Mar 15 05:14:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13175319 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 647C8C761A6 for ; Wed, 15 Mar 2023 05:15:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB85A8E0012; Wed, 15 Mar 2023 01:14:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D23558E0008; Wed, 15 Mar 2023 01:14:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA99B8E0010; Wed, 15 Mar 2023 01:14:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6C0EE8E0010 for ; Wed, 15 Mar 2023 01:14:55 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4D143A10A2 for ; Wed, 15 Mar 2023 05:14:55 +0000 (UTC) X-FDA: 80569968150.07.AFB911D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 9A3941C0005 for ; Wed, 15 Mar 2023 05:14:53 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qCXSPv+7; spf=none (imf18.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=1678857293; a=rsa-sha256; cv=none; b=fT/TfKeki2BTU9Rd8gK2fcW2LRYEYXJgUJwHXILXdH5smaIHOQZ27sb2VTCx7R5VhCh5jn 9v5Q3nAJusbADib+M0lp0Hu3QEM/l6otbe3fuIjEFXcn/J1cXQFdxZc6WwES1YYS4LCFbi jV0L52SWceqasJ3pUBENN+1BAV6HZxY= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qCXSPv+7; spf=none (imf18.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=1678857293; 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=kYj+qH1/7tSlgOsrYtaH9bSHy1IP4XWRsGSUxqRkHdw=; b=pmpeDULVyfAnG8QTnNfIPL/mraZlgK8kaylJ0CBcq97ypooJG9Ti1gC4NzpnPL2YgzU3qf lQkEd+mKocCxKUOutZFm/ygWTPpmuWmcHmPTU9CIBiF8yqOS5GX67rVxw4eF5yRVq7QWfO OopF59ltHHVasLzTtkMJe+DbJEaV39I= 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=kYj+qH1/7tSlgOsrYtaH9bSHy1IP4XWRsGSUxqRkHdw=; b=qCXSPv+75+CZqxylF5+9tiMWXb QUPFEm/uOKR8S+KHFCVONuqmgQrens6os069ChSrooiIRS9f5rxzkyGLUSk/MZYVcRUOh6MV2V7Z0 qer/Cjb1yxa/DMCzHV5SR234J8FlMvpWzn2UT0qPNx2AR/TGRiU2FoIiVGotwI4w34DCRkaAEKjij CChK9b6ELKvMw2K/DnQwRkvBuVmdBOZbFWrwilne9ogqHbz2VUJ7fAwZlBEbEdkkAlZbI4JQ03Y2D PPww1Dcby4qBwBeLYqY1fxrtY6fTphNabVIbFZBzUTaY+EpXYXYL8u/1kFb5L3QAEm4Q8r1SBBPjA +S2Z8bkg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTL-00DYBY-Kj; Wed, 15 Mar 2023 05:14:47 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Brian Cain Subject: [PATCH v4 11/36] hexagon: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:19 +0000 Message-Id: <20230315051444.3229621-12-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 X-Rspam-User: X-Rspamd-Queue-Id: 9A3941C0005 X-Rspamd-Server: rspam01 X-Stat-Signature: ysnyisgi63tcbwgyjp9wp1hnar9k56rg X-HE-Tag: 1678857293-617459 X-HE-Meta: U2FsdGVkX18YOMMFBkDcWaQLnmlxoIQasGSyvefztl3yatSoup60KlEuKgEliUt2zsXnN49e3t/BP8pGZ2R5l/FdnVGvQw/dpKeao9DgoDbt/qr0wY6jfaYlgZftTuyiOfTxNhA9AAZQGesPAbg2rhq2VLSM0HYhO5ez99evKCSQZpvuzyI+hhDHZwYmVAEhMyCbQoMLFKSq7ZZTrA5QRPXSSjCWMuXRto0qOUAgvxcxG9Qb1EmIcWpmR1ewcECzqxjDmXGlW6+LZ5gIYYU8tJLkhCL/3b5ob/ErBK1zpXdMGSIYPzB5pZlM3CIU+ug29N3KKjPtP7KdvV8qfETQCcTCeWvCGLC2tYn9lrm9y2s3LT0j2g6I0N2XdXogXJk9HQEtMD/OG9av2jBW3OP/oWJ5bk3OK4OcuRUZNd6Dm5eYYCG4CGdTtqiYzmnyxxcnx20mc6O25OSVb50AZN4IPkFa7nZ9QBHqC/028ecMy03nxa8RJ/YxSt4r5iF5xmNPxjWo6xa90DjLWfDdH4L140kmyeIy5998sXZrWc/HQw3EaPo4u8bOdyBgK5xVnbogumzY5v68EcLO78p4PQtjILuHjqg36CU4oRJ196J/f28f4EGy/ktETKFgRpWRasZD7ovbYNnu5/sQ57ForfVz9wmlsC3Nmqc7F1u/lhwjg2MSyAXhpbW5tGRRuN7kp3SkLtCkr1jMMLXexXMIFUtUanZTv/ZqBHwUHAkjO78Hw383vjse0ro7UafPg/D75qc7gwhjWNmCcWy1SijapAGnOp3sh81d5fBi16FF9tmEVykx4ABROGiJDXsxEx3MObs2zZL2N3KOhr0t04q6k952iTZcWrYXBzIKpsH70Z2G8XFLeP1SjwkhIjxmzM5hLJoIFgQYwIn7ObRqnhyc48a2ys1Zvn79crNcGmme9C+EANkxnv4VZOrCSAHKjC+9B1ArexuY9712n+kUjSz4W1I yBIH7rzq I/UrJvYmYnLMuDwj+2P0MBJk9ZnSxxf4AWBW7lEfmPA7prAxJTkADTyeu4aUaZXkKwKI923GnzMyYdL/JxnroLAjt32Sem6Py1ASrL5B7UCGuH/Ah6+pcA90ykDBUjSsrZeqI3GsCSzzIhSTSsUPUBcZkU3w0+9LMNXJSoeZ+G0kHsvqF3ASbARbxXxrqe3lSdTmq11rEuB5Ipp2738Nyizv02VltHlZJIKYlq12rcO1Pw2aGYMrIbEZQERyVQBhQ4/lW 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 PFN_PTE_SHIFT and update_mmu_cache_range(). Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Brian Cain Acked-by: Mike Rapoport (IBM) --- arch/hexagon/include/asm/cacheflush.h | 7 +++++-- arch/hexagon/include/asm/pgtable.h | 9 +-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/hexagon/include/asm/cacheflush.h b/arch/hexagon/include/asm/cacheflush.h index 6eff0730e6ef..63ca314ede89 100644 --- a/arch/hexagon/include/asm/cacheflush.h +++ b/arch/hexagon/include/asm/cacheflush.h @@ -58,12 +58,15 @@ extern void flush_cache_all_hexagon(void); * clean the cache when the PTE is set. * */ -static inline void update_mmu_cache(struct vm_area_struct *vma, - unsigned long address, pte_t *ptep) +static inline void update_mmu_cache_range(struct vm_area_struct *vma, + unsigned long address, pte_t *ptep, unsigned int nr) { /* generic_ptrace_pokedata doesn't wind up here, does it? */ } +#define update_mmu_cache(vma, addr, ptep) \ + update_mmu_cache_range(vma, addr, ptep, 1) + void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long vaddr, void *dst, void *src, int len); #define copy_to_user_page copy_to_user_page diff --git a/arch/hexagon/include/asm/pgtable.h b/arch/hexagon/include/asm/pgtable.h index 59393613d086..dd05dd71b8ec 100644 --- a/arch/hexagon/include/asm/pgtable.h +++ b/arch/hexagon/include/asm/pgtable.h @@ -338,6 +338,7 @@ static inline int pte_exec(pte_t pte) /* __swp_entry_to_pte - extract PTE from swap entry */ #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) +#define PFN_PTE_SHIFT PAGE_SHIFT /* pfn_pte - convert page number and protection value to page table entry */ #define pfn_pte(pfn, pgprot) __pte((pfn << PAGE_SHIFT) | pgprot_val(pgprot)) @@ -345,14 +346,6 @@ static inline int pte_exec(pte_t pte) #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval)) -/* - * set_pte_at - update page table and do whatever magic may be - * necessary to make the underlying hardware/firmware take note. - * - * VM may require a virtual instruction to alert the MMU. - */ -#define set_pte_at(mm, addr, ptep, pte) set_pte(ptep, pte) - static inline unsigned long pmd_page_vaddr(pmd_t pmd) { return (unsigned long)__va(pmd_val(pmd) & PAGE_MASK);