Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 870CDCD98CC for ; Thu, 11 Jun 2026 11:24:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXdUy-0001Nz-ML; Thu, 11 Jun 2026 07:23:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXdUv-0001HT-VO for qemu-devel@nongnu.org; Thu, 11 Jun 2026 07:22:57 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wXdUt-00016W-Tk for qemu-devel@nongnu.org; Thu, 11 Jun 2026 07:22:57 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-490be03d47bso70149615e9.0 for ; Thu, 11 Jun 2026 04:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mihalicyn.com; s=mihalicyn; t=1781176974; x=1781781774; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hMXs98sZvrlyIMbqRYGDBzRG9ME97KoeTLg2sAOwlRo=; b=inBQHQsYR+5b3FIweE60IVJwuLjyRxSSPj5UHkfiJ/hm0pAXt4QmevcfNhFvZawNdf NgDZ5dgn/7xGcZvoI7CqYknk5/Uvcj0wW82pjXjebFDsAbhdJoRcxZLSDm+QrwyYSO1Y 4KAhNFGcf7Lq1oNQ9hM+hETWhsppqd5l3uZ9c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781176974; x=1781781774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hMXs98sZvrlyIMbqRYGDBzRG9ME97KoeTLg2sAOwlRo=; b=goAZ67Z/DYekhYJOOjCwC3le4iIbGxBHWtHpXRmxHyExxhdk094HcuoY1H5Knu/BjI nasGv5/XxQ3soaWM0zG7FfrDVzgsX3Hic2f1zRwGI1dQOK6Bz8Cz1xJ0RcyYAwTLj57h Przx9LO0vj6b99jXP6LX5TBqtPAH0NWnS3CzXnM+02oiZM65gyn6I1UHYipPRc7IVFvn 3j8xCzidR/oxfLqY1FcGpyKxgz7EyrWpv0/ujOCBOfoXeDR0YHZvmXDCusNv827XBm0o mrX5bdtwVPltOjkwZFWr8t6Z5auIiwtFJ+r7nEmPm2a21ftrkznKpKhzqZoRVfs0wecq 54Yg== X-Gm-Message-State: AOJu0YwijPG/Y7dHy123ryxt12bx5jo7vsl4KKtDWpZx7ywKWDNEOuKe yZ9izeDJWYrvZO6mf82CjMRBG9RdmEBOe3ZigLhnfLEFrga3HC2SZZTAkVkd2Vy26/yJ6wEU64G rlqH5kII= X-Gm-Gg: Acq92OE3plpSpPwDWhDTTDUUL6W7jHli6e1pLW2Eg71n+DvtHoJ9zrtCKmmv/nl4SF6 rzjPWA1vcUZrQpyyVj2FlNvrRMLf9v1t7CXoRi78v+ejf9Hir3u7S+DWQGK9RrvfDgv1+88OpJu 36IIe/W5ArSBdSgtfVcOmgAAchdtWYuz194IUt1RExPOM3/nn4sCYiDsTDs/FYi03N1rRM2G2C1 FCY+fFgrDHeHVDGjtbhrt90260Jg2Z0jQ+IGupEaW2MHW6bCji+/NDO+qAEKHF4Dyq+NraGAoJf iqXj3bF4yOy/tVHkGOcC6k4a7asf3BXrOOXt6wY9RS56+B7/Cv+PDOHrDjge0ERh1LGC96wJPVQ PGrNualrj4vncURfQxqBOhN+2/MsA25Y/dhuu1hAUGH5TubMZEPmo/TTue4qXOLyTaDJInKqteN zIG9dWLloFhffyfTrjgoaI2ollx4sCBaCMUB9zeaXHKpnctFxOIoeBfjz+35qLVv+O7yVRCloR8 h3H9a+k9E7BMeu1N0wijPpfmBuoRSWrJA== X-Received: by 2002:a05:600d:8489:10b0:490:bfda:7d7e with SMTP id 5b1f17b1804b1-490e55cc58amr20300485e9.3.1781176974177; Thu, 11 Jun 2026 04:22:54 -0700 (PDT) Received: from alex-laptop.lan (p200300cf570ffe006c26edf58ff062dc.dip0.t-ipconnect.de. [2003:cf:570f:fe00:6c26:edf5:8ff0:62dc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f35fb24sm86375554f8f.34.2026.06.11.04.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 04:22:53 -0700 (PDT) From: Alexander Mikhalitsyn To: qemu-devel@nongnu.org Cc: Klaus Jensen , Stefan Hajnoczi , Jesper Devantier , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , =?UTF-8?q?St=C3=A9phane=20Graber?= , Kevin Wolf , Keith Busch , Laurent Vivier , Fabiano Rosas , Zhao Liu , Alexander Mikhalitsyn , Paolo Bonzini , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Mikhalitsyn , Klaus Jensen Subject: [PATCH v9 3/8] hw/nvme: split nvme_init_sq/nvme_init_cq into helpers Date: Thu, 11 Jun 2026 13:22:44 +0200 Message-ID: <20260611112249.165012-4-alexander@mihalicyn.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260611112249.165012-1-alexander@mihalicyn.com> References: <20260611112249.165012-1-alexander@mihalicyn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alexander@mihalicyn.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Alexander Mikhalitsyn We will make a benefit from this split in later patches. Reviewed-by: Klaus Jensen Acked-by: Stefan Hajnoczi Signed-off-by: Alexander Mikhalitsyn --- hw/nvme/ctrl.c | 59 +++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 7510a9e0296..26bb4b52d4d 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4856,18 +4856,14 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req) return NVME_SUCCESS; } -static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, - uint16_t sqid, uint16_t cqid, uint16_t size) +static void __nvme_init_sq(NvmeSQueue *sq) { + NvmeCtrl *n = sq->ctrl; + uint16_t sqid = sq->sqid; + uint16_t cqid = sq->cqid; int i; NvmeCQueue *cq; - sq->ctrl = n; - sq->dma_addr = dma_addr; - sq->sqid = sqid; - sq->size = size; - sq->cqid = cqid; - sq->head = sq->tail = 0; sq->io_req = g_new0(NvmeRequest, sq->size); QTAILQ_INIT(&sq->req_list); @@ -4897,6 +4893,18 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, n->sq[sqid] = sq; } +static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, + uint16_t sqid, uint16_t cqid, uint16_t size) +{ + sq->ctrl = n; + sq->dma_addr = dma_addr; + sq->sqid = sqid; + sq->size = size; + sq->cqid = cqid; + sq->head = sq->tail = 0; + __nvme_init_sq(sq); +} + static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeRequest *req) { NvmeSQueue *sq; @@ -5557,25 +5565,16 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeRequest *req) return NVME_SUCCESS; } -static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, - uint16_t cqid, uint16_t vector, uint16_t size, - uint16_t irq_enabled) +static void __nvme_init_cq(NvmeCQueue *cq) { + NvmeCtrl *n = cq->ctrl; PCIDevice *pci = PCI_DEVICE(n); + uint16_t cqid = cq->cqid; - if (msix_present(pci) && irq_enabled) { - msix_vector_use(pci, vector); + if (msix_present(pci) && cq->irq_enabled) { + msix_vector_use(pci, cq->vector); } - cq->ctrl = n; - cq->cqid = cqid; - cq->size = size; - cq->dma_addr = dma_addr; - cq->phase = 1; - cq->irq_enabled = irq_enabled; - cq->vector = vector; - cq->head = cq->tail = 0; - QTAILQ_INIT(&cq->req_list); QTAILQ_INIT(&cq->sq_list); if (n->dbbuf_enabled) { cq->db_addr = n->dbbuf_dbs + (cqid << 3) + (1 << 2); @@ -5592,6 +5591,22 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, &DEVICE(cq->ctrl)->mem_reentrancy_guard); } +static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, + uint16_t cqid, uint16_t vector, uint16_t size, + uint16_t irq_enabled) +{ + cq->ctrl = n; + cq->cqid = cqid; + cq->size = size; + cq->dma_addr = dma_addr; + cq->phase = 1; + cq->irq_enabled = irq_enabled; + cq->vector = vector; + cq->head = cq->tail = 0; + QTAILQ_INIT(&cq->req_list); + __nvme_init_cq(cq); +} + static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req) { NvmeCQueue *cq; -- 2.47.3