Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3279987pxu; Sun, 11 Oct 2020 04:06:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxa4IHLDGslyct+CZuDr5y35kV76+yFDmSz5tRepMmh6j0xELmYeRp00/3i1apGOeeBuZ8M X-Received: by 2002:a17:906:3541:: with SMTP id s1mr7550364eja.413.1602414382876; Sun, 11 Oct 2020 04:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602414382; cv=none; d=google.com; s=arc-20160816; b=YBiVrIEdFU2gN7RUgJG/k5tZulOHD6BpLxuO1JJ0bcH8HxaypX2txP8pPTKcMAX92X eE+3uoztALytvlU2suZivYaWKmbhWhtYZHHSLlu+QZtFExBILdUKVQqEeflGbSwOcUlQ ht7fE2x66+XfThf91eJE96qh1ThwHycYyAoerNTHgkI/tAIUNMZVcqitF2bSOliCZulg Y3r06DEEEruuufns3AhnwXtT42k68kWbKz8gt7iEss91NJpZgASFGTXAd7AYTZSEGWyL gGXG+myZyfxSUlj+AYznvKk9+tpvXT3ArlIiQMyCRVNcwbtB2Kw+4B3wka2fJIVXhvdU dJGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=CE+u17yVHWYpo7DL85rQVRyxvAMjzDhlosZayLaHCZU=; b=ez89B+9Eqzo1+H6sMOGJTkFIx7DsB34uH/hOyXQldm1eacOqDCXaH7uDxVNJe4lxt7 jiixUVNmzPzjZHkZ1xLVcacEMPiL15huWK9zOps3YuAXtUbHfrePqzjxMh7Px1sQn4XY 9emxNoa9mX+tl3rpQHitTeb1/74t6HN3Tt9IlIG+8v8Uo3GeTm54g9Gjx4npJsPOlBeU OFp/6mwWuVLpYXOSCOifmFsTaUeZ8A+nmhy0sgosMmgoe1tBlomvUf5bMIc+CIdCcOeK JYyTor+wYMZ/cVaE3bUht1gYpiCwIEX+nenLK9CoEV9+LVDcoTa3V2mHpmcTRjKCNVLn hNYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v3si10051373ejx.576.2020.10.11.04.05.59; Sun, 11 Oct 2020 04:06:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732139AbgJJW2U (ORCPT + 99 others); Sat, 10 Oct 2020 18:28:20 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:48803 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730337AbgJJSvK (ORCPT ); Sat, 10 Oct 2020 14:51:10 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C7pPy6461z9v1JZ; Sat, 10 Oct 2020 17:14:30 +0200 (CEST) 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 bnvnQWrj8ybE; Sat, 10 Oct 2020 17:14:30 +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 4C7pPx6BCSz9v1JX; Sat, 10 Oct 2020 17:14:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5F3668B77D; Sat, 10 Oct 2020 17:14:31 +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 MAVwyHm4oxjv; Sat, 10 Oct 2020 17:14:31 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 225E08B75B; Sat, 10 Oct 2020 17:14:31 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 005DF663C3; Sat, 10 Oct 2020 15:14:30 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/603: Always fault when _PAGE_ACCESSED is not set To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Sat, 10 Oct 2020 15:14:30 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The kernel expects pte_young() to work regardless of CONFIG_SWAP. Make sure a minor fault is taken to set _PAGE_ACCESSED when it is not already set, regardless of the selection of CONFIG_SWAP. Fixes: 84de6ab0e904 ("powerpc/603: don't handle PAGE_ACCESSED in TLB miss handlers.") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_book3s_32.S | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 5eb9eedac920..2aa16d5368e1 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -457,11 +457,7 @@ InstructionTLBMiss: cmplw 0,r1,r3 #endif mfspr r2, SPRN_SPRG_PGDIR -#ifdef CONFIG_SWAP li r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC -#else - li r1,_PAGE_PRESENT | _PAGE_EXEC -#endif #if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) bgt- 112f lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ @@ -523,11 +519,7 @@ DataLoadTLBMiss: lis r1, TASK_SIZE@h /* check if kernel address */ cmplw 0,r1,r3 mfspr r2, SPRN_SPRG_PGDIR -#ifdef CONFIG_SWAP li r1, _PAGE_PRESENT | _PAGE_ACCESSED -#else - li r1, _PAGE_PRESENT -#endif bgt- 112f lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ addi r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l /* kernel page table */ @@ -603,11 +595,7 @@ DataStoreTLBMiss: lis r1, TASK_SIZE@h /* check if kernel address */ cmplw 0,r1,r3 mfspr r2, SPRN_SPRG_PGDIR -#ifdef CONFIG_SWAP li r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT | _PAGE_ACCESSED -#else - li r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT -#endif bgt- 112f lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ addi r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l /* kernel page table */ -- 2.25.0