From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 966D3A0548; Wed, 8 Jun 2022 10:56:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DCEF427F6; Wed, 8 Jun 2022 10:56:32 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id C286940689 for ; Wed, 8 Jun 2022 10:56:29 +0200 (CEST) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LJ1Jx5zr3zjXPb; Wed, 8 Jun 2022 16:55:29 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 8 Jun 2022 16:56:27 +0800 From: Chengwen Feng To: , , CC: , , Subject: [PATCH 1/3] dma/skeleton: fix return last-idx when no memcopy completed Date: Wed, 8 Jun 2022 16:50:05 +0800 Message-ID: <20220608085007.10679-2-fengchengwen@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220608085007.10679-1-fengchengwen@huawei.com> References: <20220608085007.10679-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500024.china.huawei.com (7.185.36.10) X-CFilter-Loop: Reflected 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 If no memcopy request is completed, the ring_idx of the last completed operation need returned by last_idx parameter. This patch fixes it. Fixes: 05d5fc66a269 ("dma/skeleton: introduce skeleton driver") Cc: stable@dpdk.org Signed-off-by: Chengwen Feng --- drivers/dma/skeleton/skeleton_dmadev.c | 17 ++++++++++++++--- drivers/dma/skeleton/skeleton_dmadev.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/dma/skeleton/skeleton_dmadev.c b/drivers/dma/skeleton/skeleton_dmadev.c index 81cbdd286e..6b0bb14e2c 100644 --- a/drivers/dma/skeleton/skeleton_dmadev.c +++ b/drivers/dma/skeleton/skeleton_dmadev.c @@ -118,6 +118,7 @@ skeldma_start(struct rte_dma_dev *dev) fflush_ring(hw, hw->desc_running); fflush_ring(hw, hw->desc_completed); hw->ridx = 0; + hw->last_ridx = hw->ridx - 1; hw->submitted_count = 0; hw->zero_req_count = 0; hw->completed_count = 0; @@ -322,9 +323,11 @@ skeldma_dump(const struct rte_dma_dev *dev, FILE *f) GET_RING_COUNT(hw->desc_completed)); (void)fprintf(f, " next_ring_idx: %u\n" + " last_ring_idx: %u\n" " submitted_count: %" PRIu64 "\n" " completed_count: %" PRIu64 "\n", - hw->ridx, hw->submitted_count, hw->completed_count); + hw->ridx, hw->last_ridx, + hw->submitted_count, hw->completed_count); return 0; } @@ -398,11 +401,15 @@ skeldma_completed(void *dev_private, count = RTE_MIN(nb_cpls, rte_ring_count(hw->desc_completed)); while (index < count) { (void)rte_ring_dequeue(hw->desc_completed, (void **)&desc); - if (index == count - 1) + if (index == count - 1) { + hw->last_ridx = desc->ridx; *last_idx = desc->ridx; + } index++; (void)rte_ring_enqueue(hw->desc_empty, (void *)desc); } + if (unlikely(count == 0)) + *last_idx = hw->last_ridx; return count; } @@ -422,11 +429,15 @@ skeldma_completed_status(void *dev_private, count = RTE_MIN(nb_cpls, rte_ring_count(hw->desc_completed)); while (index < count) { (void)rte_ring_dequeue(hw->desc_completed, (void **)&desc); - if (index == count - 1) + if (index == count - 1) { + hw->last_ridx = desc->ridx; *last_idx = desc->ridx; + } status[index++] = RTE_DMA_STATUS_SUCCESSFUL; (void)rte_ring_enqueue(hw->desc_empty, (void *)desc); } + if (unlikely(count == 0)) + *last_idx = hw->last_ridx; return count; } diff --git a/drivers/dma/skeleton/skeleton_dmadev.h b/drivers/dma/skeleton/skeleton_dmadev.h index 91eb5460fc..6f89400480 100644 --- a/drivers/dma/skeleton/skeleton_dmadev.h +++ b/drivers/dma/skeleton/skeleton_dmadev.h @@ -50,6 +50,7 @@ struct skeldma_hw { /* Cache delimiter for dataplane API's operation data */ char cache1 __rte_cache_aligned; uint16_t ridx; /* ring idx */ + uint16_t last_ridx; uint64_t submitted_count; /* Cache delimiter for cpucopy thread's operation data */ -- 2.33.0