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 EFC30A034F for ; Mon, 21 Feb 2022 16:37:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E975F41147; Mon, 21 Feb 2022 16:37:22 +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 A8D0C410F3 for ; Mon, 21 Feb 2022 16:37:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457841; 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=ec8kXKD33wK2QhQ6fZ8k9ERhQYxwG7bqHfYEPwNh/wg=; b=COouTPed5wYS8b5Z7a7McVob5T3CldiNly1tNrCxC6Qy5E+j6iBfxIySh1OIlopdcvjZFp tcKKcGRZdTwEA2G6FEJafXo194x1aGtH4jYucUKW2MPImPMCcOmZuSsmCjsWhxXb0WkB4f /kokkCrzdmYwD1iGDVCIlAB4oLuyX0M= 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-310-BCHp0nUaMuOMF-8SQDJ1Bw-1; Mon, 21 Feb 2022 10:37:19 -0500 X-MC-Unique: BCHp0nUaMuOMF-8SQDJ1Bw-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 05449801AC5; Mon, 21 Feb 2022 15:37:18 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB6FC7E131; Mon, 21 Feb 2022 15:37:16 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Sunil Pai G , Kevin Laatz , dpdk stable Subject: patch 'dma/idxd: fix wrap-around in burst capacity calculation' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:18 +0000 Message-Id: <20220221153625.152324-9-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/8e8fe373c0e8b4842d7e1dc4a382edc280f9a03a Thanks. Kevin --- >From 8e8fe373c0e8b4842d7e1dc4a382edc280f9a03a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 11 Jan 2022 13:41:04 +0000 Subject: [PATCH] dma/idxd: fix wrap-around in burst capacity calculation [ upstream commit 63990aeb08f45f0acd435f67fd52a3736a493563 ] The burst capacity calculation code assumes that the write and read (i.e. ids_returned) values both wrap at the ring-size, but the read value instead wraps as UINT16_MAX. Therefore, instead of just adding ring-size to the write value in case the read is greater, we need to just always mask the result to ensure a correct, in-range, value. Fixes: 9459de4edc99 ("dma/idxd: add burst capacity") Reported-by: Sunil Pai G Signed-off-by: Bruce Richardson Tested-by: Sunil Pai G Acked-by: Kevin Laatz --- drivers/dma/idxd/idxd_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c index 4442d1cbbd..ea6413cc7a 100644 --- a/drivers/dma/idxd/idxd_common.c +++ b/drivers/dma/idxd/idxd_common.c @@ -481,8 +481,6 @@ idxd_burst_capacity(const void *dev_private, uint16_t vchan __rte_unused) return 0; - /* For descriptors, check for wrap-around on write but not read */ - if (idxd->ids_returned > write_idx) - write_idx += idxd->desc_ring_mask + 1; - used_space = write_idx - idxd->ids_returned; + /* Subtract and mask to get in correct range */ + used_space = (write_idx - idxd->ids_returned) & idxd->desc_ring_mask; const int ret = RTE_MIN((idxd->desc_ring_mask - used_space), -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:44.889725852 +0000 +++ 0009-dma-idxd-fix-wrap-around-in-burst-capacity-calculati.patch 2022-02-21 15:22:44.036704001 +0000 @@ -1 +1 @@ -From 63990aeb08f45f0acd435f67fd52a3736a493563 Mon Sep 17 00:00:00 2001 +From 8e8fe373c0e8b4842d7e1dc4a382edc280f9a03a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 63990aeb08f45f0acd435f67fd52a3736a493563 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org