From nobody Tue Nov 25 22:58:36 2025 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 4dGJ5T1xPwz6Hx4j for ; Tue, 25 Nov 2025 22:58:37 +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 4dGJ5S6z9vz3fLw for ; Tue, 25 Nov 2025 22:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764111517; 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=YEYece9pmpE0pErU6vq5OSEf5Uo9xvuhQO6oi9TZuxw=; b=BX45UYI1N90YGTXvhbaOHQqagUFP0YdHmOO5vJV32xt9AVqQk8+rVy++LuJ4gTwqBZePqt ftw5CI8ayAlc8TumUkd8dPOajOBCcT3LHkamuQRPABIJ4qfSrHAff4IUnSrJC6Idb4KTIe ZH97lg0x++UKGpPZS3WUGBGHrFnvuZdTLfmRqsFkpgqCDxRTom1PMPZqxT3JES5TwGsNYb SCUOj/E1s6duCE7HNYMv+PN7cVH/nsw10AgC+Imqw+3gN69unTHI3SgzzA6/hrpA+EhYe1 iy1kZoEMw13lF5xutkwmbBzw1F44WnqXhqKLpFPtuHDQ2vy2h2n3OROxSkfXlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764111517; 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=YEYece9pmpE0pErU6vq5OSEf5Uo9xvuhQO6oi9TZuxw=; b=vmYhszFhf6q2VsGqeScgBDab00SMQyyvcODbw/sdWTTLqjvkntFMi0Lwb46g/WWWCRb8ub 3mX4X7jEWr4IFTSMJ8fdUKoTLYzbaiOOlZN2wQtfXlumCcBlCn4UUFvEXmBVH3L6WR4JDk 4HGSWfVyKo4TEycWY7PLDlXSI3eB1ouZ2t3V+pllxgAZP7cUyEWYCwppjv8jQSqRrjsUcr rTlt4ozOH+gX7KQSgNcXPD84frDU/ES7XyxhHPLeXPL1v8lmmL2VcFk+Po5aP2cPY4j/bw sAkj/RDuW3baSeZZAqr1LawgGaVRHzydH/dGr54b69jN7wTFnieOcjMhnN+t9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764111517; a=rsa-sha256; cv=none; b=S7Af1aL2p3iElaIWncGy8PhAYppKGxQSQSaXNUeIWJSb1KUjc/WakiCAW7tYaNfsCJVVs2 v1Og5gvvt7+cdXcGN6702ghYn2vJWiGQEOmDdaCICAhFzKcWr1j+4hadbrw0+t/HsPcoKW MuxfxAIl3ydszhCrnhThxR1RtzHl6iXiBbSgqxuDigWmdg5QWW3b//Y9pjkhjhMmu15XiM yqsFhPySlsMDsRvBKsi8suEqcn44k9LnE+Jngy1XciXpECOdy8jdaRaC9NchAFkAw3PaJE //eVJ2qb7P9eNFIY2Q92h+qOXCpf93/CdSeQxeNxTdVpkBM9czIn5rWLa4xt6A== 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 4dGJ5S62mWz5jY for ; Tue, 25 Nov 2025 22:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b599 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 22:58:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chuck Silvers From: Warner Losh Subject: git: 2b4dbad2db57 - main - nda: fix setting of unmappedio flag 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b4dbad2db5766294ee97bb96228ec6826a9e7c3 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 22:58:36 +0000 Message-Id: <6926349c.3b599.381eedc5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b4dbad2db5766294ee97bb96228ec6826a9e7c3 commit 2b4dbad2db5766294ee97bb96228ec6826a9e7c3 Author: Chuck Silvers AuthorDate: 2025-11-25 22:30:19 +0000 Commit: Warner Losh CommitDate: 2025-11-25 22:46:52 +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. Reviewed by: imp Fixes: dffd882d12d2a71aca464f48209ec9ae6f393b15 Sponsored by: Netflix MFC After: 1 minute --- 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 506fce3d99d3..833738cfcb98 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -648,7 +648,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; @@ -667,10 +666,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 @@ -944,6 +939,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