* patch 'service: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'bus/dpaa: " christian.ehrhardt
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Harry van Haaren, Tyler Retzlaff, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/9741b95a7978ada4d634fbcb1f8b7e19d974efc3
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From 9741b95a7978ada4d634fbcb1f8b7e19d974efc3 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:03 +0100
Subject: [PATCH] service: fix build with clang 15
[ upstream commit b41e574c2d2e8d82ec5e22a950e385c73efda850 ]
This variable is not used.
Bugzilla ID: 1130
Fixes: 21698354c832 ("service: introduce service cores concept")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/librte_eal/common/rte_service.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index 11cd5a538d..4d21d1bdc3 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -101,14 +101,12 @@ rte_service_init(void)
}
int i;
- int count = 0;
struct rte_config *cfg = rte_eal_get_configuration();
for (i = 0; i < RTE_MAX_LCORE; i++) {
if (lcore_config[i].core_role == ROLE_SERVICE) {
if ((unsigned int)i == cfg->master_lcore)
continue;
rte_service_lcore_add(i);
- count++;
}
}
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:12.530732286 +0100
+++ 0002-service-fix-build-with-clang-15.patch 2022-11-24 14:58:11.805189452 +0100
@@ -1 +1 @@
-From b41e574c2d2e8d82ec5e22a950e385c73efda850 Mon Sep 17 00:00:00 2001
+From 9741b95a7978ada4d634fbcb1f8b7e19d974efc3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b41e574c2d2e8d82ec5e22a950e385c73efda850 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- lib/eal/common/rte_service.c | 2 --
+ lib/librte_eal/common/rte_service.c | 2 --
@@ -19,5 +20,5 @@
-diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c
-index bcc2e19077..42ca1d001d 100644
---- a/lib/eal/common/rte_service.c
-+++ b/lib/eal/common/rte_service.c
-@@ -107,14 +107,12 @@ rte_service_init(void)
+diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
+index 11cd5a538d..4d21d1bdc3 100644
+--- a/lib/librte_eal/common/rte_service.c
++++ b/lib/librte_eal/common/rte_service.c
+@@ -101,14 +101,12 @@ rte_service_init(void)
@@ -31 +32 @@
- if ((unsigned int)i == cfg->main_lcore)
+ if ((unsigned int)i == cfg->master_lcore)
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'bus/dpaa: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
2022-11-24 14:00 ` patch 'service: fix build with clang 15' " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'net/atlantic: " christian.ehrhardt
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Tyler Retzlaff, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/b53ecda8ad68ab181171eb6bbdde122ea7955568
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From b53ecda8ad68ab181171eb6bbdde122ea7955568 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:05 +0100
Subject: [PATCH] bus/dpaa: fix build with clang 15
[ upstream commit 6d58990561fbfc04e2bd53e1778352ad1d117edf ]
This variable is not used.
Fixes: f38f61e982f8 ("bus/dpaa: add BMAN hardware interfaces")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
drivers/bus/dpaa/base/qbman/bman.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/bman.h b/drivers/bus/dpaa/base/qbman/bman.h
index 21a6bee778..b2aa93e046 100644
--- a/drivers/bus/dpaa/base/qbman/bman.h
+++ b/drivers/bus/dpaa/base/qbman/bman.h
@@ -519,7 +519,6 @@ static inline int bm_shutdown_pool(struct bm_portal *p, u32 bpid)
struct bm_mc_command *bm_cmd;
struct bm_mc_result *bm_res;
- int aq_count = 0;
bool stop = false;
while (!stop) {
@@ -532,8 +531,7 @@ static inline int bm_shutdown_pool(struct bm_portal *p, u32 bpid)
if (!(bm_res->verb & BM_MCR_VERB_ACQUIRE_BUFCOUNT)) {
/* Pool is empty */
stop = true;
- } else
- ++aq_count;
+ }
};
return 0;
}
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:12.786555764 +0100
+++ 0003-bus-dpaa-fix-build-with-clang-15.patch 2022-11-24 14:58:11.805189452 +0100
@@ -1 +1 @@
-From 6d58990561fbfc04e2bd53e1778352ad1d117edf Mon Sep 17 00:00:00 2001
+From b53ecda8ad68ab181171eb6bbdde122ea7955568 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6d58990561fbfc04e2bd53e1778352ad1d117edf ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'net/atlantic: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
2022-11-24 14:00 ` patch 'service: fix build with clang 15' " christian.ehrhardt
2022-11-24 14:00 ` patch 'bus/dpaa: " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'app/testpmd: " christian.ehrhardt
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Tyler Retzlaff, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/5bdb78f4793e5d9cbf567c5f286d82e6f5362b79
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From 5bdb78f4793e5d9cbf567c5f286d82e6f5362b79 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:06 +0100
Subject: [PATCH] net/atlantic: fix build with clang 15
[ upstream commit f25fa03ad1a9df09870b55efa8b543ca60ab1b88 ]
This variable is not used.
Fixes: 2b1472d7150c ("net/atlantic: implement Tx path")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
drivers/net/atlantic/atl_rxtx.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c
index 449ffd454d..7640ce9fb0 100644
--- a/drivers/net/atlantic/atl_rxtx.c
+++ b/drivers/net/atlantic/atl_rxtx.c
@@ -1132,10 +1132,9 @@ atl_xmit_cleanup(struct atl_tx_queue *txq)
if (txq != NULL) {
sw_ring = txq->sw_ring;
int head = txq->tx_head;
- int cnt;
- int i;
+ int cnt = head;
- for (i = 0, cnt = head; ; i++) {
+ while (true) {
txd = &txq->hw_ring[cnt];
if (txd->dd)
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:13.127191001 +0100
+++ 0004-net-atlantic-fix-build-with-clang-15.patch 2022-11-24 14:58:11.809189477 +0100
@@ -1 +1 @@
-From f25fa03ad1a9df09870b55efa8b543ca60ab1b88 Mon Sep 17 00:00:00 2001
+From 5bdb78f4793e5d9cbf567c5f286d82e6f5362b79 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f25fa03ad1a9df09870b55efa8b543ca60ab1b88 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index aeb79bf5a2..cb6f8141a8 100644
+index 449ffd454d..7640ce9fb0 100644
@@ -21 +22 @@
-@@ -1127,10 +1127,9 @@ atl_xmit_cleanup(struct atl_tx_queue *txq)
+@@ -1132,10 +1132,9 @@ atl_xmit_cleanup(struct atl_tx_queue *txq)
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'app/testpmd: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (2 preceding siblings ...)
2022-11-24 14:00 ` patch 'net/atlantic: " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'test/efd: " christian.ehrhardt
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Tyler Retzlaff, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/c75239d6a8aa1be2000864d7aa10c45c6e1a22c1
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From c75239d6a8aa1be2000864d7aa10c45c6e1a22c1 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:09 +0100
Subject: [PATCH] app/testpmd: fix build with clang 15
[ upstream commit ff3cc8657549a313d7d3199bc38fbcd0d8090bff ]
This variable is used to create some artificial load.
Fixes: 3c156061b938 ("app/testpmd: add noisy neighbour forwarding mode")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
app/test-pmd/noisy_vnf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c
index 58c4ee9255..76e037f79d 100644
--- a/app/test-pmd/noisy_vnf.c
+++ b/app/test-pmd/noisy_vnf.c
@@ -56,8 +56,8 @@ do_write(char *vnf_mem)
static inline void
do_read(char *vnf_mem)
{
+ uint64_t r __rte_unused;
uint64_t i = rte_rand();
- uint64_t r;
r = vnf_mem[i % ((noisy_lkup_mem_sz * 1024 * 1024) /
RTE_CACHE_LINE_SIZE)];
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:13.469297661 +0100
+++ 0005-app-testpmd-fix-build-with-clang-15.patch 2022-11-24 14:58:11.809189477 +0100
@@ -1 +1 @@
-From ff3cc8657549a313d7d3199bc38fbcd0d8090bff Mon Sep 17 00:00:00 2001
+From c75239d6a8aa1be2000864d7aa10c45c6e1a22c1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff3cc8657549a313d7d3199bc38fbcd0d8090bff ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index b17a1febd3..c65ec6f06a 100644
+index 58c4ee9255..76e037f79d 100644
@@ -21 +22 @@
-@@ -57,8 +57,8 @@ do_write(char *vnf_mem)
+@@ -56,8 +56,8 @@ do_write(char *vnf_mem)
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'test/efd: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (3 preceding siblings ...)
2022-11-24 14:00 ` patch 'app/testpmd: " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'test/member: " christian.ehrhardt
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Tyler Retzlaff, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/9d04bda265085e6f6bcaed242f7c8c8f63cbc16f
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From 9d04bda265085e6f6bcaed242f7c8c8f63cbc16f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:11 +0100
Subject: [PATCH] test/efd: fix build with clang 15
[ upstream commit 94ec062953778f986af4261c7f6eb31af7c84202 ]
This local variable hides the more global one.
The original intent was probably to use the global one.
Fixes: 0e925aef2779 ("app/test: add EFD functional and perf tests")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
app/test/test_efd_perf.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/test/test_efd_perf.c b/app/test/test_efd_perf.c
index c7d6e1e426..3ed4122b60 100644
--- a/app/test/test_efd_perf.c
+++ b/app/test/test_efd_perf.c
@@ -143,7 +143,6 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
qsort(keys, KEYS_TO_ADD, MAX_KEYSIZE, key_compare);
/* Sift through the list of keys and look for duplicates */
- int num_duplicates = 0;
for (i = 0; i < KEYS_TO_ADD - 1; i++) {
if (memcmp(keys[i], keys[i + 1], params->key_size) == 0) {
/* This key already exists, try again */
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:13.610749748 +0100
+++ 0006-test-efd-fix-build-with-clang-15.patch 2022-11-24 14:58:11.809189477 +0100
@@ -1 +1 @@
-From 94ec062953778f986af4261c7f6eb31af7c84202 Mon Sep 17 00:00:00 2001
+From 9d04bda265085e6f6bcaed242f7c8c8f63cbc16f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94ec062953778f986af4261c7f6eb31af7c84202 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index d7f4d83549..4d04ed93e3 100644
+index c7d6e1e426..3ed4122b60 100644
@@ -22 +23 @@
-@@ -153,7 +153,6 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
+@@ -143,7 +143,6 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'test/member: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (4 preceding siblings ...)
2022-11-24 14:00 ` patch 'test/efd: " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'test/event: " christian.ehrhardt
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Tyler Retzlaff, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/9abff6b0e65a32547e7eed700f21974c2f27a9f0
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From 9abff6b0e65a32547e7eed700f21974c2f27a9f0 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:12 +0100
Subject: [PATCH] test/member: fix build with clang 15
[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]
This local variable hides the more global one.
The original intent was probably to use the global one.
Fixes: 0cc67a96e486 ("test/member: add functional and perf tests")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
app/test/test_member.c | 1 -
app/test/test_member_perf.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/app/test/test_member.c b/app/test/test_member.c
index 748ddcc266..0e3681ab45 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -545,7 +545,6 @@ setup_keys_and_data(void)
qsort(generated_keys, MAX_ENTRIES, KEY_SIZE, key_compare);
/* Sift through the list of keys and look for duplicates */
- int num_duplicates = 0;
for (i = 0; i < MAX_ENTRIES - 1; i++) {
if (memcmp(generated_keys[i], generated_keys[i + 1],
KEY_SIZE) == 0) {
diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c
index e2840f12d3..a312401992 100644
--- a/app/test/test_member_perf.c
+++ b/app/test/test_member_perf.c
@@ -150,7 +150,6 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
qsort(keys, KEYS_TO_ADD, MAX_KEYSIZE, key_compare);
/* Sift through the list of keys and look for duplicates */
- int num_duplicates = 0;
for (i = 0; i < KEYS_TO_ADD - 1; i++) {
if (memcmp(keys[i], keys[i + 1],
params->key_size) == 0) {
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:13.946661908 +0100
+++ 0007-test-member-fix-build-with-clang-15.patch 2022-11-24 14:58:11.817189526 +0100
@@ -1 +1 @@
-From 8f8ed0c1f7f20d821eba41f51243e805b66e2579 Mon Sep 17 00:00:00 2001
+From 9abff6b0e65a32547e7eed700f21974c2f27a9f0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index c1b6a7d8b9..4a93f8bff4 100644
+index 748ddcc266..0e3681ab45 100644
@@ -23 +24 @@
-@@ -573,7 +573,6 @@ setup_keys_and_data(void)
+@@ -545,7 +545,6 @@ setup_keys_and_data(void)
@@ -32 +33 @@
-index 7b6adf913e..2f79888fbd 100644
+index e2840f12d3..a312401992 100644
@@ -35 +36 @@
-@@ -178,7 +178,6 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
+@@ -150,7 +150,6 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'test/event: fix build with clang 15' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (5 preceding siblings ...)
2022-11-24 14:00 ` patch 'test/member: " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'net/ixgbevf: fix promiscuous and allmulti' " christian.ehrhardt
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: David Marchand; +Cc: Tyler Retzlaff, Daxue Gao, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/15caa4a3f6f176db14b35d19e828123d029f98f0
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From 15caa4a3f6f176db14b35d19e828123d029f98f0 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:13 +0100
Subject: [PATCH] test/event: fix build with clang 15
[ upstream commit ff5b90f9d0675f1fa92b449ed086b6641301be51 ]
This variable is not used.
Fixes: d1f3385d0076 ("test: add event timer adapter auto-test")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Tested-by: Daxue Gao <daxuex.gao@intel.com>
---
app/test/test_event_timer_adapter.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c
index efd86cad58..622c62f914 100644
--- a/app/test/test_event_timer_adapter.c
+++ b/app/test/test_event_timer_adapter.c
@@ -764,7 +764,6 @@ _cancel_thread(void *args)
{
RTE_SET_USED(args);
struct rte_event_timer *ev_tim = NULL;
- uint64_t cancel_count = 0;
uint16_t ret;
while (!arm_done || rte_ring_count(timer_producer_ring) > 0) {
@@ -774,7 +773,6 @@ _cancel_thread(void *args)
ret = rte_event_timer_cancel_burst(timdev, &ev_tim, 1);
TEST_ASSERT_EQUAL(ret, 1, "Failed to cancel timer");
rte_mempool_put(eventdev_test_mempool, (void *)ev_tim);
- cancel_count++;
}
return TEST_SUCCESS;
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:14.195825067 +0100
+++ 0008-test-event-fix-build-with-clang-15.patch 2022-11-24 14:58:11.825189575 +0100
@@ -1 +1 @@
-From ff5b90f9d0675f1fa92b449ed086b6641301be51 Mon Sep 17 00:00:00 2001
+From 15caa4a3f6f176db14b35d19e828123d029f98f0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff5b90f9d0675f1fa92b449ed086b6641301be51 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 654c412836..1a440dfd10 100644
+index efd86cad58..622c62f914 100644
@@ -22 +23 @@
-@@ -911,7 +911,6 @@ _cancel_thread(void *args)
+@@ -764,7 +764,6 @@ _cancel_thread(void *args)
@@ -30 +31 @@
-@@ -921,7 +920,6 @@ _cancel_thread(void *args)
+@@ -774,7 +773,6 @@ _cancel_thread(void *args)
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'net/ixgbevf: fix promiscuous and allmulti' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (6 preceding siblings ...)
2022-11-24 14:00 ` patch 'test/event: " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'doc: add LRO size limitation in mlx5 guide' " christian.ehrhardt
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: Olivier Matz; +Cc: Wenjun Wu, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/acb3bb3600b226617f5e1d31626dc8f316faa69f
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From acb3bb3600b226617f5e1d31626dc8f316faa69f Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz@6wind.com>
Date: Thu, 29 Sep 2022 14:21:55 +0200
Subject: [PATCH] net/ixgbevf: fix promiscuous and allmulti
[ upstream commit 21e471abb548f91190479c75da0c28ebc25dec36 ]
The configuration of allmulti and promiscuous modes conflicts
together. For instance, if we enable promiscuous mode, then enable and
disable allmulti, then the promiscuous mode is wrongly disabled.
Fix this behavior by:
- doing nothing when we set/unset allmulti if promiscuous mode is on
- restorting the proper mode (none or allmulti) when we disable
promiscuous mode
Fixes: 1f4564ed7696 ("net/ixgbevf: enable promiscuous mode")
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Wenjun Wu <wenjun1.wu@intel.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 65d81c6cec..9a196fb9a6 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -8718,9 +8718,13 @@ static int
ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
{
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ int mode = IXGBEVF_XCAST_MODE_NONE;
int ret;
- switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_NONE)) {
+ if (dev->data->all_multicast)
+ mode = IXGBEVF_XCAST_MODE_ALLMULTI;
+
+ switch (hw->mac.ops.update_xcast_mode(hw, mode)) {
case IXGBE_SUCCESS:
ret = 0;
break;
@@ -8742,6 +8746,9 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
int ret;
int mode = IXGBEVF_XCAST_MODE_ALLMULTI;
+ if (dev->data->promiscuous)
+ return 0;
+
switch (hw->mac.ops.update_xcast_mode(hw, mode)) {
case IXGBE_SUCCESS:
ret = 0;
@@ -8763,6 +8770,9 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
int ret;
+ if (dev->data->promiscuous)
+ return 0;
+
switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_MULTI)) {
case IXGBE_SUCCESS:
ret = 0;
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:14.355601214 +0100
+++ 0009-net-ixgbevf-fix-promiscuous-and-allmulti.patch 2022-11-24 14:58:11.841189674 +0100
@@ -1 +1 @@
-From 21e471abb548f91190479c75da0c28ebc25dec36 Mon Sep 17 00:00:00 2001
+From acb3bb3600b226617f5e1d31626dc8f316faa69f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21e471abb548f91190479c75da0c28ebc25dec36 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index fd06ddbe35..ae9f65b334 100644
+index 65d81c6cec..9a196fb9a6 100644
@@ -28 +29 @@
-@@ -7787,9 +7787,13 @@ static int
+@@ -8718,9 +8718,13 @@ static int
@@ -43 +44 @@
-@@ -7811,6 +7815,9 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
+@@ -8742,6 +8746,9 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
@@ -53 +54 @@
-@@ -7832,6 +7839,9 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
+@@ -8763,6 +8770,9 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'doc: add LRO size limitation in mlx5 guide' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (7 preceding siblings ...)
2022-11-24 14:00 ` patch 'net/ixgbevf: fix promiscuous and allmulti' " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:00 ` patch 'doc: fix maximum packet size of virtio driver' " christian.ehrhardt
2022-11-24 14:04 ` patch 'vdpa/ifc: handle data path update failure' " Christian Ehrhardt
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: Gregory Etelson; +Cc: Matan Azrad, dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/7affcdababda623d2638ece56bb2334e3e7597fa
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From 7affcdababda623d2638ece56bb2334e3e7597fa Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Thu, 17 Nov 2022 16:39:01 +0200
Subject: [PATCH] doc: add LRO size limitation in mlx5 guide
[ upstream commit ea75808941c8020c568e47d1ef9b25223258c131 ]
Maximal LRO message size must be multiply of 256.
Otherwise, TCP payload may not fit into a single WQE.
Fixes: 1c7e57f9bd33 ("net/mlx5: set maximum LRO packet size")
Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
doc/guides/nics/mlx5.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 8f7b285271..5d2ffe416c 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -226,6 +226,8 @@ Limitations
TCP header (122B).
- Rx queue with LRO offload enabled, receiving a non-LRO packet, can forward
it with size limited to max LRO size, not to max RX packet length.
+ - The driver rounds down the port configuration value ``max_lro_pkt_size``
+ (from ``rte_eth_rxmode``) to a multiple of 256 due to hardware limitation.
- Timestamps:
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:14.591197334 +0100
+++ 0010-doc-add-LRO-size-limitation-in-mlx5-guide.patch 2022-11-24 14:58:11.841189674 +0100
@@ -1 +1 @@
-From ea75808941c8020c568e47d1ef9b25223258c131 Mon Sep 17 00:00:00 2001
+From 7affcdababda623d2638ece56bb2334e3e7597fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea75808941c8020c568e47d1ef9b25223258c131 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 4f0db21dde..ab9498a91e 100644
+index 8f7b285271..5d2ffe416c 100644
@@ -22 +23 @@
-@@ -404,6 +404,8 @@ Limitations
+@@ -226,6 +226,8 @@ Limitations
@@ -28,2 +29,2 @@
- - LRO can be used with outer header of TCP packets of the standard format:
- eth (with or without vlan) / ipv4 or ipv6 / tcp / payload
+
+ - Timestamps:
^ permalink raw reply [flat|nested] 12+ messages in thread* patch 'doc: fix maximum packet size of virtio driver' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (8 preceding siblings ...)
2022-11-24 14:00 ` patch 'doc: add LRO size limitation in mlx5 guide' " christian.ehrhardt
@ 2022-11-24 14:00 ` christian.ehrhardt
2022-11-24 14:04 ` patch 'vdpa/ifc: handle data path update failure' " Christian Ehrhardt
10 siblings, 0 replies; 12+ messages in thread
From: christian.ehrhardt @ 2022-11-24 14:00 UTC (permalink / raw)
To: Yi Li; +Cc: dpdk stable
Hi,
FYI, your patch has been queued to stable release 19.11.14
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/26/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/d3e0f869dbfa0e047bbad292a40b4fb580fe23bb
Thanks.
Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
From d3e0f869dbfa0e047bbad292a40b4fb580fe23bb Mon Sep 17 00:00:00 2001
From: Yi Li <liyi1@chinatelecom.cn>
Date: Sat, 19 Nov 2022 16:24:20 +0800
Subject: [PATCH] doc: fix maximum packet size of virtio driver
[ upstream commit c4c1b97670602a616f7fcf3a6613967a2c730df6 ]
According to VIRTIO_MAX_RX_PKTLEN macro definition, for virtio driver
currently supported pkt size is 9728.
Fixes: fc1f2750a3ec ("doc: programmers guide")
Signed-off-by: Yi Li <liyi1@chinatelecom.cn>
---
doc/guides/nics/virtio.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst
index 3059bb8fba..1fe3ae1a4e 100644
--- a/doc/guides/nics/virtio.rst
+++ b/doc/guides/nics/virtio.rst
@@ -43,7 +43,7 @@ Features and Limitations of virtio PMD
In this release, the virtio PMD provides the basic functionality of packet reception and transmission.
* It supports merge-able buffers per packet when receiving packets and scattered buffer per packet
- when transmitting packets. The packet size supported is from 64 to 1518.
+ when transmitting packets. The packet size supported is from 64 to 9728.
* It supports multicast packets and promiscuous mode.
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-24 14:58:14.959290971 +0100
+++ 0011-doc-fix-maximum-packet-size-of-virtio-driver.patch 2022-11-24 14:58:11.853189749 +0100
@@ -1 +1 @@
-From c4c1b97670602a616f7fcf3a6613967a2c730df6 Mon Sep 17 00:00:00 2001
+From d3e0f869dbfa0e047bbad292a40b4fb580fe23bb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c4c1b97670602a616f7fcf3a6613967a2c730df6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index aace780249..c422e7347a 100644
+index 3059bb8fba..1fe3ae1a4e 100644
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14
2022-11-24 14:00 patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14 christian.ehrhardt
` (9 preceding siblings ...)
2022-11-24 14:00 ` patch 'doc: fix maximum packet size of virtio driver' " christian.ehrhardt
@ 2022-11-24 14:04 ` Christian Ehrhardt
10 siblings, 0 replies; 12+ messages in thread
From: Christian Ehrhardt @ 2022-11-24 14:04 UTC (permalink / raw)
To: Taekyung Kim; +Cc: Chenbo Xia, Maxime Coquelin, Andy Pei, dpdk stable
On Thu, Nov 24, 2022 at 3:00 PM <christian.ehrhardt@canonical.com> wrote:
>
> Hi,
>
> FYI, your patch has been queued to stable release 19.11.14
Sorry, this caused build errors so I had to withdraw it again.
> 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/26/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/b9dbbd4a5a69f467f2e2762c7fafd79a7fb72a2c
>
> Thanks.
>
> Christian Ehrhardt <christian.ehrhardt@canonical.com>
>
> ---
> From b9dbbd4a5a69f467f2e2762c7fafd79a7fb72a2c Mon Sep 17 00:00:00 2001
> From: Taekyung Kim <kim.tae.kyung@navercorp.com>
> Date: Thu, 10 Nov 2022 13:09:43 +0900
> Subject: [PATCH] vdpa/ifc: handle data path update failure
>
> [ upstream commit 903ec2b1b49e496815c016b0104fd655cd972661 ]
>
> Stop and return the error code when update_datapath fails.
> update_datapath prepares resources for the vdpa device.
> The driver should not perform any further actions
> if update_datapath returns an error.
>
> Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")
>
> Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
> Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> Acked-by: Andy Pei <andy.pei@intel.com>
> ---
> drivers/net/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> 1 file changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
> index e0044ec29e..0981b61242 100644
> --- a/drivers/net/ifc/ifcvf_vdpa.c
> +++ b/drivers/net/ifc/ifcvf_vdpa.c
> @@ -893,7 +893,12 @@ ifcvf_dev_config(int vid)
> internal = list->internal;
> internal->vid = vid;
> rte_atomic32_set(&internal->dev_attached, 1);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath for vDPA device %s",
> + vdev->device->name);
> + rte_atomic32_set(&internal->dev_attached, 0);
> + return -1;
> + }
>
> if (rte_vhost_host_notifier_ctrl(vid, true) != 0)
> DRV_LOG(NOTICE, "vDPA (%d): software relay is used.", did);
> @@ -933,7 +938,12 @@ ifcvf_dev_close(int vid)
> internal->sw_fallback_running = false;
> } else {
> rte_atomic32_set(&internal->dev_attached, 0);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath for vDPA device %s",
> + vdev->device->name);
> + internal->configured = 0;
> + return -1;
> + }
> }
>
> return 0;
> @@ -1202,7 +1212,15 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> pthread_mutex_unlock(&internal_list_lock);
>
> rte_atomic32_set(&internal->started, 1);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath %s", pci_dev->name);
> + rte_atomic32_set(&internal->started, 0);
> + rte_vdpa_unregister_device(internal->vdev);
> + pthread_mutex_lock(&internal_list_lock);
> + TAILQ_REMOVE(&internal_list, list, next);
> + pthread_mutex_unlock(&internal_list_lock);
> + goto error;
> + }
>
> rte_kvargs_free(kvlist);
> return 0;
> @@ -1231,7 +1249,8 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
>
> internal = list->internal;
> rte_atomic32_set(&internal->started, 0);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0)
> + DRV_LOG(ERR, "failed to update datapath %s", pci_dev->name);
>
> rte_pci_unmap_device(internal->pdev);
> rte_vfio_container_destroy(internal->vfio_container_fd);
> --
> 2.38.1
>
> ---
> Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- - 2022-11-24 14:58:12.152133231 +0100
> +++ 0001-vdpa-ifc-handle-data-path-update-failure.patch 2022-11-24 14:58:11.805189452 +0100
> @@ -1 +1 @@
> -From 903ec2b1b49e496815c016b0104fd655cd972661 Mon Sep 17 00:00:00 2001
> +From b9dbbd4a5a69f467f2e2762c7fafd79a7fb72a2c Mon Sep 17 00:00:00 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit 903ec2b1b49e496815c016b0104fd655cd972661 ]
> +
> @@ -12 +13,0 @@
> -Cc: stable@dpdk.org
> @@ -19 +20 @@
> - drivers/vdpa/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> + drivers/net/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> @@ -22,5 +23,5 @@
> -diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
> -index 8dfd49336e..49d68ad1b1 100644
> ---- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> -+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> -@@ -1098,7 +1098,12 @@ ifcvf_dev_config(int vid)
> +diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
> +index e0044ec29e..0981b61242 100644
> +--- a/drivers/net/ifc/ifcvf_vdpa.c
> ++++ b/drivers/net/ifc/ifcvf_vdpa.c
> +@@ -893,7 +893,12 @@ ifcvf_dev_config(int vid)
> @@ -38,3 +39,3 @@
> - hw = &internal->hw;
> - for (i = 0; i < hw->nr_vring; i++) {
> -@@ -1146,7 +1151,12 @@ ifcvf_dev_close(int vid)
> + if (rte_vhost_host_notifier_ctrl(vid, true) != 0)
> + DRV_LOG(NOTICE, "vDPA (%d): software relay is used.", did);
> +@@ -933,7 +938,12 @@ ifcvf_dev_close(int vid)
> @@ -53,3 +54,3 @@
> - internal->configured = 0;
> -@@ -1752,7 +1762,15 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> - }
> + return 0;
> +@@ -1202,7 +1212,15 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> + pthread_mutex_unlock(&internal_list_lock);
> @@ -71 +72 @@
> -@@ -1781,7 +1799,8 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
> +@@ -1231,7 +1249,8 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
--
Christian Ehrhardt
Senior Staff Engineer, Ubuntu Server
Canonical Ltd
^ permalink raw reply [flat|nested] 12+ messages in thread