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 71540A0545 for ; Mon, 20 Jun 2022 11:48:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67A3A40150; Mon, 20 Jun 2022 11:48:27 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 8A9924280B for ; Mon, 20 Jun 2022 11:48:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718506; 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: in-reply-to:in-reply-to:references:references; bh=vzVDCAFgYTs35vTGQ96LQ5a98QQBisw+8Sw5e7H0RK4=; b=QcXuldf8Y9XRVXPIpqoc4yCKwPrUdlLHQzLJgOOnixRUgvWQ8ivse/JG6QyhMR9342Hu33 yWvpUEFqwWAORmVgsrxXan3XcxiPQl+Eu3XcTkXuVGPktIsd86w/QQVvYFIu9UQ7goJJ1T o3ds3Hz3ir4zbAbUKisZUTpNSNhxB4E= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-245-YFuZAMB2NTSTPVdfbqlypQ-1; Mon, 20 Jun 2022 05:48:22 -0400 X-MC-Unique: YFuZAMB2NTSTPVdfbqlypQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FDE0801756; Mon, 20 Jun 2022 09:48:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0F92400F3FF; Mon, 20 Jun 2022 09:48:21 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'dma/skeleton: fix index returned when no memcpy completed' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:51 +0100 Message-Id: <20220620094752.1027299-18-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e027f40cd22e85c1790a12d8441c8659025fc228 Thanks. Kevin --- >From e027f40cd22e85c1790a12d8441c8659025fc228 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 8 Jun 2022 16:50:05 +0800 Subject: [PATCH] dma/skeleton: fix index returned when no memcpy completed [ upstream commit 618a40a0c97f4e80b05d2dce4d63eecc6210a242 ] 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") 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 @@ -119,4 +119,5 @@ skeldma_start(struct rte_dma_dev *dev) fflush_ring(hw, hw->desc_completed); hw->ridx = 0; + hw->last_ridx = hw->ridx - 1; hw->submitted_count = 0; hw->zero_req_count = 0; @@ -323,7 +324,9 @@ skeldma_dump(const struct rte_dma_dev *dev, FILE *f) (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; @@ -399,9 +402,13 @@ skeldma_completed(void *dev_private, 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; @@ -423,9 +430,13 @@ skeldma_completed_status(void *dev_private, 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 @@ -51,4 +51,5 @@ struct skeldma_hw { char cache1 __rte_cache_aligned; uint16_t ridx; /* ring idx */ + uint16_t last_ridx; uint64_t submitted_count; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:28.169434815 +0100 +++ 0018-dma-skeleton-fix-index-returned-when-no-memcpy-compl.patch 2022-06-20 10:46:27.796146856 +0100 @@ -1 +1 @@ -From 618a40a0c97f4e80b05d2dce4d63eecc6210a242 Mon Sep 17 00:00:00 2001 +From e027f40cd22e85c1790a12d8441c8659025fc228 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 618a40a0c97f4e80b05d2dce4d63eecc6210a242 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org