From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14C41C54EAA for ; Mon, 30 Jan 2023 12:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235858AbjA3MBm (ORCPT ); Mon, 30 Jan 2023 07:01:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235736AbjA3MBl (ORCPT ); Mon, 30 Jan 2023 07:01:41 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 987332709 for ; Mon, 30 Jan 2023 04:01:39 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id bg26so1967934wmb.0 for ; Mon, 30 Jan 2023 04:01:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LQSbWzdXITTUFGVPTFXHGgENmDgXWQs7cxb8n6vTRIg=; b=FBBCrHDLcZIwpZIFFr23Mw6NZdyt7URvQ6mOEb0h2FYiZsvQJgl3+AE4V4xyw+bTgf JQW1v9G41RZsd+wR61Fi7GA3ZzX8bdqHEFwOihptCL/FAWL7DfbzAFtX3t9lXFe6e69w 2tN7o5ouc0CU9252QUVHBHwoi2nXS2FHkd/fhsfBmehZU5ZPQyKgbj56O4e/rM/Lvib2 OH82e2PfnY8huMSX069AwLyR0Zwt2oV5MVY6RgPcTkSU1BCoJkB7zA/LLTtKgp38cuKP jGuTZhVZa3vYRH6KWPfyCGQ3lPh/ggl17vpBgCIHsCnxOZ9YK8H/Tec7qcjre5pSSbCh wGGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LQSbWzdXITTUFGVPTFXHGgENmDgXWQs7cxb8n6vTRIg=; b=r1NYYPs24Z17ZCbeCwSbntzJug8W1bpV47fxiNcA3LtA7IFJEbxsZ+dcbjwp6+piK4 5ZVnDEjFBKbYM3CDK0UC2Q9PzGQoiWW0WEnBD5dKl/BjO/SQ6YGjEYAdIEt8tsVXBI1y wBveCgHs2xD5G3oen98chwqVE4nIErkdm0+D0AHmSii2wJcQO0ct8BlSb+HeVPaKBnYt +v8u/kQltHD3KH5OPoBBVdCqGW/CUhKL0LKGD5LdBrdJeVvfHlnDmlyWFxolayOjUpQg ggTjbg7CppKEWe77Enw1ggk58tnxxIebsfeZ7IGY3GLSypUcO6gkc5jJtDiO2pWGxqM/ 48Mw== X-Gm-Message-State: AO0yUKU7pryT24hIpBghpRwXqNlrbMiP1FiYQ9IwHJp9XZxrVy2NiFDV vKAiIEacs6lznvhcNXkDTgaD5Q== X-Google-Smtp-Source: AK7set+vlIXaacxs8ZtFvZu5Wuo3OckV4hDJBqZ0iP3d/rZxsjNJoGharDe6eDWMLFzJIvp9qqkgaQ== X-Received: by 2002:a05:600c:3ca3:b0:3dc:1687:9ba2 with SMTP id bg35-20020a05600c3ca300b003dc16879ba2mr22946325wmb.35.1675080098179; Mon, 30 Jan 2023 04:01:38 -0800 (PST) Received: from localhost (2001-1ae9-1c2-4c00-20f-c6b4-1e57-7965.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:20f:c6b4:1e57:7965]) by smtp.gmail.com with ESMTPSA id j6-20020a05600c42c600b003dc521f336esm5652568wme.14.2023.01.30.04.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 04:01:37 -0800 (PST) From: Andrew Jones To: linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: 'Heiko Stuebner ' , 'Krzysztof Kozlowski ' , 'Anup Patel ' , 'Palmer Dabbelt ' , 'Atish Patra ' , 'Paul Walmsley ' , 'Albert Ou ' , 'Conor Dooley ' , 'Rob Herring ' , 'Jisheng Zhang ' , Anup Patel Subject: [PATCH v3 6/6] RISC-V: KVM: Expose Zicboz to the guest Date: Mon, 30 Jan 2023 13:01:28 +0100 Message-Id: <20230130120128.1349464-7-ajones@ventanamicro.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130120128.1349464-1-ajones@ventanamicro.com> References: <20230130120128.1349464-1-ajones@ventanamicro.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Guests may use the cbo.zero instruction when the CPU has the Zicboz extension and the hypervisor sets henvcfg.CBZE. Add Zicboz support for KVM guests which may be enabled and disabled from KVM userspace using the ISA extension ONE_REG API. Signed-off-by: Andrew Jones Reviewed-by: Conor Dooley Reviewed-by: Anup Patel --- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index c1a1bb0fa91c..e44c1e90eaa7 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -106,6 +106,7 @@ enum KVM_RISCV_ISA_EXT_ID { KVM_RISCV_ISA_EXT_SVINVAL, KVM_RISCV_ISA_EXT_ZIHINTPAUSE, KVM_RISCV_ISA_EXT_ZICBOM, + KVM_RISCV_ISA_EXT_ZICBOZ, KVM_RISCV_ISA_EXT_MAX, }; diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index e5126cefbc87..198ee86cad38 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -63,6 +63,7 @@ static const unsigned long kvm_isa_ext_arr[] = { KVM_ISA_EXT_ARR(SVPBMT), KVM_ISA_EXT_ARR(ZIHINTPAUSE), KVM_ISA_EXT_ARR(ZICBOM), + KVM_ISA_EXT_ARR(ZICBOZ), }; static unsigned long kvm_riscv_vcpu_base2isa_ext(unsigned long base_ext) @@ -865,6 +866,9 @@ static void kvm_riscv_vcpu_update_config(const unsigned long *isa) if (riscv_isa_extension_available(isa, ZICBOM)) henvcfg |= (ENVCFG_CBIE | ENVCFG_CBCFE); + if (riscv_isa_extension_available(isa, ZICBOZ)) + henvcfg |= ENVCFG_CBZE; + csr_write(CSR_HENVCFG, henvcfg); #ifdef CONFIG_32BIT csr_write(CSR_HENVCFGH, henvcfg >> 32); -- 2.39.1