From patchwork Sat Jan 28 17:28:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438528wrn; Sat, 28 Jan 2023 09:41:11 -0800 (PST) X-Google-Smtp-Source: AK7set/HW5+KYmUAV0sgDteFzbbnzF70RkD+qkIu7tjTn9Zb9/Pe6kpgMjg4BT1oUiB2W1dDJeFC X-Received: by 2002:aa7:855a:0:b0:593:da8:6f34 with SMTP id y26-20020aa7855a000000b005930da86f34mr4436235pfn.5.1674927670898; Sat, 28 Jan 2023 09:41:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927670; cv=none; d=google.com; s=arc-20160816; b=nd1VwFl0qqn05Tg1fQ0U4Ki6uaQk3BKq8W6ZuzJZB2yP9LRSH37c13K7DSB5f3X6TM UHmXUqSpm8PtN/67n6ys0+epBnlOeTWt2aRUsBk4/egkRGknERiQE9BudoNc0EH8Nrzr bJzh9YlP5c5v/5CoHiXAPNtXFW6j6UleEiUKaGL+Ye9NrgChXguJSpdwE398buKrbvF1 nBjHVou1XXzBtzZ/4jeEgVggORWiw8Eyyo1VBOaoQ/p/iNfbi5VlEN0C7NF8m7ki4rzS stUiQlXktXjRjdXN1QCKb/iEaOjaADeYwRHMF0rOQF2ha28nsqlTFCA6lYCFZMpIOUWo nExw== 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=nteusArEvprlx3rB6ZmruUkFnHD91znBdGdjunZXJII=; b=iAf097G3UMgBSncT+bQ+jAvaHCJn+eLZFpzasNVIQGWGRBSGJKRV0JpD12KcyN7s04 QZDXeCcfOhOW3hlm6iUikmgDkOg5h8yFwuuHwSEdJGdjdHM8qzHq+VyGzDs8k0Ro+Eim xCZ7RNi4HQSL0kb/uo/rcrGNkwzsZIwQCvWME/q9VnIhsFOmdEymwJEg1qmv2pqPnDo+ mvapifvn++0+3zykGBwhGD/Ch/RmAWOp2JqdbvEcyCq/oscTdZE7IR9sri7FnECrTY3E cyPHrKO5SBY+daWqrqxNk6wQdSao1BHyC0HdP/0m7plWxBKnCJ7LGXKGuw1gq3PZyxoC 4V6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oT0zfWs0; 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 y10-20020a62b50a000000b00576c9c3c4aasi7624493pfe.5.2023.01.28.09.40.59; Sat, 28 Jan 2023 09:41:10 -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=oT0zfWs0; 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 S234813AbjA1RkX (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbjA1RkT (ORCPT ); Sat, 28 Jan 2023 12:40:19 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 512262A175; Sat, 28 Jan 2023 09:39:48 -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 75409B80B57; Sat, 28 Jan 2023 17:39:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96EF2C433EF; Sat, 28 Jan 2023 17:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927566; bh=DagLxOVAD8dZ5XZJ5KAelN3Ssg2fs0hrrowAksRXbDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oT0zfWs0nmmmMMj/V7Yp77YZBYwmb+jzveUOU35SYj7UHoo97UB+PNzvdWdemBupl RPZyoZkye6qMuTem5VFY5Js3fmeaj+oFDqd165GJgdBe71iQWR7j3c+zWosc33lJMB Wlc43mqAIAeuBMMq4UocIFmsJ7K10MdfVFiQCFxiS/AyzyrCMBRDvkyABpxoH6q2QM XrYAQmFSFDnX2hZKP0vzqooc5aGD0qPzSvHnH92ivfZUXdWdL7RQXZ0msaRX4/qlnI 3rei05KJyw9oIPsNv/NdqV6jtROmdwyj9cf8DZbSgvhGZq32Oaz40nuBRftt6q3SzY fgGnPFoHbNTLQ== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 01/13] riscv: move riscv_noncoherent_supported() out of ZICBOM probe Date: Sun, 29 Jan 2023 01:28:44 +0800 Message-Id: <20230128172856.3814-2-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> 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?1756288957529563099?= X-GMAIL-MSGID: =?utf-8?q?1756288957529563099?= It's a bit weird to call riscv_noncoherent_supported() each time when insmoding a module. Move the calling out of feature patch func. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Conor Dooley --- arch/riscv/kernel/cpufeature.c | 1 - arch/riscv/kernel/setup.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index dde0e91d7668..62443fd32fa7 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -298,7 +298,6 @@ static bool __init_or_module cpufeature_probe_zicbom(unsigned int stage) if (!riscv_isa_extension_available(NULL, ZICBOM)) return false; - riscv_noncoherent_supported(); return true; } diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 86acd690d529..376d2827e736 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -300,6 +300,9 @@ void __init setup_arch(char **cmdline_p) riscv_init_cbom_blocksize(); riscv_fill_hwcap(); apply_boot_alternatives(); + if (IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM) && + riscv_isa_extension_available(NULL, ZICBOM)) + riscv_noncoherent_supported(); } static int __init topology_init(void) From patchwork Sat Jan 28 17:28:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438763wrn; Sat, 28 Jan 2023 09:41:57 -0800 (PST) X-Google-Smtp-Source: AK7set9GJT6OrHWcH1aChg09gYWQ3blExtlnDtka6u/WdGCFu8wIr7Wy9KJpUTbAs2PT+eTdid9Y X-Received: by 2002:a05:6a20:7faa:b0:bc:30aa:8a6d with SMTP id d42-20020a056a207faa00b000bc30aa8a6dmr8548912pzj.2.1674927717154; Sat, 28 Jan 2023 09:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927717; cv=none; d=google.com; s=arc-20160816; b=GnzPlUMl8IdJaupa6fhnVqKEgqnv5m+31rpo9WCstAwP45ftDxqP5d9QrqsYN3c5yN Q3hNxQu2+jyECyRdTRmWoq6WwnJ3wxoH0KdJpkJ2EroKYUx08ZuEtBfQhuYSP32hWTN0 5HCzCh+fa2ZFZJEgWgYVhjpwXcCp3Ia9/L06t3++Henbdc97chBpjadPOEzS5zkTdX+G Bcoaz+ldaCUv11PdhLkU4EUH8m0Ph+Al6TuypUmGOZ7yhEnzlAa1oQn5Rg5qMjyfKwN+ uutO7MxW2bAcP0duRCmDiDS/+ipprZ3sfPlJLwK6oiVPTgThh0T+CcFaukQhYgRjef5L LUqg== 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=+vzZ0sUl7tHwPKOmp6gPXwrd5ukPPRAMBGv1pFet+nA=; b=00wh5QOsKmY8UnCuIxShfWQrbblpZCiSLdSPUCzpN4fUQ21fMKaMGebv3EH9/nbsk9 yKWd3zlTFTMRuEVowKxFdxsMtM6vgG49bw9Azv2zTRbjFMqTBK3WlRxKzAD81VoAcAEb TILhCCIUz6j1eOQ6j7LhrvdnjSg1RgRlCOWNhjlbmXAaNb/Ct+ozoGQ662jrlZ3vpkrJ 1UOn7AkZMtg7jxhDzA6f/iI4z48xE8AT/8xSQC/w6o0nPBA+kgnZ3WZ/miEDTlirU3bI XBieuwrqjx0DfgMYOSuuyikM8rdUFg4JtpxP2Iq3e36JC/HRflKbttRvX3//vgH1YLwx ZRgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sqouXPdw; 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 c124-20020a633582000000b004df27953506si7153035pga.510.2023.01.28.09.41.45; Sat, 28 Jan 2023 09:41:57 -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=sqouXPdw; 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 S234840AbjA1Rk0 (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjA1RkX (ORCPT ); Sat, 28 Jan 2023 12:40:23 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34D33298DA; Sat, 28 Jan 2023 09:39:51 -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 6EAFCB800E2; Sat, 28 Jan 2023 17:39:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91502C433D2; Sat, 28 Jan 2023 17:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927569; bh=TTEHjs77lMSGyMyLb+GPNvLBucTI1hfj0V7Hm4KfZnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sqouXPdwpFFry4G0PA0upcZn7eKG9kRL3+Eb7Svbv0uYsIBMt9RCKmR/0tA47fmqY HNtmXimUsJwyoj/53MBMd+h2CAD+6WuxO7nokFEZMVFmb1NezKIVBt0zNxjjvqryqK rjEgHJHOxrSYC7g/41hu+Ejnf6tCil7UQcjFpGbilF12+I5t3D9TsnqlpFH2OEzTde j/APOjrf+RxNzfCpmKF6hu9MFkjO93pJbzbBvOuiRDHyL2j4mJ7wHB9OWoObjMDd2K ztJR8wG/PqTVbNPhVwS7ekIm+QQBba/zedyz6GRCNZo945hJmNek6m8FPevzTik2fU lAfUdq39q5gAw== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 02/13] riscv: cpufeature: detect RISCV_ALTERNATIVES_EARLY_BOOT earlier Date: Sun, 29 Jan 2023 01:28:45 +0800 Message-Id: <20230128172856.3814-3-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> 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?1756289006172076468?= X-GMAIL-MSGID: =?utf-8?q?1756289006172076468?= Currently riscv_cpufeature_patch_func() does nothing at the RISCV_ALTERNATIVES_EARLY_BOOT stage. Add a check to detect whether we are in this stage and exit early. This will allow us to use riscv_cpufeature_patch_func() for scanning of all ISA extensions. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Heiko Stuebner Reviewed-by: Conor Dooley --- arch/riscv/kernel/cpufeature.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 62443fd32fa7..59e20cad1b3d 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -330,6 +330,9 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, struct alt_entry *alt; u32 tmp; + if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) + return; + for (alt = begin; alt < end; alt++) { if (alt->vendor_id != 0) continue; From patchwork Sat Jan 28 17:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438551wrn; Sat, 28 Jan 2023 09:41:16 -0800 (PST) X-Google-Smtp-Source: AK7set9wMtXTENh8KKcMzeQkXg0uq+/1yey4GhiT2ZSoD1oown4HjUdDtj9/xDJ9mYXekUinviAx X-Received: by 2002:aa7:82c5:0:b0:593:6e2f:b859 with SMTP id f5-20020aa782c5000000b005936e2fb859mr4250873pfn.4.1674927676084; Sat, 28 Jan 2023 09:41:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927676; cv=none; d=google.com; s=arc-20160816; b=jZeSUbkPzcDgBCYS0cXhvULt2bd8Nwc2mZIQ1WEs0LgPOJCvcpA8tBQRgzSuQY/9RJ kVvPMyvZ39nI9dxHRuIPwFn43ZZhvID9hQwA82w9q4Jc9N4/pHAzpXwccie84MF5oj6T va5mSmBqaMB/LiELb1JynyQzRYyA6TzLngNEEACgsEfaFp3DXfsrliaTjwsODoT097YP 4b1AtRw3QC+a38UemaFGZ3OwbHNPKPwh/ySptl4og/xXFCdQqarTuqkTDa6B3+KRjXsz Dv+ye4Azqp9sXq4+K7BxROt58y9hauaRafj8Zk8OlB9YtAtMjAcoM4w43y85aiiCyHWq KzyQ== 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=P+8G2xXjcd4n39YMUanqCTIrnEzUM2uO/tF4+mihVTE=; b=BcVIsv9Zal1om7R1fD9lLDD/Lr36/Pb1q/IOZEVIMZSfhNg79G0nlirAVGSZsDdItO 0Efaa6p+PLVInXl0r0+GU0lSCVqAX9BFsiSeeACCA9LEBOfv8C2NFQdLX62YS2VAwgnZ 6QKqJnjc5O50KGZQhIMalmcxeJb0vRx9L+qAF4rxQ+wWnd1O7KVqxGH5XpEAydzpGa4F XTY2bRi3VmTqcfZtYNL4v6lUWowQhWKf0eCsNDphSfftGMHwBVA8zXjMLHEV+UzFiT/k Olo+M3MoAb/Ph27q4wHdGLvpMA/6q9P6AvElR0tStV7H04kuDhJag1W1q+oFCV+hFXsU mW8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fppQbQPv; 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 l11-20020a62be0b000000b00592fb2b162esi4404021pff.366.2023.01.28.09.41.04; Sat, 28 Jan 2023 09:41:16 -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=fppQbQPv; 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 S234868AbjA1Rka (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234803AbjA1RkY (ORCPT ); Sat, 28 Jan 2023 12:40:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D24A92A9A9; Sat, 28 Jan 2023 09:39:51 -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 66FB5B80AF8; Sat, 28 Jan 2023 17:39:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DDE8C4339C; Sat, 28 Jan 2023 17:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927572; bh=RY4Ft67/jFkA5pSWPnl3Ooh6rnb+H+w7ncPhEVFu+Js=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fppQbQPv2ocuYIvC8Ch2SeJpjm4xfS8JFwMLZeSKr5jpecjim9xDOjNwlWcIe4QmP Jgapu1Cq6ROxAQvkWYzKZMztcHY6OUqj+Qr2MdwtUzZV/CK8vK+GsPeGGWKDO9Tz5J Nymkcz2wk2TF7pvXon44OKavOBYVI5pajUoMB8ZLz3Y3wn4CEZW8gWf0N3ZURO1uqg HRZAYrSXLbQFpdVbuWKAQHv2FsiVaGGJDn9JPOYJ4SNyiyzsEjNUGsZc3KG/8f7Ax/ ExaQiGvCbym3xIguILYiJaJtluYJf6yxAFaC5/COXJETBGeyYAfc4u0KFp6+UfrkGt dytviqXK8mU8Q== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 03/13] riscv: hwcap: make ISA extension ids can be used in asm Date: Sun, 29 Jan 2023 01:28:46 +0800 Message-Id: <20230128172856.3814-4-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> 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?1756288963056789179?= X-GMAIL-MSGID: =?utf-8?q?1756288963056789179?= So that ISA extensions can be used in assembly files, convert the multi-letter RISC-V ISA extension IDs enums to macros. In order to make them visible, move the #ifndef __ASSEMBLY__ guard to a later point in the header Signed-off-by: Jisheng Zhang Reviewed-by: Heiko Stuebner Reviewed-by: Andrew Jones Reviewed-by: Conor Dooley --- arch/riscv/include/asm/hwcap.h | 45 ++++++++++++++++------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 57439da71c77..8e0ee841fa77 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -12,20 +12,6 @@ #include #include -#ifndef __ASSEMBLY__ -#include -/* - * This yields a mask that user programs can use to figure out what - * instruction set this cpu supports. - */ -#define ELF_HWCAP (elf_hwcap) - -enum { - CAP_HWCAP = 1, -}; - -extern unsigned long elf_hwcap; - #define RISCV_ISA_EXT_a ('a' - 'a') #define RISCV_ISA_EXT_c ('c' - 'a') #define RISCV_ISA_EXT_d ('d' - 'a') @@ -46,23 +32,34 @@ extern unsigned long elf_hwcap; #define RISCV_ISA_EXT_BASE 26 /* - * This enum represent the logical ID for each multi-letter RISC-V ISA extension. + * These macros represent the logical ID for each multi-letter RISC-V ISA extension. * The logical ID should start from RISCV_ISA_EXT_BASE and must not exceed * RISCV_ISA_EXT_MAX. 0-25 range is reserved for single letter * extensions while all the multi-letter extensions should define the next * available logical extension id. * Entries are sorted alphabetically. */ -enum riscv_isa_ext_id { - RISCV_ISA_EXT_SSCOFPMF = RISCV_ISA_EXT_BASE, - RISCV_ISA_EXT_SSTC, - RISCV_ISA_EXT_SVINVAL, - RISCV_ISA_EXT_SVPBMT, - RISCV_ISA_EXT_ZICBOM, - RISCV_ISA_EXT_ZIHINTPAUSE, - RISCV_ISA_EXT_ID_MAX +#define RISCV_ISA_EXT_SSCOFPMF 26 +#define RISCV_ISA_EXT_SSTC 27 +#define RISCV_ISA_EXT_SVINVAL 28 +#define RISCV_ISA_EXT_SVPBMT 29 +#define RISCV_ISA_EXT_ZICBOM 30 +#define RISCV_ISA_EXT_ZIHINTPAUSE 31 + +#ifndef __ASSEMBLY__ +#include +/* + * This yields a mask that user programs can use to figure out what + * instruction set this cpu supports. + */ +#define ELF_HWCAP (elf_hwcap) + +enum { + CAP_HWCAP = 1, }; -static_assert(RISCV_ISA_EXT_ID_MAX <= RISCV_ISA_EXT_MAX); + +extern unsigned long elf_hwcap; + /* * This enum represents the logical ID for each RISC-V ISA extension static From patchwork Sat Jan 28 17:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49880 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438475wrn; Sat, 28 Jan 2023 09:41:04 -0800 (PST) X-Google-Smtp-Source: AK7set+8GOugzghidSgtM4osqqHZeAxFfE13lPDYRUMwhs44Jszh5lyK9oj63wqReaOxWD0emPck X-Received: by 2002:a17:903:2444:b0:196:15f6:bafc with SMTP id l4-20020a170903244400b0019615f6bafcmr18326356pls.47.1674927663978; Sat, 28 Jan 2023 09:41:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927663; cv=none; d=google.com; s=arc-20160816; b=JlEYmeg+owHn33WoPvpgWF411Fs7oiUPakViqz7s+gCPTnAMJyjk5zP+JAoV5U4knK x4U89egdiUG7uP8gvBklx+e4IYdFSaAj/At4wiyjNAmdPczeEnNE8rMVXOw+5kQ3ZbXR diLfum2hBwB2TmHMbuyXjO7Ydef5sL0hucMoBcTwpwSpULxTXSAp3UpbmqAV8dX9ENJA Qy3vyWxZ2ePQCrLpgvJHQiyunZYDWZRvEfmDa+W+WREqRNax04FYrrEICSQBAD051Knm IfgLMlkxSezVBNy5Lh5djJeOGqHNoz/ty+PVdkLH9ZoyLkHCLCUyed8ElJHd9xCkKNR8 mCnQ== 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=CtnkoC1qTQE76eea16+YiNAbgrLUBZBLkVL9zEP5JqI=; b=S6h9Xm/Y2MU2xkWFjzcjmbjg+Ub5LdZBnMcp+zZmKEE0cNpqw/ljjwMUn1cRaKU49+ bFYhODVcfiab9inPYtXNoO48+/Ta6lvbXqn4eCQhNBr20fHPL8P+k2FISTQezVipNiEM GvnNXlZQHHWNMADhbeWBUrwSshzzelpDd7QV/SEvQ8yBVx3K4Lhm5+hNgNTlKgTPx7db KO2nKqpFPKhb46JfkzbaDCpAhr9P/m7xT9o2+7VP8Dyn7p4zl8YGl+AZ8qAeGyHENX4t qHHkCGAMGbiLM3EKaDFvGAoTArc3pxGheaJziUKhl2JLmIZ6rPinn5Cnt2hIkMy+WJ2i QuYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iqC95G3F; 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 w11-20020a170902d3cb00b0019488aa379asi8155283plb.181.2023.01.28.09.40.52; Sat, 28 Jan 2023 09:41:03 -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=iqC95G3F; 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 S234759AbjA1RkM (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230264AbjA1RkI (ORCPT ); Sat, 28 Jan 2023 12:40:08 -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 5E22C2CC62; Sat, 28 Jan 2023 09:39:38 -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 57594B80B7C; Sat, 28 Jan 2023 17:39:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A7E3C433D2; Sat, 28 Jan 2023 17:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927575; bh=YmRACTn/DXQ9ZObAMSHNQDkrN2B1xLJ8b/iZHrSjUcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iqC95G3F12GlZk/hg0HJIrgIMiQliHkrrZFmTr6emGKfukPB6qgDa6WGd2E9htPgM Vf6otzp1go8FewGr0k93kh9u3b0ItON/jmRxPiMlyYuC85KxudPbJenqDuk5eGxsuP xW/7LLvLrBxoiZmHrflbMg66XvQd1/QyQgJv078jNMf3zh1t2o20JsSmMwMTnKt6oR LyXar8saNkOPxOIJ/vBRCNaseKOmm+vxUGtUtg+64gDD4H6pa7lY2ttuAF76R8ia47 FKJkmYbRIlLQdoAfZGC+A8Ap1ttOy6lG69qQRVr206aNHNLTpCv8GiOO0oTdSGb/oV tENtZX9nGnn9Q== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 04/13] riscv: cpufeature: extend riscv_cpufeature_patch_func to all ISA extensions Date: Sun, 29 Jan 2023 01:28:47 +0800 Message-Id: <20230128172856.3814-5-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756288950252654004?= X-GMAIL-MSGID: =?utf-8?q?1756288950252654004?= riscv_cpufeature_patch_func() currently only scans a limited set of cpufeatures, explicitly defined with macros. Extend it to probe for all ISA extensions. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Conor Dooley --- arch/riscv/include/asm/errata_list.h | 9 ++-- arch/riscv/kernel/cpufeature.c | 64 ++++------------------------ 2 files changed, 11 insertions(+), 62 deletions(-) diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h index 4180312d2a70..274c6f889602 100644 --- a/arch/riscv/include/asm/errata_list.h +++ b/arch/riscv/include/asm/errata_list.h @@ -7,6 +7,7 @@ #include #include +#include #include #ifdef CONFIG_ERRATA_SIFIVE @@ -22,10 +23,6 @@ #define ERRATA_THEAD_NUMBER 3 #endif -#define CPUFEATURE_SVPBMT 0 -#define CPUFEATURE_ZICBOM 1 -#define CPUFEATURE_NUMBER 2 - #ifdef __ASSEMBLY__ #define ALT_INSN_FAULT(x) \ @@ -55,7 +52,7 @@ asm(ALTERNATIVE("sfence.vma %0", "sfence.vma", SIFIVE_VENDOR_ID, \ #define ALT_SVPBMT(_val, prot) \ asm(ALTERNATIVE_2("li %0, 0\t\nnop", \ "li %0, %1\t\nslli %0,%0,%3", 0, \ - CPUFEATURE_SVPBMT, CONFIG_RISCV_ISA_SVPBMT, \ + RISCV_ISA_EXT_SVPBMT, CONFIG_RISCV_ISA_SVPBMT, \ "li %0, %2\t\nslli %0,%0,%4", THEAD_VENDOR_ID, \ ERRATA_THEAD_PBMT, CONFIG_ERRATA_THEAD_PBMT) \ : "=r"(_val) \ @@ -129,7 +126,7 @@ asm volatile(ALTERNATIVE_2( \ "add a0, a0, %0\n\t" \ "2:\n\t" \ "bltu a0, %2, 3b\n\t" \ - "nop", 0, CPUFEATURE_ZICBOM, CONFIG_RISCV_ISA_ZICBOM, \ + "nop", 0, RISCV_ISA_EXT_ZICBOM, CONFIG_RISCV_ISA_ZICBOM, \ "mv a0, %1\n\t" \ "j 2f\n\t" \ "3:\n\t" \ diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 59e20cad1b3d..6193f401f0c5 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -276,59 +276,11 @@ void __init riscv_fill_hwcap(void) } #ifdef CONFIG_RISCV_ALTERNATIVE -static bool __init_or_module cpufeature_probe_svpbmt(unsigned int stage) -{ - if (!IS_ENABLED(CONFIG_RISCV_ISA_SVPBMT)) - return false; - - if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) - return false; - - return riscv_isa_extension_available(NULL, SVPBMT); -} - -static bool __init_or_module cpufeature_probe_zicbom(unsigned int stage) -{ - if (!IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM)) - return false; - - if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) - return false; - - if (!riscv_isa_extension_available(NULL, ZICBOM)) - return false; - - return true; -} - -/* - * Probe presence of individual extensions. - * - * This code may also be executed before kernel relocation, so we cannot use - * addresses generated by the address-of operator as they won't be valid in - * this context. - * Tests, unless otherwise required, are to be added in alphabetical order. - */ -static u32 __init_or_module cpufeature_probe(unsigned int stage) -{ - u32 cpu_req_feature = 0; - - if (cpufeature_probe_svpbmt(stage)) - cpu_req_feature |= BIT(CPUFEATURE_SVPBMT); - - if (cpufeature_probe_zicbom(stage)) - cpu_req_feature |= BIT(CPUFEATURE_ZICBOM); - - return cpu_req_feature; -} - void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, struct alt_entry *end, unsigned int stage) { - u32 cpu_req_feature = cpufeature_probe(stage); struct alt_entry *alt; - u32 tmp; if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) return; @@ -336,18 +288,18 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, for (alt = begin; alt < end; alt++) { if (alt->vendor_id != 0) continue; - if (alt->errata_id >= CPUFEATURE_NUMBER) { - WARN(1, "This feature id:%d is not in kernel cpufeature list", + if (alt->errata_id >= RISCV_ISA_EXT_MAX) { + WARN(1, "This extension id:%d is not in ISA extension list", alt->errata_id); continue; } - tmp = (1U << alt->errata_id); - if (cpu_req_feature & tmp) { - patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len); - riscv_alternative_fix_offsets(alt->old_ptr, alt->alt_len, - alt->old_ptr - alt->alt_ptr); - } + if (!__riscv_isa_extension_available(NULL, alt->errata_id)) + continue; + + patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len); + riscv_alternative_fix_offsets(alt->old_ptr, alt->alt_len, + alt->old_ptr - alt->alt_ptr); } } #endif From patchwork Sat Jan 28 17:28:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438715wrn; Sat, 28 Jan 2023 09:41:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXu43fahh/6m78fno9nCoGlNqIIZxlvr62S/O/sEA7R8iq54qgf0abNXrAGS6YNdst5yIrpj X-Received: by 2002:a62:e911:0:b0:578:ac9f:79a9 with SMTP id j17-20020a62e911000000b00578ac9f79a9mr37782686pfh.15.1674927710387; Sat, 28 Jan 2023 09:41:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927710; cv=none; d=google.com; s=arc-20160816; b=gH3sZ0mnN6kU7BV7E5ngP57VX4S2MhCYKctrv3yxJHyMG1nIFNpJachEILg5AwvR5Y ap2hXGjPP5G7sy5+w53jr6ma5nGGNHEDADoMMgYZ/RqqY5/bNJS49C9rzZmZAJe81QTh jCMnMFjGm4zw1fqyoYb+oToMUTSGHaQXtzTknr7rRvYL+V1TBvYZPnULvot7AH2hmW4R 4RT6najf39LodBXS6/+SUQoZMdnGc11BMhsd+VP2ZIdiAgFbEotcI4E8Qba+emnk0PFU rboSr+P8BT7Cj2YwljocLCL4eePkYirADAXIqHVObwoQ98i2DucwoJ0oHAF2OJ0EWnSZ zPwg== 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=H+6TA2J1KLpp7VD8/ZbdidhCzCeErx8QfCxMGM2pmBk=; b=L8MIN5023i0srw+Yz3N2L0c4Zn2bI50Y/RYlaLzqbwid8ikmQb65gWK+XJD1XSnNEr qFAwbR7Wmn7P3uexKvLUfLhm4sYzt3mEb3CueYKbgxt9p8rrFYrHZ7bRymgLm/XC6OI6 m0qTIAjqZtviK3kzIal28OUqeQQg2Hn1vUme4wup6nVwHKRq968GqZy62penJIy10yfn hv1hMQIVp2nkbZ20GOgYXiNXxgG5B6OWrA3xA9ZfVilm72q1g6HXrfBHScU9SZ/p9py1 incU2AhIEk1wyHXHIsJRb+xheCXJFNtj21vYeOc29oE5Oycp9Tw4r3M6k2TQpvNxmzRv U6bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=n39vjOjE; 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 k7-20020aa790c7000000b0058241d3a271si7724193pfk.49.2023.01.28.09.41.37; Sat, 28 Jan 2023 09:41:50 -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=n39vjOjE; 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 S235000AbjA1Rkr (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234893AbjA1Rkg (ORCPT ); Sat, 28 Jan 2023 12:40:36 -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 0E97E2B2A0; Sat, 28 Jan 2023 09:40:00 -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 5E26BB80B86; Sat, 28 Jan 2023 17:39:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 864F4C433EF; Sat, 28 Jan 2023 17:39:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927578; bh=rCPun3SIfwHKigmxd5E5UG5gquIqTtUI/lKy/0NjAL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n39vjOjE7PcDBd6PoM+cQWvfzAPYJrF+ge3GNRMBO4LCEyeNcTfWUiW/jq9SRG8u9 XhytVj5GI+UjMOq6Nnh57CDC8jONbJ/GfYKn1saAB+jynibgLpOYejwJhLCeynwnLb A8/m0OC/vVq/0XNESyRqcxdRCZ/WPngdT7ph505pJRrK48xvzAx9dGO6uP+aGxHLZJ bH62WUySDcefzgighgM+NpkCcyyPwJTitiqzbEJ2k/TOLwEyHVTEfTxYOSr0/iIo2a JgCuuWH3QvDGlZEFjILYOcmCoiMA8YswfOMpnAqgjm0AGxsP3RHs0MheQ0d917PhCI 8bAM1id64Br6g== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 05/13] riscv: introduce riscv_has_extension_[un]likely() Date: Sun, 29 Jan 2023 01:28:48 +0800 Message-Id: <20230128172856.3814-6-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756288999166742102?= X-GMAIL-MSGID: =?utf-8?q?1756288999166742102?= 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 if 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. Link: https://lore.kernel.org/linux-riscv/20220922060958.44203-1-samuel@sholland.org/ [1] Link: https://lore.kernel.org/linux-arm-kernel/20220912162210.3626215-8-mark.rutland@arm.com/ [2] Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Acked-by: Conor Dooley --- arch/riscv/include/asm/hwcap.h | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 8e0ee841fa77..411ef0fb5c4b 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -8,6 +8,7 @@ #ifndef _ASM_RISCV_HWCAP_H #define _ASM_RISCV_HWCAP_H +#include #include #include #include @@ -99,6 +100,42 @@ static __always_inline int riscv_isa_ext2key(int num) } } +static __always_inline bool +riscv_has_extension_likely(const unsigned long ext) +{ + compiletime_assert(ext < RISCV_ISA_EXT_MAX, + "ext must be < RISCV_ISA_EXT_MAX"); + + asm_volatile_goto( + ALTERNATIVE("j %l[l_no]", "nop", 0, %[ext], 1) + : + : [ext] "i" (ext) + : + : l_no); + + return true; +l_no: + return false; +} + +static __always_inline bool +riscv_has_extension_unlikely(const unsigned long ext) +{ + compiletime_assert(ext < RISCV_ISA_EXT_MAX, + "ext must be < RISCV_ISA_EXT_MAX"); + + asm_volatile_goto( + ALTERNATIVE("nop", "j %l[l_yes]", 0, %[ext], 1) + : + : [ext] "i" (ext) + : + : l_yes); + + return false; +l_yes: + return true; +} + unsigned long riscv_isa_extension_base(const unsigned long *isa_bitmap); #define riscv_isa_extension_mask(ext) BIT_MASK(RISCV_ISA_EXT_##ext) From patchwork Sat Jan 28 17:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49885 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438677wrn; Sat, 28 Jan 2023 09:41:44 -0800 (PST) X-Google-Smtp-Source: AK7set/lxqr3qmoefTK5rdAeHPLtEaNKUoWdTq7iA8yCSuczbNElRyvIlOVd+d4KGDSXHFW2K8hu X-Received: by 2002:a05:6a00:98b:b0:593:ad98:8683 with SMTP id u11-20020a056a00098b00b00593ad988683mr983924pfg.6.1674927703696; Sat, 28 Jan 2023 09:41:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927703; cv=none; d=google.com; s=arc-20160816; b=uGN0yADEYib3c100zVoGF78XUGEf4s2zDgunsyDe6neNJCm+YUm9guVefZdSINIZB/ GyCmbnSJDOq3LBGzYD1sUJwtdcSI3SnHEXAD11YYoVcuRJnL0QSIgNwSPqsf287DpW5R rs4Ovl1ScUiglKw0disush4Iuofvb8txO3jm9RfgZI8P+HacK6d0Yo6EP/GW1mwzW7dV kyW08Sw4cA/1026gJx178xp/RekmiBaZqt6S1uHPybmoCsuwYlTeOGPIC/ESik92yDQw IQb888mQtuzYpnVvlahN53rjWMYxEMUdlIkYGUW0IFiui2t0dSf/P7AsUrxHxPjMUijl 90NA== 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=UUZCMDHT9ow9f6aA9hMHHMel+k/ZbW5eVbimycB0uhA=; b=QZxmdbEJAjPV0M54BvTMPgN2foPCQNIN94g2pJqN3QOwbU3cvrsnUnKgB1HsE6vnHT o31x+RAtm+NBQcx3UYRWbgeFnlYLpVHp5EEUYmKrD/fKP46JiXsD4LaCZwQJGM2RKvlY QLe1I1aAOAPwIK8D4ogv3ZgZ6gN8gKrCdg40mnohzRV4KBvJ0IV/ZgDnkbrM8ebj4bfq JUiLQXQplRD+e0ShV63/dMaUVmLxTGHygpElriZZ04KoBonbHcHbUJwcDaLq8QoCNnGU k/iNki7TqdUQ96oTtB7Q9baKmxQsKBxr670imiSxrMTSDJV1v9pTwdkFgKZPpqkJgZa9 YEmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bCOcZ4V9; 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 t1-20020a62ea01000000b005871ef7e13csi7508281pfh.46.2023.01.28.09.41.25; Sat, 28 Jan 2023 09:41:43 -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=bCOcZ4V9; 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 S235051AbjA1Rkx (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234900AbjA1Rkg (ORCPT ); Sat, 28 Jan 2023 12:40:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66CE72C648; Sat, 28 Jan 2023 09:40:00 -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 5BD46B80B83; Sat, 28 Jan 2023 17:39:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80EB3C433D2; Sat, 28 Jan 2023 17:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927581; bh=a+5QZf9cRg0N2ZzfrrrGF2H31LP1zc5XIp+raVH9xP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bCOcZ4V9XDkJ5wWljeWU20Sde8cDhpniyQvi/aZWm1g2Y7jlYc4p11fL5Ie+we9ye CP8+Nluu5rOSahshmseQnNNFzEGH39khv+vGHVqcvkAvVZ4O6i41qg6FZFkpHwpdoa cvB4Jv/tlRWg5YxXtIpYv1g/ZU987OyFHVY4KeJJfKHmws9hJnSIFRamg4oOC+ZiOA /WcqKlKqc4hT3XrZTe8GH2BDWqzFPSyYORVkwvGNcuFM90s2z5VRvFbq7rbbw0D1ep SI7ZL1nI5C6B12p7Qso3JURdQQ6rZs2rxKSpqmnfPTFiU/TTxA9RhyYF37hmGR9ilm IK+0MTYUX1ptw== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 06/13] riscv: fpu: switch has_fpu() to riscv_has_extension_likely() Date: Sun, 29 Jan 2023 01:28:49 +0800 Message-Id: <20230128172856.3814-7-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> 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?1756288992060100526?= X-GMAIL-MSGID: =?utf-8?q?1756288992060100526?= Switch has_fpu() from static branch to the new helper riscv_has_extension_likely(). Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Heiko Stuebner Reviewed-by: Conor Dooley --- arch/riscv/include/asm/switch_to.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/switch_to.h b/arch/riscv/include/asm/switch_to.h index 11463489fec6..60f8ca01d36e 100644 --- a/arch/riscv/include/asm/switch_to.h +++ b/arch/riscv/include/asm/switch_to.h @@ -59,7 +59,8 @@ static inline void __switch_to_aux(struct task_struct *prev, static __always_inline bool has_fpu(void) { - return static_branch_likely(&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_FPU]); + return riscv_has_extension_likely(RISCV_ISA_EXT_f) || + riscv_has_extension_likely(RISCV_ISA_EXT_d); } #else static __always_inline bool has_fpu(void) { return false; } From patchwork Sat Jan 28 17:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49881 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438498wrn; Sat, 28 Jan 2023 09:41:06 -0800 (PST) X-Google-Smtp-Source: AK7set8HJYon0XAKHWHBdNrqqdAhxBf3bQuM+A5NknDQSU8zmYraSa0oEaUKcBAfqSPNslGYGDP+ X-Received: by 2002:a05:6a20:1454:b0:bc:c0b9:e0b3 with SMTP id a20-20020a056a20145400b000bcc0b9e0b3mr754224pzi.28.1674927666608; Sat, 28 Jan 2023 09:41:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927666; cv=none; d=google.com; s=arc-20160816; b=HRP8ar/2C+jdkwJ2H+KjAezTnBC+edTrIvo9czvr9A1D+edw6pTmdmr5E0EUWbNACg 6p91HMijZ2o2uxE1VQfDApuHxNG6CTyWT6hnhgtYxX+qGvr9T8MBpqWh+6NUvwxbOpfJ tCftA4RlZYkJ/0dIJb/VefBEWAb2g4MrA9FM2GvMjIhpYDO4lVNzycYOtS3Si83m3mIP aUGbQX+X4C0yfCuzKxhRfqFaqGBSIDENepxhQoQhKsNgKw4SbiwSHDrQSB7CBruiaQUt KODA7d4XNNPtLfWo1beaJk7G51SNW1hRWGqqVG10JLkRwsudIZWfiYFiMS9/p8odTVPA GQmw== 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=H6sQDj4400ruszpM2FDtNnN2i7UQausnIiljs0xsLps=; b=NMiMIEl97hcdEBYB+JXFEdcGc9LOwmmtpWr6hiWJTHECdwkTfFwH0KO62Q9mZ7WJF/ CNAV/0eRMR2Q4KssC3Z1lzAb8ke5GXnFkQtbPG3T3g6PFnlxni9CjPpYmEc4ORcDziaf MhJlN5NkR6H3n4eS8ckJT5225jEg77w4uHC7vnSIC5RtvVXDpbTUrsS7iftnhyMcCgj2 Oee6YjhnPZXGDExR82/nwENMgW1qvyMO1hJI8EC1601nq+ajXVwB7DmIIKSQpZVHjnkg ncLPYSfjLx8vELjMa8t3ecTil9i4gv41QKAdemV8Ms4G+5Wm1P4ol0WDPYgvHWCyqrpb YujA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D2ZxPGo2; 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 v190-20020a622fc7000000b0058e08bde1eesi7697436pfv.144.2023.01.28.09.40.54; Sat, 28 Jan 2023 09:41:06 -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=D2ZxPGo2; 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 S234408AbjA1RkV (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjA1RkS (ORCPT ); Sat, 28 Jan 2023 12:40:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7922229E07; Sat, 28 Jan 2023 09:39:46 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 9550360BAA; Sat, 28 Jan 2023 17:39:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BAA6C4339B; Sat, 28 Jan 2023 17:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927584; bh=W6NwJoOq7fauyX3aaR9QaMpoEnd1BqGf85SXKRegHDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2ZxPGo26zm2P5Tb+gL6cWHX2PYGm+SMKh0gbzM9WpswULEijQBnsqxEZPRV2dSe5 ANQgIshYHzrzHUvdlX3y3e2+sRBYX4RRcQbhMr9lnUMuZ72wmPOQ9EH1bY3G2ugfQu gbOOTrxfXtktVGPUrjMwe6wQS+XzDFcBSWCYeONW/AKgdnGD/LNS8fka9iCd/j5X0Y vPjCu+T3rQSweeG9d678AQ9p2iZINKAqmHtR8TabklCDjUve5n2eYIFSEVUwu22izt 5dX5ysg9enyznja3ybGMf9CZl/XsxQXMdsEdpfEZQ2pnClwfQILiJBwPdOZ8C88F1F ae4H1/9u4CT6g== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 07/13] riscv: module: move find_section to module.h Date: Sun, 29 Jan 2023 01:28:50 +0800 Message-Id: <20230128172856.3814-8-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756288952647483530?= X-GMAIL-MSGID: =?utf-8?q?1756288952647483530?= Move find_section() to module.h so that the implementation can be shared by the alternatives code. This will allow us to use alternatives in the vdso. Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones Signed-off-by: Jisheng Zhang --- arch/riscv/include/asm/module.h | 16 ++++++++++++++++ arch/riscv/kernel/module.c | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/module.h b/arch/riscv/include/asm/module.h index 76aa96a9fc08..0f3baaa6a9a8 100644 --- a/arch/riscv/include/asm/module.h +++ b/arch/riscv/include/asm/module.h @@ -5,6 +5,7 @@ #define _ASM_RISCV_MODULE_H #include +#include struct module; unsigned long module_emit_got_entry(struct module *mod, unsigned long val); @@ -111,4 +112,19 @@ static inline struct plt_entry *get_plt_entry(unsigned long val, #endif /* CONFIG_MODULE_SECTIONS */ +static inline const Elf_Shdr *find_section(const Elf_Ehdr *hdr, + const Elf_Shdr *sechdrs, + const char *name) +{ + const Elf_Shdr *s, *se; + const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; + + for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) { + if (strcmp(name, secstrs + s->sh_name) == 0) + return s; + } + + return NULL; +} + #endif /* _ASM_RISCV_MODULE_H */ diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 91fe16bfaa07..76f4b9c2ec5b 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -429,21 +429,6 @@ void *module_alloc(unsigned long size) } #endif -static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, - const Elf_Shdr *sechdrs, - const char *name) -{ - const Elf_Shdr *s, *se; - const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; - - for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) { - if (strcmp(name, secstrs + s->sh_name) == 0) - return s; - } - - return NULL; -} - int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *me) From patchwork Sat Jan 28 17:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49884 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438572wrn; Sat, 28 Jan 2023 09:41:19 -0800 (PST) X-Google-Smtp-Source: AK7set+qAAVlsGtm1q4FWLAYdgVdQrW+sEkUSQzlrOJa0K6LwDycWMX7bzl1mOcYOLufI9lRpsSt X-Received: by 2002:a05:6a20:8e29:b0:bc:6df2:f0cd with SMTP id y41-20020a056a208e2900b000bc6df2f0cdmr5898597pzj.35.1674927679652; Sat, 28 Jan 2023 09:41:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927679; cv=none; d=google.com; s=arc-20160816; b=Jr1C238gfAo7ADNn+mf84h6Sj25zt9WjnO2llaQSZgKZRu8QaxwgyyA394zJ8iYIEZ +vhpAklFkA7OZnPZTKW/NJaxpoC/9G99dLVdDAb7Ly1TnjHT6t6mW7Q0mU8dnL2o3+S7 K2Y9QCg/tO8+rTH0+dNgybGoLDyELjq2gCf4ghI+ksFQDmPbjh7PbcqHuFse0b4LzJDa jCrLEOopVmKu1hdwYAeU/quoRozNH12hmQlTGvNDqiM9lE6UAZ6RNQ10K+98Q8ilfjlA n9gvWbHBNFVdBdDViODOgI0L5AnGLcCeuPDC5baUBjx6rOFWavoa1nl9567PgNVaHvVm 2r5w== 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=NMhjGVcNkR3ctcSm2n50zDt76cKY4uIPxFEqALPUYUw=; b=dIxK/7e7MEBdmgmjXYLU330OOgpzX0Ja7Yt8RzqhCSSYqgLqAYyQvtTs1MQtnosEuK CBES6O/f43tM1JfQmuEz+QWS5bRcekJUupuqK7CwzrskfCT8xNk4FYW+8tMR3SSouun8 rp7xHYDnjxDyQh4oTQwTWukeTIC2aNPuBfY+Db31YAM0oZHs2ULucwQpVNbk8I4g7nIe i3IUBz22TQMH3cjz35tGX+GGH+gdbqdsMk15/OnIzZhh3KtHpcCj2NvadRROe5lwu4lH ++kW6pkhbxz5QqvpvfWY+/m9z1J+lm3u6gKaYmYq+4Gs7xmAsHzJ9WIAAnbdaQyhnTV3 n+Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TUx+idFX; 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 t13-20020a170902e84d00b001898d8881d1si8850145plg.598.2023.01.28.09.41.07; Sat, 28 Jan 2023 09:41:19 -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=TUx+idFX; 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 S234906AbjA1Rkg (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjA1Rk3 (ORCPT ); Sat, 28 Jan 2023 12:40:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C9462A990; Sat, 28 Jan 2023 09:39:54 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 8D4CF60B40; Sat, 28 Jan 2023 17:39:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 765F2C433EF; Sat, 28 Jan 2023 17:39:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927587; bh=xns7aXEDFfAuJusdRE+rDCll5I8rYO5SpKHZOS1DEIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TUx+idFX2Ddn8y39dLpOYIR3uwySlB380yNZKygJJdk2Z7Qcef0UUqrgaWnHi7yce t1VuaVAJ0w67kvofeP2LysFz6WSpGaUTnN2Cq4rD40JE+brZ6VDA0yguWGCI4KGt76 OhpNk3k0i2WyOFV2hL058F733HRfkDzyu55HL1/PvEd80e1l3VviiBZb87tjNnqMEB 6+aZPwFBCmzS0oj4mX+Vw6r/WLZh2MVYOmI52NY4l3+GgPkeTZsT8mZKlIfJq14MgL T3XBH6L29NLW5AH4j5l0k78adQV0BgTMcCUA5Ms49SkKJsKOJFAs7QxN4IXLRfgnGK KYzLRE7PUjVjw== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 08/13] riscv: module: Add ADD16 and SUB16 rela types Date: Sun, 29 Jan 2023 01:28:51 +0800 Message-Id: <20230128172856.3814-9-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756288966851433525?= X-GMAIL-MSGID: =?utf-8?q?1756288966851433525?= From: Andrew Jones To prepare for 16-bit relocation types to be emitted in alternatives add support for ADD16 and SUB16. Signed-off-by: Andrew Jones Reviewed-by: Conor Dooley --- arch/riscv/kernel/module.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 76f4b9c2ec5b..7c651d55fcbd 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -268,6 +268,13 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location, return -EINVAL; } +static int apply_r_riscv_add16_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + *(u16 *)location += (u16)v; + return 0; +} + static int apply_r_riscv_add32_rela(struct module *me, u32 *location, Elf_Addr v) { @@ -282,6 +289,13 @@ static int apply_r_riscv_add64_rela(struct module *me, u32 *location, return 0; } +static int apply_r_riscv_sub16_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + *(u16 *)location -= (u16)v; + return 0; +} + static int apply_r_riscv_sub32_rela(struct module *me, u32 *location, Elf_Addr v) { @@ -315,8 +329,10 @@ static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, [R_RISCV_CALL] = apply_r_riscv_call_rela, [R_RISCV_RELAX] = apply_r_riscv_relax_rela, [R_RISCV_ALIGN] = apply_r_riscv_align_rela, + [R_RISCV_ADD16] = apply_r_riscv_add16_rela, [R_RISCV_ADD32] = apply_r_riscv_add32_rela, [R_RISCV_ADD64] = apply_r_riscv_add64_rela, + [R_RISCV_SUB16] = apply_r_riscv_sub16_rela, [R_RISCV_SUB32] = apply_r_riscv_sub32_rela, [R_RISCV_SUB64] = apply_r_riscv_sub64_rela, }; From patchwork Sat Jan 28 17:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1439244wrn; Sat, 28 Jan 2023 09:43:24 -0800 (PST) X-Google-Smtp-Source: AK7set+E5IP3EMhDMGyyd8XGt/g69bgQu/+0I47izPqGExabYbhi84n21b/522m7Jx1Y1pT2bw/o X-Received: by 2002:a17:90b:1806:b0:22b:e5b9:43e9 with SMTP id lw6-20020a17090b180600b0022be5b943e9mr20258708pjb.25.1674927804135; Sat, 28 Jan 2023 09:43:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927804; cv=none; d=google.com; s=arc-20160816; b=OqLIaZPMODvgSa3/8coRZi6YySCd+/fcQcHduRb8xDXH+o4FGu8l9AI4PLUANwkojL Pw1xo78hMC9+dz3LgIQk6Yn9KQC5fpaDkOIatV/CssPo1lMLycQwkI2ME1QLs6FIBCsJ TL5oxFp7IDgctT/DmqFus1VfC6obmMW66oLJbTPNwFXPzTu7+kcAlBlnCtAJirqK4l8s azkmFQ0Ewof9zLHT+L3M/J7y7wvaUo/q0fWCXtRfoLf/SCcPRa0OHPZvUi5gwGc4FzSS YYjzbNamb8xJgskPzYbHZ8q6gbr3xmqPFFHIXOxFY5mNlyzJTAO8jMilC+vpfokMMnwS TI0g== 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=yO5NC/tv10SQgcADiVgE8XYO6cKqIZHvBZU4ax8ujxg=; b=pdZi/5OBQfq37Xp+/JUp8kA9LSQkcO1YJmDzp/1Venh/PwU7MiIcmtku1KpUCVfszs bJ6vRqQyasb5LmHH/kuOlHEOOKlcARBM8+p/sHgzWODeVxqdJ+FECRWMkYLqSaYRrPWH d7ZVso5arqzW306KXe9cmr0VxAnfCqkiWWqRTKt1aBFsqe1I4x9g86nOTQd0TzFmBYho 60BneLh5iFhmEcu83+EMh7PYpgTV4+C9NBnHtiMpc4HaukVN6mTDM8mULy1AIyVaNNNc MNMJPTwVRRm1yq1L/6lpDP8GpaLfQZ8LlRsb6TbywOC8IMfTKZZ1i6IswYoAagURAW9Q EpqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZPIvAFkt; 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 np16-20020a17090b4c5000b0022c2e765b69si8933999pjb.92.2023.01.28.09.43.11; Sat, 28 Jan 2023 09:43:24 -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=ZPIvAFkt; 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 S235091AbjA1RlA (ORCPT + 99 others); Sat, 28 Jan 2023 12:41:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234942AbjA1Rkj (ORCPT ); Sat, 28 Jan 2023 12:40:39 -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 BD9AF2C674; Sat, 28 Jan 2023 09:40:13 -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 5AEBBB80B84; Sat, 28 Jan 2023 17:39:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71FF8C433D2; Sat, 28 Jan 2023 17:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927590; bh=z8/AvCzWD8j3/AewPzC9HFHxsotm2IYSW/Hr076TD5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZPIvAFktiW/YEoqiSA/Lcz+xOYPQ0O5KyIILrpQzOj7TGkug5vYjPvZXbYaQnOZ1W Oibf94Sh1328o1Bl9enWXXU8D248Gr5k+6OTD1bgaRyFEe+nsfzeyQz6NhMQ6+82HI QJ4543hTlA6oFT8pQExSbETju8OmX3bAq6pM1oV7A0pgtjpimkfJU69Wa50TQS4LlM PPT5Np+0jcBSGLHE8snWl+xtma8ElG3CTgoEryKsOjK1TKWOacIcGe6Z5QsA4wbRH2 3aCFRJDOaO849zs5Lt9k+tMvhn9VdHQw62VLTghvJ4YJ4L+KlgU5FAbRQJjomsKp15 3D4jl5c0PHTKQ== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v5 09/13] riscv: switch to relative alternative entries Date: Sun, 29 Jan 2023 01:28:52 +0800 Message-Id: <20230128172856.3814-10-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756289097415835070?= X-GMAIL-MSGID: =?utf-8?q?1756289097415835070?= Instead of using absolute addresses for both the old instrucions and the alternative instructions, use offsets relative to the alt_entry values. So this not only cuts the size of the alternative entry, but also meets the prerequisite for patching alternatives in the vDSO, since absolute alternative entries are subject to dynamic relocation, which is incompatible with the vDSO building. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Conor Dooley --- 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/kernel/cpufeature.c | 8 +++++--- 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/arch/riscv/errata/sifive/errata.c b/arch/riscv/errata/sifive/errata.c index 1031038423e7..ef9a4eec0dba 100644 --- a/arch/riscv/errata/sifive/errata.c +++ b/arch/riscv/errata/sifive/errata.c @@ -107,7 +107,8 @@ void __init_or_module sifive_errata_patch_func(struct alt_entry *begin, tmp = (1U << alt->errata_id); if (cpu_req_errata & tmp) { - patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len); + patch_text_nosync(ALT_OLD_PTR(alt), ALT_ALT_PTR(alt), + alt->alt_len); cpu_apply_errata |= tmp; } } diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c index fac5742d1c1e..c0bea5c94128 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -87,6 +87,7 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al struct alt_entry *alt; u32 cpu_req_errata = thead_errata_probe(stage, archid, impid); u32 tmp; + void *oldptr, *altptr; for (alt = begin; alt < end; alt++) { if (alt->vendor_id != THEAD_VENDOR_ID) @@ -96,12 +97,16 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al tmp = (1U << alt->errata_id); if (cpu_req_errata & tmp) { + oldptr = ALT_OLD_PTR(alt); + altptr = ALT_ALT_PTR(alt); + /* On vm-alternatives, the mmu isn't running yet */ if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) - memcpy((void *)__pa_symbol(alt->old_ptr), - (void *)__pa_symbol(alt->alt_ptr), alt->alt_len); + memcpy((void *)__pa_symbol(oldptr), + (void *)__pa_symbol(altptr), + alt->alt_len); else - patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len); + patch_text_nosync(oldptr, altptr, alt->alt_len); } } diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h index 7226e2462584..cc6a81c00f2f 100644 --- a/arch/riscv/include/asm/alternative-macros.h +++ b/arch/riscv/include/asm/alternative-macros.h @@ -7,11 +7,11 @@ #ifdef __ASSEMBLY__ .macro ALT_ENTRY oldptr newptr vendor_id errata_id new_len - RISCV_PTR \oldptr - RISCV_PTR \newptr - REG_ASM \vendor_id - REG_ASM \new_len - .word \errata_id + .4byte \oldptr - . + .4byte \newptr - . + .2byte \vendor_id + .2byte \new_len + .4byte \errata_id .endm .macro ALT_NEW_CONTENT vendor_id, errata_id, enable = 1, new_c : vararg @@ -59,11 +59,11 @@ #include #define ALT_ENTRY(oldptr, newptr, vendor_id, errata_id, newlen) \ - RISCV_PTR " " oldptr "\n" \ - RISCV_PTR " " newptr "\n" \ - REG_ASM " " vendor_id "\n" \ - REG_ASM " " newlen "\n" \ - ".word " errata_id "\n" + ".4byte ((" oldptr ") - .) \n" \ + ".4byte ((" newptr ") - .) \n" \ + ".2byte " vendor_id "\n" \ + ".2byte " newlen "\n" \ + ".4byte " errata_id "\n" #define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \ ".if " __stringify(enable) " == 1\n" \ diff --git a/arch/riscv/include/asm/alternative.h b/arch/riscv/include/asm/alternative.h index 1bd4027d34ca..b8648d4f2ac1 100644 --- a/arch/riscv/include/asm/alternative.h +++ b/arch/riscv/include/asm/alternative.h @@ -23,6 +23,11 @@ #define RISCV_ALTERNATIVES_MODULE 1 /* alternatives applied during module-init */ #define RISCV_ALTERNATIVES_EARLY_BOOT 2 /* alternatives applied before mmu start */ +/* add the relative offset to the address of the offset to get the absolute address */ +#define __ALT_PTR(a, f) ((void *)&(a)->f + (a)->f) +#define ALT_OLD_PTR(a) __ALT_PTR(a, old_offset) +#define ALT_ALT_PTR(a) __ALT_PTR(a, alt_offset) + void __init apply_boot_alternatives(void); void __init apply_early_boot_alternatives(void); void apply_module_alternatives(void *start, size_t length); @@ -31,12 +36,12 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len, int patch_offset); struct alt_entry { - void *old_ptr; /* address of original instruciton or data */ - void *alt_ptr; /* address of replacement instruction or data */ - unsigned long vendor_id; /* cpu vendor id */ - unsigned long alt_len; /* The replacement size */ - unsigned int errata_id; /* The errata id */ -} __packed; + s32 old_offset; /* offset relative to original instruction or data */ + s32 alt_offset; /* offset relative to replacement instruction or data */ + u16 vendor_id; /* cpu vendor id */ + u16 alt_len; /* The replacement size */ + u32 errata_id; /* The errata id */ +}; struct errata_checkfunc_id { unsigned long vendor_id; diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 6193f401f0c5..18ea518f9e68 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -281,6 +281,7 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, unsigned int stage) { struct alt_entry *alt; + void *oldptr, *altptr; if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) return; @@ -297,9 +298,10 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, if (!__riscv_isa_extension_available(NULL, alt->errata_id)) continue; - patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len); - riscv_alternative_fix_offsets(alt->old_ptr, alt->alt_len, - alt->old_ptr - alt->alt_ptr); + oldptr = ALT_OLD_PTR(alt); + altptr = ALT_ALT_PTR(alt); + patch_text_nosync(oldptr, altptr, alt->alt_len); + riscv_alternative_fix_offsets(oldptr, alt->alt_len, oldptr - altptr); } } #endif From patchwork Sat Jan 28 17:28:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1439013wrn; Sat, 28 Jan 2023 09:42:38 -0800 (PST) X-Google-Smtp-Source: AK7set/satotYeQ2eSZhtdS5zpmeypLADKMNzJSHtiCbKwn/ssoZn2DHgGCziwg0KHA1Mfmxt1u+ X-Received: by 2002:a17:903:18c:b0:196:3088:5ddc with SMTP id z12-20020a170903018c00b0019630885ddcmr15878932plg.17.1674927758079; Sat, 28 Jan 2023 09:42:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927758; cv=none; d=google.com; s=arc-20160816; b=ZZEGNK8qnm46mSklW7RdAi87GnPoKaXhF4e9PJK6QejN+Sn+TJm6097LkwZfTbbIPq nwk+GBT7xUuzytx2uRlmCwXuAHM9YhBRYsAs3XgOzoQcJFQYxEVxm0sBy87U1BnUtJ6S UgKT5Ij6l/imkX6GlyDtmgWIPUSrKOFEj5YEgg/Wn7eLny1qLbJ/rMzLHrRQSiPgEAn2 snEeBdUjgP4sPembmXyIk0udEVwPKvLBln3IYGekOgS9GaiQe3UuJm9X6//ks/XPIe4/ QkeGYHS0A2izbGAhUa9w5YtSt50qb5s6fkzLRBCpuVgl+R0qWUedx7gQjOpT/XWpz6j4 YYgA== 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=lBVSSQeAYrW/qM32j+boY2l0EknZbBODM24BZx8gwfU=; b=elXfXmxdgczeOezfeVrM5D1DKj87Tx7RXNjMZV9CTPchpVGEuY07M5vO4sG+Un3D0z SvqLk4HdBDkQyBrJwZV+HbAEqjK/oQ5l1Ug71pdUyu+JWw8RBj90sHZR6Qq6tV3ZSCba lNhawBrR3we8y3lb6gkvbR4pWoRUD1L+YeFetGrE+SuJjTdFfbPqZnNu35UcUcaZh4YR 3p2vZq+eDwYg3nhepWQzvpPDsszHxDzEBKjrqRKNziRrv/xi1g+tSavp98eNHLZAS3YA X/aX/xlPSY5JJ3P0fHNncfKa961CV4HbAr47SFD8AZ4AzlGW61YNgwXF/Foq2YVS2fUD 08RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XJtR3mFH; 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 u64-20020a638543000000b004dac8ca24e4si7346287pgd.356.2023.01.28.09.42.26; Sat, 28 Jan 2023 09:42:38 -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=XJtR3mFH; 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 S234803AbjA1Rkm (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234872AbjA1Rkf (ORCPT ); Sat, 28 Jan 2023 12:40:35 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60B672BED6; Sat, 28 Jan 2023 09:39:57 -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 dfw.source.kernel.org (Postfix) with ESMTPS id AE0C160C39; Sat, 28 Jan 2023 17:39:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AEB3C433EF; Sat, 28 Jan 2023 17:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927593; bh=6Eu0jHWRD+88REC096NM3n9cVsx1NdyvP+EwuRbaOno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XJtR3mFHUnd6Nzjw7zzK2ULqOkpFgciNQYxaXhPOziEFL0Em4hdMdoKt/m9O8E8kp GLnLWWn5iuBPgP6ZSme34AR8+yKtPd0DD/ewhzATnaAqQR1AUQNz9DTYs9E6DR2c0Q qoPGG/pCgXypdQKfsuef2jiqQjujI4GHS60Boc0rjR4BWHwikX6nKNz2Irce/LkpFZ huhckckGlJ5OPmOVna3ihhUqOtqbl0ctb1zW33K5+68iOfvQosBVf/TjJ/N1kcBIXr pRLd91jagGirah6LKHAE7OFOEKc9SEjDaAzP4l+vocfaodv7SOK6A5FMVc7MxcEtT9 y3az2hesgvK0A== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v5 10/13] riscv: alternative: patch alternatives in the vDSO Date: Sun, 29 Jan 2023 01:28:53 +0800 Message-Id: <20230128172856.3814-11-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> 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?1756289048991054027?= X-GMAIL-MSGID: =?utf-8?q?1756289048991054027?= Make it possible to use alternatives in the vDSO, so that better implementations can be used if possible. Signed-off-by: Jisheng Zhang Reviewed-by: Guo Ren Reviewed-by: Andrew Jones --- arch/riscv/include/asm/vdso.h | 4 ++++ arch/riscv/kernel/alternative.c | 29 +++++++++++++++++++++++++++++ arch/riscv/kernel/vdso.c | 5 ----- arch/riscv/kernel/vdso/vdso.lds.S | 7 +++++++ 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h index a7644f46d0e5..f891478829a5 100644 --- a/arch/riscv/include/asm/vdso.h +++ b/arch/riscv/include/asm/vdso.h @@ -28,8 +28,12 @@ #define COMPAT_VDSO_SYMBOL(base, name) \ (void __user *)((unsigned long)(base) + compat__vdso_##name##_offset) +extern char compat_vdso_start[], compat_vdso_end[]; + #endif /* CONFIG_COMPAT */ +extern char vdso_start[], vdso_end[]; + #endif /* !__ASSEMBLY__ */ #endif /* CONFIG_MMU */ diff --git a/arch/riscv/kernel/alternative.c b/arch/riscv/kernel/alternative.c index 3d4f1f32c7f6..fc341b69bf62 100644 --- a/arch/riscv/kernel/alternative.c +++ b/arch/riscv/kernel/alternative.c @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -160,6 +162,31 @@ static void __init_or_module _apply_alternatives(struct alt_entry *begin, stage); } +#ifdef CONFIG_MMU +static void __init apply_vdso_alternatives(void) +{ + const Elf_Ehdr *hdr; + const Elf_Shdr *shdr; + const Elf_Shdr *alt; + struct alt_entry *begin, *end; + + hdr = (Elf_Ehdr *)vdso_start; + shdr = (void *)hdr + hdr->e_shoff; + alt = find_section(hdr, shdr, ".alternative"); + if (!alt) + return; + + begin = (void *)hdr + alt->sh_offset, + end = (void *)hdr + alt->sh_offset + alt->sh_size, + + _apply_alternatives((struct alt_entry *)begin, + (struct alt_entry *)end, + RISCV_ALTERNATIVES_BOOT); +} +#else +static void __init apply_vdso_alternatives(void) { } +#endif + void __init apply_boot_alternatives(void) { /* If called on non-boot cpu things could go wrong */ @@ -168,6 +195,8 @@ void __init apply_boot_alternatives(void) _apply_alternatives((struct alt_entry *)__alt_start, (struct alt_entry *)__alt_end, RISCV_ALTERNATIVES_BOOT); + + apply_vdso_alternatives(); } /* diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index e410275918ac..4e631c098f4d 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -22,11 +22,6 @@ struct vdso_data { }; #endif -extern char vdso_start[], vdso_end[]; -#ifdef CONFIG_COMPAT -extern char compat_vdso_start[], compat_vdso_end[]; -#endif - enum vvar_pages { VVAR_DATA_PAGE_OFFSET, VVAR_TIMENS_PAGE_OFFSET, diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vdso.lds.S index 150b1a572e61..4a0606633290 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S @@ -40,6 +40,13 @@ SECTIONS . = 0x800; .text : { *(.text .text.*) } :text + . = ALIGN(4); + .alternative : { + __alt_start = .; + *(.alternative) + __alt_end = .; + } + .data : { *(.got.plt) *(.got) *(.data .data.* .gnu.linkonce.d.*) From patchwork Sat Jan 28 17:28:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438756wrn; Sat, 28 Jan 2023 09:41:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXtHlWzZ1vENF3pfHsYX9WUjeH8gT2C3q46HO7ZnEwYL9rO6gLtlRu6eFnfIDI5Zw93nAJqd X-Received: by 2002:a17:902:9009:b0:193:2d46:7c5f with SMTP id a9-20020a170902900900b001932d467c5fmr41092961plp.33.1674927715498; Sat, 28 Jan 2023 09:41:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927715; cv=none; d=google.com; s=arc-20160816; b=nZj/cZof7iHshpA0u7rM9BfJmsNIbyu/lTrQtSJOxCWpezSkLH7pwnFLrFysQwaANG C3eTaXHZsNc5DVBG8aKPBb6Bcv19FimqyH1lHd4RSKLNz0Z5x+4vMWCjUP+vCQevh6Ss vB8LhY8+WbDD+l5tW3tJdSuMi3ABONiKwZ9SlEKGiN8LNVTW4oKGf2r2ZEH58uosGjYX EJRcuogKSgB9OMSxWRPfh1MFcV6vuRK8Onaa7It2+wvFVKHGqXqRu1JVVkWOmYfRH9nF Yh3yTvn/sESPIv+Q9OFN7HKCiLYp/3qGGj6DqD1Nwk3Xi3FbjJv/Z6ysYrqGYIPPh9oY Yjpg== 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=lFz/KRjkijXC9iN3WExh7D+L6Y0+YBXVWQTLuoYUrOY=; b=WN0Pf7UgVJD7vjNEaJu0Yv0rYkW+zlQ3N8VzWBWPNH6HWR/KlRO9uQsbABWGpRzcUE G1DdASwHBCnaPVFbOIYckZld38YetdWG6jDmnJMmIPC9ujXxKjXVLdYjB/0zY2dJUQGz bGv2E2/bcZPDXwnsaA/w6yzzBJVD+Ae1rVYVHO/0SeBdxi0CshU336DOfbhUWhVk36ET 1jcBRO7t22hMZ0kxZUEXFEc5+nvea8OoTXzFwGVvIQYHg2FOx4dV5YNVGGNplWJDrYgA BK8+q3YGL0q3NdrvA270pG2TGBn9VbbluMSbHjUK0k4dDRBAqqQbLjXtUys6LXHmlxi/ 7z2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=or6Q1P3q; 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 w22-20020a170902a71600b00194b1c44205si7584721plq.523.2023.01.28.09.41.44; Sat, 28 Jan 2023 09:41:55 -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=or6Q1P3q; 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 S234935AbjA1Rkj (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234881AbjA1Rkg (ORCPT ); Sat, 28 Jan 2023 12:40:36 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBA6A2BEEF; Sat, 28 Jan 2023 09:39:58 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D7EC360C33; Sat, 28 Jan 2023 17:39:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93349C4339E; Sat, 28 Jan 2023 17:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927596; bh=s7J/q6ens2rvlMJbJ7trLTcT6RXo2JnK5jMkTSfRtMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=or6Q1P3qk1ryFUh6y0FImUlHZcfNXCDeY0rpPap7KVTCY2YjEI5DTFaw3nKtOE4cH tg6i1O2ma3ObRI6jH0W7/2azYCUb0Zzf6O24dHKXNszSqhNFUUjouRpYG1dP3HTOhh OTOg9ws0qfqJrtnaZa8PVgRITgwDuU1kPDBvwkIHjkRfq+aYt1qgntuq9OIEV4Nh6i 1QaLn13sJEbaWGPJHICadre4zBDftCNStlB1iNRx255xVmixR2mYYAhCHL+FTJz+II yd6QE44US6JUVA6jmsrWI0/zrQa09GFfhI/+4j477sRVjYAoBIesbPGKEH+sk+HHsQ CbAF2PWb+KwCA== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v5 11/13] riscv: cpu_relax: switch to riscv_has_extension_likely() Date: Sun, 29 Jan 2023 01:28:54 +0800 Message-Id: <20230128172856.3814-12-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> 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?1756289004293472831?= X-GMAIL-MSGID: =?utf-8?q?1756289004293472831?= Switch cpu_relax() from static branch to the new helper riscv_has_extension_likely() Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Heiko Stuebner Reviewed-by: Guo Ren Reviewed-by: Conor Dooley --- arch/riscv/include/asm/vdso/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/vdso/processor.h b/arch/riscv/include/asm/vdso/processor.h index fa70cfe507aa..edf0e25e43d1 100644 --- a/arch/riscv/include/asm/vdso/processor.h +++ b/arch/riscv/include/asm/vdso/processor.h @@ -10,7 +10,7 @@ static inline void cpu_relax(void) { - if (!static_branch_likely(&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_ZIHINTPAUSE])) { + if (!riscv_has_extension_likely(RISCV_ISA_EXT_ZIHINTPAUSE)) { #ifdef __riscv_muldiv int dummy; /* In lieu of a halt instruction, induce a long-latency stall. */ From patchwork Sat Jan 28 17:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1438740wrn; Sat, 28 Jan 2023 09:41:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsv38ob0lizAmJwRDnJ8HhocwQ9g8jgGq+sIRG0qswBVKCYCEkPEYE84mcx8N7mwLXnscyV X-Received: by 2002:a17:902:a70f:b0:18f:ac9f:2a02 with SMTP id w15-20020a170902a70f00b0018fac9f2a02mr38680196plq.10.1674927713096; Sat, 28 Jan 2023 09:41:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927713; cv=none; d=google.com; s=arc-20160816; b=xxq4sDovKgWbGyk6JOoVA1Sr2dCHLCAt9dth6kRtKScIJ1D1rZxZ02a3Pz6xek0IxV PRTXKdRVBAhFUzuyJx7/E/2MnqJjJZIpdXKwuCF7thRBgJBhYpiRYreMWOh9qLgoxujx j0jKhB2AhXVqN7m4QcVu0WuRlJb719rimBsDq8aDuMc2bMbmLba2NDNNF2yrcb8OgK9Y oRGXCHmyKEaQIoyKyTwxmyGyzLcZPdESqx4eZGhOZ11AaZ99PwsNc+qmcmhMIWf+R9uA CwnkIiXsmnVKnsow0skjthWO+r6MLUDoSBq4emeqUGQ81Aumgxv4XOb34surBLEOZMQT 8vNA== 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=m1NzZeQ02C/HqBSR4tPDf6VPSq4MgT+DBF/Aquu5ib0=; b=HfJ1Vy5O0H6+xoRinh+GBp3paH2sV8vbwuv1dPgD3RpwMjRRbyZ5XvMNkix5qKl7ER qkK/WEKOgrNn/nbCzws1AfJ0Ekhf40EdYA/CT0YODqM1k2ysAgknht9X/0GfHGgBhQgD hHy9VrVHxwscsG/sWonxVLhncD0EexN9fm3e6R/U8x90btpTAsx6GLH4+nA2xKwIkMzj 3LtgmThv+LnBFrwAoehBnN07TESQ0B1c+P8uoIhdlFgBjLK/Sjxhv6V/sHHC8MI9ss6M gy+M+1kUctojxY+6+ntip75QEV5neBkguda9MPQWcenRDpjW0DEWrq4+N4Vnuo9YzvR/ vYqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z+0DG6iM; 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 y7-20020a170902864700b00188ef2314acsi7727448plt.527.2023.01.28.09.41.41; Sat, 28 Jan 2023 09:41:53 -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=Z+0DG6iM; 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 S235017AbjA1Rku (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234897AbjA1Rkg (ORCPT ); Sat, 28 Jan 2023 12:40:36 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 730B52C64A; Sat, 28 Jan 2023 09:40:00 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 0F35A60C3D; Sat, 28 Jan 2023 17:40:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBECCC4339B; Sat, 28 Jan 2023 17:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927599; bh=KzJQY36H8UTRdV4GA4A94Tvlfy8MJf2bQK7pvin0bDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z+0DG6iMUNd/aSmKM3xHy7dAo/bKB3CVzLXFN3QjB/TYRPjxzcStllfQrOorWTdZJ ToqptEGflygaNaZSkU3wJp8JTh+PDzdo+gqCShT1ppZul7j8xcghsFjwkhbqIvDAi+ jHLmm4EBtDmQgzdJmJimFkuRJMWf5rRgeMn5ylir11CPQa94F9vApetIInxmZnHli5 DoB3+FckRyOSNezDo0qWlex10Oym97tbCNrdMTVL+aan269VJ+uGJvFmJf5M3mXtU9 Y6unIz2hyFURp2zxYICWWwg66f7t6ydh5HMYaN1VEwHP7wEL3shcGdaioLZ2jleD5G 5Jt0aZWrdkLtA== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v5 12/13] riscv: KVM: Switch has_svinval() to riscv_has_extension_unlikely() Date: Sun, 29 Jan 2023 01:28:55 +0800 Message-Id: <20230128172856.3814-13-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756289001796018133?= X-GMAIL-MSGID: =?utf-8?q?1756289001796018133?= From: Andrew Jones Switch has_svinval() from static branch to the new helper riscv_has_extension_unlikely(). Signed-off-by: Andrew Jones Reviewed-by: Guo Ren Acked-by: Anup Patel --- arch/riscv/kvm/tlb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/riscv/kvm/tlb.c b/arch/riscv/kvm/tlb.c index 309d79b3e5cd..aa3da18ad873 100644 --- a/arch/riscv/kvm/tlb.c +++ b/arch/riscv/kvm/tlb.c @@ -15,8 +15,7 @@ #include #include -#define has_svinval() \ - static_branch_unlikely(&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_SVINVAL]) +#define has_svinval() riscv_has_extension_unlikely(RISCV_ISA_EXT_SVINVAL) void kvm_riscv_local_hfence_gvma_vmid_gpa(unsigned long vmid, gpa_t gpa, gpa_t gpsz, From patchwork Sat Jan 28 17:28:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 49891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1439114wrn; Sat, 28 Jan 2023 09:42:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXupWEwHXJXSeuEkNryVJ8o57a/TY+7CDDbp2WDmfdxVnW54fMk5ldoJm5zFSZ0lQ8vpb9XI X-Received: by 2002:a17:90b:3eca:b0:229:f4cd:1e03 with SMTP id rm10-20020a17090b3eca00b00229f4cd1e03mr35099025pjb.22.1674927776495; Sat, 28 Jan 2023 09:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674927776; cv=none; d=google.com; s=arc-20160816; b=srxt4k5+WLk485UtdCLel75db0DNuwwOw/dTd3t9egd69kkPL+nFh7KK3IqpPgQ6IC yiGXHOaJWp9Cfgm+zZ4GzN5RQkPC260pikWlm7GOaml7m1Db9JaM7iozms8jKg5LPGfa Jf2wVW+nT3mU+D8/t87ScYqdWWa/w6+7o9WL06FUbhgKRW80CA/JofMe3h4WLVHK/J0Q mgklB4D330vdSDPoOneJdlZ7Gf2laLcFrlxts+eQX+AWkAA0wbxo6tZtRTljz+lg8ZKl vYE52fI5/lyCIdVXcG6JCl9INnCtslJTLMqPjK22POZPY7Fs6q1kPdk0Qp5ZqyOOW3GI nnCA== 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=oV/RPx6Cl+jug0ze57HdDI2JcMpuwNlKo7M+EjhUQXM=; b=I8csXgmSGmOAWuxTPxBf6mpV/yEB3HUf97C3yr4YQQG2gdAVG8C07hBc0QZKbZC3cH SqjcZIhgJe+Rk989szr+MxsRJn1OhBg7lJWwr5shDXNUfxqL/VQkijbWN07gYNetwdG8 ZFr3bcbolB6IpMUQC7S/ykugJVkkWbH/Z2fz5Fvddo3P2ag9uEg5AuppvUL/oxUjbe1V aJvtR+6PrIoude2e1HcJyfSVCi6rbhXFnxpA+tH5cqnumiNGw7Y0+2HQZpiwh53kgqxW M5xNEtWWQkJixByduqVcAO8Gln6xEwJvPFOTlZR/5UH/9GfDSCyZe2zNhJQAGwKK30D6 ASvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qlBKhqtf; 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 30-20020a17090a199e00b0022c3e9115e3si6879338pji.172.2023.01.28.09.42.45; Sat, 28 Jan 2023 09:42:56 -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=qlBKhqtf; 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 S235079AbjA1Rk4 (ORCPT + 99 others); Sat, 28 Jan 2023 12:40:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234936AbjA1Rkj (ORCPT ); Sat, 28 Jan 2023 12:40:39 -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 BE5432C67F; Sat, 28 Jan 2023 09:40:13 -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 E9474B80B87; Sat, 28 Jan 2023 17:40:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4C84C4339C; Sat, 28 Jan 2023 17:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927602; bh=v9v2YuI2MYmPy9J7ATNdpGXQZhVb8633CvAOR8a31S8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlBKhqtf5QnrY9lDWy5hF/HXhdnsfuUqtlThv0vc6GDpSPGkMqzvCvhDNxY6VtUbS 9wnz1v/qzkfH/fhAeH+PRTrxlcz5ciscoVSlfPAo5cJJR3ygyitX7JCdum7FAoZMVI sL4i7gFhHUMoxePKr7X7/0NFRKJVcY0ApHh+xz3g3vfWMYNBcBRzo3L8v7iUsY/zhZ RevokyFvxg76211KfiYLfIugOZSCxARqNlIXvMvzJW6WDhck9Iju2UXjsZ+usl8Chl 5LeGbGBS0KEerO0qpLjg44HLa27lPslYi5DfO7jaAxKcQRdckISqx+tJkMvZOK13xi WPK8g4UPR/rvQ== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v5 13/13] riscv: remove riscv_isa_ext_keys[] array and related usage Date: Sun, 29 Jan 2023 01:28:56 +0800 Message-Id: <20230128172856.3814-14-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230128172856.3814-1-jszhang@kernel.org> References: <20230128172856.3814-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756289068351680635?= X-GMAIL-MSGID: =?utf-8?q?1756289068351680635?= All users have switched to riscv_has_extension_*, remove unused definitions, vars and related setting code. Signed-off-by: Jisheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Heiko Stuebner Reviewed-by: Conor Dooley Reviewed-by: Guo Ren --- arch/riscv/include/asm/hwcap.h | 32 -------------------------------- arch/riscv/kernel/cpufeature.c | 9 --------- 2 files changed, 41 deletions(-) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 411ef0fb5c4b..7936ae6f7bdf 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -61,20 +61,6 @@ enum { extern unsigned long elf_hwcap; - -/* - * This enum represents the logical ID for each RISC-V ISA extension static - * keys. We can use static key to optimize code path if some ISA extensions - * are available. - * Entries are sorted alphabetically. - */ -enum riscv_isa_ext_key { - RISCV_ISA_EXT_KEY_FPU, /* For 'F' and 'D' */ - RISCV_ISA_EXT_KEY_SVINVAL, - RISCV_ISA_EXT_KEY_ZIHINTPAUSE, - RISCV_ISA_EXT_KEY_MAX, -}; - struct riscv_isa_ext_data { /* Name of the extension displayed to userspace via /proc/cpuinfo */ char uprop[RISCV_ISA_EXT_NAME_LEN_MAX]; @@ -82,24 +68,6 @@ struct riscv_isa_ext_data { unsigned int isa_ext_id; }; -extern struct static_key_false riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_MAX]; - -static __always_inline int riscv_isa_ext2key(int num) -{ - switch (num) { - case RISCV_ISA_EXT_f: - return RISCV_ISA_EXT_KEY_FPU; - case RISCV_ISA_EXT_d: - return RISCV_ISA_EXT_KEY_FPU; - case RISCV_ISA_EXT_SVINVAL: - return RISCV_ISA_EXT_KEY_SVINVAL; - case RISCV_ISA_EXT_ZIHINTPAUSE: - return RISCV_ISA_EXT_KEY_ZIHINTPAUSE; - default: - return -EINVAL; - } -} - static __always_inline bool riscv_has_extension_likely(const unsigned long ext) { diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 18ea518f9e68..a4f737bc7530 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -29,9 +29,6 @@ unsigned long elf_hwcap __read_mostly; /* Host ISA bitmap */ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; -DEFINE_STATIC_KEY_ARRAY_FALSE(riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX); -EXPORT_SYMBOL(riscv_isa_ext_keys); - /** * riscv_isa_extension_base() - Get base extension word * @@ -267,12 +264,6 @@ void __init riscv_fill_hwcap(void) if (elf_hwcap & BIT_MASK(i)) print_str[j++] = (char)('a' + i); pr_info("riscv: ELF capabilities %s\n", print_str); - - for_each_set_bit(i, riscv_isa, RISCV_ISA_EXT_MAX) { - j = riscv_isa_ext2key(i); - if (j >= 0) - static_branch_enable(&riscv_isa_ext_keys[j]); - } } #ifdef CONFIG_RISCV_ALTERNATIVE