From patchwork Mon Jun 10 05:54:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13691516 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 1C938C27C5F for ; Mon, 10 Jun 2024 05:56:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A6BE6B00B3; Mon, 10 Jun 2024 01:56:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 92E246B00B4; Mon, 10 Jun 2024 01:56:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B5626B00B5; Mon, 10 Jun 2024 01:56:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 579AD6B00B3 for ; Mon, 10 Jun 2024 01:56:05 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 19B7A14044E for ; Mon, 10 Jun 2024 05:56:05 +0000 (UTC) X-FDA: 82213918290.12.58D1C16 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf22.hostedemail.com (Postfix) with ESMTP id E42DEC0011 for ; Mon, 10 Jun 2024 05:56:02 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf22.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717998963; 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; bh=5YhBJVVFRl3EoQKKpKhbq1vJKrkfH8JAW5ygc4FL7lU=; b=EogSZlkAnifQpUIR2V8uhFxbAg04ulSBSS9k5TEMV82EtgMno6HQPPKVJF8C58pZooSe7c JuUnVVBDuFAdCqF3nBBdWufo4tggWKOExxPzi9pP31Mrt1MMx3SUZHGdQ1c1Efe51B2P2X PmL1JnVVRLOPUJ4s4XmmYU7F1LxfLss= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf22.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717998963; a=rsa-sha256; cv=none; b=hpZpwPD/2NFixY8b9u9C25xi9n9QmnbtjfppnW+QZO+PQ87avanWnSFcmiKqfNTIPIvGBO mJcSS7BFNOFzlqNCZkSzDWR4rvNCA/IGiqolcO5yr7tUFNhHsTjshMnJGv3+Q1n/1gqUPi qSS50l5r+IRY1vOJnJZMpgs6zs1WGNs= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4VyLcb0cTVz9v6s; Mon, 10 Jun 2024 07:55:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IatcaPycSvwn; Mon, 10 Jun 2024 07:55:11 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4VyLcM0Xccz9v6y; Mon, 10 Jun 2024 07:54:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0DFB58B76C; Mon, 10 Jun 2024 07:54:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 90IcYmTAACrX; Mon, 10 Jun 2024 07:54:58 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [172.25.230.108]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CE5038B76E; Mon, 10 Jun 2024 07:54:58 +0200 (CEST) From: Christophe Leroy To: Andrew Morton , Jason Gunthorpe , Peter Xu , Oscar Salvador , Michael Ellerman , Nicholas Piggin Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 14/18] powerpc/e500: Free r10 for FIND_PTE Date: Mon, 10 Jun 2024 07:54:59 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1717998887; l=4544; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=CGeNYqnnvnjPnGCbM1yMAoxPPNyoWmWcvtJY5TjAVy0=; b=s7I5Kfq9tOAr0tMpAuTkGwgZZLSIM1G9Y/ldC3ZFWbKbUT+5W9MHXPbhU2EjMjh151AUz0aRB szpZ9jLv+GtBqY08UHUfxcf1gGEACRcyZL3sSe03IZsBTHa3hrOro7d X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Queue-Id: E42DEC0011 X-Stat-Signature: pqef3kgz6yj9xhi6d53dzdr7tacuzseq X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1717998962-720489 X-HE-Meta: U2FsdGVkX19TvOBNmdZMsGp4Z8d8Ryk2qThhE6Yf8KMsDim6sahmVOd3fCJZsjSi3c8Z6iAcflMBF/5mdeCJ0R22mUzv70FX3QQlCr1ini5aFdEfvmOtK967AR3UUVKaFlOBbvDUTBqWCwmSdd+xMjQuRoykatfHcjI4mSX4xqCkbvrnRwDJRa3Dq4uidrn2pyhZVKbvdsQtIAhkpYP1TkAyU8u8UKhUhtUGqgtZZdQRgrE5SN8lh8jgpiGDcQVYmoh0herGgrThqkchd6XJGzBHeqD5EAUF70WgkQXHpGb5ZuAW1x4hEJ8MNtIuXTf2C0yYee4M4jLwAg7VxLYpYXC+sccfNZWnySaxFi59IBH7JM6g7P7Tg6JZZ+MEr5zcF9Rs+1wE2dw0fsHfuSzclsZuA8zdG7cbrA+SEzcXMhuw6kZz+n20SKlB7pqnyCBAc7IlWzahNqZnPAOdHWjxESN4XhcANQJQk2logHHxSyHrh903DhOFT4K6GLL9IYOyTb5nAts2Yl5xxTcLJPNes3fZ1aoZz/GuiXUhGEhSpCODzEhAG3oR8y/IS531hQoDlBMVPe3X8hIhJaL/KItIvGo2liEzkNsGs1tKTpBnV9DVx1C3ZVCzkMjWKWtZ7/x12DiVSAq+NfRITZi4GJyYJxTZfa9p5ZtmdBxhRLs4eRj9Qi/HC1QDe/M6PQOZCEuFhzhWJlGhHoFrUXDInVnZVp0TO+MEkSBNr7crJ8vvRN+VoiCoBl/BsqQjMxc1xVl/IiIttVW4d5u8PRhfjjHwKWkWSTAp3WcrgB1aWPBEvD+DmcVLIcnzY2iwAArxs9g8/lirtLy9WsbzFw6BwjXmhE2wUd1iZmPyZoFf8u72MsbWLtLbwU9EJgCVTHVS7kdZyslkbTlUQLdZZCxeRkWH5cZZ0Qnfk+JdsEiaoPWRCFAWCmK3vXU6QDjnXepgYxrrmo7xIemNY3HqHT1M9e7 IdRaA710 duNjDgBwVEU5aGCuwCXlfGqJfyc9xsJn46AL62c6C/lPxLfLqhUVNNBmN/mDZzxJJzCcrHUAW4PIwGAXMkJTQV1cStZkYGCNhoYM7bsO8XMr1kYWDdu1DmcUuKYnpSchv4n+vdWWci7RATo0uazhwlI1M9m/U5MCXKpQcKQb9y26ZM+rapfRRUdlHOjHYNbfQ1h453DLxBMcdQ20= 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 r13 load after the call to FIND_PTE, and use r13 instead of r10 for storing fault address. This will allow using r10 freely in FIND_PTE in following patch to handle hugepage size. Signed-off-by: Christophe Leroy --- v5: New --- arch/powerpc/kernel/head_85xx.S | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/kernel/head_85xx.S b/arch/powerpc/kernel/head_85xx.S index 282e49c51deb..226f88e77d6d 100644 --- a/arch/powerpc/kernel/head_85xx.S +++ b/arch/powerpc/kernel/head_85xx.S @@ -294,9 +294,10 @@ set_ivor: /* Macros to hide the PTE size differences * * FIND_PTE -- walks the page tables given EA & pgdir pointer - * r10 -- EA of fault + * r10 -- free * r11 -- PGDIR pointer * r12 -- free + * r13 -- EA of fault * label 2: is the bailout case * * if we find the pte (fall through): @@ -307,7 +308,7 @@ set_ivor: #ifdef CONFIG_PTE_64BIT #ifdef CONFIG_HUGETLB_PAGE #define FIND_PTE \ - rlwinm r12, r10, 14, 18, 28; /* Compute pgdir/pmd offset */ \ + rlwinm r12, r13, 14, 18, 28; /* Compute pgdir/pmd offset */ \ add r12, r11, r12; \ lwz r11, 4(r12); /* Get pgd/pmd entry */ \ rlwinm. r12, r11, 0, 0, 20; /* Extract pt base address */ \ @@ -317,26 +318,26 @@ set_ivor: andi. r10, r11, HUGEPD_SHIFT_MASK@l; /* extract size field */ \ xor r12, r10, r11; /* drop size bits from pointer */ \ b 1001f; \ -1000: rlwimi r12, r10, 23, 20, 28; /* Compute pte address */ \ +1000: rlwimi r12, r13, 23, 20, 28; /* Compute pte address */ \ li r10, 0; /* clear r10 */ \ 1001: lwz r11, 4(r12); /* Get pte entry */ #else #define FIND_PTE \ - rlwinm r12, r10, 14, 18, 28; /* Compute pgdir/pmd offset */ \ + rlwinm r12, r13, 14, 18, 28; /* Compute pgdir/pmd offset */ \ add r12, r11, r12; \ lwz r11, 4(r12); /* Get pgd/pmd entry */ \ rlwinm. r12, r11, 0, 0, 20; /* Extract pt base address */ \ beq 2f; /* Bail if no table */ \ - rlwimi r12, r10, 23, 20, 28; /* Compute pte address */ \ + rlwimi r12, r13, 23, 20, 28; /* Compute pte address */ \ lwz r11, 4(r12); /* Get pte entry */ #endif /* HUGEPAGE */ #else /* !PTE_64BIT */ #define FIND_PTE \ - rlwimi r11, r10, 12, 20, 29; /* Create L1 (pgdir/pmd) address */ \ + rlwimi r11, r13, 12, 20, 29; /* Create L1 (pgdir/pmd) address */ \ lwz r11, 0(r11); /* Get L1 entry */ \ rlwinm. r12, r11, 0, 0, 19; /* Extract L2 (pte) base address */ \ beq 2f; /* Bail if no table */ \ - rlwimi r12, r10, 22, 20, 29; /* Compute PTE address */ \ + rlwimi r12, r13, 22, 20, 29; /* Compute PTE address */ \ lwz r11, 0(r12); /* Get Linux PTE */ #endif @@ -443,13 +444,13 @@ START_BTB_FLUSH_SECTION BTB_FLUSH(r10) 1: END_BTB_FLUSH_SECTION - mfspr r10, SPRN_DEAR /* Get faulting address */ + mfspr r13, SPRN_DEAR /* Get faulting address */ /* If we are faulting a kernel address, we have to use the * kernel page tables. */ lis r11, PAGE_OFFSET@h - cmplw 5, r10, r11 + cmplw 5, r13, r11 blt 5, 3f lis r11, swapper_pg_dir@h ori r11, r11, swapper_pg_dir@l @@ -472,14 +473,14 @@ END_BTB_FLUSH_SECTION #endif 4: + FIND_PTE + #ifdef CONFIG_PTE_64BIT li r13,_PAGE_PRESENT|_PAGE_BAP_SR oris r13,r13,_PAGE_ACCESSED@h #else li r13,_PAGE_PRESENT|_PAGE_READ|_PAGE_ACCESSED #endif - - FIND_PTE andc. r13,r13,r11 /* Check permission */ #ifdef CONFIG_PTE_64BIT @@ -536,13 +537,13 @@ START_BTB_FLUSH_SECTION 1: END_BTB_FLUSH_SECTION - mfspr r10, SPRN_SRR0 /* Get faulting address */ + mfspr r13, SPRN_SRR0 /* Get faulting address */ /* If we are faulting a kernel address, we have to use the * kernel page tables. */ lis r11, PAGE_OFFSET@h - cmplw 5, r10, r11 + cmplw 5, r13, r11 blt 5, 3f lis r11, swapper_pg_dir@h ori r11, r11, swapper_pg_dir@l @@ -551,6 +552,7 @@ END_BTB_FLUSH_SECTION rlwinm r12,r12,0,16,1 mtspr SPRN_MAS1,r12 + FIND_PTE /* Make up the required permissions for kernel code */ #ifdef CONFIG_PTE_64BIT li r13,_PAGE_PRESENT | _PAGE_BAP_SX @@ -571,6 +573,7 @@ END_BTB_FLUSH_SECTION beq 2f /* KUAP fault */ #endif + FIND_PTE /* Make up the required permissions for user code */ #ifdef CONFIG_PTE_64BIT li r13,_PAGE_PRESENT | _PAGE_BAP_UX @@ -580,7 +583,6 @@ END_BTB_FLUSH_SECTION #endif 4: - FIND_PTE andc. r13,r13,r11 /* Check permission */ #ifdef CONFIG_PTE_64BIT