From patchwork Thu Aug 10 09:32:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13349143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D96ADC001DE for ; Thu, 10 Aug 2023 09:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qzVPLZDEoQT9fUP+Avvbi00c+Wd4cYbEtD6R8Rk4l+E=; b=ths0HphUvK1Dua pQjPtST9vsZeA/HhJXd3nPHRGfuKoQa7P5D95Gx4WTQN9s/vI8Ix20FpEJjH86lOfJDc9Dk44KJWw bnazG+rEc8GqxTc+oXJwK/AbiQdZHhrV6D7ESWWVL/+YBtxQwM0IbeOI3UCgj92wmoHTxaUe2U2DN JrmHek0v/TLo/iYWc9DpuuAFk8v/cjn58wNeGMdMIOgMH7Ug3Tt1ac8HRFlBGwq0FaaUnqU7H6L7I IDcPQGNClrs7jA8GG0+FYjJQs2NfCtzykZEWhSkaXPTD7aL7JazMOaNo+BKUvofsoozCAEF5Yx4E9 A/XvKeZ/Pz3P8Rw1Xq/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qU25C-006zV1-1O; Thu, 10 Aug 2023 09:35:54 +0000 Received: from out-120.mta0.migadu.com ([91.218.175.120]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qU259-006zSf-1H for linux-arm-kernel@lists.infradead.org; Thu, 10 Aug 2023 09:35:53 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1691660140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=05GIU748ktQIL7cSAWgzz+r92+3CwTfIekEnt8UTyg8=; b=nTPIGjrO7o2dlBI9Oi2x0e3Wqbdyw2L1BvdKyU5Hl1a2Q9qEI7DlCtXnje7AaeGn60TPnl A87RvHyFkV8gNSXi5SXBDLymv8zu8BiHLk9OJUAwd/5ilbENReedkSQArBNVcrVES2CIz3 X8k00XiztStqdQ7Cl/uhor90kw/lkts= From: Qi Zheng To: catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, wangkefeng.wang@huawei.co, pasha.tatashin@soleen.com, muchun.song@linux.dev Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH] arm64: mm: use ptep_clear() instead of pte_clear() in clear_flush() Date: Thu, 10 Aug 2023 09:32:41 +0000 Message-Id: <20230810093241.1181142-1-qi.zheng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230810_023551_860786_D32C06A9 X-CRM114-Status: GOOD ( 10.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Qi Zheng In clear_flush(), the original pte may be a present entry, so we should use ptep_clear() to let page_table_check track the pte clearing operation, otherwise it may cause false positive in subsequent set_pte_at(). Fixes: 42b2547137f5 ("arm64/mm: enable ARCH_SUPPORTS_PAGE_TABLE_CHECK") Signed-off-by: Qi Zheng Acked-by: Will Deacon --- arch/arm64/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 21716c940682..9c52718ea750 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -236,7 +236,7 @@ static void clear_flush(struct mm_struct *mm, unsigned long i, saddr = addr; for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) - pte_clear(mm, addr, ptep); + ptep_clear(mm, addr, ptep); flush_tlb_range(&vma, saddr, addr); }