From patchwork Fri Jan 27 03:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 49062 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp639323wrn; Thu, 26 Jan 2023 20:19:11 -0800 (PST) X-Google-Smtp-Source: AK7set95D9ob4NIkoO0oePjYhdpoCLkHEP4cFei3WdptUU4GMB1g3S7WS0gazm+cW8CRoAFhcbLA X-Received: by 2002:a05:6a20:8422:b0:bc:246c:9be4 with SMTP id c34-20020a056a20842200b000bc246c9be4mr2378232pzd.45.1674793151112; Thu, 26 Jan 2023 20:19:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674793151; cv=none; d=google.com; s=arc-20160816; b=jWEnWyfYqsIbaAw/X8NokHhYYbDyasIbPijd8sxbiEPvSrXAgVMwhnrKMi6K3AvjxJ x2gntvsd14UpVgOh+2WtYKQN4qO1wIgsS4HxFdWkUSmSSGOPCAb4As5kD2FCvaJt6tng vNxQHqIq4i0+pQaKz+JnxMY1zMmI1M8HbXIo81MY4KdBaxQxal5kIOrm+K4n0j2UG3zD G4GV6/3S2/3c3sPALexX7TxrAx8DPTCF2MXmL0uPrlMPXYfya1GA2mqqwdy71/l+Dm+X gupxQQ2KE9PHNm6SswvizfV20CIrG2g2XzH86No0zux1Hpk7BSDMKQzLXYeem0QevVsq oV0A== 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=RrQo9NWmuYdJDwV0jq11d5+mZc2O/EGNGs9s/15RUkE=; b=Ajs03QLEkgFsiK/W0IDJh7wuinvYHTbXU5vs1hz+dZDAgosb3QYhTRCKiBlBxsjTu6 y87ipeNv7sgmi07u8UtmvNV/NhMjZL5OAKlT/bM6f0y4B96r4fBPTmNbMK4/BJzhQgLp aa8GSP+iKgb53uXqZUfFYJyKtPoFLrQDNu2RqALRrwzNbU0gR3lTSpWbd2UUhsC5lL34 MqFPLM77c74X/QSBVbkhA6t39/SfjmiF+XWRYf3X77hgd/qMF1sgrARQ/R0bF0qZ+Lcy sZ3gV5u6ZRROUjxer1rhV7SosN+9pIImBrMHmGuumxjiB2x6OSNMOth6/jPVhr3WaROm cvvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OzyjQCSO; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c18-20020a63a412000000b004b45fca9020si3140579pgf.397.2023.01.26.20.18.56; Thu, 26 Jan 2023 20:19:11 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=OzyjQCSO; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbjA0Dxm (ORCPT + 99 others); Thu, 26 Jan 2023 22:53:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjA0Dxl (ORCPT ); Thu, 26 Jan 2023 22:53:41 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2968D62240 for ; Thu, 26 Jan 2023 19:53:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id ABF7AB81F95 for ; Fri, 27 Jan 2023 03:53:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1A7BC433EF; Fri, 27 Jan 2023 03:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674791616; bh=QiRQ0Fl6+onHpSDTLUrFMpUAIIfVHseS/iKmIXAYaWc=; h=From:To:Cc:Subject:Date:From; b=OzyjQCSOa1wVfANYW40qX3EScWWACX6fBwykJNrXTF2hDppVqv8V3BkTjJiH/eXQY rhe7qgjnq8pCOqvYRBxX5C3gg1JWPluGlnbV2/cohPk+ibiC5Il4sqSQF38cACs4lH S/hS0gG1MCioogE0Psv0YFrcrlacf86vBgEZ+gwLwzkgs/R4vJXppqxYRLNa09ypq7 PwqSEKrEl7k8Tn98U2JIAw+37ojxZ7D4gYF40hJNHO0+uG6FH1OSsddXYQen8KO3hq V9Wg9IvpS2BhPTyjOm//TSDz1+eUOYHuOlxHE2HEdlMmFCufTmBO1w2CcU5V7HcxrI rjYgYYSBgstbw== From: guoren@kernel.org To: arnd@arndb.de, palmer@rivosinc.com, conor.dooley@microchip.com, apatel@ventanamicro.com, atishp@atishpatra.org, mark.rutland@arm.com, bjorn@kernel.org, guoren@kernel.org, tongtiangen@huawei.com, ajones@ventanamicro.com, andrew@sifive.com Cc: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH V2] riscv: Fixup race condition on PG_dcache_clean in flush_icache_pte Date: Thu, 26 Jan 2023 22:53:06 -0500 Message-Id: <20230127035306.1819561-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756147903177678241?= X-GMAIL-MSGID: =?utf-8?q?1756147903177678241?= From: Guo Ren In commit 588a513d3425 ("arm64: Fix race condition on PG_dcache_clean in __sync_icache_dcache()"), we found RISC-V has the same issue as the previous arm64. The previous implementation didn't guarantee the correct sequence of operations, which means flush_icache_all() hasn't been called when the PG_dcache_clean was set. That would cause a risk of page synchronization. Fixes: 08f051eda33b ("RISC-V: Flush I$ when making a dirty page executable") Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Andrew Jones Reviewed-by: Conor Dooley --- Changelog: V2: - Optimize commit log - Rebase on riscv for-next (20230127) V1: https://lore.kernel.org/linux-riscv/20221023133205.3493564-2-guoren@kernel.org/ --- arch/riscv/mm/cacheflush.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 3cc07ed45aeb..fcd6145fbead 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -90,8 +90,10 @@ void flush_icache_pte(pte_t pte) if (PageHuge(page)) page = compound_head(page); - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) + if (!test_bit(PG_dcache_clean, &page->flags)) { flush_icache_all(); + set_bit(PG_dcache_clean, &page->flags); + } } #endif /* CONFIG_MMU */