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 31B56A0540 for ; Thu, 7 Jul 2022 09:57:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CE7341147; Thu, 7 Jul 2022 09:57:23 +0200 (CEST) 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 AC46A406B4 for ; Thu, 7 Jul 2022 09:57:21 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 60AA240027 for ; Thu, 7 Jul 2022 07:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180641; bh=GinqXiSGE6qmbubtXtDToVExOzqzHFmWxbthmIUl4iQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=wcowouJKeDlynHxcEWcMuESUo/IRLOR1UnCuD/kwEwK3HoA+9JRVjXh8hvIntk9H8 OxmS+LvaBM4lqURqdz/5R4sm8SBKqvJCBs8kTkJ8GFHnrusGhSLitOy1xpOKMzo6YE WMTRM0vlXEiKvBIFLhZNbWNJ5Ianh6flNzOQRosFkk45CwlGxIJoxG0JnEddfLewrX WuuuvCddGanBFWZiQGF4PAtqv4iyzzM+fbjBo6kHaLYH2eBuWL+3IiRPhwNAQaeNXC Hfe8X02XT7s5XMhmcj8PwWCZWET6S1NeN81DHswT2Gym5TaahXTuuawS52mCCHYCHL s3ptNSM6evMHw== Received: by mail-ej1-f71.google.com with SMTP id k7-20020a1709062a4700b006fe92440164so4482224eje.23 for ; Thu, 07 Jul 2022 00:57:21 -0700 (PDT) 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=GinqXiSGE6qmbubtXtDToVExOzqzHFmWxbthmIUl4iQ=; b=PvVw9k0gvuz8Tm7rpN7QJqpcxZBoJBhPB9b9s94aIzWUgCglPQCwtCb8PZjOUfavqy KbA5vNuFOI6uhDFaAd/B+/vVa9WvXDZJkyhJGsDkD5Sv5+sBkdaLbR9tfcRl2WhWMuEe 8ckEh5jC4KeFE/n6wUKrIkIlpvxchhi0jINkla1sBcgMRbURvOH5288VULiXEJ/6UbJW j33CFnFzwPXBM6WKE3Tktn080Cu3/7eKsoF/fzzRoSmcSXquDhHmx1ur3MYn60G3ufRt jvjn/2uJUchmnZ0zDK5L/5I/Xt52T7+we3F8bsXLjJ06rwRJquKkEqFS4gqhb2OUrkEm dyWw== X-Gm-Message-State: AJIora/IAaerPZTmbsiOCxSmc5TVyZ/8dhF0x2C2nBAZmQhIsBdwDS3R mknLg50QMutCNjFPqnS+Zcg6t1cmQEFgOOjuMJ9Mo17yaV117iZSiz2Ei+IC1BiA1vLpOK2K2zP u+EDpz0GofQWY4mg19jTzX0mY X-Received: by 2002:a17:907:9494:b0:722:f3d2:ef96 with SMTP id dm20-20020a170907949400b00722f3d2ef96mr44501332ejc.705.1657180639402; Thu, 07 Jul 2022 00:57:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sB8qUz1jZ6UlJeBeFgU1Xg7f+qxW56o3mip5eMAz5OGA7S1232Tjj8zr4ZT91oLcm6ijqqVg== X-Received: by 2002:a17:907:9494:b0:722:f3d2:ef96 with SMTP id dm20-20020a170907949400b00722f3d2ef96mr44501320ejc.705.1657180639210; Thu, 07 Jul 2022 00:57:19 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id 18-20020a170906329200b0072abb95eaa4sm6194548ejw.215.2022.07.07.00.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:18 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Mingxia Liu Cc: Yuying Zhang , Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: replace hardcoded min mbuf number with macro' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:33 +0200 Message-Id: <20220707075522.194223-38-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-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.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0d9db8131162ce597f4b7952547d1cbd07bdb32a Thanks. Christian Ehrhardt --- >From 0d9db8131162ce597f4b7952547d1cbd07bdb32a Mon Sep 17 00:00:00 2001 From: Mingxia Liu Date: Thu, 31 Mar 2022 02:33:33 +0000 Subject: [PATCH] app/testpmd: replace hardcoded min mbuf number with macro [ upstream commit 57d91f5b8dc589226a307560bd36181ac7a6b7df ] Add macro MIN_TOTAL_NUM_MBUFS (1024) to indicate what the value of total-num-mbufs should bigger than. Fixes: c87988187fdb ("app/testpmd: add --total-num-mbufs option") Signed-off-by: Mingxia Liu Acked-by: Yuying Zhang Acked-by: Ferruh Yigit --- app/test-pmd/parameters.c | 5 +++-- app/test-pmd/testpmd.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index e1e9af95ec..eff1cbb9a8 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -873,11 +873,12 @@ launch_args_parse(int argc, char** argv) } if (!strcmp(lgopts[opt_idx].name, "total-num-mbufs")) { n = atoi(optarg); - if (n > 1024) + if (n > MIN_TOTAL_NUM_MBUFS) param_total_num_mbufs = (unsigned)n; else rte_exit(EXIT_FAILURE, - "total-num-mbufs should be > 1024\n"); + "total-num-mbufs should be > %d\n", + MIN_TOTAL_NUM_MBUFS); } if (!strcmp(lgopts[opt_idx].name, "max-pkt-len")) { n = atoi(optarg); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 334bcc28e6..244b0c710a 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -53,6 +53,8 @@ #define NUMA_NO_CONFIG 0xFF #define UMA_NO_CONFIG 0xFF +#define MIN_TOTAL_NUM_MBUFS 1024 + typedef uint8_t lcoreid_t; typedef uint16_t portid_t; typedef uint16_t queueid_t; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.808723882 +0200 +++ 0038-app-testpmd-replace-hardcoded-min-mbuf-number-with-m.patch 2022-07-07 09:54:10.881824099 +0200 @@ -1 +1 @@ -From 57d91f5b8dc589226a307560bd36181ac7a6b7df Mon Sep 17 00:00:00 2001 +From 0d9db8131162ce597f4b7952547d1cbd07bdb32a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 57d91f5b8dc589226a307560bd36181ac7a6b7df ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index daf6a31b2b..641c9c767e 100644 +index e1e9af95ec..eff1cbb9a8 100644 @@ -24 +25 @@ -@@ -940,11 +940,12 @@ launch_args_parse(int argc, char** argv) +@@ -873,11 +873,12 @@ launch_args_parse(int argc, char** argv) @@ -40 +41 @@ -index 67f253b30e..f04a9a11b4 100644 +index 334bcc28e6..244b0c710a 100644 @@ -43 +44 @@ -@@ -72,6 +72,8 @@ +@@ -53,6 +53,8 @@