From patchwork Sun Jan 15 15:49:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 4034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp799540wrn; Sun, 15 Jan 2023 08:01:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXsi9R3oM23ZJWtxdxnT5KkRpP2TejpWcLnwwQNwy5jcvoNy+JPTkoRLZPAUjbOPScwRqU3A X-Received: by 2002:a17:906:edaf:b0:86f:fbcf:f30a with SMTP id sa15-20020a170906edaf00b0086ffbcff30amr1866811ejb.58.1673798474367; Sun, 15 Jan 2023 08:01:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673798474; cv=none; d=google.com; s=arc-20160816; b=GGVl9yqfI7seCXc7MZ0ywBFFdyNjKkjIM5lxuCas+ACu55xt3nH2m2mCrzuA0j7mxv 9DeTDML7WWJL8zmAZL7W+LhO9Ci5PDPkKgH9nN263T6xTc36LD/6ZTCay/FHnCYeykAr NozU17o4Nkh+Gs82T8rQWf+ZjHSeHjYIYmcf7LUA25l+fuLVaozQ3XxH2IGXaW9J1G4M sHpttU9La293wEyOMZyJMt7MlgnW/bA6AD9eolKs8/0QTdUEDwNkNyL80+YAIRzoFAZH KmJ6P1HZHfpF80jJYFguDxCLrkxUnGYtx3dOGdU++FDe5z6U0LR4Eo4B8EcB/gNY0ALa WTKA== 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=+Pamgl8FLDKu/tUrhlKqHR/EvTgaAZhlT/196LF1G7U=; b=fIxMeqdixaG7nirvw/7TCTUvylEqHO6Pozf6FOx4UBDfgMpOxzlz+xfN3oqe6qsYB7 xujiUb3wdQeVDVpIZLktP9wvQ5FcUZKaAQdhdMkft4/44ml5oop1NUaSJl93nBtFbmzS Hz1NArTp7wKbvbr+CYSD6XOAVYUgIo93cW4w2LyDLxWRdAk/0/GT1RM5f3VcXtSdPFJi osJQ9Ld36OYyhXhujPtaxUGFPFE9vFkSqoo32JL9c11rETPGajxXOfQefFTZ/SPnQwzI fRz+dnz68YwmLEAFAhgxdn2Rn6uB4C9P09/cOTSd45JVR6CKVFEHkELmjKl356YeQwkU GY7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fTrLoZC/"; 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 ga36-20020a1709070c2400b0086f010dcb67si2860667ejc.428.2023.01.15.08.00.51; Sun, 15 Jan 2023 08:01:14 -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="fTrLoZC/"; 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 S231381AbjAOQAV (ORCPT + 99 others); Sun, 15 Jan 2023 11:00:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231181AbjAOQAT (ORCPT ); Sun, 15 Jan 2023 11:00:19 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77396EC6F; Sun, 15 Jan 2023 08:00:14 -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 31BBDB80B86; Sun, 15 Jan 2023 16:00:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2731DC433F0; Sun, 15 Jan 2023 16:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673798411; bh=E+NZhD2hCGi+e43+lqEhMCRkDpuYWfFvgKHNmrbFjxs=; h=From:To:Cc:Subject:Date:From; b=fTrLoZC/tNtzy1yAhQC5tKiDcsbSjEnQflv8MplgvfWlhXA/7Vql1PkTWk0SFCM6p /6dELs+DwZtzQlN+vcLfe5mHwAWe9vijw+kQgIzKWYqu3jw+GHA4bUpYZVx4MZZGTK ZGCLvX0Cc9BVPyXx3rcplLNJjuT6pcNb3cgrD0YMXRl/bXiliVnXXShkdxMf0NSCvJ uIv6DiTarFAnNhCcRGaORh9qCWyHeblRmyw3keBYCOQzrL5OGwwiFznzWi9Yp/tft7 35Th42qu6O/oDoFMbjQUpiTyxbit0gIG+jZwkHslVR87Mc5BdGmPL1ASaFWcPoHXat ycv58ip3taVNA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Conor Dooley , Andrew Jones Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v4 00/13] riscv: improve boot time isa extensions handling Date: Sun, 15 Jan 2023 23:49:40 +0800 Message-Id: <20230115154953.831-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?1755104909196528859?= X-GMAIL-MSGID: =?utf-8?q?1755104909196528859?= 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. Since v3 - collect Reviewed-by tag and remove Heiko's reviewed-by from patch5 - address Conor and Andrew comments - fix two building errors of !MMU and RV32 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 | 3 +- arch/riscv/errata/thead/errata.c | 11 ++- arch/riscv/include/asm/alternative-macros.h | 20 ++--- arch/riscv/include/asm/alternative.h | 17 ++-- 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 | 56 ++++++++++++ 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, 214 insertions(+), 162 deletions(-)