From nobody Fri Jan 14 18:10:34 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 0884D19431DC; Fri, 14 Jan 2022 18:10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jb8VN22S7z4pHL; Fri, 14 Jan 2022 18:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183836; 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=xbm6dG7HtsjAmKqes8OFAWB3BZw4Ye5tqc/MQqk8XiE=; b=DNpUPTKJH/1+04sKXLiM3PznPo4uGZQCsXLS6zQ/OLQBKhOjgIxHQRiD+SNuJ27TAprfo/ z3RdYia1/9n0Ltjff3JlzWwKakTOBx98OKhKZz35TAZQWQtPqJy0sP3azXgCdGFYpWuapL ewSPLCU424vn10Yf2oYTddNTw9vlEeXPJSZ5h2JddNwv6+KJ/460+lFaY/uvMVfn85xSlD kEfmDFw5PPufCq/VBUq5YlQxjvuVj/N1AqcjKoN3yLN1U1stwkw06/8akZKpe6//Ha+dRv +WYIe5wtx6EHbeUstLozzFrVt5I9e3j7fYkF0/tfg7HiLEOFJkgfWI18YUVLoA== 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 E428D181C1; Fri, 14 Jan 2022 18:10:34 +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 20EIAYGv096120; Fri, 14 Jan 2022 18:10:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EIAYP0096113; Fri, 14 Jan 2022 18:10:34 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:10:34 GMT Message-Id: <202201141810.20EIAYP0096113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a94baf23cf61 - stable/13 - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a94baf23cf612b06bfe97ab35627391c64e13c4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183836; 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=xbm6dG7HtsjAmKqes8OFAWB3BZw4Ye5tqc/MQqk8XiE=; b=rkumXVrQl6BVB9GfD8DSm2stX17JojFYZ6Uh6q7FEtFlkQQV2HeCUela7IVZPhUsym/drJ nUujOrlVv2cC5VACiRwswN9nnn70amBOKXE7CoB7UL+/2xY5n4ulpmPI+RyniCS3rw4y5p ZL5+5z4VdyhxKWnFREcVYeLEuhq+L6dBfBXw1NDq76GacXxJOJ307+9oZW94P+jRlJDg1T cg14IkUf3E29S+sCNostEx6RcrOD0WPAyhKdF+3pROvqXh1dVBO7f9Ujjts9X8KITSywU0 vDdXQDV+lWvdi6LAEBK/Dl58/snsFFu90ktEPeZWOgRfBQqUiP6VyN71K0yEGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183836; a=rsa-sha256; cv=none; b=Ve6M8gGIN7b/Rt3scQvIxxk6xKoBgX9S4hwYbT2U6XqTDvBLHR227lqNW/6oM1V+bo9Au0 n5bptUoTTEuvJ7vfx1sEV554risjQavvkuDpO9IFaV8Nsf3y8B6Eb5v17Ny94G2rbgw4uk qr5PX6HAtwcSQ1xRDvJeh67UkJTMUIBjJGnDc2yQVur1Uw0iGtCuCwPdzXat73hlBXjyLL VhDPcYZAwdDYrSxosDVeZStUTEVyLc5kzQqWr5sJFNuusS0fmKWn09yxn3mmsk74b9GElT /CXxFNNNGzBetS7zUSzY3Wt/s5s0bzB24cuX/cHGgDtUB7SK/wd02UsvymX0OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a94baf23cf612b06bfe97ab35627391c64e13c4e commit a94baf23cf612b06bfe97ab35627391c64e13c4e Author: Stefan Eßer AuthorDate: 2022-01-01 10:41:54 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-14 16:17:31 +0000 Restore variable aliasing in the context of cpu set operations (cherry picked from commit a19bd8e30eba1673782376a93e9787ed9b490e4e) --- 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 7e6fe03c80e4..3d99d3aca0e2 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1172,7 +1172,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) { @@ -1358,7 +1359,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