From nobody Tue Jun 23 14:42:17 2026 X-Original-To: dev-commits-src-main@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 4gl77t2KQmz6hWSv for ; Tue, 23 Jun 2026 14:42:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl77s6dpyz425k for ; Tue, 23 Jun 2026 14:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782225737; 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=ykakMYJUWMJqbbp9TQFtu+yEg/jfUCque0ZM2SzPeT0=; b=pulOzvF2v/81viogjnVn8UPh4ttVRuvoFVuwQKBf2JhGw48OTJQJcU1t4ncXRMbFaJ2G/g ISswCnVWMbzN9jFpKPxrSdQ+Mc9W7MLNsiWDDzlYaw8qEdvBrXa8gVqXgbyE+UnIB9Gsuy yWZpZgDRJl88P8Jwx4vrlkm3B0rw0B0wTFo0EjHC/CnBgFIubXEfKrbJXwqQHJQacIjPoL 3bl8OJeDOCshkeuRj9fceEJxQA8tmq6wd+rZqDLJo0G5PQdhxCGmiB9aS6p9uQGGxJDIdk Yn3mHOFNP4ZQtRPRVIIXy1G1q6EVC5PO91t2TlQCFpk44WeWhGwRJdVmQ+MHyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782225738; a=rsa-sha256; cv=none; b=WwX4LYvW74yFIeNCQnOwKX77RXqy9sTeqQJZHGf+Q8x0YDdOMOImZA2bNg1KG6wW0ABzbi NPvpTkcU1yXKxfZxeEBZnpjad62DQr7kA+aHejN0F+vIhJqGHXv1OJ6bfnNVdpA4WUVCvT N6N48/0A6asiuHw+c6xiZtw6LCFT4NA3M2zPhVGFeKCNSXXTsGbNaQdzwCJBGPqPvIwJUD tINwl9p+eoJT0rPHxbA8bLD70GZQD/Gkx1sjL00V4tBs46LqlffT6rqMHEEiWqEBCbuJ5X uhXZb/rfuY4fdU71ubRJZYCe5l+2iQro8L3fETvxDu/NBygrwRkwdCLyNlZ1ng== 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=1782225738; 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=ykakMYJUWMJqbbp9TQFtu+yEg/jfUCque0ZM2SzPeT0=; b=q7/mCqV+lgiyvXd91aQoaDoTv7KCQICSHHMqouIr0ljt5ao8FPaqaerxITTDHFKUjZ5laq iGoxdvuaNIcIpVMa5R61XoNfyMyvoJVYiv37E/t1p8X0bYgoi85VVcm/8yzgjHWFcx4SjC kSL1gP9bQf6QtMeJHaT8S8lMJcpVAafjO59DhRJ/EwD4M6rfGLhZoqf4Ew2fpisbqPTpC/ eJTOcqXI194GK2oej23VyL0Udj5a0f2QklNwBiOZtZ+eh0tvoCp1sXberty6T8PnzWBZ5F q7P+6q4DBl1ZCmsjrYXWzCXloQW8PulM2KObDfTyQMfutlVPZMj01HBDzbsftA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl77s59zLzdyB for ; Tue, 23 Jun 2026 14:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d11c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 14:42:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4c4195700249 - main - sys: use curthread_pflags_set/restore to manage TDP_DEADLKTREAT for uio List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 4c419570024951ad1e477c8d6c3d9968199faf4a Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 14:42:17 +0000 Message-Id: <6a3a9b49.1d11c.1396f4fc@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c419570024951ad1e477c8d6c3d9968199faf4a commit 4c419570024951ad1e477c8d6c3d9968199faf4a Author: Konstantin Belousov AuthorDate: 2026-06-21 18:48:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-23 14:42:03 +0000 sys: use curthread_pflags_set/restore to manage TDP_DEADLKTREAT for uio For i386, remove now unused label. Remove unneeded initialization of the 'save' local. Reviewed bu: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57726 --- sys/amd64/amd64/uio_machdep.c | 9 +++------ sys/arm/arm/uio_machdep.c | 9 +++------ sys/arm64/arm64/uio_machdep.c | 9 +++------ sys/i386/i386/uio_machdep.c | 10 +++------- sys/kern/subr_uio.c | 6 +++--- sys/powerpc/powerpc/uio_machdep.c | 9 +++------ sys/riscv/riscv/uio_machdep.c | 9 +++------ 7 files changed, 21 insertions(+), 40 deletions(-) diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c index 9fdfc898172b..851d8c6a02e0 100644 --- a/sys/amd64/amd64/uio_machdep.c +++ b/sys/amd64/amd64/uio_machdep.c @@ -57,13 +57,12 @@ int uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) { - struct thread *td = curthread; struct iovec *iov; void *cp, *vaddr; vm_offset_t page_offset; size_t cnt; int error = 0; - int save = 0; + int save; bool mapped; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, @@ -73,8 +72,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) KASSERT(uio->uio_resid >= 0, ("%s: uio %p resid underflow", __func__, uio)); - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; + save = curthread_pflags_set(TDP_DEADLKTREAT); mapped = false; while (n > 0 && uio->uio_resid) { KASSERT(uio->uio_iovcnt > 0, @@ -111,8 +109,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) offset += cnt; n -= cnt; } - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; + curthread_pflags_restore(save); return (error); } diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c index 7df6104b25fc..0aebfef07ca3 100644 --- a/sys/arm/arm/uio_machdep.c +++ b/sys/arm/arm/uio_machdep.c @@ -56,13 +56,12 @@ int uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) { - struct thread *td = curthread; struct iovec *iov; void *cp; vm_offset_t page_offset; size_t cnt; int error = 0; - int save = 0; + int save; struct sf_buf *sf; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, @@ -72,8 +71,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) KASSERT(uio->uio_resid >= 0, ("%s: uio %p resid underflow", __func__, uio)); - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; + save = curthread_pflags_set(TDP_DEADLKTREAT); while (n > 0 && uio->uio_resid) { KASSERT(uio->uio_iovcnt > 0, ("%s: uio %p iovcnt underflow", __func__, uio)); @@ -102,7 +100,6 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) offset += cnt; n -= cnt; } - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; + curthread_pflags_restore(save); return (error); } diff --git a/sys/arm64/arm64/uio_machdep.c b/sys/arm64/arm64/uio_machdep.c index 77f596498c45..b7191f48ac61 100644 --- a/sys/arm64/arm64/uio_machdep.c +++ b/sys/arm64/arm64/uio_machdep.c @@ -53,13 +53,12 @@ int uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) { - struct thread *td = curthread; struct iovec *iov; void *cp, *vaddr; vm_offset_t page_offset; size_t cnt; int error = 0; - int save = 0; + int save; bool mapped; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, @@ -69,8 +68,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) KASSERT(uio->uio_resid >= 0, ("%s: uio %p resid underflow", __func__, uio)); - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; + save = curthread_pflags_set(TDP_DEADLKTREAT); mapped = false; while (n > 0 && uio->uio_resid) { KASSERT(uio->uio_iovcnt > 0, @@ -107,7 +105,6 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) offset += cnt; n -= cnt; } - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; + curthread_pflags_restore(save); return (error); } diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c index 674de877d2a1..2640ef0b9fe8 100644 --- a/sys/i386/i386/uio_machdep.c +++ b/sys/i386/i386/uio_machdep.c @@ -56,13 +56,12 @@ int uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) { struct sf_buf *sf; - struct thread *td = curthread; struct iovec *iov; void *cp; vm_offset_t page_offset; size_t cnt; int error = 0; - int save = 0; + int save; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, ("uiomove_fromphys: mode")); @@ -71,8 +70,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) KASSERT(uio->uio_resid >= 0, ("%s: uio %p resid underflow", __func__, uio)); - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; + save = curthread_pflags_set(TDP_DEADLKTREAT); while (n > 0 && uio->uio_resid) { KASSERT(uio->uio_iovcnt > 0, ("%s: uio %p iovcnt underflow", __func__, uio)); @@ -103,8 +101,6 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) offset += cnt; n -= cnt; } -out: - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; + curthread_pflags_restore(save); return (error); } diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index fea1395a7f77..7e492d8aa705 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -241,7 +241,7 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) size_t cnt; int error, newflags, save; - save = error = 0; + error = 0; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, ("uiomove: mode")); @@ -264,6 +264,7 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) save = curthread_pflags_set(newflags); } else { KASSERT(nofault == 0, ("uiomove: nofault")); + save = 0; } while (n > 0 && uio->uio_resid) { @@ -291,8 +292,7 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) n -= cnt; } out: - if (save) - curthread_pflags_restore(save); + curthread_pflags_restore(save); return (error); } diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c index 05d06a95f544..2df39c12ba90 100644 --- a/sys/powerpc/powerpc/uio_machdep.c +++ b/sys/powerpc/powerpc/uio_machdep.c @@ -58,14 +58,13 @@ int uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) { - struct thread *td = curthread; struct iovec *iov; void *cp; vm_offset_t page_offset; vm_page_t m; size_t cnt; int error = 0; - int save = 0; + int save; struct sf_buf *sf; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, @@ -75,8 +74,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) KASSERT(uio->uio_resid >= 0, ("%s: uio %p resid underflow", __func__, uio)); - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; + save = curthread_pflags_set(TDP_DEADLKTREAT); while (n > 0 && uio->uio_resid) { KASSERT(uio->uio_iovcnt > 0, ("%s: uio %p iovcnt underflow", __func__, uio)); @@ -108,7 +106,6 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) offset += cnt; n -= cnt; } - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; + curthread_pflags_restore(save); return (error); } diff --git a/sys/riscv/riscv/uio_machdep.c b/sys/riscv/riscv/uio_machdep.c index 77f596498c45..b7191f48ac61 100644 --- a/sys/riscv/riscv/uio_machdep.c +++ b/sys/riscv/riscv/uio_machdep.c @@ -53,13 +53,12 @@ int uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) { - struct thread *td = curthread; struct iovec *iov; void *cp, *vaddr; vm_offset_t page_offset; size_t cnt; int error = 0; - int save = 0; + int save; bool mapped; KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, @@ -69,8 +68,7 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) KASSERT(uio->uio_resid >= 0, ("%s: uio %p resid underflow", __func__, uio)); - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; + save = curthread_pflags_set(TDP_DEADLKTREAT); mapped = false; while (n > 0 && uio->uio_resid) { KASSERT(uio->uio_iovcnt > 0, @@ -107,7 +105,6 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) offset += cnt; n -= cnt; } - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; + curthread_pflags_restore(save); return (error); }