From nobody Wed Nov 19 21:44:36 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 4dBZkr5Cb1z6JJwj for ; Wed, 19 Nov 2025 21:44:36 +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 4dBZkr1DJSz3CSt for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588676; 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=K7yLCrW6A87SbPTRseU75aJQ+H920CgNhL3UaTtL9hQ=; b=T838uh/0EsKeIOvJrnuZQ62fkk+0uo1HZhqE4PeAitXfKiu5YkwumCi1//JCxxi8YtO675 GZOH1N+TQCo+nMuasFZe+z+c9KKYBVkPJs3F0zqwYDEbjBpkJ4vd/0sbMeYbzy62KKnfKI COVqE+kVv38D4YcOCg/E0/1C5SnZyjemsO/mCQhInC8XfnDVdqUZfIE+pMe1E2pPBiBRQZ DHnZ6V5if+svvHEoQTh7/kjIsJ2/JlYC7ZTDIZDlvWvox/KpFG+Zj+6k1oZejfKbcCt6lS ixtA8B3HugeV3AWF2igxdZQOOUA3uB/EDqSqKiXlmgv8ONNcL8YG05QWlyOAig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588676; 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=K7yLCrW6A87SbPTRseU75aJQ+H920CgNhL3UaTtL9hQ=; b=vz75qanxuJFnw/HV8w9aid5WlAxYrqQhro8VpACCWap3K/jKjGgMCEwxH+17jVRvAhTjtf ssq22MtJ5WWehZ9PbRZE6I3VWfK15CBT0Shgo1Kvl2yC73OLqb2PqItY7GVrkfRDjMMW9J unL4DgRkEa1w0b3OpYb6LhmlswoRRnKFW7719+oiSaIqjsI0Zo8w9uFAihhhRtImXQUzI/ daFrMHjbqsxFnJpE8MU8Cn1jfs9T8KH8wT3NwY1lusvKsPCxe84hJrhr5FnnRkbThURop0 wB0Qr65pDZNSsKhCX5vuLlEPi5xu45p/Ph8nzBr2JP+wdFYCXJ7sDi3sazlAlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588676; a=rsa-sha256; cv=none; b=tOvIlQacdwthpuB2TE37TG4p7Sr+4p8SHpwZv+eVABhVHfiYHEbxl2m3KF0x2Op49LNPQa 3no5Zi7KtOWV4SGcf+wG1rzuCTzxHAQe8kaRRYuuk6XqFLFzf/Z+Q6fgrf/tFLJpoYF2W0 pcFzme+taM0MK7hqvDKYxdMO4ij+Ro3s5R7FMPi2PN7Dyklgr+850BYg11ng8/mOX3Y9qH aroxR35SMjhvEUkqCZxtFzLFT1g2kA9EE0hY0xgt+hzx6i8tK8UCrkkIZc5kbH3S3l0tV4 XsZZD1NDtx1WZBOOY8tS1ttyYOi181tGkbYazd2o4rBD0rcs6rnCChTIDd6cDQ== 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 4dBZkr0k0lzxyc for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 338a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: 0ccc71de6284 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0ccc71de62848366446a86487d36983146609605 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:36 +0000 Message-Id: <691e3a44.338a1.32b68dfa@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ccc71de62848366446a86487d36983146609605 commit 0ccc71de62848366446a86487d36983146609605 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:12 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit dffd882d12d2a71aca464f48209ec9ae6f393b15) (cherry picked from commit 31412fda9fa71d85a19604151d662ac65c301c2a) --- 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.