From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FSL_HELO_FAKE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01359C2D0E4 for ; Fri, 20 Nov 2020 17:09:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E86D22227 for ; Fri, 20 Nov 2020 17:09:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jKHdGV+3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BvT8QPjD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E86D22227 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=H1aHvQTNxRU5pwSwcq+k9WtUNeh2PnWblnctTPzITUw=; b=jKHdGV+3LoJtLEpfbAUMvdwVe kpgZakfoUrVdPYaURQpbl2n47/yZmJ9G2kLdV7nqO0MF4jZAjx4H2vzmGywYvMqTrS7hwKR47XQRK CFhF8lxUB8SRregxbU3ym49dVq09G6X8+AhB8/AIqfpCCdZbPYwE1HaaqENHuAaB8TfBy9b9qiEFB LOJjlboXKGJxNYv7aYPUX27+LTiBdgzLY0x66/HJC/48GCAEph2gxA7J9oMOvlYdkqabPgCAu5Ifn GfV2bOrgpTkhOdicBYJ68/7IIzSGJpW8FBfXjetR64Thm10qYrwcb7CBgAvcoX0I40TOBvsqTbDSs G58MmG7XA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg9uI-0007Xb-Mg; Fri, 20 Nov 2020 17:09:10 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg9uG-0007Wi-M6 for linux-arm-kernel@lists.infradead.org; Fri, 20 Nov 2020 17:09:09 +0000 Received: by mail-pf1-x442.google.com with SMTP id y7so8429270pfq.11 for ; Fri, 20 Nov 2020 09:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=S7NIupRzj3PUr0ZCv6mIkIMUnIw4nNedbT1JtFuJtQg=; b=BvT8QPjD5F7pdrvLKVYHj/ZNriTsFhgHF0+BQGonq0YOOD95joc0eNp0bAs+Hkjf7m VsBdwUQzy6pXLrmYme9/muSh4pCnjkh6yz62WbhxtW1qPMUoi9ebWuWOAiLjXd7YJ4XC A8saEcMIVPKB0lm4zCVrdXDRvOMkpBmKIwmjmqIpkPN0YyxroxoTKQSqpe/co9EUL/+n cIpUF4r0BVJ+Yr92UWOx1bvF84n5cmD4NhwxTn2OSF4IDKBhFip3fD+dhWbkKN0aut1Y qQ/6NXEztDeGU8shSrglSPk9jpK+dCBaEK1I2T3CoWEUUkrF0t0XRETSC5WoYsJ5mfiF nxAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=S7NIupRzj3PUr0ZCv6mIkIMUnIw4nNedbT1JtFuJtQg=; b=fXULKa8A9l2wfviQxhVohXNUjHo4dWtNhp4KGHY+F2X3JE5zKQ/r9hhcmNIGZxcpBD SNQAcNNV/iYruQc5YV/ucixcykCQh7q/HKpL1r8W1MkhGykR/vgYvdolmmGTBgUnupDB EnsWRtrzCAhNeCV92uRqjawesd/jy2N/6vXzJih+pKg0Iz9gm5Xr9FX0WYYetpv4WOPb M1rNBhLbf2+lCGNZUE+WFYNd1ztvCrwrDiN+zXIXyulEm3Njd0lH7lEZz5y3Kri8EWyi qQ5y2HRNP69h+LXyR+EMCuKiwmbP8DVMx7itk3GDkXtNuVWTD8kn2jeSQHxAAotZE9Pc YEFg== X-Gm-Message-State: AOAM531kS5usVdOYCuoCe0I3khHbmmotTz0+RIyjl1kxYGsblnKxmw+0 l/2yptIRahPTHVXCKlNWsks= X-Google-Smtp-Source: ABdhPJyA750sKahKtUX1refXtKAQhPqtVn1tIpVDVcrxdlyb5F7dNflMGdvgDmmn4jagOr89LRPoPg== X-Received: by 2002:a62:cec6:0:b029:18a:d620:6b86 with SMTP id y189-20020a62cec60000b029018ad6206b86mr14299369pfg.2.1605892146573; Fri, 20 Nov 2020 09:09:06 -0800 (PST) Received: from google.com ([2620:15c:211:201:7220:84ff:fe09:5e58]) by smtp.gmail.com with ESMTPSA id z11sm4244993pfk.52.2020.11.20.09.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 09:09:05 -0800 (PST) Date: Fri, 20 Nov 2020 09:09:03 -0800 From: Minchan Kim To: Will Deacon Subject: Re: [PATCH 2/6] arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect() Message-ID: <20201120170903.GC3377168@google.com> References: <20201120143557.6715-1-will@kernel.org> <20201120143557.6715-3-will@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201120143557.6715-3-will@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201120_120908_788483_4529BFC1 X-CRM114-Status: GOOD ( 23.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-team@android.com, Yu Zhao , Anshuman Khandual , Peter Zijlstra , Catalin Marinas , linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 20, 2020 at 02:35:53PM +0000, Will Deacon wrote: > With hardware dirty bit management, calling pte_wrprotect() on a writable, > dirty PTE will lose the dirty state and return a read-only, clean entry. > > Move the logic from ptep_set_wrprotect() into pte_wrprotect() to ensure that > the dirty bit is preserved for writable entries, as this is required for > soft-dirty bit management if we enable it in the future. > > Cc: It this stable material if it would be a problem once ARM64 supports softdirty in future? > Signed-off-by: Will Deacon > --- > arch/arm64/include/asm/pgtable.h | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index 1bdf51f01e73..a155551863c9 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -162,13 +162,6 @@ static inline pmd_t set_pmd_bit(pmd_t pmd, pgprot_t prot) > return pmd; > } > > -static inline pte_t pte_wrprotect(pte_t pte) > -{ > - pte = clear_pte_bit(pte, __pgprot(PTE_WRITE)); > - pte = set_pte_bit(pte, __pgprot(PTE_RDONLY)); > - return pte; > -} > - > static inline pte_t pte_mkwrite(pte_t pte) > { > pte = set_pte_bit(pte, __pgprot(PTE_WRITE)); > @@ -194,6 +187,20 @@ static inline pte_t pte_mkdirty(pte_t pte) > return pte; > } > > +static inline pte_t pte_wrprotect(pte_t pte) > +{ > + /* > + * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY > + * clear), set the PTE_DIRTY bit. > + */ > + if (pte_hw_dirty(pte)) > + pte = pte_mkdirty(pte); > + > + pte = clear_pte_bit(pte, __pgprot(PTE_WRITE)); > + pte = set_pte_bit(pte, __pgprot(PTE_RDONLY)); > + return pte; > +} > + > static inline pte_t pte_mkold(pte_t pte) > { > return clear_pte_bit(pte, __pgprot(PTE_AF)); > @@ -843,12 +850,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres > pte = READ_ONCE(*ptep); > do { > old_pte = pte; > - /* > - * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY > - * clear), set the PTE_DIRTY bit. > - */ > - if (pte_hw_dirty(pte)) > - pte = pte_mkdirty(pte); > pte = pte_wrprotect(pte); > pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep), > pte_val(old_pte), pte_val(pte)); > -- > 2.29.2.454.gaff20da3a2-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel