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: 133832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp305430vqi; Thu, 10 Aug 2023 03:00:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7UbXPno57xebRayF6x9CIqQiSQedUh3AxJF0ilBhDp43pTnREDOVUhxLdoEKhigmoe//f X-Received: by 2002:a05:6358:9206:b0:134:d26d:e27b with SMTP id d6-20020a056358920600b00134d26de27bmr2503547rwb.25.1691661607153; Thu, 10 Aug 2023 03:00:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691661607; cv=none; d=google.com; s=arc-20160816; b=uYyRnsdpDoyCyevxJyaPa8IkdK9DSM8Jd83z1bRYL9jGojaJ6HLOZYToFOjgKCjXnl gjWXLpepvdlr31RutxMFk5agKQte7mX1NajS3DfVTtNE6vOJH+uUW5Gak0MFgQQECLYh nwPTK0SFBGjaXtRRfDTYfxHLdXWWkOGleZKhGskwesM1+aTcgNp/XWJ/nDvff+EbkL5q DNuzZItBJ2xkT7gKMvF7O6KI/0bxhtoYUQyTEm+oEMrwW/yh2ViEr2IGTWGJEwQiNWwE NgWTX5fmJJaTg8ZNxQ2dsMnnzeyBX0ACJUY+4MPy4GtJF06yN1OaD/B3KXxJ11TgPw/b WMXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=05GIU748ktQIL7cSAWgzz+r92+3CwTfIekEnt8UTyg8=; fh=OEEOBXMqVF10Nj2+4lH6lX9tmqDhm1tCU6LV53RB6DQ=; b=ckHOo7yKyY9LIbvntVgRhjqnvQn3i49BYEz8EyUjeEJX5pa6+TI1uTrDzzn9aoH+qN Qb//zIvbpMOy+Sg8sckjGL1mXm9n4tbFeJVMFpuS1maavWsrOOq0SfrEHOcIPqXPTkRH pvj0vdX/kW7Gc76uoE6n0TadOjBiCF9ce3jBPU/y4BjA6Q+ZdStzrWWDQ9xt07miAdtp 5QIQEPmNHJOjGSE+Wsd9S8XUDzFbJIEguw8cdudYvGc+C3DLLEHEMlMJqD/Aksx3Uk4a jAyRPCbrucByb7AwEIUCAOH7xmBjfT0PUCzeIIfKCjhT7ZGVG72c1FTFnqKsDkbik9wI 2iIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=nTPIGjrO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d71-20020a63364a000000b00563dc438e52si1256044pga.518.2023.08.10.02.59.52; Thu, 10 Aug 2023 03:00:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=nTPIGjrO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229887AbjHJJfy (ORCPT + 99 others); Thu, 10 Aug 2023 05:35:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232921AbjHJJfw (ORCPT ); Thu, 10 Aug 2023 05:35:52 -0400 Received: from out-75.mta0.migadu.com (out-75.mta0.migadu.com [91.218.175.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9958B2703 for ; Thu, 10 Aug 2023 02:35:43 -0700 (PDT) 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773835761259943992 X-GMAIL-MSGID: 1773835761259943992 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); }