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 2D3EAA04DD for ; Wed, 28 Oct 2020 11:51:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 24678C9FE; Wed, 28 Oct 2020 11:51:10 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id AC999CA0C for ; Wed, 28 Oct 2020 11:51:07 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id h22so4302106wmb.0 for ; Wed, 28 Oct 2020 03:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=//+r+X+d48TzKk6UpstjMTvT55IA+pYFcu47BtMN93k=; b=PGK8ZpmhBLj1CdMPhLzzuG82T5+5kby0FqXt/PQp0kCeNNdqh/DeMBJd/yOolw/FqG OiRVAnI4e9HfyNKhYoMgD3L5YOBrtwfrkM8KkzAnO/ZNeh6wtNzHdkx2zoyJgk5Lus5Q bTWMX6nln9ThqcaeGb/xI+Ye5HEZO2Jya5qYGpIGxToRD3I1ShwLB55xscz7GF/Aeyhy L6JHjt4pOm6frKGuWJGVzbC3PFEJF/yuqlhG8qkXy285Bpqz+9L/ECpQJMtViJCWdJVh WaVY1o7gw/3qgXrGZeXZpI8CtEPQh51CnKagG+9Vh3z1eTqvcg5qzB9AqxarS5iVn9QA EonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=//+r+X+d48TzKk6UpstjMTvT55IA+pYFcu47BtMN93k=; b=gmc+G/Pih9hz30NNlfyy/MmyYTk0/8Dhc2VqEOYYWcmqvUE1OZklA1kx2thlCtNEKi VVR6OFBG8Ikb9O0wOCg0FugaFKAGs0QMJRMrnToHf96kazq3ppdWuHytmkSeoE7rxl8r ARg6WUsVf9r+2b+LExy2PMNPK8ZP9oKggWZhTVVmdrfLB+awPxlCypgqOzG8I9Wv0xA7 SDKUYhpa0Jt2/DAuwRh5/x/nzJNsS4AY8GVRw3ogXBmSaRWWeWCpJQrXVnh7ShhLKp2E wlpVdXx1wFHgI6CxiUouN7rpYqdnSXQJAjci1KnuiOpfE+DWAGpt2s6EKTq8EuE3Ni0M ckyA== X-Gm-Message-State: AOAM533zh4dJIrVA1Na5N1nRQb5DqPJfeL5fY1d2AfoFHqUwuHbL8gHQ G+PhGOdqDz8W9+qaB0tmIB8jdWL5FtVHGZt3 X-Google-Smtp-Source: ABdhPJwxyIxqD1/+h6eVLVYMm3S0bCz85XfYQfPu24BFP2QCGj89otlexnnNTXiRRcEd//IPq54l7Q== X-Received: by 2002:a1c:7c06:: with SMTP id x6mr7801761wmc.171.1603882267413; Wed, 28 Oct 2020 03:51:07 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c185sm6013053wma.44.2020.10.28.03.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Chenbo Xia Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:44:14 +0000 Message-Id: <20201028104606.3504127-95-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app: fix ethdev port id size' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 8a2fbac4059e7f2fedd493276a03b9b9a414d695 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 ++-- app/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 @@ -55,7 +55,7 @@ static const struct rte_bpf_xsym bpf_xsym[] = { 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; cmdline_fixed_string_t flags; @@ -153,7 +153,7 @@ cmdline_parse_inst_t cmd_operate_bpf_ld_parse = { 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/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 @@ -45,7 +45,7 @@ static uint64_t eid = ~0ULL; 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) { const uint16_t rx_ring_size = RING_SIZE, tx_ring_size = RING_SIZE; @@ -104,7 +104,7 @@ 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 }; return port_init_common(port, &conf, mp); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.739735900 +0000 +++ 0095-app-fix-ethdev-port-id-size.patch 2020-10-28 10:35:11.648832144 +0000 @@ -1,14 +1,15 @@ -From 9b539662437c0bbd385329bf077224cbb83d0c48 Mon Sep 17 00:00:00 2001 +From 8a2fbac4059e7f2fedd493276a03b9b9a414d695 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") -Cc: stable@dpdk.org Signed-off-by: Chenbo Xia Reviewed-by: Ferruh Yigit @@ -18,7 +19,7 @@ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c -index 0f984ccf4a..16e3c3b3b3 100644 +index 830bfc13a5..d2deadd4e6 100644 --- a/app/test-pmd/bpf_cmd.c +++ b/app/test-pmd/bpf_cmd.c @@ -55,7 +55,7 @@ static const struct rte_bpf_xsym bpf_xsym[] = {