From nobody Sun Oct 04 17:41:48 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 4hyVFS3FrBz6cTR9 for ; Sun, 04 Oct 2026 17:41:48 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hyVFS1pZrz3Ggj for ; Sun, 04 Oct 2026 17:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791135708; 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=9hrAdHGse6Bz5ODu/mMVYx1shmlOn0QHflGg9EPLg/Q=; b=f2qO4EoATPnKoJkdYpgT1OhFOpnaUTxss0Ewpdjod2uZc8biTmR1OP4ehGpGrMDkvvM9p4 rCk8KGcljqAnzOg/moQrC2mvpWxNEnWFPWfwD7w0302pY3bBPrPr0lJGYKw92u1ImsQdJC Z08W4dAE7qBRJMHG6ClPm3PDnFmfX9+Cm+GeLkXF4u1918OVw4zozjMQQ0Ha3139NyVSIW bkvsxCod1mAzcYT1ner9jsDnxIIBvVjEXUS9dLFii3p3fk0TvLCFDA1p+EIcvVgKfOURBj gOZpmIVZecqWV2bNH+M0yG2U6lR8j+QeLrFH7/jjheInw1ap3O5g9x2ENieo8Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791135708; b=F0ZWloUDVvjYUJvqhvHoGdlwY24MCmC0q9R/SV2aAC+0k2rgD2KoiWOcb7fJovtqcV93Lb jk4iCwhCwMa3hs+Y3kst69yoIf1ecG6dxkHH0BCfPiSGGYahSoauWNLClOQ5xIhG0/xExZ QcAa3cipMt7Dj9QkeJoHepaGmAAdDvSFxVCrShgjUxZV/vLktzLrUTjAD5et1qqjyDVO76 d4gifPFSPXeLrR1cxdx3fkengmBz7lAsZj2K2T+SgYCo3mSXx79+Jycvi0S+OqkgIHWzhT 4dz2QGc3SNkyebj0R+32Gg9xvj6swxXaeXYoBkK7HVJnOtex3UQz/KrnHNIi+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791135708; 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=9hrAdHGse6Bz5ODu/mMVYx1shmlOn0QHflGg9EPLg/Q=; b=fr/Ylel9oYzMkvwlHGwVMRpbzrhEL9oOUSMslahl+TFBEwUzeXa9uIokN5U4CYvLmyj6Sz rOAMQ7PcKdkaEwzhQWNwcWz5hiDDweewg4LsY44z6pxpfKiFohnfnTot9Cqte5Q/kYCaH8 /QOyoF7nxLf/9JmqMUIS+k1dlnpKj6LYNDSVHzFgOUoHuSVMUhxhR/rxY3IChQ9WVb8/4K zgBgMy+FsekIED9hYrFTOs9MH/TadlXuKIxViqxJogH3Lzk3px+L3z9IQq+QS9ZZ7M2rLB Fi6+I7zcywtiUznQcjYN967zuoKVDJimqy5rx5BFhuRoSXYcxnXtNyUDX8u48w== 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 4hyVFS0tygzkPX for ; Sun, 04 Oct 2026 17:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3293a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Oct 2026 17:41:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: e8a7efd92181 - main - nvme: set the controller Timestamp feature 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8a7efd92181720e9d7a7ef50fe3a00294911027 Auto-Submitted: auto-generated Date: Sun, 04 Oct 2026 17:41:48 +0000 Message-Id: <6ac28fdc.3293a.79c18c16@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=e8a7efd92181720e9d7a7ef50fe3a00294911027 commit e8a7efd92181720e9d7a7ef50fe3a00294911027 Author: Abdelkader Boudih AuthorDate: 2026-10-04 17:41:17 +0000 Commit: Abdelkader Boudih CommitDate: 2026-10-04 17:41:17 +0000 nvme: set the controller Timestamp feature Controllers that report ONCS.TIMESTAMP keep a millisecond clock that the host is expected to seed Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D59997 --- sys/dev/nvme/nvme.h | 19 ++++++++++++++ sys/dev/nvme/nvme_ctrlr.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ sys/dev/nvme/nvme_private.h | 3 +++ 3 files changed, 82 insertions(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 5b6ee1026678..ae31170f5379 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1175,6 +1175,25 @@ enum nvme_activate_action { NVME_AA_ACTIVATE = 0x2, }; +/* Timestamp - Data Structure for Set Features / Get Features */ +struct nvme_timestamp_data { + uint8_t tstmp[6]; /* milliseconds since 1970-01-01 UTC */ + uint8_t tstmps; /* attributes, get features only */ + uint8_t rsvd7; +} __packed; + +_Static_assert(sizeof(struct nvme_timestamp_data) == 8, + "bad size for nvme_timestamp_data"); + +/** Timestamp attributes */ +#define NVME_TIMESTAMP_TSTMPS_SYNCH_SHIFT (0) +#define NVME_TIMESTAMP_TSTMPS_SYNCH_MASK (0x1) +#define NVME_TIMESTAMP_TSTMPS_ORIGIN_SHIFT (1) +#define NVME_TIMESTAMP_TSTMPS_ORIGIN_MASK (0x7) + +#define NVME_TIMESTAMP_ORIGIN_RESET (0x0) +#define NVME_TIMESTAMP_ORIGIN_SET_FEATURES (0x1) + struct nvme_power_state { /** Maximum Power */ uint16_t mp; /* Maximum Power */ diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ab8b0aa37a35..1197cf460c83 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -885,6 +885,54 @@ out: free(data, M_NVME); } +/* XXX revisit the ordering if the clock ever comes up earlier. */ +static void +nvme_ctrlr_set_timestamp(struct nvme_controller *ctrlr) +{ + struct nvme_completion_poll_status status; + struct nvme_timestamp_data *ts; + struct timespec now; + uint64_t ms; + int i; + + ts = malloc(sizeof(*ts), M_NVME, M_WAITOK | M_ZERO); + getnanotime(&now); + ms = (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; + for (i = 0; i < nitems(ts->tstmp); i++) + ts->tstmp[i] = (ms >> (i * 8)) & 0xff; + + status.done = 0; + nvme_ctrlr_cmd_set_feature(ctrlr, NVME_FEAT_TIMESTAMP, 0, 0, 0, 0, 0, + ts, sizeof(*ts), nvme_completion_poll_cb, &status); + nvme_completion_poll(&status); + if (nvme_completion_is_error(&status.cpl) && bootverbose) + nvme_printf(ctrlr, "failed to set the timestamp\n"); + free(ts, M_NVME); +} + +static void +nvme_ctrlr_timestamp_mountroot(void *arg) +{ + struct nvme_controller *ctrlr = arg; + + if (ctrlr->is_failed || ctrlr->is_failed_admin || ctrlr->is_dying) + return; + nvme_ctrlr_set_timestamp(ctrlr); +} + +static void +nvme_ctrlr_configure_timestamp(struct nvme_controller *ctrlr) +{ + if (NVMEV(NVME_CTRLR_DATA_ONCS_TIMESTAMP, ctrlr->cdata.oncs) == 0) + return; + + /* The mountroot handler registered at attach does the initial set. */ + if (!root_mounted()) + return; + + nvme_ctrlr_set_timestamp(ctrlr); +} + static void nvme_ctrlr_configure_int_coalescing(struct nvme_controller *ctrlr) { @@ -1153,6 +1201,7 @@ nvme_ctrlr_start(void *ctrlr_arg, bool resetting) nvme_ctrlr_configure_aer(ctrlr); nvme_ctrlr_configure_apst(ctrlr); nvme_ctrlr_configure_int_coalescing(ctrlr); + nvme_ctrlr_configure_timestamp(ctrlr); for (i = 0; i < ctrlr->num_io_queues; i++) nvme_io_qpair_enable(&ctrlr->ioq[i]); @@ -1194,6 +1243,12 @@ nvme_ctrlr_start_config_hook(void *arg) nvme_printf(ctrlr, "ignoring Apple-internal namespaces above NSID 1\n"); + if (!root_mounted() && + NVMEV(NVME_CTRLR_DATA_ONCS_TIMESTAMP, ctrlr->cdata.oncs) != 0) + ctrlr->timestamp_tag = EVENTHANDLER_REGISTER(mountroot, + nvme_ctrlr_timestamp_mountroot, ctrlr, + EVENTHANDLER_PRI_ANY); + ctrlr->is_initialized = true; child = device_add_child(ctrlr->dev, NULL, DEVICE_UNIT_ANY); device_set_ivars(child, ctrlr); @@ -1851,6 +1906,11 @@ nvme_ctrlr_destruct(struct nvme_controller *ctrlr, device_t dev) ctrlr->is_dying = true; + if (ctrlr->timestamp_tag != NULL) { + EVENTHANDLER_DEREGISTER(mountroot, ctrlr->timestamp_tag); + ctrlr->timestamp_tag = NULL; + } + if (ctrlr->resource == NULL) goto nores; if (!mtx_initialized(&ctrlr->adminq.lock)) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index c7095bc34334..6f228cd1427b 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -329,6 +330,8 @@ struct nvme_controller { bool isr_warned; bool is_initialized; + eventhandler_tag timestamp_tag; + /* Host Memory Buffer */ int hmb_nchunks; size_t hmb_chunk;