From nobody Tue Oct 28 02:57:11 2025 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 4cwZm80HsTz6CjFt; Tue, 28 Oct 2025 02:57:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwZm76l4rz3dtg; Tue, 28 Oct 2025 02:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761620232; 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=47Iz5q5600OoP/G0X1AQVS6XYMpWolxrNtLTd7ToZGA=; b=CJmOPVhlOwIhPF5tSS0TfSJeHax0vbIuVy/2e/GOt3Vy9SSrz7Izn08CdLgA85YeVS8qyn +QxtPr1o2yNQ8vKJxHgYpQ7omB/se2fqEQu4cdsxBR9rQwT6Xdoy3jlyvFo6JqdRzdQ8SM LYBRcxQcRIb8ldvSjULpixm+UA4iGOdafkOwij+N5pJ/LuspbViTNTqkFzv2B+4yhXA4Po Z6TTtw54u4EUIVT1EiYZWMFyKbvX3oV6cwQeitfeGi67Cb7mOTMdPYVKqs7MvrO/GKGUDR LAhNFwUKdVxCdrbp+er4S0EOj5jISxSnFXjCYbspmsgpDQBir1WkT+GhIyZbAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761620232; 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=47Iz5q5600OoP/G0X1AQVS6XYMpWolxrNtLTd7ToZGA=; b=teexBduSoCVGVFd8+jPQeLw9wAMv1xr2gwOZPAvs48gUt4VTGl4i9cyOv2G85lRcaAqgbA Z34TQTnBjKqQo5Nz5JIE39fLdgjJBZuJuOd7gJrzJhegn/81VivTy59zS32W5GtpO91oKF OGsrneajl0aja8XI0pJHeY8jdSlHV4TMa4a464nDXOltwxrPoyL7z7O6Y0zUaDsivqMyBU 2owCR4xUinO6bDgBveGsBrQoN62PS3oVgMQtec7L5gIAOztaBqOs/iDkIqPFf5sCozStAD Ok89K9p0iMiggJTpn75dmnKxAFICKsIw8nuIsCJK7NVQop5aN+8Ur07QQ+NsGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761620232; a=rsa-sha256; cv=none; b=BX1q2CVP7j1Cs8/7B0RsKMOgL7BA4iCt7uP8n7xUN21jqfhXcpGNfmlZIMkBhDXVlaFv1X iW7/+WFlN1yJUIpiZIYkRdh2tE61anfWu7Jo+CZgLCPSZ7hHpGiWfVVysrLa0ipxIU7XAr x4G7xPX1m/uUn2GTWPLVZYl1gNifaD855uI3cLJu+qirAF+LkPA7UiY1Q8FDevvrhybN+p UFTbJMog9m7mtIBjC2F9jouRdbg4LH8Fc+b2PCEYfQhS/kwDtNMplwxd1leNfeQ0Yc8Voj FOTC9WFmatmt7857QmwDJyi6raYhdwU45OVIbANSF8gXpwTAaq41/jXssd0iiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwZm76KydzXMH; Tue, 28 Oct 2025 02:57:11 +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 59S2vBA3084372; Tue, 28 Oct 2025 02:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S2vB6e084369; Tue, 28 Oct 2025 02:57:11 GMT (envelope-from git) Date: Tue, 28 Oct 2025 02:57:11 GMT Message-Id: <202510280257.59S2vB6e084369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 44e214f8241f - stable/15 - deadfs: Return ENXIO instead of EIO when the device is gone. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 44e214f8241faa224e2346a5a03db8c029a7d4af Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=44e214f8241faa224e2346a5a03db8c029a7d4af commit 44e214f8241faa224e2346a5a03db8c029a7d4af Author: Poul-Henning Kamp AuthorDate: 2025-10-24 07:19:31 +0000 Commit: Colin Percival CommitDate: 2025-10-28 02:56:34 +0000 deadfs: Return ENXIO instead of EIO when the device is gone. One some systems, under some conditions, pulling a USB stick would read(2) returning EIO and not ENXIO, like it should and used to. Recoverdisk(1), which does not give up on EIO, like most programs would, spins furiously. Arguably, deadfs was always wrong in returning EIO, because once you get to deadfs no operation will ever work again, but we used to take a different path through devfs_vnops.c which got us the ENXIO. Something changed recently, and while testing this fix, I noticed that drm-kmod-66/i915kms may be the condition which trigger the different code-path. MFC to: stable/15 Fixes: 289785 Thanks to: imp, kib (cherry picked from commit 2612f1b8649bb4f069a6a064ed714daa5f10d037) --- sys/fs/deadfs/dead_vnops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 296cf058f8c9..137c86b65058 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -122,18 +122,18 @@ dead_read(struct vop_read_args *ap) { /* - * Return EOF for tty devices, EIO for others + * Return EOF for tty devices, ENXIO for others */ - if ((ap->a_vp->v_vflag & VV_ISTTY) == 0) - return (EIO); - return (0); + if (ap->a_vp->v_vflag & VV_ISTTY) + return (0); + return (ENXIO); } int dead_write(struct vop_write_args *ap) { - return (EIO); + return (ENXIO); } int