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 1762E41D52 for ; Thu, 23 Feb 2023 16:07:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6D1C643260; Thu, 23 Feb 2023 16:07:44 +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 3D57143250 for ; Thu, 23 Feb 2023 16:07:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164861; 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=/LnzTMoOJTCiG5/LVOvYC7RnGd0FAD6y/ZGKp1GNNnw=; b=djDff/mL8tHbBIYKfOtc/jqsFKzIAwGbP1j2uhryNj0PEzP8WB95qIiVBMVlXKwnxXCk+Y kXyIm67TZ+YHdXnbXq2jlRLHy/AC3vFuC6nM/yld4TCEhLdDMRh6XyioZjnCiffwtlok/K FJjOsKrp5JtoE0ny5wGbgCvTuHTht94= 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-526-uG68bdS6Oeen_GLKAEPD8A-1; Thu, 23 Feb 2023 10:07:39 -0500 X-MC-Unique: uG68bdS6Oeen_GLKAEPD8A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78BBE38149B8; Thu, 23 Feb 2023 15:07:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E6312166B29; Thu, 23 Feb 2023 15:07:36 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: David Marchand , dpdk stable Subject: patch 'mem: fix hugepage info mapping' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:31 +0000 Message-Id: <20230223150631.723699-40-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 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/28/23. 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/8a411e66c309ccbc1c5c00f92979a52de1ac794d Thanks. Kevin --- >From 8a411e66c309ccbc1c5c00f92979a52de1ac794d Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 6 Feb 2023 10:53:10 +0000 Subject: [PATCH] mem: fix hugepage info mapping [ upstream commit 66e7ac416f3d62c5ee773ff02c115a24da9f1991 ] The map_shared_memory() function should treat mmap MAP_FAILED as NULL because callers compare it with NULL to determine whether the map is failed. Fixes: 764bf26873b9 ("add FreeBSD support") Fixes: cb97d93e9d3b ("mem: share hugepage info primary and secondary") Signed-off-by: Chengwen Feng Reviewed-by: David Marchand --- lib/eal/freebsd/eal_hugepage_info.c | 2 +- lib/eal/linux/eal_hugepage_info.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/eal/freebsd/eal_hugepage_info.c b/lib/eal/freebsd/eal_hugepage_info.c index 9dbe375bd3..e58e618469 100644 --- a/lib/eal/freebsd/eal_hugepage_info.c +++ b/lib/eal/freebsd/eal_hugepage_info.c @@ -34,5 +34,5 @@ map_shared_memory(const char *filename, const size_t mem_size, int flags) retval = mmap(NULL, mem_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); close(fd); - return retval; + return retval == MAP_FAILED ? NULL : retval; } diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c index 9fb0e968db..682875ce3e 100644 --- a/lib/eal/linux/eal_hugepage_info.c +++ b/lib/eal/linux/eal_hugepage_info.c @@ -58,5 +58,5 @@ map_shared_memory(const char *filename, const size_t mem_size, int flags) MAP_SHARED, fd, 0); close(fd); - return retval; + return retval == MAP_FAILED ? NULL : retval; } -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.793557405 +0000 +++ 0040-mem-fix-hugepage-info-mapping.patch 2023-02-23 14:46:23.761235935 +0000 @@ -1 +1 @@ -From 66e7ac416f3d62c5ee773ff02c115a24da9f1991 Mon Sep 17 00:00:00 2001 +From 8a411e66c309ccbc1c5c00f92979a52de1ac794d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 66e7ac416f3d62c5ee773ff02c115a24da9f1991 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index a1b6cb31ff..24411d9c5b 100644 +index 9fb0e968db..682875ce3e 100644 @@ -36 +37 @@ -@@ -51,5 +51,5 @@ map_shared_memory(const char *filename, const size_t mem_size, int flags) +@@ -58,5 +58,5 @@ map_shared_memory(const char *filename, const size_t mem_size, int flags)