From patchwork Sun Jan 15 15:49: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: 43872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp801979wrn; Sun, 15 Jan 2023 08:05:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXvg6OIcqyBh+YQKU/u0908VcVYEwI8k51hOFVszZaUUuh1GMXf2CyUuMX+ZHZ8anb4Yf/6q X-Received: by 2002:a17:907:c11:b0:844:79b1:ab36 with SMTP id ga17-20020a1709070c1100b0084479b1ab36mr13540971ejc.25.1673798731156; Sun, 15 Jan 2023 08:05:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673798731; cv=none; d=google.com; s=arc-20160816; b=YKmxDFDpLBDnE/vuFBmTj+vgS6fpx3FcMsWYbmcHCw4zWx4lnlQQlISkDQP5fakA4H o2Het8+1s4N9XZat7h+rTrfQTZy7Sd1bYjWcrFJimuf/+T5zxZhpMzIVln2lQVJksgqv bg86ETIq7mJ8S81DEKuB+4+3U1C1k+48kioWqUGItwoZzBYvIpzmW7SncVAH5yNtXbkM vl4s43NNYpydkKddUt27rXipC5up6dTACzMf6fq1zWtO2nd0gc8jmiEA6H3R+zp0EUtS kmVrksF0i3diL4+ai4OcAZeNx+vZC4Nu49HQypGvRGLV/U6+HR5Cu4w6Ruuaoldm0L6x U02Q== 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=71tniFPbKqGIsTxWv1hQIHxzzx/z+pgP7TynAXCuppk=; b=H0Bi3m6B2vHuU2zUywpQrlX7gS1QkZ4l2UDIF91FevlTsZtplBxKOhl4crnrwQGBf9 F6ca5hUSSdr3AVAeYq6YEJ6MyoEanUyDPsgC1cgUH0v/QqWx3CCU5uZMeE/z8kcUoaEA ubJSqDIlqywXwskdspu0msg2G9WRlcR8qM3PNnc2/rXX3gcodvzMmcCKQoe3DiroabB8 XEmMAwPVspsYJNIX14ceJPLirzm5w3L5FAE8POVCSbapb6fx3gexCQAVXh10r85FeoAq baZ8OGR22adMyj5A/5zmuhikHZ0wsyFWMjNI7ebZQlYFDC4yBI+AxvSX+2/8JQ3QDq1f 3Y0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YFsX2798; 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 cs14-20020a170906dc8e00b00863bde89120si12548894ejc.128.2023.01.15.08.05.07; Sun, 15 Jan 2023 08:05:31 -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=YFsX2798; 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 S231655AbjAOQDV (ORCPT + 99 others); Sun, 15 Jan 2023 11:03:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231638AbjAOQCt (ORCPT ); Sun, 15 Jan 2023 11:02:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC4B4113D9; Sun, 15 Jan 2023 08:01:10 -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 BB75A60DB4; Sun, 15 Jan 2023 16:00:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 734EEC433F2; Sun, 15 Jan 2023 16:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673798450; bh=iakCU13SXpMb3pcvjfiiLXGeB5RnCPEYfg/spzK7YxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YFsX2798RH2/WfNI9HHQCYXHNW1bUf1ArkkBSr69Rr2lJJvWGOiPDtVLiO1odYcFI FiRlgOJJT+O3oSBPJ0I6r1UGoc11hDm4rE0KR/E09DmoKqrEr431OKEhw7gc7TdqLE I+8EUgZEsz+2n/Fy1K+47j4wdpGdf3R3GIGQcEBmI5mUSKnqgll3HNaoritJ2htdTs smqYlOT8WyotGQQDOC0I95gTulbUA63Tybo2OrIMd/dmjJdqTay9YPa5H9wwI5sTOe J4BBsV4XlnNSpCaPkijrjtGIrRyaXWOcNa4JZ4p8HZggjQr6u7OvDiW90QeLe2aCur CqHDyLBzZgEcA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Conor Dooley , Andrew Jones Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v4 12/13] riscv: KVM: Switch has_svinval() to riscv_has_extension_unlikely() Date: Sun, 15 Jan 2023 23:49:52 +0800 Message-Id: <20230115154953.831-13-jszhang@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230115154953.831-1-jszhang@kernel.org> References: <20230115154953.831-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?1755105177979359273?= X-GMAIL-MSGID: =?utf-8?q?1755105177979359273?= 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,