From nobody Thu Jul 3 20:49:16 2025
X-Original-To: dev-commits-src-all@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 4bY8590Rdhz618Jw;
Thu, 03 Jul 2025 20:49:17 +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 4bY8586sMwz45ww;
Thu, 03 Jul 2025 20:49:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1751575757;
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=TJjv9nRvWrzD+Tbx6qjCpOTG3loIvLyV2YMIWtVnXKU=;
b=gASPehy0I/v8aGwmEaVLD+7JldYkz4yiZTOisuyOPsUpTmBh+MuBdo42Yv/0zeJ21cbpjt
tcnjtGYwdwd8wdUitho9em2tDX73i+8l5JDI0wrHVuRajwTFrxtgvR40ZQ2Y0vYdu95VEh
igIVKfMVLB8rFrFQ2WzKBAUNq9RNOKlMev+3PDVaTnn4LCjE57zTu9Q+CrRfxqCUO5R3U9
PiUdngEjsP1H96c4hPb80Tybw1vtSHm9kacAn5WgsNN5rAjZ7O89SCfopHMncYWz7csjl/
SC1CD1YYk1VF0BlhDbguScHu8B7ofICk+KqdzrmrqT1U3j/+P1+FkD8sfIXKbg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1751575757;
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=TJjv9nRvWrzD+Tbx6qjCpOTG3loIvLyV2YMIWtVnXKU=;
b=yEf3fF634+FjfIuINpin4KNJB7I8v9T/ZmrjPJxtu4PEW2X/pT73U1Hjfz1sZ4NECrK0T5
N8gwxIrd3iNTZV/4sEFWE8l+wQGoIkxeRHv/HWjD6YHizLgfZAWt9hi0+w75jAc+3X564g
bK3DCFLqbOmMag/eyhF5zWND/MIBB9XUGBn7YhYfSbE8zn1whTZcxplb7F7XKelYkjbV7E
B4SnVZ4JuGNUsTsJ9/SfJA1Y7OH7hJZ/qOU/w643f7PG2FD4b6nIMUgVfIirgyv4kQ/Ram
bi9P9bqmqGhzA5BXcWI6Fd3CMXzW7O0AjXk3voaAdl20Oao1G3dI19pogR12KA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751575757; a=rsa-sha256; cv=none;
b=huEXFyuk1tyjssd2w0VqdkW6vT8kZOoHLt2CAma18mQ9bRfpZnyisBevj1XegxhO5daf4V
wiWrI9i8XQQAmTz0fFAWKFmqa2LEoCofC++fyY9YpPJqKrfmkVmNO4r6QcHTnZunKc921n
b+dqHBzfUv/ByiC6PCRz7Ro4DRw1LWzTfjRTqOmyB3RTbF0lk0KRgYFGHcl3veXWg61pY5
2l65zCIvj3TwHk6CiHCSLGr7VqvxveGtbImheElP3ru+vY5yVpnmC2EdcqQtvWdKHHivpX
XrsEq9q3S/IrBU+TmURZtQJz8fF6sWeXmaRgcgcfe4aUbu8INOmzQx9QhV8PVg==
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 4bY8586Fkgz4r2;
Thu, 03 Jul 2025 20:49:16 +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 563KnGqT033286;
Thu, 3 Jul 2025 20:49:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 563KnGxr033283;
Thu, 3 Jul 2025 20:49:16 GMT
(envelope-from git)
Date: Thu, 3 Jul 2025 20:49:16 GMT
Message-Id: <202507032049.563KnGxr033283@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: 906d7a4b521c - main - hwt: fix !SMP build.
List-Id: Commit messages for all branches of the src repository
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help:
List-Post:
List-Subscribe:
List-Unsubscribe:
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-dev-commits-src-all@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: 906d7a4b521c19b2b1ae3ec844b5d4626f2fd529
Auto-Submitted: auto-generated
The branch main has been updated by br:
URL: https://cgit.FreeBSD.org/src/commit/?id=906d7a4b521c19b2b1ae3ec844b5d4626f2fd529
commit 906d7a4b521c19b2b1ae3ec844b5d4626f2fd529
Author: Ruslan Bukin
AuthorDate: 2025-07-03 20:43:01 +0000
Commit: Ruslan Bukin
CommitDate: 2025-07-03 20:43:01 +0000
hwt: fix !SMP build.
Sponsored by: UKRI
---
sys/dev/hwt/hwt_ioctl.c | 2 ++
sys/dev/hwt/hwt_vm.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/sys/dev/hwt/hwt_ioctl.c b/sys/dev/hwt/hwt_ioctl.c
index 04133838d292..592db4931bb4 100644
--- a/sys/dev/hwt/hwt_ioctl.c
+++ b/sys/dev/hwt/hwt_ioctl.c
@@ -305,9 +305,11 @@ hwt_ioctl_alloc_mode_cpu(struct thread *td, struct hwt_owner *ho,
return (error);
CPU_FOREACH_ISSET(cpu_id, &cpu_map) {
+#ifdef SMP
/* Ensure CPU is not halted. */
if (CPU_ISSET(cpu_id, &hlt_cpus_mask))
return (ENXIO);
+#endif
#if 0
/* TODO: Check if the owner have this cpu configured already. */
ctx = hwt_owner_lookup_ctx_by_cpu(ho, halloc->cpu);
diff --git a/sys/dev/hwt/hwt_vm.c b/sys/dev/hwt/hwt_vm.c
index a6799c30300d..6c55e218dcec 100644
--- a/sys/dev/hwt/hwt_vm.c
+++ b/sys/dev/hwt/hwt_vm.c
@@ -213,9 +213,11 @@ hwt_vm_start_cpu_mode(struct hwt_context *ctx)
CPU_ZERO(&enable_cpus);
CPU_FOREACH_ISSET(cpu_id, &ctx->cpu_map) {
+#ifdef SMP
/* Ensure CPU is not halted. */
if (CPU_ISSET(cpu_id, &hlt_cpus_mask))
continue;
+#endif
hwt_backend_configure(ctx, cpu_id, cpu_id);