From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 29282A04B1 for ; Thu, 5 Nov 2020 13:41:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 04781C31F; Thu, 5 Nov 2020 13:41:39 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 16E3CC7EE for ; Thu, 5 Nov 2020 13:41:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580095; 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=0OI4XY93QZqv1hi1zNyIJiH+KvqmLecP4F+fmcCZIlg=; b=EXFHIKmSjRWsI2Lk9zRiXmPKse/C+OcJsBJXBE+WAZBmXg++1CZbyzghh+5Hwd0kOvtUJP 8fT9jMnWsVwY+GxthHC5iaxl5Wm3nN8RIOFy3xsRWx+DBfV7my7GEQo7or8UvRKRwQOCiz 9/704dQFtva1/mIoh/NVuuEoIpf77KM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-395-QDHvmAW6PHGd_a2tckQBTA-1; Thu, 05 Nov 2020 07:41:33 -0500 X-MC-Unique: QDHvmAW6PHGd_a2tckQBTA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01BDE8015C6; Thu, 5 Nov 2020 12:41:32 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8F445C5DE; Thu, 5 Nov 2020 12:41:30 +0000 (UTC) From: Kevin Traynor To: Chenbo Xia Cc: Ferruh Yigit , dpdk stable Date: Thu, 5 Nov 2020 12:39:43 +0000 Message-Id: <20201105124015.306404-36-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'app: fix ethdev port id size' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 11/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/88adb8f6874b9f07dfd5a77274628fe3f20db9a6 Thanks. Kevin. --- >From 88adb8f6874b9f07dfd5a77274628fe3f20db9a6 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Wed, 30 Sep 2020 12:23:27 +0800 Subject: [PATCH] app: fix ethdev port id size [ upstream commit 9b539662437c0bbd385329bf077224cbb83d0c48 ] The ethdev port id should be 16 bits now. This patch changes the variable size of port id in applications from 8 bits to 16 bits. Fixes: e977e4199a8d ("app/testpmd: add commands to load/unload BPF filters") Fixes: 46cf97e4bbfa ("eventdev: add test for eth Tx adapter") Signed-off-by: Chenbo Xia Reviewed-by: Ferruh Yigit --- app/test-pmd/bpf_cmd.c | 4 ++-- test/test/test_event_eth_tx_adapter.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c index 830bfc13a5..d2deadd4e6 100644 --- a/app/test-pmd/bpf_cmd.c +++ b/app/test-pmd/bpf_cmd.c @@ -56,5 +56,5 @@ struct cmd_bpf_ld_result { cmdline_fixed_string_t bpf; cmdline_fixed_string_t dir; - uint8_t port; + uint16_t port; uint16_t queue; cmdline_fixed_string_t op; @@ -154,5 +154,5 @@ struct cmd_bpf_unld_result { cmdline_fixed_string_t bpf; cmdline_fixed_string_t dir; - uint8_t port; + uint16_t port; uint16_t queue; }; diff --git a/test/test/test_event_eth_tx_adapter.c b/test/test/test_event_eth_tx_adapter.c index c26c5152c2..476c588a2c 100644 --- a/test/test/test_event_eth_tx_adapter.c +++ b/test/test/test_event_eth_tx_adapter.c @@ -46,5 +46,5 @@ static uint32_t tid; static inline int -port_init_common(uint8_t port, const struct rte_eth_conf *port_conf, +port_init_common(uint16_t port, const struct rte_eth_conf *port_conf, struct rte_mempool *mp) { @@ -101,5 +101,5 @@ port_init_common(uint8_t port, const struct rte_eth_conf *port_conf, static inline int -port_init(uint8_t port, struct rte_mempool *mp) +port_init(uint16_t port, struct rte_mempool *mp) { struct rte_eth_conf conf = { 0 }; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.954912253 +0000 +++ 0036-app-fix-ethdev-port-id-size.patch 2020-11-05 12:38:54.237896017 +0000 @@ -1 +1 @@ -From 9b539662437c0bbd385329bf077224cbb83d0c48 Mon Sep 17 00:00:00 2001 +From 88adb8f6874b9f07dfd5a77274628fe3f20db9a6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b539662437c0bbd385329bf077224cbb83d0c48 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17,2 @@ - app/test-pmd/bpf_cmd.c | 4 ++-- - app/test/test_event_eth_tx_adapter.c | 4 ++-- + app/test-pmd/bpf_cmd.c | 4 ++-- + test/test/test_event_eth_tx_adapter.c | 4 ++-- @@ -21 +22 @@ -index 0f984ccf4a..16e3c3b3b3 100644 +index 830bfc13a5..d2deadd4e6 100644 @@ -38,4 +39,4 @@ -diff --git a/app/test/test_event_eth_tx_adapter.c b/app/test/test_event_eth_tx_adapter.c -index 3af749280a..7073030902 100644 ---- a/app/test/test_event_eth_tx_adapter.c -+++ b/app/test/test_event_eth_tx_adapter.c +diff --git a/test/test/test_event_eth_tx_adapter.c b/test/test/test_event_eth_tx_adapter.c +index c26c5152c2..476c588a2c 100644 +--- a/test/test/test_event_eth_tx_adapter.c ++++ b/test/test/test_event_eth_tx_adapter.c @@ -49 +50 @@ -@@ -105,5 +105,5 @@ port_init_common(uint8_t port, const struct rte_eth_conf *port_conf, +@@ -101,5 +101,5 @@ port_init_common(uint8_t port, const struct rte_eth_conf *port_conf,