From nobody Tue Mar 3 18:01:13 2026 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 4fQNs54h7Rz6TRCL for ; Tue, 03 Mar 2026 18:01:13 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQNs52ZF0z3JRk for ; Tue, 03 Mar 2026 18:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772560873; 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=2GOjeL09ydwEnyqdf5gsStR4ob8QAUGp5ZPj+cL8MGk=; b=n0gkHuXhVR6IxGYtOALuqNNJz5PCypW9+wfbOv8+ACpVHE/bvft4tyKT6qyOoPlvj2NcXA GLJwy77hFO7hMtb3P2TQOHRmZGuO0a3X0NgdfouaKRqS36jgtmOOx3Tb9KSV/uW22rYGvi 5bipPPbuDmclqON+gE/A9OlTEedVPRhZuISDT9k5TTvolmTpuSunKkqpHuU7oV2Sm7MAPL P5XfeEBN3CiBehKfWeuJK3UIZ4/4oMj6+CXFb6iwKpv7G2rYNi4Fj+hRBuUJOi0+Lo0QAB Ouddsmc9s8wZ0kD4sjBP2j1mrEBXvdd3dcgi/lra1H9Gbk9vsmYBpdyalq3BZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772560873; a=rsa-sha256; cv=none; b=N2zIhmfPYGhylakNCZPAixvomXCNdIvkt3GmaZhXVfxqqzX6DWJYws+duntvi9Z/A3NxM5 kc+NP1nbbKn78xjjrV8/9MUdaquvCpfl+vP2NFmVZF5d2cffj0WuFb3a6QMpgF6O1eATu3 EW17/y4rFM1h7i+9jQ4KeMLwGarnInRl4Rwdq98iBi4b/3322IpUx0eIoZKJVYPb3jArIV YiHlZk38xvApXi65xUU2nGvDVeSX/VsNAJplQF4W0SaWG3f8ePsHWQRo+1n9xKYZemqP6K 210irrmefJ8mHRpHbZQ60EJ5uuqFxJL01Ir6NpV6DMS4tsy+WIq7C/jChWjAGg== 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=1772560873; 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=2GOjeL09ydwEnyqdf5gsStR4ob8QAUGp5ZPj+cL8MGk=; b=Jn2moMRU6DtNSSWqYuyz3ez/JBpvxLC34VIHrJsnRYO421axM/Y5eZel4yzyIjYvNb+bsE GNNTtx/AbhPS1ho5maijN9XYZLaSp9sk4Mv593mRbS/ZwLDNyqqC59YYV3fSAO4jI5Rd4S WZk3xotOjrknMqzofbP5MotaYHBNR50WITnAf4zrUQsPCzyXNZxovhPf5rQ9Jiy7CGXvaX SD8YH6pW+anjLXpDSX5tmyMLcyD09J+LLmI9F3q8HZg/MUy86U1MSgiN12GfIImfKxcW15 j52qfq9I6cjK3JoDEitlPpNJfPwlxWhxP3ls1EVQ8DutYe2rWD3NWiKNeqiRkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQNs51r0Tzqv for ; Tue, 03 Mar 2026 18:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42135 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Mar 2026 18:01:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b1bd7fed589f - main - nda: Move ndasetgeom 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/main X-Git-Reftype: branch X-Git-Commit: b1bd7fed589fb5381fa2595f1f08e74895868941 Auto-Submitted: auto-generated Date: Tue, 03 Mar 2026 18:01:13 +0000 Message-Id: <69a721e9.42135.5ed33ec5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bd7fed589fb5381fa2595f1f08e74895868941 commit b1bd7fed589fb5381fa2595f1f08e74895868941 Author: Warner Losh AuthorDate: 2026-03-03 17:59:22 +0000 Commit: Warner Losh CommitDate: 2026-03-03 17:59:22 +0000 nda: Move ndasetgeom Move ndasetgeom up in the file. We'll need it here for future commits. Also, preserve the UNMAPPED_BIO flag since we can't observe enough data from this routine to set it directly. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D55519 --- sys/cam/nvme/nvme_da.c | 57 +++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 833738cfcb98..9646b792e9a9 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -285,6 +285,39 @@ nda_nvme_rw_bio(struct nda_softc *softc, struct ccb_nvmeio *nvmeio, nvme_ns_rw_cmd(&nvmeio->cmd, rwcmd, softc->nsid, lba, count); } +static void +ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) +{ + struct disk *disk = softc->disk; + const struct nvme_namespace_data *nsd; + const struct nvme_controller_data *cd; + uint8_t flbas_fmt, lbads, vwc_present; + u_int flags; + + nsd = nvme_get_identify_ns(periph); + cd = nvme_get_identify_cntrl(periph); + + /* + * Preserve flags we can't infer that were set before. UNMAPPED comes + * from the PIM, so won't change after we set it the first + * time. Subsequent times, we have to preserve it. + */ + flags = disk->d_flags & DISKFLAG_UNMAPPED_BIO; /* Need to preserve */ + + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); + disk->d_sectorsize = 1 << lbads; + disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); + disk->d_delmaxsize = disk->d_mediasize; + disk->d_flags = DISKFLAG_DIRECT_COMPLETION; + if (nvme_ctrlr_has_dataset_mgmt(cd)) + disk->d_flags |= DISKFLAG_CANDELETE; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); + if (vwc_present) + disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + disk->d_flags |= flags; +} + static int ndaopen(struct disk *dp) { @@ -644,30 +677,6 @@ ndacleanup(struct cam_periph *periph) cam_periph_lock(periph); } -static void -ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) -{ - struct disk *disk = softc->disk; - const struct nvme_namespace_data *nsd; - const struct nvme_controller_data *cd; - uint8_t flbas_fmt, lbads, vwc_present; - - nsd = nvme_get_identify_ns(periph); - cd = nvme_get_identify_cntrl(periph); - - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); - lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); - disk->d_sectorsize = 1 << lbads; - disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); - disk->d_delmaxsize = disk->d_mediasize; - disk->d_flags = DISKFLAG_DIRECT_COMPLETION; - if (nvme_ctrlr_has_dataset_mgmt(cd)) - disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); - if (vwc_present) - disk->d_flags |= DISKFLAG_CANFLUSHCACHE; -} - static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) {