From nobody Fri Sep 25 21:43:20 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 4hs42J4xDbz6txp2 for ; Fri, 25 Sep 2026 21:43:20 +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 4hs42J381jz4BqW for ; Fri, 25 Sep 2026 21:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790372600; 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=Zus8ChL0tIygHl2dkH0wa/mErAx5GNwMPZ5Tq8T/Us4=; b=KZ1Wz/6DOFDCVLeDQVdzgTM9knwVraCPOSGlT4JVbq3DRMu2lIiHg023Eqej5a9q0Sshoj 4v+Pi9KBjkDrXm4p9U+6ItA1kqIp+5Fv4dkoyyGbPNXNYKaJ1oANdhVQLRTkAXFrr9HsMd l9EXI2bouivwAThXOLoemWDpCeQrZuBC5WXp9jBzPC45dOq4pzx8hjDPiGAWv3H43hjtu7 JBdrorQrRfVyGhE64l7J3OI4yjcCzLkttBHxgVYIjN1cYqeag+DDP7iwnbj7ogr0R8jbE+ HV3hnoABRNsaHpnLI0mygFJs5hQ58BNSDiKh5dhmR37nJnxpFeimBuPTWKxDtQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790372600; b=uPqKfC5soAWDRZF5Dkv7k+2QYb5TlIGXU67+LZoinF56KAUb31e6LDsXaj5yDk2GFP3XJo txdiTNDCPcpAdqoL45hyD4GzXdjAvmz6Eh2D1NKqZJrWcgGbOh2xOPErAbiIFIJB7hQTw8 RxWGGvNdFznwDZuBSWPfL7tSi65yqlzjro9Z/d7EZ9iMyrLB6z9EJ4sbdA27DRF9L80qOZ 3qXiOQfLb6zTwfKNoaFTgf5ALUh2L7afXE3NLUtjMyQ/AQOOnyAUnwTV2qXIH8AMxhtnXm RoBCVB4ubxJWQDah1mMQum96u5AknsPUcmcc3gToFhR8ZO4cKLS9bzqJ0ycmCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790372600; 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=Zus8ChL0tIygHl2dkH0wa/mErAx5GNwMPZ5Tq8T/Us4=; b=g+Kscq4qSlqA9/5wEB944cKqZl9f/6zCHhRIomly3bdZ8L0X7lXISLB6m6LJ/BJ/+B3B33 Ca6MPUBfkYaqhVuerxNlfnhSNkFP/pikSYKoSFOWZSKGzou2K+LGrTWpPX7++AiqNX0d52 rQ5NhEDFwaSIQ2KNqtA9Fidk0wMSt/aD+OUQwgQBcTaKi/GWNVLJPl+sh5ro/6IDaA0vzh Dr8xSP5GPmMtFCrTbNVPxGoLSxbMy0n99tqKlZnTcCciHtKl6SZQXDGubeewlHMxtCwtHO vvqGvybEVBxcKuRgjEsOjCyLY40TCRPoRoDi70NlmtzXKE4cxK6RtOT8OiQpQA== 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 4hs42J293czRpK for ; Fri, 25 Sep 2026 21:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40f77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 25 Sep 2026 21:43:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 4bfe52650c14 - main - nvme: share one routine between Delete I/O CQ and Delete I/O SQ 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: 4bfe52650c140694505dd136f24bb3649153124a Auto-Submitted: auto-generated Date: Fri, 25 Sep 2026 21:43:20 +0000 Message-Id: <6ab6eaf8.40f77.ba897ce@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=4bfe52650c140694505dd136f24bb3649153124a commit 4bfe52650c140694505dd136f24bb3649153124a Author: Abdelkader Boudih AuthorDate: 2026-09-25 21:42:42 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-25 21:42:42 +0000 nvme: share one routine between Delete I/O CQ and Delete I/O SQ Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D60021 --- sys/dev/nvme/nvme_ctrlr_cmd.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c index 728b49f5e41d..27a2848038d5 100644 --- a/sys/dev/nvme/nvme_ctrlr_cmd.c +++ b/sys/dev/nvme/nvme_ctrlr_cmd.c @@ -121,9 +121,9 @@ nvme_ctrlr_cmd_create_io_sq(struct nvme_controller *ctrlr, nvme_ctrlr_submit_admin_request(ctrlr, req); } -void -nvme_ctrlr_cmd_delete_io_cq(struct nvme_controller *ctrlr, - struct nvme_qpair *io_que, nvme_cb_fn_t cb_fn, void *cb_arg) +static void +nvme_ctrlr_cmd_delete_io_queue(struct nvme_controller *ctrlr, + struct nvme_qpair *io_que, uint8_t opc, nvme_cb_fn_t cb_fn, void *cb_arg) { struct nvme_request *req; struct nvme_command *cmd; @@ -131,11 +131,10 @@ nvme_ctrlr_cmd_delete_io_cq(struct nvme_controller *ctrlr, req = nvme_allocate_request_null(M_WAITOK, cb_fn, cb_arg); cmd = &req->cmd; - cmd->opc = NVME_OPC_DELETE_IO_CQ; + cmd->opc = opc; /* - * TODO: create a delete io completion queue command data - * structure. + * TODO: create a delete io queue command data structure. */ cmd->cdw10 = htole32(io_que->id); @@ -143,24 +142,19 @@ nvme_ctrlr_cmd_delete_io_cq(struct nvme_controller *ctrlr, } void -nvme_ctrlr_cmd_delete_io_sq(struct nvme_controller *ctrlr, +nvme_ctrlr_cmd_delete_io_cq(struct nvme_controller *ctrlr, struct nvme_qpair *io_que, nvme_cb_fn_t cb_fn, void *cb_arg) { - struct nvme_request *req; - struct nvme_command *cmd; - - req = nvme_allocate_request_null(M_WAITOK, cb_fn, cb_arg); - - cmd = &req->cmd; - cmd->opc = NVME_OPC_DELETE_IO_SQ; - - /* - * TODO: create a delete io submission queue command data - * structure. - */ - cmd->cdw10 = htole32(io_que->id); + nvme_ctrlr_cmd_delete_io_queue(ctrlr, io_que, NVME_OPC_DELETE_IO_CQ, + cb_fn, cb_arg); +} - nvme_ctrlr_submit_admin_request(ctrlr, req); +void +nvme_ctrlr_cmd_delete_io_sq(struct nvme_controller *ctrlr, + struct nvme_qpair *io_que, nvme_cb_fn_t cb_fn, void *cb_arg) +{ + nvme_ctrlr_cmd_delete_io_queue(ctrlr, io_que, NVME_OPC_DELETE_IO_SQ, + cb_fn, cb_arg); } void