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 5BC01A0C41 for ; Tue, 30 Nov 2021 17:39:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5782A41186; Tue, 30 Nov 2021 17:39:28 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 8B48641190 for ; Tue, 30 Nov 2021 17:39:26 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6584B3F1ED for ; Tue, 30 Nov 2021 16:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290366; bh=Pje6S9jTsDCE5UTCRPcRGaDElcWcOgrcY3ZTSPYXke4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I9MAPDU0e8EFzMh+QjA8jKYRuPpACic9QnSYV5B3MPn5xORx+UkyGox75dlEIOR/f L2H0GUd3EtqQYtXRXmDhQEJFi4lV8lAr4pblW3CD1u/wHjNi+sYlahGrtFBffXU+0M Q+g8j2tXa7PRwe45NHsEWufE/2FJiBf6KZIsAOADa9+Mt8sXWNirzFyrnxhm4vhVEg mxOQbiFYrU65cCXYLYAtW3nAk1sZYqz5idDUYq0tdHjdwfMq4yvC7yocHZnQRdFMI4 5ErAFGgZpNyiOSzf2HxWpeyghJRLoOMOyI7wuPCDS+vmNcNJtvfdyWAwuiJe+uDfmK +UWdIgaJI+33g== Received: by mail-ed1-f69.google.com with SMTP id s12-20020a50ab0c000000b003efdf5a226fso11300617edc.10 for ; Tue, 30 Nov 2021 08:39:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pje6S9jTsDCE5UTCRPcRGaDElcWcOgrcY3ZTSPYXke4=; b=K59U3SNraTbheAH+LBBfCwEcFMbOHmBOVtx/KvOTcKvRnJ4wla1BM4vEbC6VHujt4j uO2edQexE1RJ1BXmdIylb7ISOm2orYA1aT1NDMmFNLtA5lJTKjmDdKsmfpSaO+Vrh7Hc QBygt/CQUJyW1HInqfAfxpeikGsEnJoI8jlji31+K98mLRDpu4i6mkotIsAFGNBizR2W uvKixSqC1ZgKwtvqQk6iqmEH9wKBLZ2Gjw+RcD7dc9wk+F5XjfdNQ5X/dTLgMWT4C4EB 2LZdXz4fquL8tPf6t98EWrpTxSXawZ8wgCGl7GcWy/0hjQXidVzHCKQsbocYEyvqGdBG Id0w== X-Gm-Message-State: AOAM532q9GXtkv42l2Hm3TB3k/mLIEdJlQFbirMdhmpGSrNC582u6MNQ 92Oibehu/VWE45U4Wgg9P/rLucwk4ZawG0dRHac+KjwObx7+DDGAFk1zd1wYCyt6Wkpsncqk2aL Ktxgs6/uVi8V/lEbBE1qZDYjR X-Received: by 2002:a17:906:b854:: with SMTP id ga20mr238479ejb.308.1638290365825; Tue, 30 Nov 2021 08:39:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhtv1bt20tIszRj+fKPDNrnjpgvuflcUgm9TKro1GCEGc4VTPSOk7NyRm9XLQgswF4O8jaUA== X-Received: by 2002:a17:906:b854:: with SMTP id ga20mr238456ejb.308.1638290365628; Tue, 30 Nov 2021 08:39:25 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id f7sm11590549edw.44.2021.11.30.08.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:25 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'eal/freebsd: ignore in-memory option' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:29 +0100 Message-Id: <20211130163605.2460997-65-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1f3a6bf92333f9c310ba6b7a9ebfc22e0c01b9a0 Thanks. Christian Ehrhardt --- >From 1f3a6bf92333f9c310ba6b7a9ebfc22e0c01b9a0 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 13 Sep 2021 15:34:24 +0100 Subject: [PATCH] eal/freebsd: ignore in-memory option [ upstream commit 0faa4cfc50275751a86ed17147175c78a36f0da2 ] The in-memory option is not supported on FreeBSD so print a warning and ignore the flag when it is specified for BSD apps. The lack of support is due to the different way in which memory is managed on FreeBSD using the contigmem driver rather than via a hugetlbfs filesystem. Fixes: 14de8734c401 ("eal: add --in-memory option") Signed-off-by: Bruce Richardson --- lib/librte_eal/freebsd/eal/eal.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c index 2a995ee3f4..d97651725b 100644 --- a/lib/librte_eal/freebsd/eal/eal.c +++ b/lib/librte_eal/freebsd/eal/eal.c @@ -743,6 +743,10 @@ rte_eal_init(int argc, char **argv) /* FreeBSD always uses legacy memory model */ internal_config.legacy_mem = true; + if (internal_conf.in_memory) { + RTE_LOG(WARNING, EAL, "Warning: ignoring unsupported flag, '%s'\n", OPT_IN_MEMORY); + internal_conf.in_memory = false; + } if (eal_plugins_init() < 0) { rte_eal_init_alert("Cannot init plugins"); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.749316034 +0100 +++ 0065-eal-freebsd-ignore-in-memory-option.patch 2021-11-30 16:50:05.734873118 +0100 @@ -1 +1 @@ -From 0faa4cfc50275751a86ed17147175c78a36f0da2 Mon Sep 17 00:00:00 2001 +From 1f3a6bf92333f9c310ba6b7a9ebfc22e0c01b9a0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0faa4cfc50275751a86ed17147175c78a36f0da2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eal/freebsd/eal.c | 4 ++++ + lib/librte_eal/freebsd/eal/eal.c | 4 ++++ @@ -19,5 +20,5 @@ -diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c -index 6cee5ae369..fb734012a4 100644 ---- a/lib/eal/freebsd/eal.c -+++ b/lib/eal/freebsd/eal.c -@@ -718,6 +718,10 @@ rte_eal_init(int argc, char **argv) +diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c +index 2a995ee3f4..d97651725b 100644 +--- a/lib/librte_eal/freebsd/eal/eal.c ++++ b/lib/librte_eal/freebsd/eal/eal.c +@@ -743,6 +743,10 @@ rte_eal_init(int argc, char **argv) @@ -26,2 +27,2 @@ - internal_conf->legacy_mem = true; -+ if (internal_conf->in_memory) { + internal_config.legacy_mem = true; ++ if (internal_conf.in_memory) { @@ -29 +30 @@ -+ internal_conf->in_memory = false; ++ internal_conf.in_memory = false;