From patchwork Tue Jul 2 13:51:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 13719695 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 812D2C30658 for ; Tue, 2 Jul 2024 13:53:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16E696B00D9; Tue, 2 Jul 2024 09:53:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11EDC6B00DA; Tue, 2 Jul 2024 09:53:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F01A56B00DB; Tue, 2 Jul 2024 09:53:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D12A46B00D9 for ; Tue, 2 Jul 2024 09:53:03 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 96BFD14014B for ; Tue, 2 Jul 2024 13:53:03 +0000 (UTC) X-FDA: 82294953846.15.54ED566 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf07.hostedemail.com (Postfix) with ESMTP id 6209840007 for ; Tue, 2 Jul 2024 13:53:00 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf07.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=1719928359; 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=Q/Xgy+CDiaDc6PFBanbBwKum/m72vivyLm5VePleQDfZogzxP+kBpBkCbkByBYlTPEHac7 umEAmwQI9QotqKqhJ7HnkvqkeHNfY7mKL1IneZhXpv6Ya702pIYB5bLWYzbDQnbS4J7yqT Vye15xom8ssJC4we5an6XdjDjgn+qUM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719928359; a=rsa-sha256; cv=none; b=ha2xFvu94RoMITi6eeZdNT99MAR6ju9VHcrmBD80+B/ejzXbWY+j0YptdkzjOA14EQ7R0x 0Yt8ZrlnV8mwZnWHm1EichdhVVauYqUtOJJW4BNTWp5Hf7Fsng0WVbzgF6+ZVJcU+zH0Pb 92SVXJgaHRfujXeADE+Mjt9vDyCYXZc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4WD48M2G8bz9v6q; Tue, 2 Jul 2024 15:51:47 +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 F1PYD05orrHY; Tue, 2 Jul 2024 15:51:47 +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 4WD4872gVjz9v5M; Tue, 2 Jul 2024 15:51:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5733E8B774; Tue, 2 Jul 2024 15:51:35 +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 LSTeqtZMNkMb; Tue, 2 Jul 2024 15:51:35 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.233.12]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C12BE8B775; Tue, 2 Jul 2024 15:51:34 +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 v7 19/23] powerpc/e500: Free r10 for FIND_PTE Date: Tue, 2 Jul 2024 15:51:31 +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=1719928275; l=4544; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=CGeNYqnnvnjPnGCbM1yMAoxPPNyoWmWcvtJY5TjAVy0=; b=M1QWIpnPCtnELqMpfZZElEuTb8maaGQCCyTc3Ar8cokovO/DoM4+jhTmObMqHUeG6WC1Y96nA N3ZYvNGaCG7BCNl4TfIiCDNRKy//BQir7dqlmDq1vhcHqqDVpGjudhr X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= X-Rspamd-Queue-Id: 6209840007 X-Stat-Signature: zijp4ywcbdqtwp5s3mpcwirqh6ak4mqk X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1719928380-268502 X-HE-Meta: U2FsdGVkX1/CWM4867Ct5tCFxDx4KqiWminBRLuGnfpv1UfLOOUfsTOX4dvaYk/PuEyOduem5Cny3w8Vf0FTClTkKXMCDssLt3Qau81T2z1mPZly2b2qHPQzC1idzBHVqNnH6loBXustfzMGu5nqDTYCz249vOV6EJ1pSHylNXJqy8eBKJQvl1IpwIEOnVmCGrv6dPyh5jlBh2ywvW9KADWeRdkS+g/Amhz4lv+qklNtJWLLz0npVwVyUc2pDFvTQGYzuR/3QlMvh4dM0wb9YMd1k6wQoGMXxartI7ND2xi3e7cn29OEp6OfwjaJeVVFHzXSaLxreV5e0cfsXjT2BYQbBdRsF7aZmV1aHZvI/+vwy98+jKy6thPHGKSjEVVWsj679GznAvOrWLcSAWOz8fQviTK9yqJ5smnLh9qUkqo6Wbgo+nGroEsAvDcgi8Xsv6dmzGAwlhk+ftV9TzXB9evzntHKI//Qxxbl9YaD0VpT+iIV2SwFFamU8i5hQRW3T8a8NN4gslvz8TtNe3flYQQicPb2It7jWuYjTyuCQwi6KKJrrN0yzifDv5rGvUkayv3JoAGFfATIYbRO4yqPmsiiYVeUvsRhN7h5K4FW6pdcUt9GB64zcrM8XmXbBOz9TzfiW88Wgpr07Jz5qcPbjGZEpqdS+TivypStxmySPxjMtHcGqhSDLAKUGMRMveRWPEPZtee+Oi1oKiMGYWMNcRgh5Tv4DF7TTJ+++GANVqNofikZcC+HrB0InqkIArhy4u6fagqXxwrxw7x60sKbnoSHHUXA3xF33zvlrZO+DetdJzWcWHfZaaW5Xt7t99G8RU+j4RYUo5qfWKYEURMJTDg+wdNuOdGWYp/lQE1++deajyq9341mRNOz1gwjdeCNrPcJmtquj9katfVLP21S/xNAjPaPGq6BhvIZc8Z6tMKpQgy4/Tdj0yCRnDWRX9b++TrWPRlrwmXNCeHBGJo HRW3N7+D CdT/TOjrcBD/v08YUi6MNLbeFnmzQornSNucbRY+vAz+nsM2AZkeOHF4F6gB5YeZOavdBf1RgOeC//NOkvbkUtkfZlSzYrBHVR8ZeGnlu+6kh3KREcoa84MEIhS/g3u0hUeWgM63FkwWQI5Xq4Xw7nifmFhWvLZGSxra1n0i1Tbi+Zcl2MLkcH1dtpNqS2aD8PQlUoEjbNPeVnhY= 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