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 6D281A0093 for ; Tue, 10 May 2022 14:30:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68C5542831; Tue, 10 May 2022 14:30:40 +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 2619D4069D for ; Tue, 10 May 2022 14:30:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185838; 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=wwHlnb6soIa7CTJuL3FDX4woa6n7Zf2X7BNPB6oPEZk=; b=jJrZMZMvIHtie/Z8IVJlVxG1oHSt3pWvLqaZl7ntkIq8g1PBAqYpJVVwWAHjogdjx+wA56 z4SEHVINaS2cyoso7ov8Wm5bXuFM8ruPt4ABDIWelFW+8KHl7TgD6plAHJiN1BIKqnfXWB 8mRr83Etg/6SA581igaWADP7UXCYiyk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-nSuwSMLBNJOUUtPQmri1gw-1; Tue, 10 May 2022 08:30:35 -0400 X-MC-Unique: nSuwSMLBNJOUUtPQmri1gw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6972D1C3E988; Tue, 10 May 2022 12:30:35 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AC9C4010127; Tue, 10 May 2022 12:30:33 +0000 (UTC) From: Kevin Traynor To: Dmitry Kozlyuk Cc: Matan Azrad , dpdk stable Subject: patch 'common/mlx5: fix memory region range calculation' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:48 +0100 Message-Id: <20220510123010.159523-11-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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 05/15/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/72691359faa37e4ae67027bee6ea7231ac8dfac9 Thanks. Kevin --- >From 72691359faa37e4ae67027bee6ea7231ac8dfac9 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Thu, 31 Mar 2022 17:33:16 +0300 Subject: [PATCH] common/mlx5: fix memory region range calculation [ upstream commit 8113251862a0813e171d76a6a56b7f93987690ce ] MR end for a mempool chunk may be calculated incorrectly. For example, for chunk with addr=1.5M and len=1M with 2M page size the range would be [0, 2M), while the proper result is [0, 4M). Fix the calculation. Fixes: 690b2a88c2f7 ("common/mlx5: add mempool registration facilities") Signed-off-by: Dmitry Kozlyuk Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common_mr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c index 5f7e4f6734..4a5936bcdf 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -1291,9 +1291,10 @@ mlx5_range_from_mempool_chunk(struct rte_mempool *mp, void *opaque, { struct mlx5_range *ranges = opaque, *range = &ranges[idx]; + uintptr_t start = (uintptr_t)memhdr->addr; uint64_t page_size = rte_mem_page_size(); RTE_SET_USED(mp); - range->start = RTE_ALIGN_FLOOR((uintptr_t)memhdr->addr, page_size); - range->end = RTE_ALIGN_CEIL(range->start + memhdr->len, page_size); + range->start = RTE_ALIGN_FLOOR(start, page_size); + range->end = RTE_ALIGN_CEIL(start + memhdr->len, page_size); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:21.862450102 +0100 +++ 0011-common-mlx5-fix-memory-region-range-calculation.patch 2022-05-10 13:24:21.573646321 +0100 @@ -1 +1 @@ -From 8113251862a0813e171d76a6a56b7f93987690ce Mon Sep 17 00:00:00 2001 +From 72691359faa37e4ae67027bee6ea7231ac8dfac9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8113251862a0813e171d76a6a56b7f93987690ce ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index fa27bd98de..06e4c8f187 100644 +index 5f7e4f6734..4a5936bcdf 100644 @@ -24 +25 @@ -@@ -1290,9 +1290,10 @@ mlx5_range_from_mempool_chunk(struct rte_mempool *mp, void *opaque, +@@ -1291,9 +1291,10 @@ mlx5_range_from_mempool_chunk(struct rte_mempool *mp, void *opaque,