From nobody Wed Nov 19 04:13:23 2025 X-Original-To: dev-commits-src-branches@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 4dB7Pw2Lqpz6HCdx for ; Wed, 19 Nov 2025 04:13:24 +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 4dB7Pv2BdWz3ggr for ; Wed, 19 Nov 2025 04:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525603; 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=c/Q07TZjiHh+PEKooR+4fGit1mPVtWxRzET1GiILAZM=; b=R3ROnhNQjKXiXsFMvzbhazUwM8gocOVp2FcFodBBRATFXOwRTQCz6xkhSji4BUOMsajHl7 P8PZpdMnof0uJ6u5jSK6YsWKGFQfUYtfaNZWhg37OkrQstuZ6sfZcmpef0/PEA+e5wD4CB CLntetf12ORrV3Z7xPQYAU6ppgGAVaZubDFlJEKGSAU0zpvHh3nv5tSuliqyj3fxSVYKXC vHujKDRitLFK6ir1rTxZ7vcVKRXHRNnFpsdiD2syjgcKUs5+cjOqVO0XxFjswgMRFmh/yH 95N4puc8jZhIQM1cJwyGTuZlvRdkbzpGJ5gnMHZyyUbHsVP5LRwy2wQsh8f0pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525603; 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=c/Q07TZjiHh+PEKooR+4fGit1mPVtWxRzET1GiILAZM=; b=IwdJHEr3wflAiqS1sxMGwHYtFxA8a+rkszpDVHarDAgf++HUXXbvWCucemQ2bB9T/XtlwF q2lZKKzbzMuL6mSb5bKm4iDjahMNy29wjx6i3PCU+i7smsy7+rUxzh5OBLbaQ8wxFj48uW yTEEk6XtW9Zr8H+jSpzFLfDSKZTK+OlzgON4LnNeJKkRZty3TZCaJnJjzGLBJSeuQyH7jQ vjLnJiBbSTY++m+eqU2CFTb7Cgd0KF75AXdOb6hQMCcGjQuCLG7CxPzYS6jMDVT0f+4bap 9YbmKj+hIqdfo14EUQAXhSkGGQYPRK2DpQQOphvRgYiNn43h35aqFAIi0hJjVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525603; a=rsa-sha256; cv=none; b=EbeP/yZtxarb5htN+gscSMRXi1m6wjXuYCa5gczoDNdJpLoYDK40LQjpqR2d3cicF9oiYw O0QOscqAUGghTTSsFpSU0lLk8GeIeV90n1KZIPU8OpAXqvdArLkPDL2MnL1V5Ml46qHNMX o/yRYqZq2Gvvv88WnjAc/WjN3EsiYZmisiPt4Abr//GC+gsCojUW0w1vgbqLyp1vetKrFN x/H50rB0gylcwJWMdu7VK63tQ36q6OkKseAdYU1HyjmwxgBsR81NlBkONuEwmCuMpNJWDE JOmI2S7qEYkrRDFnxY9t5SxV3mNaA7SlD/o9eVhdwy+hWrV5vwK895pvmBfBBg== 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 4dB7Pv1ZrPz7Zr for ; Wed, 19 Nov 2025 04:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8699 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 31412fda9fa7 - stable/15 - nvme: Refactor geom setting to function. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 31412fda9fa71d85a19604151d662ac65c301c2a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:23 +0000 Message-Id: <691d43e3.8699.67b8660c@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=31412fda9fa71d85a19604151d662ac65c301c2a commit 31412fda9fa71d85a19604151d662ac65c301c2a Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit dffd882d12d2a71aca464f48209ec9ae6f393b15) --- sys/cam/nvme/nvme_da.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..330f4ca66e1e 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -643,6 +643,35 @@ 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; + struct ccb_pathinq cpi; + 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; + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } +} + static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) @@ -846,7 +875,6 @@ ndaregister(struct cam_periph *periph, void *arg) const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; char announce_buf[80]; - uint8_t flbas_fmt, lbads, vwc_present; u_int maxio; int quirks; @@ -903,21 +931,8 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - 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; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } + ndasetgeom(softc, periph); + /* * d_ident and d_descr are both far bigger than the length of either * the serial or model number strings.