From nobody Mon Jul 22 00:55:39 2024 X-Original-To: dev-commits-src-branches@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 4WS1zb6hvsz5Qwr8; Mon, 22 Jul 2024 00:55:39 +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 4WS1zb3KZtz4hsB; Mon, 22 Jul 2024 00:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721609739; 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=HJIOMVYuMAyHwYu2jZXzmSLiQ64XmmcJoMGKRyfd30s=; b=QZRFZajGWKMXiLc0LP3RSoVhuRROeTghbP2HxWJXH/O2No011ZND/kas5DguoMsYzT0INM r1T2GLyJP953UTR/GNlU2jy65+jeFf5Lawtj4yn6Ah+juwq+m43j6CuqguOwtOOxngLbFZ tG5TgIDEMoHtnyZy3tFlhiLri/wGUtLA4pcmXTpxFXj6qmIpMObUi616tRQpXuTJaftman xp0itubC4IExOhB+3EhTDhPpyf4VFimtR/DCIOBOGSNvhbt0VgO+I8+qlbEuvlVjQoWx3j nw/6702FxhTvZZeenrP+5dyHgNa5FUUnpqYrL2QhnmQ058wK6bG+TUfQT/YlLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721609739; a=rsa-sha256; cv=none; b=JMqACIbSoS34dm3YQiNt7PqOCBSEC1yjq2NEuUQzu+XxGin8HkrQ+IW8BNeo+qfZKeO6QD 65rddRDb1Dy0wkMUj0fy3691nv6YK9cs2EmWyPkOOK+9Mf3iKrHNXwCQd5xgmX3BrzBGMH ITZmRrtJ5I0UNmf8Cr9ChRxQr6tnQF058M8Ex+g7/E7JxXx4bS3aeB62vG/nkp1OaDOsT3 dfPpAxPTV6r0IqR2eve0qFvwceQt1QQtJBtAojpbc5BREQNp71YZ8pr5nZt6sEk4Jv0HNA RwnOziDs4acbOAqjNYnqETQj40e4+m1Hs4CwaQ7rUmuLmEkZ5GmNAvz3mtjukg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721609739; 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=HJIOMVYuMAyHwYu2jZXzmSLiQ64XmmcJoMGKRyfd30s=; b=vyj3QweJEo5r0R8j6ATy9uj7SKxquYdJ2TSgj7YDzXsVzpxQxUAbSEvV0CqYO5AqShcvS8 RvrNq+wQNRJ5hav5XfMMRBvfl/i1nrTsuGoGXd5omN0zhMVkXyzCSGn7mXxAx7A+ZCPjHj HDhHf9wLhDbUILHjxROjQIN9k8nFNSqd6yevaSa1oLiWgq8illImf7r8BMDHoljHFXm6Mr StfYImWTySKKZZF1UIoLFbm5IKF+tVKR4aVgX1oPKMC2YRKkB+dwihv0NtiJQbR4zboHkR yWKrkytM1dt1d/lV0YAXnhJ3gnlHk1mGMXcdjAubKQNRETRTNk8Ym08wGgpUeA== 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 4WS1zb2wcqzN8f; Mon, 22 Jul 2024 00:55:39 +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 46M0tdjh007380; Mon, 22 Jul 2024 00:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46M0tdq1007377; Mon, 22 Jul 2024 00:55:39 GMT (envelope-from git) Date: Mon, 22 Jul 2024 00:55:39 GMT Message-Id: <202407220055.46M0tdq1007377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c1dd895406a8 - stable/14 - sched tests: Avoid underflow when maxcpuid == 0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1dd895406a849bebeceaac6e6f48c4983c37268 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1dd895406a849bebeceaac6e6f48c4983c37268 commit c1dd895406a849bebeceaac6e6f48c4983c37268 Author: Mark Johnston AuthorDate: 2024-07-14 16:12:32 +0000 Commit: Mark Johnston CommitDate: 2024-07-22 00:55:27 +0000 sched tests: Avoid underflow when maxcpuid == 0 MFC after: 1 week (cherry picked from commit 5b98bd30686a358b2a20728a4a6b5cecb7e28dc9) --- tests/sys/kern/sched_affinity.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/sched_affinity.c b/tests/sys/kern/sched_affinity.c index dce8678bcf6e..44802c5ac8e1 100644 --- a/tests/sys/kern/sched_affinity.c +++ b/tests/sys/kern/sched_affinity.c @@ -67,13 +67,16 @@ ATF_TC_BODY(test_setinvalidcpu, tc) { size_t cpusetsize; cpuset_t *set; + int cpu; + + cpu = maxcpuid > 1 ? maxcpuid - 1 : 0; cpusetsize = CPU_ALLOC_SIZE(maxcpuid + 1); set = CPU_ALLOC(maxcpuid + 1); ATF_REQUIRE(set != NULL); CPU_ZERO_S(cpusetsize, set); CPU_SET_S(maxcpuid + 1, cpusetsize, set); - CPU_SET_S(maxcpuid - 1, cpusetsize, set); + CPU_SET_S(cpu, cpusetsize, set); ATF_REQUIRE(sched_setaffinity(0, cpusetsize, set) == 0); CPU_FREE(set); @@ -82,7 +85,7 @@ ATF_TC_BODY(test_setinvalidcpu, tc) ATF_REQUIRE(set != NULL); CPU_ZERO_S(cpusetsize, set); CPU_SET_S(maxcpuid + 1, cpusetsize, set); - CPU_SET_S(maxcpuid - 1, cpusetsize, set); + CPU_SET_S(cpu, cpusetsize, set); ATF_REQUIRE(cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, cpusetsize, set) == -1); ATF_REQUIRE_EQ(errno, EINVAL);