From patchwork Mon Aug 12 23:42:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chautru, Nicolas" X-Patchwork-Id: 143111 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 75D58457A5; Tue, 13 Aug 2024 01:40:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB3B040E64; Tue, 13 Aug 2024 01:39:53 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mails.dpdk.org (Postfix) with ESMTP id 43452402BB for ; Tue, 13 Aug 2024 01:39:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723505989; x=1755041989; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FVcMF6oPGz/GJj6u3Itq3gleFzKz7ojJPpUoKf+khsc=; b=VW+OzF06wxpL6s+1q9zLReHejZeoFQHY/VoIx0TEzXx8Q2mZvhkPrB7G yTwrqyi+6mQ4O3/sLGD0mPyl508HZ4TbexcEXByGr4CH3Sk0FEwvs7+or YbEx5V1DNRrl2vRcbroccLrZItqUmR1Y6asP1/fVs/YjdZpiTZw0Ri25h 5RZ28QkrWwqpthQBo7LtZ2/cU4SzgVeMjgetz5deJ11T9I/PJ5vF4gH+D jAfceeV3D783Wz+P97ySrPpLviSjS+hElXBiWPb2cRwfklkLbxOnCuyFE TyLPQInHJrsQjwExD/966D0SSPPWvCvcMu3EHFB5WadM7l2cP5M4wkUA+ Q==; X-CSE-ConnectionGUID: 2aQChbOLR0iJlrovlwcBWA== X-CSE-MsgGUID: zyOAW/6JTRGwIWcruoArzQ== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="32323303" X-IronPort-AV: E=Sophos;i="6.09,284,1716274800"; d="scan'208";a="32323303" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2024 16:39:47 -0700 X-CSE-ConnectionGUID: BkmDmf3kS12jg8Wm5azM4g== X-CSE-MsgGUID: b6p+uFSWSS+YwGeptUMAdQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,284,1716274800"; d="scan'208";a="62630019" Received: from spr-npg-bds1-eec2.sn.intel.com (HELO spr-npg-bds1-eec2..) ([10.233.181.123]) by fmviesa003.fm.intel.com with ESMTP; 12 Aug 2024 16:39:46 -0700 From: Nicolas Chautru To: dev@dpdk.org, maxime.coquelin@redhat.com Cc: hemant.agrawal@nxp.com, david.marchand@redhat.com, hernan.vargas@intel.com, Nicolas Chautru Subject: [PATCH v2 2/3] baseband/acc: refactor queue status update Date: Mon, 12 Aug 2024 16:42:00 -0700 Message-Id: <20240812234201.2196633-3-nicolas.chautru@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812234201.2196633-1-nicolas.chautru@intel.com> References: <20240812234201.2196633-1-nicolas.chautru@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Introducing common function for queue stats update within the acc PMDs. Signed-off-by: Nicolas Chautru Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/acc_common.h | 18 ++++++++ drivers/baseband/acc/rte_acc100_pmd.c | 45 ++++++-------------- drivers/baseband/acc/rte_vrb_pmd.c | 61 +++++++++------------------ 3 files changed, 50 insertions(+), 74 deletions(-) diff --git a/drivers/baseband/acc/acc_common.h b/drivers/baseband/acc/acc_common.h index e249f37e38..06a88360de 100644 --- a/drivers/baseband/acc/acc_common.h +++ b/drivers/baseband/acc/acc_common.h @@ -1555,6 +1555,24 @@ acc_aq_avail(struct rte_bbdev_queue_data *q_data, uint16_t num_ops) return aq_avail; } +/* Update queue stats during enqueue. */ +static inline void +acc_update_qstat_enqueue(struct rte_bbdev_queue_data *q_data, + uint16_t enq_count, uint16_t enq_err_count) +{ + q_data->queue_stats.enqueued_count += enq_count; + q_data->queue_stats.enqueue_err_count += enq_err_count; + q_data->queue_stats.enqueue_depth_avail = acc_aq_avail(q_data, 0); +} + +/* Update queue stats during dequeue. */ +static inline void +acc_update_qstat_dequeue(struct rte_bbdev_queue_data *q_data, uint16_t deq_count) +{ + q_data->queue_stats.dequeued_count += deq_count; + q_data->queue_stats.enqueue_depth_avail = acc_aq_avail(q_data, 0); +} + /* Calculates number of CBs in processed encoder TB based on 'r' and input * length. */ diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index ab69350080..d2a0a36e12 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -892,6 +892,7 @@ acc100_queue_stop(struct rte_bbdev *dev, uint16_t queue_id) dev->data->queues[queue_id].queue_stats.dequeue_err_count = 0; dev->data->queues[queue_id].queue_stats.enqueue_warn_count = 0; dev->data->queues[queue_id].queue_stats.dequeue_warn_count = 0; + dev->data->queues[queue_id].queue_stats.enqueue_depth_avail = 0; return 0; } @@ -3196,9 +3197,7 @@ acc100_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3245,9 +3244,7 @@ acc100_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, desc_idx, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3284,9 +3281,7 @@ acc100_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3322,9 +3317,7 @@ acc100_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3388,9 +3381,7 @@ acc100_enqueue_dec_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3426,9 +3417,7 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3468,9 +3457,7 @@ acc100_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3505,9 +3492,7 @@ acc100_enqueue_dec_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3897,8 +3882,7 @@ acc100_dequeue_enc(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_descs; - /* Update enqueue stats */ - q_data->queue_stats.dequeued_count += dequeued_ops; + acc_update_qstat_dequeue(q_data, dequeued_ops); return dequeued_ops; } @@ -3940,8 +3924,7 @@ acc100_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_descs; - /* Update enqueue stats */ - q_data->queue_stats.dequeued_count += dequeued_ops; + acc_update_qstat_dequeue(q_data, dequeued_ops); return dequeued_ops; } @@ -3986,8 +3969,7 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_cbs; - /* Update enqueue stats */ - q_data->queue_stats.dequeued_count += i; + acc_update_qstat_dequeue(q_data, i); return i; } @@ -4033,8 +4015,7 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_cbs; - /* Update enqueue stats */ - q_data->queue_stats.dequeued_count += i; + acc_update_qstat_dequeue(q_data, i); return i; } diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c index 585dc49bd6..630b514f03 100644 --- a/drivers/baseband/acc/rte_vrb_pmd.c +++ b/drivers/baseband/acc/rte_vrb_pmd.c @@ -1109,6 +1109,7 @@ vrb_queue_stop(struct rte_bbdev *dev, uint16_t queue_id) dev->data->queues[queue_id].queue_stats.dequeue_err_count = 0; dev->data->queues[queue_id].queue_stats.enqueue_warn_count = 0; dev->data->queues[queue_id].queue_stats.dequeue_warn_count = 0; + dev->data->queues[queue_id].queue_stats.enqueue_depth_avail = 0; return 0; } @@ -2738,9 +2739,7 @@ vrb_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -2778,9 +2777,7 @@ vrb_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, desc_idx, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -2817,9 +2814,7 @@ vrb_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -2864,9 +2859,7 @@ vrb_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -2926,9 +2919,7 @@ vrb_enqueue_dec_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -2961,9 +2952,7 @@ vrb_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3004,9 +2993,7 @@ vrb_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3041,9 +3028,7 @@ vrb_enqueue_dec_tb(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3453,8 +3438,7 @@ vrb_dequeue_enc(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_descs; - /* Update enqueue stats. */ - q_data->queue_stats.dequeued_count += dequeued_ops; + acc_update_qstat_dequeue(q_data, dequeued_ops); return dequeued_ops; } @@ -3496,8 +3480,7 @@ vrb_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_descs; - /* Update enqueue stats. */ - q_data->queue_stats.dequeued_count += dequeued_ops; + acc_update_qstat_dequeue(q_data, dequeued_ops); return dequeued_ops; } @@ -3535,8 +3518,7 @@ vrb_dequeue_dec(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_cbs; - /* Update enqueue stats */ - q_data->queue_stats.dequeued_count += i; + acc_update_qstat_dequeue(q_data, i); return i; } @@ -3575,8 +3557,7 @@ vrb_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_cbs; - /* Update enqueue stats. */ - q_data->queue_stats.dequeued_count += i; + acc_update_qstat_dequeue(q_data, i); return i; } @@ -3782,9 +3763,7 @@ vrb_enqueue_fft(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, i, &q_data->queue_stats); - /* Update stats */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -3851,8 +3830,7 @@ vrb_dequeue_fft(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_cbs; - /* Update enqueue stats. */ - q_data->queue_stats.dequeued_count += i; + acc_update_qstat_dequeue(q_data, i); return i; } @@ -4106,9 +4084,7 @@ vrb2_enqueue_mldts(struct rte_bbdev_queue_data *q_data, acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats); - /* Update stats. */ - q_data->queue_stats.enqueued_count += i; - q_data->queue_stats.enqueue_err_count += num - i; + acc_update_qstat_enqueue(q_data, i, num - i); return i; } @@ -4207,8 +4183,9 @@ vrb2_dequeue_mldts(struct rte_bbdev_queue_data *q_data, q->aq_dequeued += aq_dequeued; q->sw_ring_tail += dequeued_cbs; - /* Update enqueue stats. */ - q_data->queue_stats.dequeued_count += i; + + acc_update_qstat_dequeue(q_data, i); + return i; }