From nobody Tue Nov 18 21:04:51 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 4d9xvS36qyz6GYSK for ; Tue, 18 Nov 2025 21:04:52 +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 4d9xvR6X7Wz3lJF for ; Tue, 18 Nov 2025 21:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499891; 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=a6Owkq6BS+ogLXdtAyGmhenbg8gdijda0cCZ+P1MMKw=; b=x84nobTFYjzQv1643VohglmAH/PwOdACrwf2M/CTUTNHvipyM24q9SzIxe1EEZYlmCsNgP dcePL/F9tVvBk2jfrpAMED6Pn3n71dM2BMk4jiKFkkk7unyyT/Pv3riQdCFORYwWe/3EgT znn0gxcTukvwgpKrzgyT+bYNPNaCPetSF2gtRpzmFEegVgGljORrXl7ADG/dOglA+su28J 2nnZZ6pvUkT8K/lHuvOPmdRyJSvJDkyORrIOZZfaPK8ONHaANs1g1XmA7O74zM23rq5Myg 4Gnoprt/c65er8o9J8NnGktAJGX7AmdJ1Q8OHc9VIlhZUTWs9wiEJns3W1WQiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499891; 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=a6Owkq6BS+ogLXdtAyGmhenbg8gdijda0cCZ+P1MMKw=; b=Um7hWHirqgr3O0SAGz93kUNlACwsYQMO7DwVcD6gx43P2Ccot3iNPCxHJZvprEqWPp4ExX D9HHeaN923/T48ctcoU2odleyO+DOBpW67hlGBRU8zavsZ3NWobPv2jtvVcUWzOd1Km1WC XW4SyGa4Mir6l2yVjoVeNs+pPCZqzF/MmYpELxz48gFhBW/7XB+a1iVFRYqEPlbM14i5yU iZ6GP8H/TxULwmA+XVbtQHrp5MEiVA1CgOdes33LfsoNkqYFlU4purZ01MsDEEJ+iwQOks E6CvHnexTDn5zFzWoQYWTcEt9TPGSJyBpr5K3hwWuUpUkWNhUAZ004p6JtaKUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499891; a=rsa-sha256; cv=none; b=QoE16bDejpqc6FkGXAxvbrpOABi/NuBPXFqiRKRUuM1yIxSzcNPeXgajReK1A3rls5BTuR nxA2rLsTh7xCm7s52m23i7Iax9T31kjrhiBji4E6w+2nvwdNjWF1ydI4BkmE0uTjy8auhw kWR4DTJR1nqzwc0Rqe0MzTNdUVNPtVbiMINhOgiWAo50/yXWNfuRWIcMBNf0/gDqQj7Xyl fwiGX0RQRD7ffoC+cf3fb9KrOShRlOLqKJ4rrww4GgkGD+YThjWOoH5tc8RGJBG3NBfuoN 9TPr4Ux+SZ739/RInbdP0B/0Rh7F5O3fcA2wxupJm1DTS7e5Zprj3ECys3GuBQ== 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 4d9xvR5y48z198D for ; Tue, 18 Nov 2025 21:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33fbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: dffd882d12d2 - main - nvme: Refactor geom setting to function. 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: dffd882d12d2a71aca464f48209ec9ae6f393b15 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:51 +0000 Message-Id: <691cdf73.33fbc.eb914bb@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dffd882d12d2a71aca464f48209ec9ae6f393b15 commit dffd882d12d2a71aca464f48209ec9ae6f393b15 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-18 20:32:28 +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 --- 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 9c4707da482c..3e9efabe33cd 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -644,6 +644,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) @@ -847,7 +876,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; @@ -904,21 +932,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.