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 0F290A0555 for ; Thu, 9 Jun 2022 13:37:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A27E406B4; Thu, 9 Jun 2022 13:37:59 +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 8E78D40220 for ; Thu, 9 Jun 2022 13:37:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774675; 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=0QHxp3aBslGYpbkfyOj7N8NvNlzVzNhMmLT1/Ibp/OU=; b=B+2SVZk+ylMBn1l6xAdyruZaAiTfVHmED2t/iN89j2sBeDlSIpHDH3mSK+JHd+1fN7kCtZ E8liEy0wSoKe9tcCts1Bc6re4Rl/i6bywhNOvkkLdb9JO/BCwPscB/pHQrN4BcUxfW8wOE 7IhvxmajZqM6o4L+kFY+IYObW8hqiJI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-103-ThFwCcWCMd-MnnBvevptJw-1; Thu, 09 Jun 2022 07:37:50 -0400 X-MC-Unique: ThFwCcWCMd-MnnBvevptJw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5F3285A581; Thu, 9 Jun 2022 11:37:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 848C01730C; Thu, 9 Jun 2022 11:37:48 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Thu, 9 Jun 2022 12:36:15 +0100 Message-Id: <20220609113701.386938-28-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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 06/13/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/8f2021fbd91840f1c2cc860dd44d6cffa34cfaea Thanks. Kevin --- >From 8f2021fbd91840f1c2cc860dd44d6cffa34cfaea 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 daf6a31b2b..641c9c767e 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -941,9 +941,10 @@ 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")) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index bedc4e07fb..943217f2bd 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -73,4 +73,6 @@ #define UMA_NO_CONFIG 0xFF +#define MIN_TOTAL_NUM_MBUFS 1024 + typedef uint8_t lcoreid_t; typedef uint16_t portid_t; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.424453072 +0100 +++ 0028-app-testpmd-replace-hardcoded-min-mbuf-number-with-m.patch 2022-06-09 12:34:29.687980542 +0100 @@ -1 +1 @@ -From 57d91f5b8dc589226a307560bd36181ac7a6b7df Mon Sep 17 00:00:00 2001 +From 8f2021fbd91840f1c2cc860dd44d6cffa34cfaea Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 57d91f5b8dc589226a307560bd36181ac7a6b7df ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index 67f253b30e..f04a9a11b4 100644 +index bedc4e07fb..943217f2bd 100644