From nobody Mon Apr 27 01:29:44 2026 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 4g3mFh5M2cz6bQL3 for ; Mon, 27 Apr 2026 01:29:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3mFh3V13z3XZF for ; Mon, 27 Apr 2026 01:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777253384; 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=xzfg5H1ncAvp6UervSk1vbSjSfu5a+knTG5aoEfwCzw=; b=FLiWpXw8TbiEmxvfUJJ0Wf2BYG8PJzRPDHFnJVhCGJfQ8zTEjSA08rLNg4gOq4kkG+sXYw T5c/v3XACBrxaWWGfCY97aD3JUOjpj/Vmf7KjA/XzgJdoDBeF7Pt9uC49XBFKJNryY/1X8 j8PmzN2cR8UkGhPxplIz/QXDODk69GaOMiYnBfWDSOKppba9dbJYk5Ej1cWYekb27KaE3G kT0xnMYU1jlQlQtY5bJRkAkbK9Y0tBCCwsgg0X07ukcIDkOP9Omy0IaCVWRs53R8BVTer9 wTZu4Lei7FlK2C8PaEW/Ray6AuMagoAzIrO45SS1AFQlqWdz6zj1IPM+jzEsJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777253384; a=rsa-sha256; cv=none; b=wrtGJKEnDjct8D1hZXk6CYolGvjU84sRUpR2I62z2Ek42sixLJ8YaW0iLMjoF2FORNL1l/ R455C5DSLRu8As9f241PYk2jmA8bmzYXitOBquhTj6iGrQHmIGux3BM5vX1BUHjZkgcWUS h3TUpvMxMrC5cv+HDFTM6ZsB9XF9mmcFQv0DlP4A2dEU+a9wplIPBMS3KnezY6YwyxvZjA T76hma/T8i+76qpPCQp1tcJnX7MDCZQrFGqqV0ulGOhPyaHSQNykVGXZTYUv+s9Obap86p z9rw4ijTXgjhDrrelSFGLNmiv+EQanXNXiAWTURE4wipKW6MB43w2YppdwWgNA== 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=1777253384; 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=xzfg5H1ncAvp6UervSk1vbSjSfu5a+knTG5aoEfwCzw=; b=ykmhhZT1PVpR05X3ymY6/yaYPHp971o8dZRQTvDIjkSvC5K2Gknkco4/26n0zJpJ1yRCjs W6wAjE4h17jyboQasZOLAb/8C58/WBEVY/xvdXe1/9Z2n+cBpzkBWX8Nyvkfn8qcM4WZCl TvJWNaaxpKHZFO7Juy3IDrUSDpFQMePvqhBk64cpNW7Ps9N4ReHm72a1ilBboQPwRXV/Xt Kq94mFnAgpiPT+wM9skhUNdtQ6Sw8cxiwkd3HSP150hy0b4eLMt7RMLaub4XJkDjlK0anX SxfUjkpPmbZB66/wm/HTnW1r9saacZpM3hL4YW70zxUfk8CuKL3+vYx3Bj6Duw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3mFh2jZKzlRJ for ; Mon, 27 Apr 2026 01:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2695f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 01:29:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fad4e7b656b8 - stable/15 - membarrier(2): use atomic for lockless read of curproc->p_flag2 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fad4e7b656b86befd5995fc4704c68e57a96caa6 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 01:29:44 +0000 Message-Id: <69eebc08.2695f.43727b7c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fad4e7b656b86befd5995fc4704c68e57a96caa6 commit fad4e7b656b86befd5995fc4704c68e57a96caa6 Author: Konstantin Belousov AuthorDate: 2026-04-18 18:42:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-27 01:28:59 +0000 membarrier(2): use atomic for lockless read of curproc->p_flag2 (cherry picked from commit 950fd59955e10429c1325c327f0141a7e97fcfe5) --- sys/kern/kern_membarrier.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_membarrier.c b/sys/kern/kern_membarrier.c index f0660bd7360e..6d210a1b1783 100644 --- a/sys/kern/kern_membarrier.c +++ b/sys/kern/kern_membarrier.c @@ -120,7 +120,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) struct thread *td1; cpuset_t cs; uint64_t *swt; - int c, error; + int c, error, f; bool first; if (flags != 0 || (cmd & ~MEMBARRIER_SUPPORTED_CMDS) != 0) @@ -133,6 +133,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) p = td->td_proc; error = 0; + f = atomic_load_int(&td->td_proc->p_flag2); switch (cmd) { case MEMBARRIER_CMD_GLOBAL: @@ -155,7 +156,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) break; case MEMBARRIER_CMD_GLOBAL_EXPEDITED: - if ((td->td_proc->p_flag2 & P2_MEMBAR_GLOBE) == 0) { + if ((f & P2_MEMBAR_GLOBE) == 0) { error = EPERM; } else { CPU_ZERO(&cs); @@ -171,7 +172,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) break; case MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED: - if ((p->p_flag2 & P2_MEMBAR_GLOBE) == 0) { + if ((f & P2_MEMBAR_GLOBE) == 0) { PROC_LOCK(p); p->p_flag2 |= P2_MEMBAR_GLOBE; PROC_UNLOCK(p); @@ -179,7 +180,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) break; case MEMBARRIER_CMD_PRIVATE_EXPEDITED: - if ((td->td_proc->p_flag2 & P2_MEMBAR_PRIVE) == 0) { + if ((f & P2_MEMBAR_PRIVE) == 0) { error = EPERM; } else { pmap_active_cpus(vmspace_pmap(p->p_vmspace), &cs); @@ -188,7 +189,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) break; case MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED: - if ((p->p_flag2 & P2_MEMBAR_PRIVE) == 0) { + if ((f & P2_MEMBAR_PRIVE) == 0) { PROC_LOCK(p); p->p_flag2 |= P2_MEMBAR_PRIVE; PROC_UNLOCK(p); @@ -196,7 +197,7 @@ kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) break; case MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE: - if ((td->td_proc->p_flag2 & P2_MEMBAR_PRIVE_SYNCORE) == 0) { + if ((f & P2_MEMBAR_PRIVE_SYNCORE) == 0) { error = EPERM; } else { /*