From nobody Tue Nov 25 23:43:58 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 4dGK5v60Pkz6J0rR for ; Tue, 25 Nov 2025 23:44:03 +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 4dGK5v5VZmz3nfM for ; Tue, 25 Nov 2025 23:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764114243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n293kHSytU07VRjuPquCr37Y5a8WxlvAIOMueIDVPoc=; b=HVzoV9csCTOiGSNFw/qnVUpZ+PdXMz7kmqzY0UygEbjc2y1+YUoLfpSPR4YvJHZVIkvtGl eckp925Ws6Kxm81J6q9eE0Fb1931hkKjhnXfoYkRtU2VkQ3v20uzc7QIjrgc8N3QWw0JV7 7UEhqSaAPe9BbjVpTJ/J6O4kHk/dBFdj5r9EZmSlSgG9M+FvnWTItNH395H188y/qmm72W X6F/ijmFr2Zyi6vYVgK9INMOAAoW0KM+wq59nwYB5A+29JUPoYq/WF0CnYm3eaUVaJcEtP ApKVF2yS17oTSnZsxebhQm623IDNMlYVAFFXcmFDRKBX8YMeePogvMf+An7BWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764114243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n293kHSytU07VRjuPquCr37Y5a8WxlvAIOMueIDVPoc=; b=s6uVbsFY+1twnKRBuNzM4J0T6xmRoIIzRtf6Tere0TXvXz4xxRriA90c4LVdwiaJTOOwSc UAX5bN3vGdVFTSFOwrun754Jx7MFFNmE4/R0aryc0YXxEZDMMwGKbOykVl0HyQmyofBH/F vyFlFu9gq1rbA90Fkq1hl9z8ErVKw0aaC8xrQwf+73v3LkiwzStwll2nQH+tx1ROlfbz4x wPYk3j/g6ycjghXJmlJ9VMphIGYfFPOTCsyJDe3S+ZnNdnKw6lfIzyU1HaWQtA+FBwfHmT e7/TXanQvH3FILs9/ZGT5qlsK8zMQBj5eqx6grvUoNdADxTbbIJa5dWG6VYwyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764114243; a=rsa-sha256; cv=none; b=qZxMg99ANAHT97FAn7BbASjHgEdFbhP0NZPB2fkye66rkt4EojY09mdHgWaerzvrKBvY9G F9s+7U7kj2B2LdjmG6mWhmyDfr1Eka5hk+nG9It5d8VTjXAKqgpWZBNKA48Egsydd4zjUa vhXntGP+oVK8Lw6s/oB404PLFk1H/6mXgJ1eh/yMgNGEBVfQj+1f6K89akrZKLrGOc6gOf BVVZh4EhpR4feW16f+8s+Al4kzBGrQ99hnGP0wd+RNG8gcAy2gPwQEfAhE7+vu0LgqnZSz 2E4xDo8SYdiYkEt1hyLb7isdwPMv1zg2mE5WER3iXTcECNxE3MGIWAfSFK4KJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dGK5v5657z6Z7 for ; Tue, 25 Nov 2025 23:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f258 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 23:43:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Chuck Silvers From: Colin Percival Subject: git: 4f2d5bcdbf9b - releng/15.0 - nda: fix setting of unmappedio flag 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4f2d5bcdbf9bb9ecdee48d47c1c33a461f3f54e4 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 23:43:58 +0000 Message-Id: <69263f3e.3f258.6afefa46@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4f2d5bcdbf9bb9ecdee48d47c1c33a461f3f54e4 commit 4f2d5bcdbf9bb9ecdee48d47c1c33a461f3f54e4 Author: Chuck Silvers AuthorDate: 2025-11-25 22:30:19 +0000 Commit: Colin Percival CommitDate: 2025-11-25 23:41:38 +0000 nda: fix setting of unmappedio flag The upstream refactoring of ndaregister() to split out ndasetgeom() accidentally used an uninitialed variable to decide whether or not to set DISKFLAG_UNMAPPED_BIO. Fix this by moving that portion of ndasetgeom() back up to ndaregister(). The check for PIM_UNMAPPED is not really needed because nvme devices always have that set, so it cannot change in the other path that ndasetgeom() is now called. Approved by: re (cperciva) Reviewed by: cperciva, gallatin, imp Fixes: dffd882d12d2a71aca464f48209ec9ae6f393b15 Sponsored by: Netflix MFC After: 1 minute (cherry picked from commit 2b4dbad2db5766294ee97bb96228ec6826a9e7c3) (cherry picked from commit e271f9327f46250c9043c29c86e943d53080bf2a) --- sys/cam/nvme/nvme_da.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 2eb43809f4b1..d409961cea65 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -647,7 +647,6 @@ static void ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) { struct disk *disk = softc->disk; - struct ccb_pathinq cpi; const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; uint8_t flbas_fmt, lbads, vwc_present; @@ -666,10 +665,6 @@ ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); if (vwc_present) disk->d_flags |= DISKFLAG_CANFLUSHCACHE; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } } static void @@ -943,6 +938,10 @@ ndaregister(struct cam_periph *periph, void *arg) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; ndasetgeom(softc, periph); + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } /* * d_ident and d_descr are both far bigger than the length of either