Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp410292imu; Fri, 25 Jan 2019 04:35:36 -0800 (PST) X-Google-Smtp-Source: ALg8bN6Ed0bneHF5Pw63BDH2yDVcsyj1F11SH4GmTXw+XvUK2QIl/7qII0Eqe3WYw+kwQeZv6n6j X-Received: by 2002:a63:4c5:: with SMTP id 188mr9910257pge.391.1548419735936; Fri, 25 Jan 2019 04:35:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548419735; cv=none; d=google.com; s=arc-20160816; b=Oq1yqdaPVwM3Y9bW0NLfLLkVT+vB0y3gRCH2oM0Llu+sA/JCd/PaGsOX1QedQFJSVN d1j22OAtoOwic3Px3XUP8uzyRE1Q3hAlb5/8g6qZA6Qi7ejJGzg6bI8AM31SLIsz439c TfQFgM9Xcd/iJHr0FaZAhSMVwsGYoC2tSyWhOvGZ3CJRyDJ5JIqJ+8IZPfZYGX/XO8rU 4PLfNJXEcCx5+l9t4h7kxS9DPhtRWFwMfkruZZZUASJOnmHEW7CNc9VcMEgFpwomQhpm wEI/4WSEagdoryATZ1H60xi/TDX7mBywzi2cNC+9O5FsvlnNCF3HmMd9v0Gg1jB0Ocdx dP9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=shxpvL1EpT7PNv9ssXfb555llHD7XkFegIZFp6AerwU=; b=tO9/OXSw01rqPwopMBnpURtbZQUvLU8236JFmWGRrCv5cd4+QKGkbFmz0z17HP1BSC Capwh+tMlhR1VIaaA6UYmLa28YjvEXlQRDGEgDvDbLijftal0obXS74RlJcclDGNeFZo HlP8bqg7oVJ4GtZHYdkPUZXDorKv5Xd2qu0KKc4Ngp9s1OS+wCxcPeKf0xmAlN97AWcV JD3zu9pgNbSUe3US+phJ3xmzkyNWDYUAVeB3YpswZu5DystWIoCewLfAhNM5ikNh4lhA dkAUPb/WMDSLW/J8ePG7LVV4mTli/ncc7WWQOWfbHqakp6/FGqf0mB+rWBZtwjPkZY9k to1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Y0fUpU5I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9si25211906pfq.129.2019.01.25.04.35.20; Fri, 25 Jan 2019 04:35:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Y0fUpU5I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728461AbfAYMeP (ORCPT + 99 others); Fri, 25 Jan 2019 07:34:15 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:54439 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727826AbfAYMeM (ORCPT ); Fri, 25 Jan 2019 07:34:12 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43mJNx4G5Yz9tyxs; Fri, 25 Jan 2019 13:34:09 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Y0fUpU5I; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id sgG4hIpj0rqd; Fri, 25 Jan 2019 13:34:09 +0100 (CET) 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 43mJNx2xNdz9tyxr; Fri, 25 Jan 2019 13:34:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1548419649; bh=shxpvL1EpT7PNv9ssXfb555llHD7XkFegIZFp6AerwU=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Y0fUpU5IfHkU6vEY3/SH+DuqXJZ0shuUB12lDjSHjCUHdyy/8vCMx2VdSmoeAbuDj 5bpKn6GaS0CHyZGt5ehlR8MV0/tpA3I1nIoy1sKcI6DprEt7EANgDh+vQDTSv0UveI 6cU7M949kpgsjjQ6zleffVDjyYfRoPr69EYtm7EY= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id AA0F28B87A; Fri, 25 Jan 2019 13:34:10 +0100 (CET) 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 I2ny5lr9zVz2; Fri, 25 Jan 2019 13:34:10 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7D9CA8B761; Fri, 25 Jan 2019 13:34:10 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 65B5172DA9; Fri, 25 Jan 2019 12:34:10 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 05/10] powerpc/603: Don't handle kernel page TLB misses when not need To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , joakim.tjernlund@infinera.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 25 Jan 2019 12:34:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ITLB miss on kernel pages only occur with CONFIG_MODULES and CONFIG_DEBUG_PAGEALLOC. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_32.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 53f65124edd5..3bbf937ad634 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -500,15 +500,19 @@ InstructionTLBMiss: */ /* Get PTE (linux-style) and check access */ mfspr r3,SPRN_IMISS +#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 +#endif mfspr r2, SPRN_SPRG_603_PGDIR li r1,_PAGE_USER|_PAGE_PRESENT|_PAGE_EXEC /* low addresses tested as user */ +#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ addi r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l /* kernel page table */ +#endif 112: rlwimi r2,r3,12,20,29 /* insert top 10 bits of address */ lwz r2,0(r2) /* get pmd entry */ rlwinm. r2,r2,0,0,19 /* extract address of pte page */ -- 2.13.3