Received: by 2002:ac0:a679:0:0:0:0:0 with SMTP id p54csp346153imp; Thu, 21 Feb 2019 02:39:38 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib/gl3f3joaTtJ9ukQ4pTfU83NdgD3L6FQXvtocl4Lpg96kFtcFYgsLeAmcoEOZUHFJacUE X-Received: by 2002:a63:8048:: with SMTP id j69mr33605278pgd.432.1550745578368; Thu, 21 Feb 2019 02:39:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550745578; cv=none; d=google.com; s=arc-20160816; b=sxjDzCTM1XEwuzmsKIOS1pUcqhpnqOONrLtN4rVZ2i6uCdl+6QXLYgmAI+4RhM0rBW nOXqZEzZSTo3WOpTcJysc8mFOPDSKjLwhHzUx7SpT8mM0eQIkSqVUwn52UiY568T9PLC mKb2ba1hvrQckq4Lq5rxPWUg7exirY7IFHxNzY1vx96Axt9TU8/SuTXlL8/sDyphYswb YDmzbNoJmMUdblM7ZopJxOpArVMd83ctBX/0WdgXFiH3Rd9UUzE/qK0fOZ/92JATIOJg Zha27zfxh0JdHKKGIdvgQJDC/wVNPYF0bCp24x2E+QaWf/v+fQdCpEFQgE8NqqQuw/Ap nRow== 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=MAszOCzV0/hHXUCEqsnUBeQfl5X8y4aIl+tqH9Rpxb0=; b=jwHaaYSLRy4v/i1wBXprK7OwFB6i+57W10UF2sdu1f94itun3ufAsi90untk4Z+fau AIkNCqmUEnL9k3DjKYuUC1sGPd2rH+otBJKD/qWCViNIHiNEPdF8A3t9TM6qy1ruVGpo 3B7T16WiodR56SjGH/CqY6eEbVtx35Ju6tXCMSeKCQSw4LEhxAPebeX4vd5oHieXO5bG gbBNGhg/lpZspI7PqdsMMysM7aQPoHyFedgfcTEKa7qMQhvVASjICSE5SOyt4nGIUamc eGNJEPlZdNn6GrCvWcbY2L8Zq4tFfgpuSCqUDGwhyIdCz5VfoVJFaXji8FnXA3h+StbV afJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=E9ddfQYt; 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 75si16539188pgb.230.2019.02.21.02.39.23; Thu, 21 Feb 2019 02:39:38 -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=E9ddfQYt; 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 S1727792AbfBUKi1 (ORCPT + 99 others); Thu, 21 Feb 2019 05:38:27 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:13338 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727437AbfBUKh7 (ORCPT ); Thu, 21 Feb 2019 05:37:59 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 444rXP5MjJz9typD; Thu, 21 Feb 2019 11:37:57 +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=E9ddfQYt; 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 d2JJfiF9qa1q; Thu, 21 Feb 2019 11:37:57 +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 444rXP480kz9typB; Thu, 21 Feb 2019 11:37:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1550745477; bh=MAszOCzV0/hHXUCEqsnUBeQfl5X8y4aIl+tqH9Rpxb0=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=E9ddfQYtOAhHLcw6fyE5y/XnjzFDmQPziNp9UZzihqXMJFh0fpSnVvBBTduuCZqkC aXAukLcCYpfZzklUMX+GhWS3daf08AOFTbcBX4YiKi147iDFLE8eDfP2ZklB300sBm lzjHtXR5TSGHB6XCMBojsAG5v+sNZkQYzDAi06ks= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BB1218B859; Thu, 21 Feb 2019 11:37:58 +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 64LiCa2_Ketq; Thu, 21 Feb 2019 11:37:58 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 946668B852; Thu, 21 Feb 2019 11:37:58 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 68C256E856; Thu, 21 Feb 2019 10:37:58 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 06/10] powerpc/603: Don't handle kernel page TLB misses when not need To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 21 Feb 2019 10:37:58 +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 4c2cc42399aa..e4338d785a94 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -498,15 +498,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_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