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 93F42A034E for ; Mon, 21 Feb 2022 16:37:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E9FC410F7; Mon, 21 Feb 2022 16:37:19 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id AC1484013F for ; Mon, 21 Feb 2022 16:37:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457838; 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=1WVz6BCBWTZslIjZpkxW34NB5ycrTikoahkO5Z1eeMc=; b=eyxMlK4Vqe2kNPrPhi1W+n25BHUJn0j4VDwnBaANuojlUBJ5H0Hp6FSHMZa2nYunTFZ0Bm 3RpdC+V35ePb7D/xwi84RF3zWb+A9rqeSjSjthCwf0OG5z5IEdg71MGvg3oTdOv7OdDmwJ bqgj2wC+uNibt37ow2tU885o+QeP9r4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-142-bKlcs2YsPrWjXgTrVQEbBw-1; Mon, 21 Feb 2022 10:37:16 -0500 X-MC-Unique: bKlcs2YsPrWjXgTrVQEbBw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E81522F45; Mon, 21 Feb 2022 15:37:14 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA3F47E131; Mon, 21 Feb 2022 15:37:13 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Kevin Laatz , Jiayu Hu , dpdk stable Subject: patch 'dma/idxd: fix burst capacity calculation' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:16 +0000 Message-Id: <20220221153625.152324-7-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/cb7d9a39cb58dae8792de670b60b31e942225ef6 Thanks. Kevin --- >From cb7d9a39cb58dae8792de670b60b31e942225ef6 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 11 Jan 2022 13:41:02 +0000 Subject: [PATCH] dma/idxd: fix burst capacity calculation [ upstream commit a2b43447e923a54a4d8293fae960fbe2dc3f641e ] When the maximum burst size supported by HW is less than the available ring space, incorrect capacity was returned when there was already some jobs queued up for submission. This was because the capacity calculation failed to subtract the number of already-enqueued jobs from the max burst size. After subtraction is done, ensure that any negative values (which should never occur if the user respects the reported limits), are clamped to zero. Fixes: 9459de4edc99 ("dma/idxd: add burst capacity") Signed-off-by: Bruce Richardson Acked-by: Kevin Laatz Tested-by: Jiayu Hu --- drivers/dma/idxd/idxd_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c index fc11b11337..4442d1cbbd 100644 --- a/drivers/dma/idxd/idxd_common.c +++ b/drivers/dma/idxd/idxd_common.c @@ -486,5 +486,7 @@ idxd_burst_capacity(const void *dev_private, uint16_t vchan __rte_unused) used_space = write_idx - idxd->ids_returned; - return RTE_MIN((idxd->desc_ring_mask - used_space), idxd->max_batch_size); + const int ret = RTE_MIN((idxd->desc_ring_mask - used_space), + (idxd->max_batch_size - idxd->batch_size)); + return ret < 0 ? 0 : (uint16_t)ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:44.852003793 +0000 +++ 0007-dma-idxd-fix-burst-capacity-calculation.patch 2022-02-21 15:22:44.035703999 +0000 @@ -1 +1 @@ -From a2b43447e923a54a4d8293fae960fbe2dc3f641e Mon Sep 17 00:00:00 2001 +From cb7d9a39cb58dae8792de670b60b31e942225ef6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a2b43447e923a54a4d8293fae960fbe2dc3f641e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org