From patchwork Thu Apr 3 11:25:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 14037359 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63C93C3601B for ; Thu, 3 Apr 2025 11:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7JFnsE+4CTYQB4f4Re0xToxd/NH5J14kF+P5DVAiUTg=; b=I2mECLjRR1GECo lPqNP03GnOdc2JfQ3nHcaxBqffxT2wgDqYFw+qazkzOKedZiYwgFq/OVTKeN9bL/6ZHduAqWQfd7k YkawxzFdnjKzw2UXAmvoYEcHTWrarOvNY/hzVyR6UYeEhFV24/K4reNaklw839q4g/mwQA2DYCGld OKhkBFajABHQ+9ehDcdlomjx2OBgkBJHNofMV2+z1erESgnviMeX/oIWgSrnPDpz6us8KvRmH5Fev TpHNnuyTsWBDqoZAcLleli/JnkUJwjvFc4+frJn2ocg644U3iDcYt/GVIc7MBwFcrYhPyfIvN2lLp zYejbUJLjq0JFZJhQf5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0ItD-00000008jSc-0ltp; Thu, 03 Apr 2025 11:37:43 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0Inu-00000008iSH-3iLW for linux-riscv@lists.infradead.org; Thu, 03 Apr 2025 11:32:16 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cf825f46bso734735e9.3 for ; Thu, 03 Apr 2025 04:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1743679933; x=1744284733; darn=lists.infradead.org; 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=WBJFdG3z/8VkLDYY4XL1oPtAwDow6ej1t0aXVg/kRKM=; b=AAyw2tVPqvFvGlKZdvzvF7zb86fc9q1PamjOVMCJtS5uccYwOEQntUxPrHm1VUwW53 d9Y7YsNq2vsx9PwqqjetBx+OwEylvn7RhBc3faQ0LObUfThqGODvxlnHicvPuEmGmuUY PHibHzjITS2EQvryndq8CbXPLUEpu2ckO4Y7l0PXpdCP7FYwxXqBvdxhB6z38gO05bIf 1twx4TlJJwA/GfVI3JD41isEGhxIDmuUEid9xuL2aEcsc8eYnqpMe0fRPZ+tuSZJUT1F Nmw5VaOprnmNO7/DdQi/Bgy54Hs5FLqQHVNfqKzJ5DUEWD+cXQQO6k57KU90VOrc77+q tHJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743679933; x=1744284733; 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=WBJFdG3z/8VkLDYY4XL1oPtAwDow6ej1t0aXVg/kRKM=; b=bWlKoT9uxXbgy3dj+OsjfJV3Nwevyk90txBBCljW3CxOr93HiNgRcC9YI1zXxYWM59 5XlIRqUfctw4E7OvPLrZ4sdWaffh91U0koU2L9xQ4mxlDIG0g4gGMQeN0GaeX/m2Bepk 5lrOhMqswNjVJt0MrXsvAudMeKQPBPm18Lsi+SuX+trqy3yDgJqX4rkVSzCIBt3AWMWY Y1htaY7zcMolXEu29dU3tZ4GY68uPQakJxoOEElL9Y0UD6xOdz9J5vFKNLxfNBLxm2a0 a1mVXKkbyMJmbUXnETfuwA/vo5Xo2dTZywaZDEi5Mxh8D69vNyPT4UM+OdxpAuuhocfQ EtZA== X-Forwarded-Encrypted: i=1; AJvYcCWADaPNNF+cBTTKcAF7ItRRIUJNlmGAwkONsBWi2dVlU4YaPOMgMDaLJQQ7JRRbLa69IdRz+khUBSjqgA==@lists.infradead.org X-Gm-Message-State: AOJu0Yw51W39yGykxjx/w04iCoIAZA3fKPVlWV1KLFhK2xGlYLWXjmQt Xcxx8UAEa8t8C2WGArYhXq/2sNwG4um2pfTfc9iSkPzaJr1fxyBGcqCDh6ht4L4= X-Gm-Gg: ASbGncvBULcuPT15Jo2EGflKQE3IU7YQ+DdIlwQyZjvzgYwpd75zJ1DMrb8apHKHgNt Q2wyGQPWFcR4FGgknLY+OhcVAVPMNG45nVAMeqR0zF/FI5+0oyZyAqfJKuBKWYQokBcGp0jczBX yS/yD3ecOjO/qodznqO+G1+vO87q3It/Rag8GjwjvngrbNVAAIjumVDTjD/AyMQzPVGFpnWr+fw IjkptrVU1C/dl+d2fxx5cm0uWw91qz2cZtKwNQrDujokJ4hE4lqB8EZzovgDy/8yt+XzaAUIYFm +z/TccXr08SnNoWquFegzu2LQ6IzbWYKA+pXgA9HBfHh+iSEOWEbZ/ZRxXd3O6aqmbNBSqcWevM nVQ== X-Google-Smtp-Source: AGHT+IEmT1nc0GRaKk4V5Lw6Y+h94knU+oKxuBtmIqWaoagUJp23E2laTFWN8HrLfDImIKVCRKrM7g== X-Received: by 2002:a05:600c:3510:b0:43b:c825:6cde with SMTP id 5b1f17b1804b1-43ea93540demr38321015e9.3.1743679933409; Thu, 03 Apr 2025 04:32:13 -0700 (PDT) Received: from localhost (cst2-173-141.cust.vodafone.cz. [31.30.173.141]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec3429f67sm16500145e9.7.2025.04.03.04.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 04:32:13 -0700 (PDT) From: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= To: kvm-riscv@lists.infradead.org Cc: kvm@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Andrew Jones , Mayuresh Chitale Subject: [PATCH 2/5] KVM: RISC-V: refactor sbi reset request Date: Thu, 3 Apr 2025 13:25:21 +0200 Message-ID: <20250403112522.1566629-5-rkrcmar@ventanamicro.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250403112522.1566629-3-rkrcmar@ventanamicro.com> References: <20250403112522.1566629-3-rkrcmar@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250403_043214_948677_7E7ED0DA X-CRM114-Status: GOOD ( 12.26 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The same code is used twice and SBI reset sets only two variables. Signed-off-by: Radim Krčmář --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 2 ++ arch/riscv/kvm/vcpu_sbi.c | 12 ++++++++++++ arch/riscv/kvm/vcpu_sbi_hsm.c | 13 +------------ arch/riscv/kvm/vcpu_sbi_system.c | 10 +--------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h index 4ed6203cdd30..aaaa81355276 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -55,6 +55,8 @@ void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run); void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, struct kvm_run *run, u32 type, u64 flags); +void kvm_riscv_vcpu_sbi_request_reset(struct kvm_vcpu *vcpu, + unsigned long pc, unsigned long a1); int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index d1c83a77735e..f58368f7df1d 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -156,6 +156,18 @@ void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu, run->exit_reason = KVM_EXIT_SYSTEM_EVENT; } +void kvm_riscv_vcpu_sbi_request_reset(struct kvm_vcpu *vcpu, + unsigned long pc, unsigned long a1) +{ + spin_lock(&vcpu->arch.reset_cntx_lock); + vcpu->arch.guest_reset_context.sepc = pc; + vcpu->arch.guest_reset_context.a0 = vcpu->vcpu_id; + vcpu->arch.guest_reset_context.a1 = a1; + spin_unlock(&vcpu->arch.reset_cntx_lock); + + kvm_make_request(KVM_REQ_VCPU_RESET, vcpu); +} + int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run) { struct kvm_cpu_context *cp = &vcpu->arch.guest_context; diff --git a/arch/riscv/kvm/vcpu_sbi_hsm.c b/arch/riscv/kvm/vcpu_sbi_hsm.c index 3070bb31745d..f26207f84bab 100644 --- a/arch/riscv/kvm/vcpu_sbi_hsm.c +++ b/arch/riscv/kvm/vcpu_sbi_hsm.c @@ -15,7 +15,6 @@ static int kvm_sbi_hsm_vcpu_start(struct kvm_vcpu *vcpu) { - struct kvm_cpu_context *reset_cntx; struct kvm_cpu_context *cp = &vcpu->arch.guest_context; struct kvm_vcpu *target_vcpu; unsigned long target_vcpuid = cp->a0; @@ -32,17 +31,7 @@ static int kvm_sbi_hsm_vcpu_start(struct kvm_vcpu *vcpu) goto out; } - spin_lock(&target_vcpu->arch.reset_cntx_lock); - reset_cntx = &target_vcpu->arch.guest_reset_context; - /* start address */ - reset_cntx->sepc = cp->a1; - /* target vcpu id to start */ - reset_cntx->a0 = target_vcpuid; - /* private data passed from kernel */ - reset_cntx->a1 = cp->a2; - spin_unlock(&target_vcpu->arch.reset_cntx_lock); - - kvm_make_request(KVM_REQ_VCPU_RESET, target_vcpu); + kvm_riscv_vcpu_sbi_request_reset(target_vcpu, cp->a1, cp->a2); __kvm_riscv_vcpu_power_on(target_vcpu); diff --git a/arch/riscv/kvm/vcpu_sbi_system.c b/arch/riscv/kvm/vcpu_sbi_system.c index bc0ebba89003..359be90b0fc5 100644 --- a/arch/riscv/kvm/vcpu_sbi_system.c +++ b/arch/riscv/kvm/vcpu_sbi_system.c @@ -13,7 +13,6 @@ static int kvm_sbi_ext_susp_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, struct kvm_vcpu_sbi_return *retdata) { struct kvm_cpu_context *cp = &vcpu->arch.guest_context; - struct kvm_cpu_context *reset_cntx; unsigned long funcid = cp->a6; unsigned long hva, i; struct kvm_vcpu *tmp; @@ -45,14 +44,7 @@ static int kvm_sbi_ext_susp_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, } } - spin_lock(&vcpu->arch.reset_cntx_lock); - reset_cntx = &vcpu->arch.guest_reset_context; - reset_cntx->sepc = cp->a1; - reset_cntx->a0 = vcpu->vcpu_id; - reset_cntx->a1 = cp->a2; - spin_unlock(&vcpu->arch.reset_cntx_lock); - - kvm_make_request(KVM_REQ_VCPU_RESET, vcpu); + kvm_riscv_vcpu_sbi_request_reset(vcpu, cp->a1, cp->a2); /* userspace provides the suspend implementation */ kvm_riscv_vcpu_sbi_forward(vcpu, run);