From patchwork Wed Jan 11 17:10:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 3879 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3444079wrt; Wed, 11 Jan 2023 09:22:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXubDiYHWWpQsLhowS5iJ+GdAiYgOBggBuzNr7GVV+IND4har1j8npyZbd78uLTMpmx6U1vp X-Received: by 2002:a05:6a20:c11a:b0:af:8ff3:fc80 with SMTP id bh26-20020a056a20c11a00b000af8ff3fc80mr3764469pzb.20.1673457729386; Wed, 11 Jan 2023 09:22:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673457729; cv=none; d=google.com; s=arc-20160816; b=A+gd9pOd4/H88dL5lkpVna03F5F3AjkJTMtazW8yaurmsPxcdmREK3Yse79r7N2quB 8BRb9wmirzcUF2A9RZmDlxr6Mx52jU2IOsasXkb4MYl0lani+oqptlfqzKRe51e3RySM SzHEERtOhFBxL/h7AMBF6zy90FJUNBlccez5U2uWFOL+YK9uLTphUZJi3M3m7KMy4qOm 2JuRzLAQE1sOkOgp5WJGH45kR5F4ZuZi8N3r4tXwlTSe4sBQ8hug3D+krZ9RgMBg+8W0 Zpluu3jK090hNqKHWjo94FAFm7L7AenL3KwIgnCDw+xjFz3k6kYjfC3Zw8iOJvjRbyqH IqSA== 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=DSPv2oiGBVOZkZbFuHap0e7EPzqph2+8uH9RzT47P5M=; b=1JeyDgCGzP3RXLC22ZEGsQBbQn9yGgtxlJ5hqJtHWbZi0Ru0pyNfWPxVoeyuMHgZ8R u6S1U8zRkW+HGlB9YkDUsg5lJvp1gf0IXRZgjsNkXnA4JmCWrX+93o0yisHauiNL9LKf jxYZIpp1yt0A2dR4D9tguooFyG6YSFOMMoZvSgR2sIw0NYLhX5ypojCRwWF7yvGieduW RD50WJRWRdHgOO58maA1O2BH6DTaQJfEPg/FtA5mT8m910+sIRNuy/QwYgKwSyF7pe2Z hC+qsHYS6GFOeNebc/OnnWdnnCaGwxvamhTflxvmLtDS59hphzXmKZX0SzlXUjlVX4H9 veeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WM7u8gMY; 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 h6-20020a63df46000000b00438766f903asi14208779pgj.490.2023.01.11.09.21.53; Wed, 11 Jan 2023 09:22:09 -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=WM7u8gMY; 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 S235167AbjAKRU7 (ORCPT + 99 others); Wed, 11 Jan 2023 12:20:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234506AbjAKRUs (ORCPT ); Wed, 11 Jan 2023 12:20:48 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6786B3057E; Wed, 11 Jan 2023 09:20:47 -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 9C9FCB81B79; Wed, 11 Jan 2023 17:20:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0514FC433F0; Wed, 11 Jan 2023 17:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673457644; bh=pzDOm0E4vq1cIaLcDnzebNoZMoYCJhuWx2pQVYQ7bEA=; h=From:To:Cc:Subject:Date:From; b=WM7u8gMYzSIA8VJEAQs0L0tETJKkdVaad0i42V/bQ+Fnl/KC3UNWHC8L/rzRTQL/E pCsd2unfZkHENbQ3hQq8O6EjDMQdvxbuTQzPudVJm+WFf35j2h/1wRYoZdB6k/biaU 384ybprfkuqjSO7CMme/BbyI3B8QH1jzapuuQcaHZGAPlDTPyOxzrTXbVy42BEGXh4 K22+Cbyc17bwvz9KJ9W/V1z7X7so+9ygNatjS/XHgCK6sntu8yDB+aoOO+HiVlLSmx i4M8+eJ/NKH+0f2aSr536YePC8UU0HZQIyKPUIKTOBP9MCqZCwCs2YIdx/34oMm30W qO4phnIGjz5Ww== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v3 00/13] riscv: improve boot time isa extensions handling Date: Thu, 12 Jan 2023 01:10:14 +0800 Message-Id: <20230111171027.2392-1-jszhang@kernel.org> X-Mailer: git-send-email 2.38.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?1754747612019908439?= X-GMAIL-MSGID: =?utf-8?q?1754747612019908439?= Generally, riscv ISA extensions are fixed for any specific hardware platform, so a hart's features won't change after booting, this chacteristic makes it straightforward to use a static branch to check a specific ISA extension is supported or not to optimize performance. However, some ISA extensions such as SVPBMT and ZICBOM are handled via. the alternative sequences. Basically, for ease of maintenance, we prefer to use static branches in C code, but recently, Samuel found that the static branch usage in cpu_relax() breaks building with CONFIG_CC_OPTIMIZE_FOR_SIZE[1]. As Samuel pointed out, "Having a static branch in cpu_relax() is problematic because that function is widely inlined, including in some quite complex functions like in the VDSO. A quick measurement shows this static branch is responsible by itself for around 40% of the jump table." Samuel's findings pointed out one of a few downsides of static branches usage in C code to handle ISA extensions detected at boot time: static branch's metadata in the __jump_table section, which is not discarded after ISA extensions are finalized, wastes some space. I want to try to solve the issue for all possible dynamic handling of ISA extensions at boot time. Inspired by Mark[2], this patch introduces riscv_has_extension_*() helpers, which work like static branches but are patched using alternatives, thus the metadata can be freed after patching. Hi Heiko, I combined your code and my code into patch1, since one of the key patch in the merged "Allow calls in alternatives" series rolled back to your v1. So I added your Co-developed-by and Signed-off-by thanks Since v2 - rebase on riscv-next - collect Reviewed-by tag - fix jal imm construction - combine Heiko's code and my code for jal patching, thus add Co-developed-by tag - address comments from Conor Since v1 - rebase on v6.1-rc7 + Heiko's alternative improvements[3] - collect Reviewed-by tag - add one patch to update jal offsets in patched alternatives - add one patch to switch to relative alternative entries - add patches to patch vdso [1]https://lore.kernel.org/linux-riscv/20220922060958.44203-1-samuel@sholland.org/ [2]https://lore.kernel.org/linux-arm-kernel/20220912162210.3626215-8-mark.rutland@arm.com/ [3]https://lore.kernel.org/linux-riscv/20221130225614.1594256-1-heiko@sntech.de/ Andrew Jones (1): riscv: KVM: Switch has_svinval() to riscv_has_extension_unlikely() Jisheng Zhang (12): riscv: fix jal offsets in patched alternatives riscv: move riscv_noncoherent_supported() out of ZICBOM probe riscv: cpufeature: detect RISCV_ALTERNATIVES_EARLY_BOOT earlier riscv: hwcap: make ISA extension ids can be used in asm riscv: cpufeature: extend riscv_cpufeature_patch_func to all ISA extensions riscv: introduce riscv_has_extension_[un]likely() riscv: fpu: switch has_fpu() to riscv_has_extension_likely() riscv: module: move find_section to module.h riscv: switch to relative alternative entries riscv: alternative: patch alternatives in the vDSO riscv: cpu_relax: switch to riscv_has_extension_likely() riscv: remove riscv_isa_ext_keys[] array and related usage arch/riscv/errata/sifive/errata.c | 4 +- arch/riscv/errata/thead/errata.c | 11 ++- arch/riscv/include/asm/alternative-macros.h | 20 ++--- arch/riscv/include/asm/alternative.h | 12 +-- arch/riscv/include/asm/errata_list.h | 9 +- arch/riscv/include/asm/hwcap.h | 97 +++++++++++---------- arch/riscv/include/asm/insn.h | 27 ++++++ arch/riscv/include/asm/module.h | 16 ++++ arch/riscv/include/asm/switch_to.h | 3 +- arch/riscv/include/asm/vdso.h | 4 + arch/riscv/include/asm/vdso/processor.h | 2 +- arch/riscv/kernel/alternative.c | 52 +++++++++++ arch/riscv/kernel/cpufeature.c | 78 +++-------------- arch/riscv/kernel/module.c | 15 ---- arch/riscv/kernel/setup.c | 3 + arch/riscv/kernel/vdso.c | 5 -- arch/riscv/kernel/vdso/vdso.lds.S | 7 ++ arch/riscv/kvm/tlb.c | 3 +- 18 files changed, 206 insertions(+), 162 deletions(-)