Received: by 2002:ac0:a679:0:0:0:0:0 with SMTP id p54csp345896imp; Thu, 21 Feb 2019 02:39:16 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib4j0tgfV19pMizbT0z9HEdF6pPnyTNouNO61fXoamA5K6hrOkir6fr1e6cEzLiXjshlwUT X-Received: by 2002:aa7:80d7:: with SMTP id a23mr39054956pfn.86.1550745556664; Thu, 21 Feb 2019 02:39:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550745556; cv=none; d=google.com; s=arc-20160816; b=CcdBKxnnyWNfugJKJZt4ZH6qpudXVnhexzr3v626kh6TXj6fB+DsnL1ylKw6KEjhGq 0R6tzz4SBGn7K1Ab5FaloyXmmn+FtGckhg6zz7qH4Q7cWZoav6RVubo6bD0t0+8RkCU2 85oLA2eS/wqaRJ/meOjssQWwwmKonqU9J5jj9WiM4Wc+xRTw9CcFAKV3nVG46N1690Sw MCPA7pcJ7+Iz0qJAYMFSV1cTcyAtt3p0GxsYT5myJDD/1r6dEGcxuYTUMwvK/U77kwUL aeA4hLCSK3mt/68fprTgrqPMheqUJwOKRyqJ779iyJri8yJHz5aVj5DnlOWBiYyz+Ddm o5Tw== 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=pqpmm4OnIbpXLctgs5XUJA4ZiI6rAlkmk6w0s1b4mNY=; b=N5wfOiX9glL99umFJR2hCndRz8y4vS2vQ33skIodjlogZ4G8eozfVY1GTJ1vKa+4RG z8NY53NfduZezSOxiXQcPdb/i0PhNfj92WN6ZNwxQ7DMp+39h+6E6camkNnABIlTetE3 mhE8ioQXHVO8Olqh5pQT0Ib+3qvSjQYxrXUvJHG/uw2BjmkpYzmECRjtyan/khFI5gR4 b3L+6+EgQFqd6jWhWk+2UzxXDCSCGxPJfpgC8zBpZ7gw5tguHzkXRo59xv8xlAY+yrR9 m70O6R0/qFzPIvq9hqNDNGRXgc/UZnXmJ5OB20TaMJpMWKZgiGYCDHMgFq8cFX9PCdLG DpSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=NACZrf0E; 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 h78si16529478pfj.70.2019.02.21.02.39.01; Thu, 21 Feb 2019 02:39:16 -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=NACZrf0E; 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 S1727768AbfBUKiV (ORCPT + 99 others); Thu, 21 Feb 2019 05:38:21 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:33520 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbfBUKiC (ORCPT ); Thu, 21 Feb 2019 05:38:02 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 444rXR6Hzpz9v01r; Thu, 21 Feb 2019 11:37:59 +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=NACZrf0E; 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 LvWrmJGDLLMY; Thu, 21 Feb 2019 11:37:59 +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 444rXR55yFz9typB; Thu, 21 Feb 2019 11:37:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1550745479; bh=pqpmm4OnIbpXLctgs5XUJA4ZiI6rAlkmk6w0s1b4mNY=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=NACZrf0EPG8ZPpvhKJKSv8kECjzVqM+jhSZU4E5c8tjIlOksQHUr+Ea3cgXz15T0Z clYneSV/rqB/6+osUT9N0k6D0Xy0cwza/nsQuVxYR+n2XTypqVKUEIrfhN5NyJX490 lUtVd6a/KOOiVgFGCCeTRHLsU7G/p3R9fKBfaz1M= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D62AC8B85A; Thu, 21 Feb 2019 11:38:00 +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 721REIaLi7e7; Thu, 21 Feb 2019 11:38:00 +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 A58478B852; Thu, 21 Feb 2019 11:38:00 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 747456E856; Thu, 21 Feb 2019 10:38:00 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 08/10] powerpc/603: let's handle PAGE_DIRTY directly To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 21 Feb 2019 10:38:00 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PAGE_DIRTY corresponds to the C bit. If writing on a page for which the C bit is not set, a DataStoreTLBMiss is generated. No need to check it in DataLoadTLBMiss. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_32.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 6db54425f1d9..b071f328b4b0 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -595,12 +595,10 @@ DataLoadTLBMiss: stw r0,0(r2) /* update PTE (accessed bit) */ /* Convert linux-style PTE to low word of PPC-style PTE */ rlwinm r1,r0,32-10,31,31 /* _PAGE_RW -> PP lsb */ - rlwinm r2,r0,32-7,31,31 /* _PAGE_DIRTY -> PP lsb */ - and r1,r1,r2 /* writable if _RW and _DIRTY */ rlwimi r0,r0,32-1,30,30 /* _PAGE_USER -> PP msb */ rlwimi r0,r0,32-1,31,31 /* _PAGE_USER -> PP lsb */ ori r1,r1,0xe04 /* clear out reserved bits */ - andc r1,r0,r1 /* PP = user? (rw&dirty? 2: 3): 0 */ + andc r1,r0,r1 /* PP = user? rw? 2: 3: 0 */ BEGIN_FTR_SECTION rlwinm r1,r1,0,~_PAGE_COHERENT /* clear M (coherence not required) */ END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT) @@ -669,7 +667,7 @@ DataStoreTLBMiss: lwz r0,0(r2) /* get linux-style pte */ andc. r1,r1,r0 /* check access & ~permission */ bne- DataAddressInvalid /* return if access not permitted */ - ori r0,r0,_PAGE_ACCESSED|_PAGE_DIRTY + ori r0,r0,_PAGE_ACCESSED /* * NOTE! We are assuming this is not an SMP system, otherwise * we would need to update the pte atomically with lwarx/stwcx. -- 2.13.3