From nobody Mon Feb 03 11:51:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YmlGP1CdFz5n40M; Mon, 03 Feb 2025 11:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmlGP0Nnrz3qsF; Mon, 03 Feb 2025 11:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738583517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7557xcjlOQgpRlfFTsZ1TkmtRJ7omkcODJMvjUSYIQI=; b=KOU7IWiHw8V+RqJBVdk56/WRHo6RuRfbg9ZSGVHDzEiLUM6MoRMO7fZbpT3lLE4MC6ztw4 A3YDXZX3HOCa80yJLKDOkYTjbndzEGSy+RT4Qx7+gUyZJ7cqWiulYE8H4YyfBaYmWSrxG9 HyP44jO2tCcCcRVNMmeNRccTD25Dg8h86Gfu95U7Ebv4xpgxT4YdIt0Fee9WSsPQP7APES 0CAo/jLalC1rz6y6x+o9TAGhq7J4f5uzz1EbcEsJmLFtoFcY4rt1zOgn8BjGlJOKYehGKH c8GnY+YQv+uHWTnMrzexXUrJAKYsw+I1LsZjqS3Kbi3jmqdym4K2nO+JuCsYbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738583517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7557xcjlOQgpRlfFTsZ1TkmtRJ7omkcODJMvjUSYIQI=; b=o0jbGKy6r6/aHiDaijTc8k82HKggWJ9mPtfM2urZjSg5DkeJAi5n2AzEmMtSWWyV/jYNm9 i+FLgxRI+WxkTbxZhSeO0stB2uVUYJpf9GQPjBIvx0H+J1aUS2YgM7xYr6KKAAm9zmT3mh fpTVsTsIy727eb/Tf2gKjVlUxfuOHFIODHrOs7I2A26/3cSi8fszN3/3ONeHU/qoT2b71X P61PQoP/tFB5R+0gYn3XJYisW1OhsSqMV2NJvM2g5UpOShzQUacx0F9e8zuh3cViw/e8UZ vWy70QE7YBNlb3z3awn4BzY/0csT7BxrxvigcpLZy72WzvXjeanZN89Of2vqUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738583517; a=rsa-sha256; cv=none; b=P3nJxBwyzgVkmDxmo2wv7Pqt2Z+qEAtIVT2NpC5KbJBaSc9uCDUWgpXmvpvvdG/S48fDQ+ Kf5bUtHFFYeQ2dDFiNhJvu+VSSi8W+t1CgcnhHqp5WSHOLX3BzLyu9KXm0XCxmt9oGg0x7 exJ28SEZPynYAnoJmJmvKLT5pNty8XqCFkEYeDMoILW0nx1Hk5/lXFJreetYofw5ANezKE sHXI3Kx4g7nMjtxbEu3YGnVWJ1iZGpeUV7Jn/RHGE9mOLLqsTA4pBPIWO4sIXjHzEEPv4A fPDImn6QlKICCi1hJTc1oF5alVoZt2rPg3DaUufrq0wxxlB6C9AI+xX48+bGMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YmlGN710NzZyl; Mon, 03 Feb 2025 11:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 513Bpulg040536; Mon, 3 Feb 2025 11:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513BpuSJ040533; Mon, 3 Feb 2025 11:51:56 GMT (envelope-from git) Date: Mon, 3 Feb 2025 11:51:56 GMT Message-Id: <202502031151.513BpuSJ040533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: c7e0b94b7de7 - main - riscv vmm: consider hart_mask_base argument in the SBI IPI handler. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7e0b94b7de76fec57f4ac25e02de39088ee77d3 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e0b94b7de76fec57f4ac25e02de39088ee77d3 commit c7e0b94b7de76fec57f4ac25e02de39088ee77d3 Author: Ruslan Bukin AuthorDate: 2025-02-03 11:48:18 +0000 Commit: Ruslan Bukin CommitDate: 2025-02-03 11:49:48 +0000 riscv vmm: consider hart_mask_base argument in the SBI IPI handler. From the spec: Any SBI function, requiring a hart mask, must take the following two arguments: - unsigned long hart_mask is a scalar bit-vector containing hartids - unsigned long hart_mask_base is the starting hartid from which the bit-vector must be computed. hart_mask_base can be set to -1 to indicate that hart_mask shall be ignored and all available harts must be considered. Differential Revision: https://reviews.freebsd.org/D48717 --- sys/riscv/vmm/vmm_sbi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/riscv/vmm/vmm_sbi.c b/sys/riscv/vmm/vmm_sbi.c index 586eb7c4d41c..3ba90e349b3c 100644 --- a/sys/riscv/vmm/vmm_sbi.c +++ b/sys/riscv/vmm/vmm_sbi.c @@ -154,6 +154,7 @@ vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx) cpuset_t active_cpus; struct hyp *hyp; uint64_t hart_mask; + uint64_t hart_mask_base; uint64_t func_id; int hart_id; int bit; @@ -161,6 +162,7 @@ vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx) func_id = hypctx->guest_regs.hyp_a[6]; hart_mask = hypctx->guest_regs.hyp_a[0]; + hart_mask_base = hypctx->guest_regs.hyp_a[1]; dprintf("%s: hart_mask %lx\n", __func__, hart_mask); @@ -173,6 +175,8 @@ vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx) while ((bit = ffs(hart_mask))) { hart_id = (bit - 1); hart_mask &= ~(1u << hart_id); + if (hart_mask_base != -1) + hart_id += hart_mask_base; if (CPU_ISSET(hart_id, &active_cpus)) { /* TODO. */ target_vcpu = vm_vcpu(hyp->vm, hart_id);