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 4CA6BA00C2 for ; Tue, 8 Mar 2022 15:15:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47FA44068E; Tue, 8 Mar 2022 15:15:57 +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 3DEBC4068B for ; Tue, 8 Mar 2022 15:15:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748955; 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=8QNoYc+xayc6mrMRwv6cuPfiSauqTAOWKQYdj61ONCw=; b=CGfU/VQWHRMYl8m6AVkL2oemtrJQeWmUb2GDRlBo/BaTfGoADaRzJ2OOosU/9/AfmGasqI HQQ+j5vtk7D/J67sQRJ85nR5GzaA9K47KyLGTc6ewIF8L8lWEe2VIRidX+fXIH7nnDgvhF 9dL5pxp9GC4iIux3316IyZBzV9OiOYY= 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-398-1WW39ngPMoi8MljJfXqG2Q-1; Tue, 08 Mar 2022 09:15:50 -0500 X-MC-Unique: 1WW39ngPMoi8MljJfXqG2Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75878824FA6; Tue, 8 Mar 2022 14:15:49 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B52585EE5; Tue, 8 Mar 2022 14:15:48 +0000 (UTC) From: Kevin Traynor To: Suanming Mou Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix indexed pool fetch overlap' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:32 +0000 Message-Id: <20220308141500.286915-17-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 03/14/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/fc4aef6adefeb92cb0ef4ca0aca5f9b2b6333763 Thanks. Kevin --- >From fc4aef6adefeb92cb0ef4ca0aca5f9b2b6333763 Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 23 Feb 2022 08:26:11 +0200 Subject: [PATCH] net/mlx5: fix indexed pool fetch overlap [ upstream commit 7bc528bac95a00e2462ae76b1f9e8610d4d67477 ] For indexed pool with local cache, when a new trunk is allocated, half of the trunk's index was fetched to the local cache. In case of local cache size was less then half of the trunk size, memory overlap happened. This commit adds the check of the fetch size, if local cache size is less than fetch size, adjust the fetch size to be local cache size. Fixes: d15c0946beea ("net/mlx5: add indexed pool local cache") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index be33af96fe..4115a2ad77 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -341,4 +341,6 @@ check_again: ts_idx = mlx5_trunk_idx_offset_get(pool, trunk_idx) + 1; fetch_size = trunk->free >> 1; + if (fetch_size > pool->cfg.per_core_cache) + fetch_size = trunk->free - pool->cfg.per_core_cache; for (i = 0; i < fetch_size; i++) lc->idx[i] = ts_idx + i; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:28.856463933 +0000 +++ 0017-net-mlx5-fix-indexed-pool-fetch-overlap.patch 2022-03-08 13:55:28.414314937 +0000 @@ -1 +1 @@ -From 7bc528bac95a00e2462ae76b1f9e8610d4d67477 Mon Sep 17 00:00:00 2001 +From fc4aef6adefeb92cb0ef4ca0aca5f9b2b6333763 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7bc528bac95a00e2462ae76b1f9e8610d4d67477 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org