From nobody Sat Jan 01 11:25:17 2022 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 D2A02192503B; Sat, 1 Jan 2022 11:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JR06j3mV0z52T2; Sat, 1 Jan 2022 11:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 582751DAFF; Sat, 1 Jan 2022 11:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 201BPHfj021261; Sat, 1 Jan 2022 11:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 201BPHUD021260; Sat, 1 Jan 2022 11:25:17 GMT (envelope-from git) Date: Sat, 1 Jan 2022 11:25:17 GMT Message-Id: <202201011125.201BPHUD021260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: a19bd8e30eba - main - Restore variable aliasing in the context of cpu set operations 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a19bd8e30eba1673782376a93e9787ed9b490e4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641036317; 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=BAKifkBYOLzBKyZAWF108Wd0VlzENnTFuUGTLvroEsI=; b=shQbiI2DVFSBrQgtCDxxF+pCnS2XXt2hRilgjZMocL/xgR1jtInIS5Yv89lMq1f4YjsPo1 cW1nL1gZS3Ej51GURAdfxjHI9Yn6zX2gbAjsJV/xDntgE5nFOlFlr/qSqWB/9t5b04QLs9 sBTtv84lMBgPwmeSTbE8RpFvTP9LVybg3minX8zjeZNr08aQAtmWm6dlGgQtLjjjTJiD5/ X2aaK6wqfFj9dUQDjtm1YFjBVtdIuFwZRHsiv9sJXiaDwYOUihrwQCWvSoX3vH6xj4SHKt Kg8T5KocJsDQEKmzr+R9Ug5GIQcE4XzRXcje01P5m9ytEH6iaSrrg9osx19EQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641036317; a=rsa-sha256; cv=none; b=mj1DTObY4+4NOUZ/hofUFO/d8RDDPMS1lnxLIn20W2zGgBUILbV58ddxxVfy1ju5Aj6ari tu0Fs7NPdHiZvtNoQ6uZ4vkMhO9D+qdLeta77DtecCpDPARJy0HIx3bbSJ9dq1q2ROJrZ8 WNBBoufpl3nbfbED9Ly8z1nvZA7zkvcyOiMzjavvBUqQED6/w8ylNvejGSi3EeuJwBnHMx PibrWk5FOBidk2if+tNB3hICVhrfRo9+DM4rnIzXgWCAQJ6Zv9aut81BCOocV8p+b/uBCx H/i2WbaTnm4GPXHtzoz5hbq6SbZorIPcuTI+2iHAoElZ+OGiG+uwn5vGcXMjNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=a19bd8e30eba1673782376a93e9787ed9b490e4e commit a19bd8e30eba1673782376a93e9787ed9b490e4e Author: Stefan Eßer AuthorDate: 2022-01-01 10:41:54 +0000 Commit: Stefan Eßer CommitDate: 2022-01-01 10:58:40 +0000 Restore variable aliasing in the context of cpu set operations A simplification of set operations removed side-effects of the previous code, which are restored by this commit. --- sys/kern/kern_rmlock.c | 3 ++- sys/kern/sched_4bsd.c | 6 ++++-- sys/kern/subr_kdb.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c index 5e64f79e3836..08a01fca9827 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -548,7 +548,8 @@ _rm_wlock(struct rmlock *rm) if (CPU_CMP(&rm->rm_writecpus, &all_cpus)) { /* Get all read tokens back */ - CPU_ANDNOT(&readcpus, &all_cpus, &rm->rm_writecpus); + readcpus = all_cpus; + CPU_ANDNOT(&readcpus, &readcpus, &rm->rm_writecpus); rm->rm_writecpus = all_cpus; /* diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index ae8c77f3aa4a..5233cba95c54 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1179,7 +1179,8 @@ forward_wakeup(int cpunum) } if (forward_wakeup_use_mask) { - CPU_ANDNOT(&map, &idle_cpus_mask, &dontuse); + map = idle_cpu_mask; + CPU_ANDNOT(&map, &map, &dontuse); /* If they are both on, compare and use loop if different. */ if (forward_wakeup_use_loop) { @@ -1365,7 +1366,8 @@ sched_add(struct thread *td, int flags) kick_other_cpu(td->td_priority, cpu); } else { if (!single_cpu) { - CPU_ANDNOT(&tidlemsk, &idle_cpus_mask, &hlt_cpus_mask); + tidlemsk = idle_cpus_mask; + CPU_ANDNOT(&tidlemsk, &tidlemsk, &hlt_cpus_mask); CPU_CLR(cpuid, &tidlemsk); if (!CPU_ISSET(cpuid, &idle_cpus_mask) && diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index 2218c20586f2..14a0205fc098 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -707,7 +707,8 @@ kdb_trap(int type, int code, struct trapframe *tf) if (!SCHEDULER_STOPPED()) { #ifdef SMP - CPU_ANDNOT(&other_cpus, &all_cpus, &stopped_cpus); + other_cpus = all_cpus; + CPU_ANDNOT(&other_cpus, &other_cpus, &stopped_cpus); CPU_CLR(PCPU_GET(cpuid), &other_cpus); stop_cpus_hard(other_cpus); #endif