From nobody Tue Nov 25 23:00:04 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 4dGJ7911wvz6HxCs for ; Tue, 25 Nov 2025 23:00:05 +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 4dGJ784hTfz3h33 for ; Tue, 25 Nov 2025 23:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764111604; 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=/U7SfyC/KQDu7Woi7/ZGuLig5LnMSYRasKLNtiwjEZs=; b=jXda3PFVtUhvmvruzQDIvowhm8NJtCpAMU+NfNSq/XpfSSOr5Iz+GrlGwLVjWYbdLP3MjM 256gZrE5a5kfmSQGyUItpb+oJHByoqZp2yv0VMBTZjBgaWNECFcbykVqaQs3SBbL3MwX1+ Acm3xZCC8tDwcFNyVGjRtq5qWgzNeTXbd1MfhpdALyeh4g8L+yybPOqaeFMKScKTDO16Vf k4R2mQPF8LJKBJ7RlTco2/egtNCLHNAmovDeWkBJM6SScVzkw2QKzS1bAxNO6Zg1i+dKJb yEgJAD1sje+L7yU22YxY1odqPvPSQ3PGFDq4qvtwLbhzBeYjq1/QIrCKPDnxbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764111604; 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=/U7SfyC/KQDu7Woi7/ZGuLig5LnMSYRasKLNtiwjEZs=; b=h3n2Nr57T2rLXeBCZkhf0fDwkKR3GjL6/7X4fPUlhbQ7uSNzQqeV4uTb8aM4Kd8ownlek0 zXV0XqBNnv4KeJuZQX+/ZkOPQlIZdpXU9fXNUtMNvxbHxFmSek5pqgOJyFDnI+m3r5Q9Od Qo8wTgvntCp63J3QWG9m953Qg2a4ojmGpz7M7+rHyCiaM3C2iTJRJkCqw7vbtiBZIRDeuR n0u5LS7RzFy8rE7+MYZgbFSPFpdv9/yGcYI/l+aRJtlmthI98LhurxTwSVxzJCK/OJyUX5 JqpfSJfCa7PlX1W5m0Jn/xwNy2ErhPMGisc7sbTKqOJnYxQ3+HubAj1D+B86Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764111604; a=rsa-sha256; cv=none; b=kwj8CfZK+2Kpp4P0jZwEOBjZnFozmluRFf3GGj1S1xkglHdJIW2K9QIYyb2s/zQ76quQR3 mAjJjxII9wzOOVFciMbVhpMCJKIC0pHdU+MREz1SdGX0XZgG+7Ws2RU1nMKKnKJ/9VvJNF /ICTcnmtkMO/GHC6U5KgJwV50Ts8Y3HFHCqJfCgI/3vbv9vQagcHcgw0eqpOovVInyx1Gh mmOyoCTxq+RUnMXhsC1Q1OrTEiGXUT5bVCpRdi/zSurclRH0m+L3o8eem7pIcI7PkPZIN9 cHBdi5cp2eTc0A128c4MH/yRw/mXj4ZviwB8PWUW9iPrEyKrDPQPwFtbfRoy9Q== 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 4dGJ784DZZz4rC for ; Tue, 25 Nov 2025 23:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c35f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 23:00:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Chuck Silvers From: Warner Losh Subject: git: e271f9327f46 - stable/15 - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e271f9327f46250c9043c29c86e943d53080bf2a Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 23:00:04 +0000 Message-Id: <692634f4.3c35f.1ea5bd89@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e271f9327f46250c9043c29c86e943d53080bf2a commit e271f9327f46250c9043c29c86e943d53080bf2a Author: Chuck Silvers AuthorDate: 2025-11-25 22:30:19 +0000 Commit: Warner Losh CommitDate: 2025-11-25 22:59:13 +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 (cherry picked from commit 2b4dbad2db5766294ee97bb96228ec6826a9e7c3) --- 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