From patchwork Mon Feb 17 19:08:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13978494 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 29125C021AA for ; Mon, 17 Feb 2025 19:08:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC602280088; Mon, 17 Feb 2025 14:08:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A4F75280085; Mon, 17 Feb 2025 14:08:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8582D280088; Mon, 17 Feb 2025 14:08:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5BC21280085 for ; Mon, 17 Feb 2025 14:08:44 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 17C6DB1B2F for ; Mon, 17 Feb 2025 19:08:44 +0000 (UTC) X-FDA: 83130373368.10.3FD779C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 77C1F40008 for ; Mon, 17 Feb 2025 19:08:42 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YXhaJWKL; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739819322; a=rsa-sha256; cv=none; b=uKreyX3/QQ4FzEdziZp9thtbXmLbO3KXLrh2bas/eo+y8WiG7pz9UGCAtF/ZpLWoMrX2uv GmnTtR+k1eZaJJ/Tx+PnpEfnX0jFFHhxcT7UiNZzuJCTgKXHpWEPlBftNet35gQ5CFDh1r HkaXtYtISgiSk8f5l2g/vAtt2B+TgAE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YXhaJWKL; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739819322; 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=irsUPCJDDf9sWPbOR5tfnHLkyAVI2ujQHmur4Rc6/5I=; b=7pPZgZXZ1KehHwMzZwcnmldbGUsTVSnVRX/Y/C9VtrD4GUMshJ54jqkguYB+jOWm/7yZ2v pUaeHb5ULfpsx/n3z3fxfj4J6iS29aqcfH1Bzby14n2fG1yjYwmxYL9AlXBEu/V3qr6aAU PPkZtcercHpEe4n+xOW+Okb/xCUVMFg= 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=irsUPCJDDf9sWPbOR5tfnHLkyAVI2ujQHmur4Rc6/5I=; b=YXhaJWKLYm+FmviTMlIhMOBmPJ PdTTcuf/M3ukyskR8HsQNa9WRzD5eyRz2Y8U5uC+ZBVNLRmB/zBDIZriJnVP4mUqtZLb8CrAPmfbw r1jHXZk3tuoSZ+tMoN/W7PZnxDKajMvW+2F7/ap+qB8onNjw2rwB4S3+Zp6LbX9wAkbFZQly0p7Xm wKAjrJYQrOzYpalnDopo1OtWgGHqxi0cPxuHXbDMxHMAGmv1cCuh7GpDCZjDsCTfhtqUYInwMM3cN oXU4pgZO6LzJ4Pht2G+33kYABnQ6jUlUv6v3ogxyM8XV+Zub6EQJCrLrvMKMbmtFQeZMRgquxNLIC NZu0XKhA==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tk6Tv-00000001pBP-01vp; Mon, 17 Feb 2025 19:08:39 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org, x86@kernel.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org Subject: [PATCH 5/7] um: Remove custom definition of mk_pte() Date: Mon, 17 Feb 2025 19:08:32 +0000 Message-ID: <20250217190836.435039-6-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250217190836.435039-1-willy@infradead.org> References: <20250217190836.435039-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 77C1F40008 X-Stat-Signature: zgeb95i46sufwt7wrdogzaw8sohq5r33 X-Rspam-User: X-HE-Tag: 1739819322-37126 X-HE-Meta: U2FsdGVkX187UMbijye+Qwcsr2X/cfFCTFiOoJ8CNO3yUzU1Ts/daWYiP84+l6/aq0kCHpusVnC9zElB/bIy+DBdQK/9FiOLNsnhpgO2ug6aOkpOohehZMAmaT0n/zj+mjgt6AjbTElR2vZdwNBYR8uojjvIPR6YzQ8N1PIAc8O0mx6gVhpOMufQDk8BEKUFcN/b210K9dgONzf/fxzuyv6LtpmK80ePhC328z7VZwgkeDGeq1qhZQ729kqBWgVmbFlJUX80OhpTA5gFatNDrXC01t/C4A+aoIBcj5hkJbQYFnjremsYFry8+HI3C9voz2JUg765VNJjvmp6N1rI1QCf5hCHDlfLdA8Q6Og2VDTs3tRsIzLu2nQlbs+9VCuSOVaHbFn9c0AySYpJ//csMumbCF3Qdyco81kdDJTR0S25t4CosL82jcR2vpxAaSVhzdzMd4HK7Q3Ysczet8uf9yZWSjrD1IqH1WTomBkhp2cgazNp5EzVG495egR2o5JrvWTXhLBGS3kuPqKACQV/BdnuXgOtjWGtEqJq2jvS4jXUTYEqtcEPCFrf17D+/KGLmJtRaMs2WOw4igiGV3CKgVIcpYZ9naYC2KQtx2XhkxFrVcHuv1FMOvGGMIlqocwSU4wGHccwcShbMch1Af47BRlIg52FX6mkNabp773qL6CCoTmvRWuuni2/WvQdhDlr6ivRoqbsGxuSeGlbMNstli5GWR2D26pSNFIPH2J0IT1rNiPP33aZmElJ2s+NoamuRzgtM740b8l9trZcEroHlGBzm1RJOW2h5hr2L7T2y/ys1PgV52C9r0S0T2lcSewrDGuRyFYapbE4ShlyWq9vZegH3kmrNigRbmBNScv37pHkF8GM2X4Ll2bRWzmVQf+4+QthiN/B7CJ8f5I7RyLruLRZeaJfl9kIWOBag2bFkcePvU/AfwDvj9nQXDRfMjDPzrjsVqWFhp9egojiRNK WB3ZdBV+ AyzW0B2PXX76EhGiSanUpuq3bw5uq1fJS278m8n3dAD54ntIEC4I/WnfHHyPt0SbSoT6oVDAuOJ151vpj9zJfZLOWrBorkzWcdaKaMqfaA+6PGjKdYTuojWk3N5Bdqbzbg5QODJ/r/y06EzcP6vzoDUlNbM2qzyT0dbLoLvviB05z9b/n9N29ezcLXgv/MJc8cQiP6t+cNH4k77nqVh1MSELi7rV89iqk0u4QR5mXHQKdkIVleajj9Thutv4pc2hjuvSmNbAdVzWYavGVA68G+P95FmWFaBQYiokm 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: Move the pfn_pte() definitions from the 2level and 4level files to the generic pgtable.h and delete the custom definition of mk_pte() so that we use the central definition. Signed-off-by: Matthew Wilcox (Oracle) --- arch/um/include/asm/pgtable-2level.h | 1 - arch/um/include/asm/pgtable-4level.h | 9 --------- arch/um/include/asm/pgtable.h | 18 ++++++++---------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/um/include/asm/pgtable-2level.h b/arch/um/include/asm/pgtable-2level.h index ab0c8dd86564..14ec16f92ce4 100644 --- a/arch/um/include/asm/pgtable-2level.h +++ b/arch/um/include/asm/pgtable-2level.h @@ -37,7 +37,6 @@ static inline void pgd_mkuptodate(pgd_t pgd) { } #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval)) #define pte_pfn(x) phys_to_pfn(pte_val(x)) -#define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot)) #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot)) #endif diff --git a/arch/um/include/asm/pgtable-4level.h b/arch/um/include/asm/pgtable-4level.h index 0d279caee93c..7a271b7b83d2 100644 --- a/arch/um/include/asm/pgtable-4level.h +++ b/arch/um/include/asm/pgtable-4level.h @@ -102,15 +102,6 @@ static inline unsigned long pte_pfn(pte_t pte) return phys_to_pfn(pte_val(pte)); } -static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot) -{ - pte_t pte; - phys_t phys = pfn_to_phys(page_nr); - - pte_set_val(pte, phys, pgprot); - return pte; -} - static inline pmd_t pfn_pmd(unsigned long page_nr, pgprot_t pgprot) { return __pmd((page_nr << PAGE_SHIFT) | pgprot_val(pgprot)); diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index 5601ca98e8a6..ca2a519d53ab 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -260,19 +260,17 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b) return !((pte_val(pte_a) ^ pte_val(pte_b)) & ~_PAGE_NEEDSYNC); } -/* - * Conversion functions: convert a page and protection to a page entry, - * and a page entry and page directory to the page they refer to. - */ - #define __virt_to_page(virt) phys_to_page(__pa(virt)) #define virt_to_page(addr) __virt_to_page((const unsigned long) addr) -#define mk_pte(page, pgprot) \ - ({ pte_t pte; \ - \ - pte_set_val(pte, page_to_phys(page), (pgprot)); \ - pte;}) +static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) +{ + pte_t pte; + + pte_set_val(pte, pfn_to_phys(pfn), pgprot); + + return pte; +} static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) {