From patchwork Sun Dec 4 17:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 29439 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1891743wrr; Sun, 4 Dec 2022 10:13:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf77+axoGxv2dhUN4NjlD/LsSSySUtf/taVg/A9eqgcoFMSfm9Y0ceTe5oeaZ0I3GsXV1jNj X-Received: by 2002:a05:6402:120c:b0:46b:86:20b5 with SMTP id c12-20020a056402120c00b0046b008620b5mr31957352edw.130.1670177630225; Sun, 04 Dec 2022 10:13:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670177630; cv=none; d=google.com; s=arc-20160816; b=aR05ei3++EwSVgaHHrOZB6Y9n1+NKTCakX/jJPh9HCI6vR7XLrx1RJ4u0MWfG52JCx +MBLeIjv4n6yXWd4mayWBuEzMBupZD3YNmGMRr6Hayig1GYELNTnGqn92QrWFOv5nWpi PYnAsNUYhMwnn8V6D2JiYg2dshEPUpXOFUa1foIvf66WUPBwOuIoo9g/TtrImi48fYRZ nDQULFXWk2pekPHqeaJs9DxiO0wU5rc97tm3pdEmRrjX1YCuMAK5SD8Rprw0lEUq5AV4 ZtuDTs0XV/lZ2Cc2aC2dz5JcsEFFDouu0YRa8oxLY4JzGhHkFHncCbIXWpQ0tkL5IV50 d4Fw== 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=yHZrslWsyfg1imj+v2YmkrITiWwQiTlssU3WLMsr4jA=; b=Hoo5mkkv0d29kRKLFnPLZDiSZEJi41eslANqnPQbo8hbEgSTFgJN5j3n39uJY+Lpu9 R9XISXcPbqwPVhRjtGnw4eJzAMFJOuXEu8JdWQLSJdp4v0nv4WYxdv2hFVaDTkvWPAvh RX6mki3rf9yiAGIbGjlbZxzKJ40wPan1zSz3kIstakT8gbnUhWLP+aRsMRUMkmx3b/aW qzlKAxeg30q3/H6kilAZxKukCQxHDQj3aPAhAhDyyiaaAPgkj9yKjJsJ+auZrkS4S9VX g8SVUrPDMzqYklONFNCb4nLJxtkNPy1fJfYXWjGMSdLnz+Hs2574nF7rE1I6cPWcIQv3 ozUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Qei5qnSY; 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 ss28-20020a170907c01c00b007adc8c49d83si8612123ejc.477.2022.12.04.10.13.27; Sun, 04 Dec 2022 10:13: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=Qei5qnSY; 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 S230455AbiLDR5p (ORCPT + 99 others); Sun, 4 Dec 2022 12:57:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230375AbiLDR5F (ORCPT ); Sun, 4 Dec 2022 12:57:05 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE405140CD; Sun, 4 Dec 2022 09:57:04 -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 5BC90B80A3A; Sun, 4 Dec 2022 17:57:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B88B1C433C1; Sun, 4 Dec 2022 17:56:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670176622; bh=qOV0A82uSGScKXzZE+xjnxD5QH+BqBXG94TMk6hBrFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qei5qnSYgp6jPx00+NjGmGdMA6LmMOzfkJZVAhQBA6SEjChCX79an5V3M4Qg0XoRp Z9xlnjgoQtJUBG1+40BwZEpfPZXNNjPwYBJ4D+O15zsvUMxu7k/Vavi0Tclyl5nwgz GIyj9w3Z+PYgDxyI0EdlF37fjD6YaceD01cn7psahs+S1ZfFv/BoNz0ymKyK4kw6pQ gc5441t5xL4/IRdmOWgBHOt3Lq6fOlujQrg7Ye4kVAvPZ0fXxb3svKCHJTjP8cop7c 7awyHZNGbktkmIymvPtyRHLflRYdhmQQgazbjslMNcFml6ApxOsu8u352lOkVX0eVn Vm9y0yOx3EYeA== From: Jisheng Zhang To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Anup Patel , Atish Patra , Heiko Stuebner , Andrew Jones Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v2 12/13] riscv: KVM: Switch has_svinval() to riscv_has_extension_unlikely() Date: Mon, 5 Dec 2022 01:46:31 +0800 Message-Id: <20221204174632.3677-13-jszhang@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221204174632.3677-1-jszhang@kernel.org> References: <20221204174632.3677-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?1751308178974525758?= X-GMAIL-MSGID: =?utf-8?q?1751308178974525758?= 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 --- 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,