From nobody Fri Jan 9 21:03:13 2026 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 4dnvPZ0vFfz6MMkP for ; Fri, 09 Jan 2026 21:03:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnvPY6zM1z3SWb for ; Fri, 09 Jan 2026 21:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767992594; 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=WzT+rWHWiSByVQ4t0Kar3CUGPJNJ2IkijtxNeb7Dbmc=; b=F4GF3epbULsOQUr4VHkvrJ+hzqi9tXLgWMu3BJ3O3RL9lcsqUNSkJKNe9XQGmwYILLB/uB LU+92V4Zx1WdkCZSpVXFNXBZeqY6+U5RJPE/YjvXQiNWGfKCdXlK9fe3pyOY4HgsgbFSVm HkKBcnFVAHq9ii7l4UQ3WjR7naCS0EC3l4LR9F1jXHFwa2QByyzhuULw4Z9q0xBnU76qWF v0vjcjUPPP6nsn2wabeECedlwPkNRZV9wbA3y1GMZKYSkhHj2CZekRCYU0sj1obI5vppxD CltCW/5uuQMZLwOchONS63W9kh9dwgZR6E0FJv0kjtArQA2D/UZtAC6iZu2SVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767992594; 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=WzT+rWHWiSByVQ4t0Kar3CUGPJNJ2IkijtxNeb7Dbmc=; b=qjwGLiHwDKIgLYL8paz9Ntay2SAp0latUnk6tjq+YVyi9xTTZ31T3JX/B8sfjClNnk0KlH xC3JVriu7mDssvo4f8XaOjeIT55WHVnOIzmRd44W5XXbAmrm/URZxczEPX2W2U6zBCV8vd 7xRUomPANA2Tj2HP4NGO2t6hNcmjCwedrJyu/9/fZxnYC+EhPAMQNi/Kal3JMQcRvoj5XS LVjP+hW6A6erWJUzLlG5x64NKvky0MwvpqfKkS1JgyOSSWijnYN9o/fInGMc4Jt7Mh2uz9 sb/z0CjrshfYZ/lC8iZapXGKX8aL1fZ/BfTjDSW8Y4okxjnkCHse86H5VM6v9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767992594; a=rsa-sha256; cv=none; b=Qmplgm7B7H9vPYOdLClJ0eyYpem84yntjQjnY0Nl+nrR7iTpg8mKXtn9zjjiCdi7BUaYLO lwbGCDTOm/OVkO2ngUrRR1bcLqWGTvSS/zUkZTUXF4Q5Pe2PUrlCHP/pEoXeTYO7XxNTiJ DXsARt6e+UiUMNo6U1j7826W6QrgDlTNUGHuitEUzMUVOnI2E3gIe6vuxSINOn5yYIz1L8 MW7OuLIDy8+1LCSxCUbjfhQH12hcmaFvbWhG+T7xR1/nQzEnXmUfEmT8ooclG1GDFwvMPG Pp54LeiTMHJE2TfWeuoWbpX+B9QuTvZIP0HqOC8bDdRzDTw+E3KE4nEKQH4Sbg== 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 4dnvPY6Tjgz8Wd for ; Fri, 09 Jan 2026 21:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d880 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 21:03:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alexey Sukhoguzov From: Warner Losh Subject: git: 4c18ec0e75e1 - main - nvme: Handle get/set feature payloads 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: 4c18ec0e75e1f2ca99e587d749a9191513e63a29 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 21:03:13 +0000 Message-Id: <69616d11.d880.61fff2c0@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4c18ec0e75e1f2ca99e587d749a9191513e63a29 commit 4c18ec0e75e1f2ca99e587d749a9191513e63a29 Author: Alexey Sukhoguzov AuthorDate: 2024-10-30 10:48:09 +0000 Commit: Warner Losh CommitDate: 2026-01-09 20:32:48 +0000 nvme: Handle get/set feature payloads Signed-off-by: Alexey Sukhoguzov Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1444 --- sys/dev/nvme/nvme_ctrlr_cmd.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c index 5a44ed425acb..1a48a058edd8 100644 --- a/sys/dev/nvme/nvme_ctrlr_cmd.c +++ b/sys/dev/nvme/nvme_ctrlr_cmd.c @@ -171,7 +171,11 @@ nvme_ctrlr_cmd_set_feature(struct nvme_controller *ctrlr, uint8_t feature, struct nvme_request *req; struct nvme_command *cmd; - req = nvme_allocate_request_null(M_WAITOK, cb_fn, cb_arg); + if (payload != NULL) + req = nvme_allocate_request_vaddr(payload, payload_size, + M_WAITOK, cb_fn, cb_arg); + else + req = nvme_allocate_request_null(M_WAITOK, cb_fn, cb_arg); cmd = &req->cmd; cmd->opc = NVME_OPC_SET_FEATURES; @@ -193,7 +197,11 @@ nvme_ctrlr_cmd_get_feature(struct nvme_controller *ctrlr, uint8_t feature, struct nvme_request *req; struct nvme_command *cmd; - req = nvme_allocate_request_null(M_WAITOK, cb_fn, cb_arg); + if (payload != NULL) + req = nvme_allocate_request_vaddr(payload, payload_size, + M_WAITOK, cb_fn, cb_arg); + else + req = nvme_allocate_request_null(M_WAITOK, cb_fn, cb_arg); cmd = &req->cmd; cmd->opc = NVME_OPC_GET_FEATURES;