From nobody Thu Aug 7 09:51:45 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 4byMrK5Dlrz643hw; Thu, 07 Aug 2025 09:51:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byMrK3mVDz3Ytg; Thu, 07 Aug 2025 09:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754560305; 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=ClTqG2NQYy7SXmE9faOKU6Y3y8Vwvm+pUsScUOgtOVw=; b=sRjQj9lV2O8tUZs8K0C8rLUBEvk6vObQ9O20OTW971nv5ajpfwSRQYDid7XtIzJ2ob4TAH PXsO9mqAgi+ov9yhBwlj+4TwkHrIWkhj5XgHD7mjl/Z52zTGUjpSyQv8Z/CO8Be8hqQYy1 ovNbT1G0IcnrE+L/gsmBk0rVm0/KI+9++LUDSqee5xp20DlDxVekxlXoT4LJMZRPgOkC9D lQ4JjScJgzxR4xp+GsgQ2zqk3jY1Qd2/TN48zsyelu3auorUmN+UQBLnMfwv7K73RQOQqG 8I7ZErF3Y4UKXJ5DPuWrFjvWiVp1Q9yfGPwuFdqd8LzvY22a3wyyy8KtNnh5mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754560305; 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=ClTqG2NQYy7SXmE9faOKU6Y3y8Vwvm+pUsScUOgtOVw=; b=ddECy7+gjdPd0bDj/5hoKtTmliweqg0Ou/xGEIFLx85QU/x/rD3zKN7A3I/w9fhNm0sjM7 gxXZdDh9Km0xruiCdZvNimc819oCQj3CzcT64LgVjoKVEy/IAVZ1JQ+xKng0mwLFI3hzns heLWNmYzHmpKbA7NjguUBpdXgsl5U4Va6WQ8mR7U+cmjWSfVX75YZ5P4bDL6gFI/QcW2SW 6jxEcicZ6h3MH5K+fHAWgljk+QQ3rD+LRRoCN6+jfXII+/phNrThwG0qBkKy9SLvekzZku GWynLgcoXltVSusXdWB/hOHb/F1SwIxt6eNL+1eh2qKec80rmpQ0xf9V/NEvBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754560305; a=rsa-sha256; cv=none; b=MGpew/wzmzpBFVIeH9HycM/KzC/+rFNMlh7IyHs211WODElYFjBTXND1natXamZtrEyDSi nGuj5GW3Wq+6G81Cee5Cb3UYJQtvdk4fPGOzZzVX8ishUUeArg0WQ0AZQjKy1UYbIJEHi+ HW5EvJpJZtmdxgyNepJ3utk9hobSy2afahXl0LC19ddD+kZR8fg6VZI2IuoZLpIvuuRAYX uMM2z4A5masz5C95AoM3GStDIEKXRRcxNRYEQCy4H4je77DDjDeV0fd4IIP5sREq4i87Er n808iXxvjDyuoHk+Ma/cG+Iixzc6uPxHV0yaraTZW1h/XTD2fmjf+viFoaLZhg== 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 4byMrK3Fqzz1207; Thu, 07 Aug 2025 09:51:45 +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 5779pjCY017874; Thu, 7 Aug 2025 09:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5779pj2e017871; Thu, 7 Aug 2025 09:51:45 GMT (envelope-from git) Date: Thu, 7 Aug 2025 09:51:45 GMT Message-Id: <202508070951.5779pj2e017871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e560cb46edd4 - main - bhyve/arm64: Fix a race in PSCI CPU_ON 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e560cb46edd4898bdb77e82a4b5e53956357a48d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e560cb46edd4898bdb77e82a4b5e53956357a48d commit e560cb46edd4898bdb77e82a4b5e53956357a48d Author: Andrew Turner AuthorDate: 2025-08-07 09:31:48 +0000 Commit: Andrew Turner CommitDate: 2025-08-07 09:45:15 +0000 bhyve/arm64: Fix a race in PSCI CPU_ON When multiple CPUs try to start the same CPU only one should return success, the other CPUs should see either ON_PENDING or ALREADY_ON. There was a race between checking if the CPU is on and marking it as on in the running_cpumask CPU set. Fix the race by using CPU_TEST_SET_ATOMIC to both check and set the state in running_cpumask. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51766 --- usr.sbin/bhyve/aarch64/vmexit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/aarch64/vmexit.c b/usr.sbin/bhyve/aarch64/vmexit.c index 9ecf25c04e41..6297a01d427f 100644 --- a/usr.sbin/bhyve/aarch64/vmexit.c +++ b/usr.sbin/bhyve/aarch64/vmexit.c @@ -216,7 +216,7 @@ vmexit_smccc(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) break; } - if (CPU_ISSET(newcpu, &running_cpumask)) { + if (CPU_TEST_SET_ATOMIC(newcpu, &running_cpumask)) { smccc_rv = PSCI_RETVAL_ALREADY_ON; break; } @@ -235,7 +235,6 @@ vmexit_smccc(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) assert(error == 0); vm_resume_cpu(newvcpu); - CPU_SET_ATOMIC(newcpu, &running_cpumask); smccc_rv = PSCI_RETVAL_SUCCESS; break;