From patchwork Sun Oct 23 13:32:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 8030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1620000wrr; Sun, 23 Oct 2022 06:38:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5v2AXT5sEsGqOuE7g6PrvbmTyOwzQns/vF5mZgOwRRwHv6DsQk59/55bc0gvqmYLEP1slj X-Received: by 2002:a05:6402:1ccd:b0:459:aa70:9e12 with SMTP id ds13-20020a0564021ccd00b00459aa709e12mr26366158edb.206.1666532333109; Sun, 23 Oct 2022 06:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666532333; cv=none; d=google.com; s=arc-20160816; b=a1iEXO+VvnND3f6j2sSNLGDmxt9YL/QhgvSSldKjRCLEcKo+2tkxC8BwsTZVe+5nH+ aLL5IR2UZzJ8h2cRJflAxD8eJhtwKY5F9Yoo3a4ZzjIJcXdQyjJBmmXBrHpKz3+M/jy4 Zf2xQGk4+ieTTcJ52ss0meNwl9ykrTzb3Zex6mzxRtcCCv0ikiVjgWsA/DrgLllDB4tS IlfuMANcyiGa3wZ1JxQGIrTRRqPIbLn5mXzxedH0k2AdOqqdpvxTs6Vj1uhjjeGy9LE1 bDMTF05RKtYLGs17hIhNeIpbJ1WOKY32LXgoPeDWDxbscLUimWYKwBNEQ5oMXPrF2vjz DrMQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wc77EUO46tkZmvjhga1NyWr3AzK6MXwnC5/wsCI+pnM=; b=WO7qC1eYFLWVSYcDagk7oGutbF5LNLy1D4oHuep91N4UVneDfRQJvPxlR/w0WHPAIQ GwoClBFxkxJ+oFVVywCVUbn3DxniTQeCd0L3QpFZtWOxpEsSM1+pimJuCI2JRnvo9YHf HmMHedPbyLMb2vM1xCEcUshTvp6b+XqPJ7xzTnDr1wJqCSjO5BjvQBlP8wDa1/MmGEc8 eqi54VZ94hgNytry1g4bxy+FbbhOH5wIb20YLlQu4orKwLniHJCKqv91xwkT3a4dBAnB ayXo86/EB5sTuPjYcL9PAznO/7kTSoDmR+V5nduf9Np4/zNWlZydE7k+hXL59wlXhwx/ qMNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=J+LaVmkY; 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 w15-20020a05640234cf00b0046096c494dcsi12185434edc.29.2022.10.23.06.38.29; Sun, 23 Oct 2022 06:38:53 -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=@kernel.org header.s=k20201202 header.b=J+LaVmkY; 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 S230493AbiJWNeA (ORCPT + 99 others); Sun, 23 Oct 2022 09:34:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230416AbiJWNd4 (ORCPT ); Sun, 23 Oct 2022 09:33:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 762C969181; Sun, 23 Oct 2022 06:33:55 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 1134060EA2; Sun, 23 Oct 2022 13:33:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55DEDC433C1; Sun, 23 Oct 2022 13:33:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666532034; bh=HM2oYzakfdXfJJzbe5qVxXYIO2tAmfA0Z3AF7nO+COs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+LaVmkYWNM8WRyG7XrRI2PdMKBhVkMak40G66C7VtwH/Kr0Zl+kaP9Lc4w9DZarR aPv6uKX+1AHYRXKEgTublGNogmX+cYSNu2CZY40m6LRy36Er0uipUDC4eWo3HcNRfm dXeTPt13+wyzYnotwEdF3XT72+LTd9DKpn7UJmF5w/Xl2mS+rphOSvB8Y6AG4HR/0m mrP5NC1mukgGEXbdcRCv2TbiA05MdenMXkR+HiezGv+RexxXv41Dekska9vb8uqSlX nlOcZ965NqKjt9iFjG8efAclxrCruGeiuxHP9I4ifNH0zHm9xf/OUDGAwCxOhKJPDl TtQqLUtUwGzgg== From: guoren@kernel.org To: guoren@kernel.org, palmer@dabbelt.com, palmer@rivosinc.com, heiko@sntech.de, arnd@arndb.de, songmuchun@bytedance.com, catalin.marinas@arm.com, chenhuacai@loongson.cn, Conor.Dooley@microchip.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org, Guo Ren , Will Deacon , Steven Price Subject: [PATCH 1/2] riscv: Fixup race condition on PG_dcache_clean in flush_icache_pte Date: Sun, 23 Oct 2022 09:32:04 -0400 Message-Id: <20221023133205.3493564-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221023133205.3493564-1-guoren@kernel.org> References: <20221023133205.3493564-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747485808064178680?= X-GMAIL-MSGID: =?utf-8?q?1747485808064178680?= From: Guo Ren RISC-V follows the arm64 flush_icache_pte mechanism and also includes its bug. The patch ensures that instructions are observable in a new mapping. For more details, see 588a513d3425 ("arm64: Fix race condition on PG_dcache_clean in __sync_icache_dcache()"). Signed-off-by: Guo Ren Signed-off-by: Guo Ren Cc: Catalin Marinas Cc: Will Deacon Cc: Steven Price --- 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 6cb7d96ad9c7..7c9f97fa3938 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -82,7 +82,9 @@ void flush_icache_pte(pte_t pte) { struct page *page = pte_page(pte); - 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 */ From patchwork Sun Oct 23 13:32:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 8031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1620245wrr; Sun, 23 Oct 2022 06:39:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7AJU3owKjsSyPZhrwegLt5Yg64Wk73qeGKlh0LWu6T4+IHmdJSR7dq6k00zJzsuutWBxTI X-Received: by 2002:a17:90b:4ac8:b0:20d:56c4:a892 with SMTP id mh8-20020a17090b4ac800b0020d56c4a892mr66827827pjb.19.1666532386745; Sun, 23 Oct 2022 06:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666532386; cv=none; d=google.com; s=arc-20160816; b=AlvkmpcadL6SWT9svlpUMxPJzoOVIsPwwKMI+g/wl1J7Z1NeqKSDwuPeSh9TRqsjYf JQzG62j3MyVOo4M4f8iWiEHyFp0ZqbB6+YpZeNY90QAPDuoGjQ11Uw+JgbeLEPEiS2Cw 66rxXeGtAN8JUZj9JTYQdfLGfUiuQV0KBwChFo3qERUIt/p12tO17LzkNhGI1xWVT9NX xfcizVM1tg8x0U+0OVpeCmbqhG8AiAvKHm63d1MAO1l+OECRDOVYR0x7JzXBeMx3Q5bf YnSTAe/yyaQQtdGpRTWsvRtCfq69Jbmbb1b3mq5qQTZoQhh5s7JK12qc5bthMR1wCWD/ DL/Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v4QrxhegU7dUYq1gGHr11j/aNsrU+3Q41V6qvRIggk4=; b=dO8e1sPjKhy/OajtIVQb9RrCa7gS8a0qpp8getO0PG7metjGf3G0dSfhPQYvU8HorV WrohtK85MgMXUY5c5Opatv6H6RhT0Zlo1jPHRebDMfBaotkNFRDELNpX8ik7PRo3SRxc yuZ9SJloG5o56H90LdJFB2kAxIYEafq0MuHaam5gQW+NxM5G/WS+ojKhPC50pgMdxjLn 8BJ6X8ztL69b5GTj0lJtgkXQzRVYp+30jsHwiFdiL6zoKAFxJLB/HOP1M35YzdYJzgI1 85dYPz3nWL+ftLfmCQsaw9y5l9OUsA7b9tAQmZA+ilpUmrto/4w9PMXx1HbODhkR9ii6 W36g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AVFtjHfS; 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 r30-20020a63205e000000b00460b9d08d7bsi30516378pgm.868.2022.10.23.06.39.33; Sun, 23 Oct 2022 06:39:46 -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=@kernel.org header.s=k20201202 header.b=AVFtjHfS; 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 S230182AbiJWNeR (ORCPT + 99 others); Sun, 23 Oct 2022 09:34:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230518AbiJWNeG (ORCPT ); Sun, 23 Oct 2022 09:34:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB0A93AE49; Sun, 23 Oct 2022 06:34:02 -0700 (PDT) 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 2B2C0B80BFF; Sun, 23 Oct 2022 13:34:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D109C43470; Sun, 23 Oct 2022 13:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666532040; bh=HgCI1fwpCRV6cbIVNToGS+BLd1ULTdQix8qchtvlux4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AVFtjHfSb8Pix+ZODNxlJQR5O5aUXDkMSRquLor3ywU7ifraASh1B9mCOEjvSpmhi 5pwloxojUVQPEPJ2nXi5g1JVDuDE1h3HpRLY42daghXEUPTF7NpE69kjP4CO1wc0ML OzbFYnrf6HzV8oxKV1yp5MMhWhLI4SLmS2V+DRTzZxBvEFKaEvXBlJ6KnhO+lYL3dI 1IWrS6h4wVbfMAXen6V8wN5llaAW/lK3lOeEvN7oClwG3ggzWrMfgYvsVvCq5yv/EB qeU0OFXs587rqByUX1KKY/7/nHUUujPncosY2MQnzIcadA2hayGkXIyo9eL+kUJ0RU yMZXSDWBeTMUQ== From: guoren@kernel.org To: guoren@kernel.org, palmer@dabbelt.com, palmer@rivosinc.com, heiko@sntech.de, arnd@arndb.de, songmuchun@bytedance.com, catalin.marinas@arm.com, chenhuacai@loongson.cn, Conor.Dooley@microchip.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org, Guo Ren Subject: [PATCH 2/2] riscv: Enable ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP Date: Sun, 23 Oct 2022 09:32:05 -0400 Message-Id: <20221023133205.3493564-3-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221023133205.3493564-1-guoren@kernel.org> References: <20221023133205.3493564-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747485863976672291?= X-GMAIL-MSGID: =?utf-8?q?1747485863976672291?= From: Guo Ren This patch enable the feature of "free some vmemmap pages of HugeTLB page" [1]. To make it work correct, we also need fixup PG_dcache_clean setting for huge page [2]. [1] https://lore.kernel.org/linux-doc/20210510030027.56044-1-songmuchun@bytedance.com/ [2] https://lore.kernel.org/linux-mm/20220302084624.33340-1-songmuchun@bytedance.com/ Signed-off-by: Guo Ren Signed-off-by: Guo Ren Cc: Muchun Song Cc: Huacai Chen Cc: Arnd Bergmann Acked-by: Muchun Song --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/cacheflush.h | 3 +++ arch/riscv/mm/cacheflush.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 6b48a3ae9843..81ac25b0e005 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -45,6 +45,7 @@ config RISCV select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_GENERAL_HUGETLB select ARCH_WANT_HUGE_PMD_SHARE if 64BIT + select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU select BUILDTIME_TABLE_SORT if MMU diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h index 8a5c246b0a21..96f7381aeeeb 100644 --- a/arch/riscv/include/asm/cacheflush.h +++ b/arch/riscv/include/asm/cacheflush.h @@ -17,6 +17,9 @@ static inline void local_flush_icache_all(void) static inline void flush_dcache_page(struct page *page) { + if (PageHuge(page)) + page = compound_head(page); + if (test_bit(PG_dcache_clean, &page->flags)) clear_bit(PG_dcache_clean, &page->flags); } diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 7c9f97fa3938..ca35807cf185 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -82,6 +82,9 @@ void flush_icache_pte(pte_t pte) { struct page *page = pte_page(pte); + if (PageHuge(page)) + page = compound_head(page); + if (!test_bit(PG_dcache_clean, &page->flags)) { flush_icache_all(); set_bit(PG_dcache_clean, &page->flags);