From patchwork Fri Sep 15 08:26:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong-Xuan Wang X-Patchwork-Id: 140522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1154188vqi; Fri, 15 Sep 2023 09:05:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJnMetZN/qNmR9eqhYvVAC5fl9/fIx9ZCbFVZLbjbM/0fDiOiyhsy7NaU2ldouCAYxBc9y X-Received: by 2002:a17:90b:890:b0:274:7de7:d6fa with SMTP id bj16-20020a17090b089000b002747de7d6famr1961707pjb.9.1694793939386; Fri, 15 Sep 2023 09:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694793939; cv=none; d=google.com; s=arc-20160816; b=Z+i5kRTuEjtuz/V+o24Y7Dhget+FGMQp2qIPr/+kjxn8YVD2QGmx18BMIWBmFZa5I/ 1weMnz0H8HXvQIsW0dHbYe9U+msoBT9VjwhITGz9xN2kbWRrqSRLymehTEWLiuUaMz/Y cUugkvQnmR5bCt8VtCry7Z+ndVSN8z2XewuryUe0MvhWxFo7yYZcwOjseLx6sE7wmOjx SdxdbapzXl66+AGHr/B1D0rK+jyWZsaoEYT+CZbcsNAPD62OIM6Pj3zQ5TQAcpwE1aEQ bqS07gCAOQHVPcwERchHqbaqdBwPPM8yfMS7ufnF8ODAQZNRtf6bEKnXoPXl2PlVFEyE v/bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=vCzI3E8aO188t/F32/cMXTqfHUINrJvH0Tp5qCpKPJc=; fh=ejC2l+bOB1t4KQQR905tsfe+1gEIJ7QXA0l0V+UOAq0=; b=V3Vnc8xbrq5nHpLTk83LvC7j0b+QqIj9BOVEoabqtxDRP6Eu6mXGbJKgYpnqdhbUB/ aRILkL/i4IRySNP18QnXT+NED4hNKRLNSzdsVWyewNEt0IzzgmlSaJmVreKxkBmESvXX 5MTgIbQq77nHpmFwi7G/c6LiPL5UPeQ/e0oxOanKFtonP02DvNYSksZswk4Xf1eNcPCp dyD/wbam0rYSOhLR0ixgnKlnIjmPk4BNKpAuM25GHmPauJW7EOtxysyWM9yKyoC1g/ag MgcxfgJQHwfVQfrjkGqLagSF0f/wEb+C/FoTre2SPdjF+w+M8C4+Q8JOqdGIwQDtzu5J gk3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=RnH9JHz2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id l22-20020a656816000000b0056969e398fcsi3457941pgt.862.2023.09.15.09.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:05:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=RnH9JHz2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id B7F4D82CDF4D; Fri, 15 Sep 2023 01:28:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233116AbjIOI20 (ORCPT + 32 others); Fri, 15 Sep 2023 04:28:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233282AbjIOI2J (ORCPT ); Fri, 15 Sep 2023 04:28:09 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3CB930DB for ; Fri, 15 Sep 2023 01:27:23 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1c1ff5b741cso17185425ad.2 for ; Fri, 15 Sep 2023 01:27:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1694766443; x=1695371243; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=vCzI3E8aO188t/F32/cMXTqfHUINrJvH0Tp5qCpKPJc=; b=RnH9JHz283ZLJuYD7ZhBVFWdfOoi++hgmVADdJMIxV5KzeRtPWg/XZG7HdZcrEVy/f B6lRJK1W2bqTQ+GkbXUq7vYOjMpbQg7v1z28MORLOuD1aySToktuGpTNC5G2u7hIfk4R 0Qv+D0HUuz7T3+cba1wm/SSb0oB6SUm9KCP00C5MAzxbWEkMNXuRiG1HzTeq34mltysg A99HEHQZqfoau7pvL7et5jdj7aCpzkBQpUm73B7VYJjIh/5jA0Sihc7qKYpNip4mDP6Z 7pdcden5gWRB7lq4V6ZW8q5li4rU11VMIM5t3y/yxRekXQ2dEASmsaov0fVG8h69gbLE ydtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694766443; x=1695371243; h=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=vCzI3E8aO188t/F32/cMXTqfHUINrJvH0Tp5qCpKPJc=; b=tZjZEGrYbkl5loiB5+zc50v8MTHmP3qi7Mym2XtPA12wYMX3gB+pfVdmLwGbAPyLje QvMAG4cf71GNOqH5eh0sQXZ2PJsxS0CbVfTMg9aR10UGKPFAfbWvGMJRMYlPTAVEvo2w /v4tRbDA5ceQJs9BY9H+VTwp6J2IfVjxf8D9pgVSN1eZoUZz6aOHDgYUZsL5Oo8OBNXS rNVhskT4s9o5wQLwny+aNxJUcBMjzifNRbJt2XzJvG5JpdKP1bBcjmee35jybcgKLLuf jl6c5qNm63dlvOTGtLyjebajC0375oIRO5kWwCF7iluClAZGQpUUABTLd5ozMNfV9JS3 /ZvA== X-Gm-Message-State: AOJu0YyAPzHWUtfVuNZplDRS/xvUxR86BFj3G519zJTtFIssoirwLsCE 4HvSYCdxH4laPnVKM7FYew89xQ== X-Received: by 2002:a17:902:6848:b0:1c0:e091:6a08 with SMTP id f8-20020a170902684800b001c0e0916a08mr847355pln.69.1694766443167; Fri, 15 Sep 2023 01:27:23 -0700 (PDT) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id f4-20020a170902ab8400b001c0af36dd64sm2912806plr.162.2023.09.15.01.27.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 01:27:22 -0700 (PDT) From: Yong-Xuan Wang To: linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org Cc: greentime.hu@sifive.com, vincent.chen@sifive.com, tjytimi@163.com, alex@ghiti.fr, Yong-Xuan Wang , Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] RISC-V: KVM: Add Svadu Extension Support for Guest/VM Date: Fri, 15 Sep 2023 08:26:58 +0000 Message-Id: <20230915082701.3643-3-yongxuan.wang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230915082701.3643-1-yongxuan.wang@sifive.com> References: <20230915082701.3643-1-yongxuan.wang@sifive.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 15 Sep 2023 01:28:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777120249636971330 X-GMAIL-MSGID: 1777120249636971330 We extend the KVM ISA extension ONE_REG interface to allow VMM tools to detect and enable Svadu extension for Guest/VM. Also set the HADE bit in henvcfg CSR if Svadu extension is available for Guest/VM. Signed-off-by: Yong-Xuan Wang --- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu.c | 3 +++ arch/riscv/kvm/vcpu_onereg.c | 1 + 3 files changed, 5 insertions(+) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index 992c5e407104..3c7a6c762d0f 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -131,6 +131,7 @@ enum KVM_RISCV_ISA_EXT_ID { KVM_RISCV_ISA_EXT_ZICSR, KVM_RISCV_ISA_EXT_ZIFENCEI, KVM_RISCV_ISA_EXT_ZIHPM, + KVM_RISCV_ISA_EXT_SVADU, KVM_RISCV_ISA_EXT_MAX, }; diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 82229db1ce73..91b92a1f4e33 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -487,6 +487,9 @@ static void kvm_riscv_vcpu_update_config(const unsigned long *isa) if (riscv_isa_extension_available(isa, ZICBOZ)) henvcfg |= ENVCFG_CBZE; + if (riscv_isa_extension_available(isa, SVADU)) + henvcfg |= ENVCFG_HADE; + csr_write(CSR_HENVCFG, henvcfg); #ifdef CONFIG_32BIT csr_write(CSR_HENVCFGH, henvcfg >> 32); diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c index 1b7e9fa265cb..211915dad677 100644 --- a/arch/riscv/kvm/vcpu_onereg.c +++ b/arch/riscv/kvm/vcpu_onereg.c @@ -36,6 +36,7 @@ static const unsigned long kvm_isa_ext_arr[] = { /* Multi letter extensions (alphabetically sorted) */ KVM_ISA_EXT_ARR(SSAIA), KVM_ISA_EXT_ARR(SSTC), + KVM_ISA_EXT_ARR(SVADU), KVM_ISA_EXT_ARR(SVINVAL), KVM_ISA_EXT_ARR(SVNAPOT), KVM_ISA_EXT_ARR(SVPBMT),