Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3280442pxu; Sun, 11 Oct 2020 04:07:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1ID73pJ4TOiJVcoayWSRArf7oob4ITYtb52eteKSUvr/ONMsqIam7JSOUz8T02H21tFYM X-Received: by 2002:a50:fe13:: with SMTP id f19mr8762990edt.179.1602414430608; Sun, 11 Oct 2020 04:07:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602414430; cv=none; d=google.com; s=arc-20160816; b=epvTnG2mpZlkNtUFGH7LEr8p+aslCqNvCIzKXK+LVVEWMZmKfFoCLSTQI3KTVlR89y uCj1uLUhQvbNFj0Ym+mlb+VC8vq9FEeDwTvu9UUuaFqVy4EsWpGrWp7WdNvqEkh/yHbf X2mgGmfawXWGsIbXcnh+s/mmntjEfofMO3olXD4140sgQnGQOB9Tgz/AW79FIeg8jmp5 A0J78ffHXPd8eBEpYwiHCkUACAqmjOVhyJldWgke22smVBtd7VNiQQ0N1koCcydMLUh/ GIc9R47B0n1ofCTbJ5OtOCHUxIfzJDDVYpQH+/VPUvs7QuYwDS4bneM5friZUFnoQeFT 1lHw== 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=MEvm4nO2thApX6Fv+jwKdBDz2y0KInKT0xii+IwlavI=; b=iMO6ia9toS3kCsGh0wB57zpWraNqguyDyPUfVsMrg92Ik5k1l4HSgKu53lwcPfSnPM p73uFO+oDdiaDCQdr49QLgekchLwmlJICltYK9cHdy0TgG/VDd1u+0JR5WJObBJDtoyy MiFaNooPx7Z8cyHahXlTg7NjSlCD9ERzIs+p7TfZro3/y7lewj0woVZ92Cg7Fu/NjGqt 3miL52c6NQAP4g3pI6X8KmLtaFXjF8v799Oc8vf8mOYqberF5y6WNrMrFeom2jbSkWLa R+eZ8b9O2vb+m8YMHmOpAuefbZ6/Z3SO5RFbBILSd0EsXup06mz5+ZNjg9LggEaEFxz/ R++Q== 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 bs1si11931184edb.6.2020.10.11.04.06.48; Sun, 11 Oct 2020 04:07:10 -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 S1732367AbgJJWbF (ORCPT + 99 others); Sat, 10 Oct 2020 18:31:05 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:65493 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730327AbgJJSvS (ORCPT ); Sat, 10 Oct 2020 14:51:18 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C7pPx2Vssz9v1JY; Sat, 10 Oct 2020 17:14:29 +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 cuGeN8Bp2LeP; Sat, 10 Oct 2020 17:14:29 +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 4C7pPx0sj0z9v1JX; 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 686AD8B77D; Sat, 10 Oct 2020 17:14:30 +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 oGgrYaCL4l73; Sat, 10 Oct 2020 17:14:30 +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 29AE88B75B; Sat, 10 Oct 2020 17:14:30 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id EF177663C3; Sat, 10 Oct 2020 15:14:29 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/40x: 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:29 +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: 2c74e2586bb9 ("powerpc/40x: Rework 40x PTE access and TLB miss") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_40x.S | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S index 44c9018aed1b..a1ae00689e0f 100644 --- a/arch/powerpc/kernel/head_40x.S +++ b/arch/powerpc/kernel/head_40x.S @@ -284,11 +284,7 @@ _ENTRY(saved_ksp_limit) rlwimi r11, r10, 22, 20, 29 /* Compute PTE address */ lwz r11, 0(r11) /* Get Linux PTE */ -#ifdef CONFIG_SWAP li r9, _PAGE_PRESENT | _PAGE_ACCESSED -#else - li r9, _PAGE_PRESENT -#endif andc. r9, r9, r11 /* Check permission */ bne 5f @@ -369,11 +365,7 @@ _ENTRY(saved_ksp_limit) rlwimi r11, r10, 22, 20, 29 /* Compute PTE address */ lwz r11, 0(r11) /* Get Linux PTE */ -#ifdef CONFIG_SWAP li r9, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC -#else - li r9, _PAGE_PRESENT | _PAGE_EXEC -#endif andc. r9, r9, r11 /* Check permission */ bne 5f -- 2.25.0