Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp409646imu; Fri, 25 Jan 2019 04:34:56 -0800 (PST) X-Google-Smtp-Source: ALg8bN55e43EcaYBfdCG/qJ3rv40eMf1wMgya3vdCLWiw4TR1+0GO0+azb32jT7qMFR2mmlbcYr8 X-Received: by 2002:a63:334a:: with SMTP id z71mr9919147pgz.400.1548419696096; Fri, 25 Jan 2019 04:34:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548419696; cv=none; d=google.com; s=arc-20160816; b=r2vuatG9oxMhUuv6/T3fCuVWL7hLZlZr3/MF9tvFhxleYSrZNMxRBK7La7YB6V1Bpy DY6cvGuCYq3Q7ETSlOdiGnZG/ViE7z09LmskYEgpUmLtw6ORew+P+VMd2IK9NpVKzpCm oGyZSi6Pzx+akPC6aV9AkNQC8pldUVsBm/SOLM5yrqp4UcOfmPqPwUxN0m9DuaB3F6Gf aJ/7OY8p/Wa3RWg9jbGztU2+UWeUZzwOXl5HYhX/zl/R2QqvN9sLOXflLiM40PoGPYwZ wZLFYASf8UZ/4umSk5T3kzLrEGMxvCoHP+H+lQS9E8AklClP2KmWp8tGk6TGOmIfAcpw cQ1w== 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=WipMeeEOUJx/FE8w1+6nFDz722YqkfVGCrpdT9quoOU=; b=KGW1NrrwO1i0cBcGXDZoD2ct1jsC3eH++aDRLVzqZQjhDOnYwomcJfWg+xg/697MB5 L/qXH7iBXsW3X1KkHfTIaer/B3+mqYjWcuT1GSUz5+qIRl3p4YL6GmpnguYlQYmxLo6B i6kajNcNyjppLXDO6igqRiH8j7JC6arcly0WUaqXclVkFcyE6FIQwzdqjXdeRDUV2EJj CM4WIIqx3ivbTl+/BjZvLI68uh6Wanz4X/2DHdDhHfZkyHr0cGfTgs1iY3ViJ7eml89r VM0jTpKtQGdr+CcOKC0k1XqJI1kataa18I0oJnxISJ5xepca7nkvwjU+8UzEXB07U7kD bIPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=VwBpXh06; 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 i62si6299371pfc.17.2019.01.25.04.34.40; Fri, 25 Jan 2019 04:34:56 -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=VwBpXh06; 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 S1728624AbfAYMeU (ORCPT + 99 others); Fri, 25 Jan 2019 07:34:20 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:54112 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728550AbfAYMeS (ORCPT ); Fri, 25 Jan 2019 07:34:18 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43mJP344dvz9tyxx; Fri, 25 Jan 2019 13:34:15 +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=VwBpXh06; 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 uzLxnJ3v1N3e; Fri, 25 Jan 2019 13:34:15 +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 43mJP333p9z9tyxr; Fri, 25 Jan 2019 13:34:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1548419655; bh=WipMeeEOUJx/FE8w1+6nFDz722YqkfVGCrpdT9quoOU=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=VwBpXh06CeQqLNDY293B3jrpkpSLgNk1H6jlhq1uQNkxdfZVV94jf0QNmZv2LHgVz ytPzpg4U5lajQyAQJ1lGr3bBBBHjbZtxyj491GlZm4bcyrAisAzu7d76+ap4uuk9nk /x/hGfEaicL0Z8yRuWNGdoIHMvAFk1GseZhW+PBc= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B26EA8B87A; Fri, 25 Jan 2019 13:34:16 +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 NdgGamQGBiNc; Fri, 25 Jan 2019 13:34:16 +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 934008B761; Fri, 25 Jan 2019 13:34:16 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 759C372DA9; Fri, 25 Jan 2019 12:34:16 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 08/10] powerpc/603: Don't worry about _PAGE_USER in TLB miss handlers 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:16 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PP bits take user access into account, so no need to check _PAGE_USER here. A DSI or ISI will be generated if needed. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_32.S | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index abbaf51b6f58..44cc84857520 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -505,11 +505,9 @@ InstructionTLBMiss: cmplw 0,r1,r3 #endif mfspr r2, SPRN_SPRG_603_PGDIR - li r1,_PAGE_USER|_PAGE_PRESENT|_PAGE_EXEC /* low addresses tested as user */ + li r1,_PAGE_PRESENT | _PAGE_EXEC #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 @@ -575,10 +573,8 @@ DataLoadTLBMiss: lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 mfspr r2, SPRN_SPRG_603_PGDIR - li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ + li r1, _PAGE_PRESENT 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 */ 112: rlwimi r2,r3,12,20,29 /* insert top 10 bits of address */ @@ -655,10 +651,8 @@ DataStoreTLBMiss: lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 mfspr r2, SPRN_SPRG_603_PGDIR - li r1,_PAGE_RW|_PAGE_USER|_PAGE_PRESENT /* access flags */ + li r1, _PAGE_RW | _PAGE_PRESENT /* access flags */ 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 */ 112: rlwimi r2,r3,12,20,29 /* insert top 10 bits of address */ -- 2.13.3