[PATCH v2] net/i40e: remove redundant judgment
Merged variable updates under the same condition. It reduces branch.
In ampere-altra, there is no performance improvement with this patch.
In x86 sse and avx2 path, there is also no performance improvement.
v2:
1. add change for avx and altivec path.
Suggested-by: Honnappa Nagarahalli
Signed-off-by: Feifei Wang
Reviewed-by: Ruifeng Wang
---
drivers/net/i40e/i40e_rxtx_common_avx.h | 9 +
drivers/net/i40e/i40e_rxtx_vec_altivec.c | 9 +
drivers/net/i40e/i40e_rxtx_vec_neon.c| 9 +
drivers/net/i40e/i40e_rxtx_vec_sse.c | 9 +
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/net/i40e/i40e_rxtx_common_avx.h
b/drivers/net/i40e/i40e_rxtx_common_avx.h
index cfc1e63173..85958d6c81 100644
--- a/drivers/net/i40e/i40e_rxtx_common_avx.h
+++ b/drivers/net/i40e/i40e_rxtx_common_avx.h
@@ -198,14 +198,15 @@ i40e_rxq_rearm_common(struct i40e_rx_queue *rxq,
__rte_unused bool avx512)
#endif
rxq->rxrearm_start += RTE_I40E_RXQ_REARM_THRESH;
- if (rxq->rxrearm_start >= rxq->nb_rx_desc)
+ rx_id = rxq->rxrearm_start - 1;
+
+ if (unlikely(rxq->rxrearm_start >= rxq->nb_rx_desc)) {
rxq->rxrearm_start = 0;
+ rx_id = rxq->nb_rx_desc - 1;
+ }
rxq->rxrearm_nb -= RTE_I40E_RXQ_REARM_THRESH;
- rx_id = (uint16_t)((rxq->rxrearm_start == 0) ?
-(rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1));
-
/* Update the tail pointer on the NIC */
I40E_PCI_REG_WC_WRITE(rxq->qrx_tail, rx_id);
}
diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index 2dfa04599c..8672ad1c41 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -89,14 +89,15 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq)
}
rxq->rxrearm_start += RTE_I40E_RXQ_REARM_THRESH;
- if (rxq->rxrearm_start >= rxq->nb_rx_desc)
+ rx_id = rxq->rxrearm_start - 1;
+
+ if (unlikely(rxq->rxrearm_start >= rxq->nb_rx_desc)) {
rxq->rxrearm_start = 0;
+ rx_id = rxq->nb_rx_desc - 1;
+ }
rxq->rxrearm_nb -= RTE_I40E_RXQ_REARM_THRESH;
- rx_id = (uint16_t)((rxq->rxrearm_start == 0) ?
-(rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1));
-
/* Update the tail pointer on the NIC */
I40E_PCI_REG_WRITE(rxq->qrx_tail, rx_id);
}
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c
b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 12e6f1cbcb..49391fe4c7 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -64,14 +64,15 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq)
}
rxq->rxrearm_start += RTE_I40E_RXQ_REARM_THRESH;
- if (rxq->rxrearm_start >= rxq->nb_rx_desc)
+ rx_id = rxq->rxrearm_start - 1;
+
+ if (unlikely(rxq->rxrearm_start >= rxq->nb_rx_desc)) {
rxq->rxrearm_start = 0;
+ rx_id = rxq->nb_rx_desc - 1;
+ }
rxq->rxrearm_nb -= RTE_I40E_RXQ_REARM_THRESH;
- rx_id = (uint16_t)((rxq->rxrearm_start == 0) ?
-(rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1));
-
rte_io_wmb();
/* Update the tail pointer on the NIC */
I40E_PCI_REG_WRITE_RELAXED(rxq->qrx_tail, rx_id);
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c
b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index bdc979a839..baf83cb3df 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@@ -77,14 +77,15 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq)
}
rxq->rxrearm_start += RTE_I40E_RXQ_REARM_THRESH;
- if (rxq->rxrearm_start >= rxq->nb_rx_desc)
+ rx_id = rxq->rxrearm_start - 1;
+
+ if (unlikely(rxq->rxrearm_start >= rxq->nb_rx_desc)) {
rxq->rxrearm_start = 0;
+ rx_id = rxq->nb_rx_desc - 1;
+ }
rxq->rxrearm_nb -= RTE_I40E_RXQ_REARM_THRESH;
- rx_id = (uint16_t)((rxq->rxrearm_start == 0) ?
-(rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1));
-
/* Update the tail pointer on the NIC */
I40E_PCI_REG_WC_WRITE(rxq->qrx_tail, rx_id);
}
--
2.25.1
Re: release candidate 23.03-rc3
On Mon, Mar 20, 2023 at 5:29 PM Thomas Monjalon wrote:
>
> A new DPDK release candidate is ready for testing:
> https://git.dpdk.org/dpdk/tag/?id=v23.03-rc3
>
> There are 110 new patches in this snapshot.
>
> Release notes:
> https://doc.dpdk.org/guides/rel_notes/release_23_03.html
>
> Few major additions arrived in this -rc3:
> - test application for machine learning inference
> - DTS hello world
> The test framework DTS is being improved and migrated into the mainline.
> Please join the DTS effort for contributing, reviewing or testing.
>
> As usual, you can report any issue on https://bugs.dpdk.org
>
> DPDK 23.03-rc4 could be out at the end of this week.
A regression has been raised against v23.03-rc3 by Red Hat QE (see
tests with FAILED status in the report below).
This regression has been tracked in bz 1196 and fixed with
9e3223adfab7 ("vhost: fix deadlock with no multiqueue").
Test environment:
kernel 5.14
qemu 6.2
dpdk: git://dpdk.org/dpdk
# git log -1
commit 9e3223adfab71bc88e9ba67c520b87c529d34a35
Author: David Marchand
Date: Thu Mar 23 15:44:33 2023 +0100
vhost: fix deadlock with no multiqueue
This deadlock happens when a guest, that
had virtio ports with multi
queues configured, does not announce the
multi q feature in
SET_FEATURES.
In such a situation, all vq locks are
already taken before calling
free_vq(), which itself takes the lock.
As mentioned in the code, in this
situation, the virtio device is not
running yet and no datapath thread is
using the vq. So we can
release the lock before calling free_vq().
Bugzilla ID: 1196
Fixes: 4b02c2673757 ("vhost: annotate
async accesses")
Signed-off-by: David Marchand
Reviewed-by: Maxime Coquelin
NICs: X540-AT2 NIC(ixgbe, 10G)
Test result:
Guest with device assignment(PF) throughput testing(1G hugepage size): PASS
Guest with device assignment(PF) throughput testing(2M hugepage size) : PASS
Guest with device assignment(VF) throughput testing: PASS
Guest with vhost-user 2Q throughput testing: PASS
Vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect: PASS
Vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect: PASS
Guest with ovs+dpdk+vhost-user 1Q live migration testing: PASS
Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS
Guest with ovs+dpdk+vhost-user 2Q live migration testing: PASS
Guest with ovs+dpdk+vhost-user 4Q live migration testing: PASS
Host PF + DPDK testing: PASS
Host VF + DPDK testing: PASS
PVP 1Q live migration testing: PASS
PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS
PVP vhost-user 2Q throughput testing: FAILED --> PASS
PVP vhost-user 1Q - cross numa node throughput testing: FAILED --> PASS
PVP 1Q cross numa node live migration testing: FAILED --> PASS
PVP 4Q reconnect with dpdk-client, qemu-server dpdk-testpmd
reconnect: FAILED --> PASS
--
David Marchand
RE: [PATCH] net/mlx5: fix CQEs dumping for Tx
Hi,
> -Original Message-
> From: Alexander Kozyrev
> Sent: Friday, March 24, 2023 1:52 AM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Raslan Darawsheh ; Slava
> Ovsiienko ; Matan Azrad
> Subject: [PATCH] net/mlx5: fix CQEs dumping for Tx
>
> The regular CQE size can be 64 bytes or 128 bytes depending on the cache
> line size. The error CQE is always 64 bytes long.
> Only 64 bytes are dumped to the log file in case of Tx queue recovery form
> the error. Use the CQE size, not the error CQE size.
>
> Fixes: 957e45fb7b ("net/mlx5: handle Tx completion with error")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Alexander Kozyrev
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
RE: [PATCH v3] net/mlx5: fix the sysfs port name translation
Hi,
> -Original Message-
> From: Bing Zhao
> Sent: Thursday, March 23, 2023 12:54 PM
> To: Slava Ovsiienko ; Matan Azrad
> ; step...@networkplumber.org
> Cc: dev@dpdk.org; Raslan Darawsheh ;
> sta...@dpdk.org
> Subject: [PATCH v3] net/mlx5: fix the sysfs port name translation
>
> With some OFED or upstream kernel of mlx5, the port name fetched from
> "/sys/class/net/[DEV]/phys_port_name" may have a tailing "\n" as the
> EOL. The sscanf() will return the scanned items number with this EOL.
>
> In such case, the "equal to" condition is considered as false and
> the function mlx5_translate_port_name() will recognize the port type
> wrongly with UNKNOWN result.
>
> The tailing carriage return character should be removed before
> calling the mlx5_translate_port_name(), this was already done in the
> NL message handling. In the meanwhile, the possible incorrect line
> feed character is also taken into consideration.
>
> Fixes: 654810b56828 ("common/mlx5: share Netlink commands")
> Fixes: 420bbdae89f2 ("net/mlx5: fix host physical function representor
> naming")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Bing Zhao
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
On 3/28/2023 3:08 AM, Junfeng Guo wrote: > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini > > Google Virtual Ethernet > M: Junfeng Guo > +M: Jeroen de Borst > +M: Rushil Gupta > +M: Joshua Washington > F: drivers/net/gve/ > F: doc/guides/nics/gve.rst > F: doc/guides/nics/features/gve.ini Can you please separate the maintainers' file update into a different patch?
Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
On 3/28/2023 3:08 AM, Junfeng Guo wrote: > Switch copyright from MIT to BSD-3 for GVE base code. > In the meantime, remove MIT license exception for GVE driver. > Also update the maintainers for GVE driver. > I guess you are switching 'license' from MIT to BSD-3, not copyright. Copyright holder is still Google/Intel etc.. Can you please update patch title & commit log accordingly? > Signed-off-by: Rushil Gupta > Signed-off-by: Joshua Washington > Signed-off-by: Junfeng Guo > Signed-off-by: Jeroen de Borst <...> > diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h > index 2dc4507acb..ac0fc1472e 100644 > --- a/drivers/net/gve/base/gve.h > +++ b/drivers/net/gve/base/gve.h > @@ -1,6 +1,32 @@ > -/* SPDX-License-Identifier: MIT > - * Google Virtual Ethernet (gve) driver > - * Copyright (C) 2015-2022 Google, Inc. > +/* > + * SPDX-License-Identifier: BSD-3-Clause > + * > + * Copyright (c) 2022-2023 Google LLC > + * > + * Redistribution and use in source and binary forms, with or without > modification, > + * are permitted provided that the following conditions are met: > + * > + * 1. Redistributions of source code must retain the above copyright notice, > this > + *list of conditions and the following disclaimer. > + * > + * 2. Redistributions in binary form must reproduce the above copyright > notice, > + *this list of conditions and the following disclaimer in the > documentation > + *and/or other materials provided with the distribution. > + * > + * 3. Neither the name of the copyright holder nor the names of its > contributors > + *may be used to endorse or promote products derived from this software > without > + *specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS > IS" AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > IMPLIED > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE > LIABLE FOR > + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > DAMAGES > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > SERVICES; > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED > AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > THIS > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ Why not using SPDX tag for new BSD-3 License, but add whole license to the files? We have SPDX tag to prevent this.
Re: [PATCH 2/2] net/gve: update copyright holders
On 3/28/2023 3:08 AM, Junfeng Guo wrote: > Add Google LLC as one of the copyright holders for GVE. > > Signed-off-by: Rushil Gupta > Signed-off-by: Joshua Washington > Signed-off-by: Junfeng Guo > Signed-off-by: Jeroen de Borst > --- > drivers/net/gve/gve_ethdev.c | 32 ++-- > drivers/net/gve/gve_ethdev.h | 32 ++-- > drivers/net/gve/gve_logs.h | 32 ++-- > drivers/net/gve/gve_rx.c | 32 ++-- > drivers/net/gve/gve_tx.c | 32 ++-- > drivers/net/gve/meson.build | 31 ++- > 6 files changed, 180 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c > index cf28a4a3b7..1b8f0fde8f 100644 > --- a/drivers/net/gve/gve_ethdev.c > +++ b/drivers/net/gve/gve_ethdev.c > @@ -1,5 +1,33 @@ > -/* SPDX-License-Identifier: BSD-3-Clause > - * Copyright(C) 2022 Intel Corporation > +/* > + * SPDX-License-Identifier: BSD-3-Clause > + * > + * Copyright (c) 2022-2023 Google LLC > + * Copyright (c) 2022-2023 Intel Corporation > + * > + * Redistribution and use in source and binary forms, with or without > modification, > + * are permitted provided that the following conditions are met: > + * > + * 1. Redistributions of source code must retain the above copyright notice, > this > + *list of conditions and the following disclaimer. > + * > + * 2. Redistributions in binary form must reproduce the above copyright > notice, > + *this list of conditions and the following disclaimer in the > documentation > + *and/or other materials provided with the distribution. > + * > + * 3. Neither the name of the copyright holder nor the names of its > contributors > + *may be used to endorse or promote products derived from this software > without > + *specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS > IS" AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > IMPLIED > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE > LIABLE FOR > + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > DAMAGES > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > SERVICES; > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED > AND ON > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > THIS > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ Can you please separate the patches that updates license and copyright?
RE: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
> -Original Message- > From: Ferruh Yigit > Sent: Tuesday, March 28, 2023 16:51 > To: Guo, Junfeng ; Zhang, Qi Z > ; Wu, Jingjing ; Xing, > Beilei > Cc: dev@dpdk.org; Rushil Gupta ; Joshua > Washington ; Jeroen de Borst > > Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 > > On 3/28/2023 3:08 AM, Junfeng Guo wrote: > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini > > > > Google Virtual Ethernet > > M: Junfeng Guo > > +M: Jeroen de Borst > > +M: Rushil Gupta > > +M: Joshua Washington > > F: drivers/net/gve/ > > F: doc/guides/nics/gve.rst > > F: doc/guides/nics/features/gve.ini > > Can you please separate the maintainers' file update into a different > patch? Sure, will split this as an extra patch. Thanks!
RE: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
> -Original Message-
> From: Ferruh Yigit
> Sent: Tuesday, March 28, 2023 16:55
> To: Guo, Junfeng ; Zhang, Qi Z
> ; Wu, Jingjing ; Xing,
> Beilei
> Cc: dev@dpdk.org; Rushil Gupta ; Joshua
> Washington ; Jeroen de Borst
>
> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>
> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> > Switch copyright from MIT to BSD-3 for GVE base code.
> > In the meantime, remove MIT license exception for GVE driver.
> > Also update the maintainers for GVE driver.
> >
>
> I guess you are switching 'license' from MIT to BSD-3, not copyright.
> Copyright holder is still Google/Intel etc..
>
> Can you please update patch title & commit log accordingly?
Oh, yes!
This patch just switched the 'license' from MIT to BSD-3, not copyright.
Will update this, thanks!
>
> > Signed-off-by: Rushil Gupta
> > Signed-off-by: Joshua Washington
> > Signed-off-by: Junfeng Guo
> > Signed-off-by: Jeroen de Borst
>
> <...>
>
> > diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
> > index 2dc4507acb..ac0fc1472e 100644
> > --- a/drivers/net/gve/base/gve.h
> > +++ b/drivers/net/gve/base/gve.h
> > @@ -1,6 +1,32 @@
> > -/* SPDX-License-Identifier: MIT
> > - * Google Virtual Ethernet (gve) driver
> > - * Copyright (C) 2015-2022 Google, Inc.
> > +/*
> > + * SPDX-License-Identifier: BSD-3-Clause
> > + *
> > + * Copyright (c) 2022-2023 Google LLC
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> modification,
> > + * are permitted provided that the following conditions are met:
> > + *
> > + * 1. Redistributions of source code must retain the above copyright
> notice, this
> > + *list of conditions and the following disclaimer.
> > + *
> > + * 2. Redistributions in binary form must reproduce the above
> copyright notice,
> > + *this list of conditions and the following disclaimer in the
> documentation
> > + *and/or other materials provided with the distribution.
> > + *
> > + * 3. Neither the name of the copyright holder nor the names of its
> contributors
> > + *may be used to endorse or promote products derived from this
> software without
> > + *specific prior written permission.
> > + *
> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS "AS IS" AND
> > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> LIMITED TO, THE IMPLIED
> > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> PARTICULAR PURPOSE ARE
> > + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR
> > + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES
> > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> SUBSTITUTE GOODS OR SERVICES;
> > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> HOWEVER CAUSED AND ON
> > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> LIABILITY, OR TORT
> > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> OUT OF THE USE OF THIS
> > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> DAMAGE.
> > */
>
> Why not using SPDX tag for new BSD-3 License, but add whole license to
> the files? We have SPDX tag to prevent this.
These are provided by Google team. So I just keep them unchanged here.
So you mean that we only need to keep the license tag part as:
{
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
+ */
}
Right?
Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
On 3/28/2023 10:06 AM, Guo, Junfeng wrote:
>
>
>> -Original Message-
>> From: Ferruh Yigit
>> Sent: Tuesday, March 28, 2023 16:55
>> To: Guo, Junfeng ; Zhang, Qi Z
>> ; Wu, Jingjing ; Xing,
>> Beilei
>> Cc: dev@dpdk.org; Rushil Gupta ; Joshua
>> Washington ; Jeroen de Borst
>>
>> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>>
>> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
>>> Switch copyright from MIT to BSD-3 for GVE base code.
>>> In the meantime, remove MIT license exception for GVE driver.
>>> Also update the maintainers for GVE driver.
>>>
>>
>> I guess you are switching 'license' from MIT to BSD-3, not copyright.
>> Copyright holder is still Google/Intel etc..
>>
>> Can you please update patch title & commit log accordingly?
>
> Oh, yes!
> This patch just switched the 'license' from MIT to BSD-3, not copyright.
> Will update this, thanks!
>
>>
>>> Signed-off-by: Rushil Gupta
>>> Signed-off-by: Joshua Washington
>>> Signed-off-by: Junfeng Guo
>>> Signed-off-by: Jeroen de Borst
>>
>> <...>
>>
>>> diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
>>> index 2dc4507acb..ac0fc1472e 100644
>>> --- a/drivers/net/gve/base/gve.h
>>> +++ b/drivers/net/gve/base/gve.h
>>> @@ -1,6 +1,32 @@
>>> -/* SPDX-License-Identifier: MIT
>>> - * Google Virtual Ethernet (gve) driver
>>> - * Copyright (C) 2015-2022 Google, Inc.
>>> +/*
>>> + * SPDX-License-Identifier: BSD-3-Clause
>>> + *
>>> + * Copyright (c) 2022-2023 Google LLC
>>> + *
>>> + * Redistribution and use in source and binary forms, with or without
>> modification,
>>> + * are permitted provided that the following conditions are met:
>>> + *
>>> + * 1. Redistributions of source code must retain the above copyright
>> notice, this
>>> + *list of conditions and the following disclaimer.
>>> + *
>>> + * 2. Redistributions in binary form must reproduce the above
>> copyright notice,
>>> + *this list of conditions and the following disclaimer in the
>> documentation
>>> + *and/or other materials provided with the distribution.
>>> + *
>>> + * 3. Neither the name of the copyright holder nor the names of its
>> contributors
>>> + *may be used to endorse or promote products derived from this
>> software without
>>> + *specific prior written permission.
>>> + *
>>> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
>> CONTRIBUTORS "AS IS" AND
>>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>> LIMITED TO, THE IMPLIED
>>> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
>> PARTICULAR PURPOSE ARE
>>> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
>> CONTRIBUTORS BE LIABLE FOR
>>> + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>> CONSEQUENTIAL DAMAGES
>>> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>> SUBSTITUTE GOODS OR SERVICES;
>>> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
>> HOWEVER CAUSED AND ON
>>> + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>> LIABILITY, OR TORT
>>> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
>> OUT OF THE USE OF THIS
>>> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
>> DAMAGE.
>>> */
>>
>> Why not using SPDX tag for new BSD-3 License, but add whole license to
>> the files? We have SPDX tag to prevent this.
>
> These are provided by Google team. So I just keep them unchanged here.
> So you mean that we only need to keep the license tag part as:
> {
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright (c) 2022-2023 Google LLC
> + */
> }
> Right?
Yes please.
RE: [PATCH 2/2] net/gve: update copyright holders
> -Original Message- > From: Ferruh Yigit > Sent: Tuesday, March 28, 2023 16:57 > To: Guo, Junfeng ; Zhang, Qi Z > ; Wu, Jingjing ; Xing, > Beilei > Cc: dev@dpdk.org; Rushil Gupta ; Joshua > Washington ; Jeroen de Borst > > Subject: Re: [PATCH 2/2] net/gve: update copyright holders > > On 3/28/2023 3:08 AM, Junfeng Guo wrote: > > Add Google LLC as one of the copyright holders for GVE. > > > > Signed-off-by: Rushil Gupta > > Signed-off-by: Joshua Washington > > Signed-off-by: Junfeng Guo > > Signed-off-by: Jeroen de Borst > > --- > > drivers/net/gve/gve_ethdev.c | 32 > ++-- > > drivers/net/gve/gve_ethdev.h | 32 > ++-- > > drivers/net/gve/gve_logs.h | 32 ++- > - > > drivers/net/gve/gve_rx.c | 32 ++-- > > drivers/net/gve/gve_tx.c | 32 ++-- > > drivers/net/gve/meson.build | 31 > ++- > > 6 files changed, 180 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/net/gve/gve_ethdev.c > b/drivers/net/gve/gve_ethdev.c > > index cf28a4a3b7..1b8f0fde8f 100644 > > --- a/drivers/net/gve/gve_ethdev.c > > +++ b/drivers/net/gve/gve_ethdev.c > > @@ -1,5 +1,33 @@ > > -/* SPDX-License-Identifier: BSD-3-Clause > > - * Copyright(C) 2022 Intel Corporation > > +/* > > + * SPDX-License-Identifier: BSD-3-Clause > > + * > > + * Copyright (c) 2022-2023 Google LLC > > + * Copyright (c) 2022-2023 Intel Corporation > > + * > > + * Redistribution and use in source and binary forms, with or without > modification, > > + * are permitted provided that the following conditions are met: > > + * > > + * 1. Redistributions of source code must retain the above copyright > notice, this > > + *list of conditions and the following disclaimer. > > + * > > + * 2. Redistributions in binary form must reproduce the above > copyright notice, > > + *this list of conditions and the following disclaimer in the > documentation > > + *and/or other materials provided with the distribution. > > + * > > + * 3. Neither the name of the copyright holder nor the names of its > contributors > > + *may be used to endorse or promote products derived from this > software without > > + *specific prior written permission. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS "AS IS" AND > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > LIMITED TO, THE IMPLIED > > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE ARE > > + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR > CONTRIBUTORS BE LIABLE FOR > > + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL DAMAGES > > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > SUBSTITUTE GOODS OR SERVICES; > > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > HOWEVER CAUSED AND ON > > + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > LIABILITY, OR TORT > > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > OUT OF THE USE OF THIS > > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH > DAMAGE. > > */ > > Can you please separate the patches that updates license and copyright? Sure. The background is that, in the past (DPDK 22.11) we didn't get the approval of license from Google, thus chose the MIT License for the base code, and BSD-3 License for GVE common code (without the files in /base folder). We also left the copyright holder of base code just to Google Inc, and made Intel as the copyright holder of GVE common code (without /base folder). Today we are working together for GVE dev and maintaining. And we got the approval of BSD-3 License from Google for the base code. Thus we dicided to 1) switch the License of GVE base code from MIT to BSD-3; 2) add Google LLC as one of the copyright holders for GVE common code. Thanks!
RE: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
> -Original Message-
> From: Ferruh Yigit
> Sent: Tuesday, March 28, 2023 17:09
> To: Guo, Junfeng ; Zhang, Qi Z
> ; Wu, Jingjing ; Xing,
> Beilei
> Cc: dev@dpdk.org; Rushil Gupta ; Joshua
> Washington ; Jeroen de Borst
>
> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>
> On 3/28/2023 10:06 AM, Guo, Junfeng wrote:
> >
> >
> >> -Original Message-
> >> From: Ferruh Yigit
> >> Sent: Tuesday, March 28, 2023 16:55
> >> To: Guo, Junfeng ; Zhang, Qi Z
> >> ; Wu, Jingjing ; Xing,
> >> Beilei
> >> Cc: dev@dpdk.org; Rushil Gupta ; Joshua
> >> Washington ; Jeroen de Borst
> >>
> >> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
> >>
> >> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> >>> Switch copyright from MIT to BSD-3 for GVE base code.
> >>> In the meantime, remove MIT license exception for GVE driver.
> >>> Also update the maintainers for GVE driver.
> >>>
> >>
> >> I guess you are switching 'license' from MIT to BSD-3, not copyright.
> >> Copyright holder is still Google/Intel etc..
> >>
> >> Can you please update patch title & commit log accordingly?
> >
> > Oh, yes!
> > This patch just switched the 'license' from MIT to BSD-3, not copyright.
> > Will update this, thanks!
> >
> >>
> >>> Signed-off-by: Rushil Gupta
> >>> Signed-off-by: Joshua Washington
> >>> Signed-off-by: Junfeng Guo
> >>> Signed-off-by: Jeroen de Borst
> >>
> >> <...>
> >>
> >>> diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
> >>> index 2dc4507acb..ac0fc1472e 100644
> >>> --- a/drivers/net/gve/base/gve.h
> >>> +++ b/drivers/net/gve/base/gve.h
> >>> @@ -1,6 +1,32 @@
> >>> -/* SPDX-License-Identifier: MIT
> >>> - * Google Virtual Ethernet (gve) driver
> >>> - * Copyright (C) 2015-2022 Google, Inc.
> >>> +/*
> >>> + * SPDX-License-Identifier: BSD-3-Clause
> >>> + *
> >>> + * Copyright (c) 2022-2023 Google LLC
> >>> + *
> >>> + * Redistribution and use in source and binary forms, with or without
> >> modification,
> >>> + * are permitted provided that the following conditions are met:
> >>> + *
> >>> + * 1. Redistributions of source code must retain the above copyright
> >> notice, this
> >>> + *list of conditions and the following disclaimer.
> >>> + *
> >>> + * 2. Redistributions in binary form must reproduce the above
> >> copyright notice,
> >>> + *this list of conditions and the following disclaimer in the
> >> documentation
> >>> + *and/or other materials provided with the distribution.
> >>> + *
> >>> + * 3. Neither the name of the copyright holder nor the names of its
> >> contributors
> >>> + *may be used to endorse or promote products derived from this
> >> software without
> >>> + *specific prior written permission.
> >>> + *
> >>> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> >> CONTRIBUTORS "AS IS" AND
> >>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> >> LIMITED TO, THE IMPLIED
> >>> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> >> PARTICULAR PURPOSE ARE
> >>> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> >> CONTRIBUTORS BE LIABLE FOR
> >>> + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> >> CONSEQUENTIAL DAMAGES
> >>> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> >> SUBSTITUTE GOODS OR SERVICES;
> >>> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> >> HOWEVER CAUSED AND ON
> >>> + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> >> LIABILITY, OR TORT
> >>> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> >> OUT OF THE USE OF THIS
> >>> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> >> DAMAGE.
> >>> */
> >>
> >> Why not using SPDX tag for new BSD-3 License, but add whole license
> to
> >> the files? We have SPDX tag to prevent this.
> >
> > These are provided by Google team. So I just keep them unchanged here.
> > So you mean that we only need to keep the license tag part as:
> > {
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright (c) 2022-2023 Google LLC
> > + */
> > }
> > Right?
>
> Yes please.
Sure, thanks!
[PATCH v2 1/3] net/gve: switch license from MIT to BSD-3
Switch license from MIT to BSD-3 for GVE base code. In the meantime, remove MIT license exception for GVE driver. Signed-off-by: Rushil Gupta Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst --- .mailmap| 1 + drivers/net/gve/base/gve.h | 5 ++--- drivers/net/gve/base/gve_adminq.c | 5 ++--- drivers/net/gve/base/gve_adminq.h | 6 +++--- drivers/net/gve/base/gve_desc.h | 6 +++--- drivers/net/gve/base/gve_desc_dqo.h | 6 +++--- drivers/net/gve/base/gve_osdep.h| 3 ++- drivers/net/gve/base/gve_register.h | 6 +++--- license/exceptions.txt | 1 - 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.mailmap b/.mailmap index dc30369117..9d66fa727c 100644 --- a/.mailmap +++ b/.mailmap @@ -588,6 +588,7 @@ Jens Freimann Jeremy Plsek Jeremy Spewock Jerin Jacob +Jeroen de Borst Jerome Jutteau Jerry Hao OS Jerry Lilijun diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h index 2dc4507acb..55b7c2688e 100644 --- a/drivers/net/gve/base/gve.h +++ b/drivers/net/gve/base/gve.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_H_ diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c index e745b709b2..3519a2217f 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #include "../gve_ethdev.h" diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h index 05550119de..76862a148e 100644 --- a/drivers/net/gve/base/gve_adminq.h +++ b/drivers/net/gve/base/gve_adminq.h @@ -1,6 +1,6 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC + */ #ifndef _GVE_ADMINQ_H diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h index 006b36442f..0df97eacaf 100644 --- a/drivers/net/gve/base/gve_desc.h +++ b/drivers/net/gve/base/gve_desc.h @@ -1,6 +1,6 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC + */ /* GVE Transmit Descriptor formats */ diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h index ee1afdecb8..fef9c21da9 100644 --- a/drivers/net/gve/base/gve_desc_dqo.h +++ b/drivers/net/gve/base/gve_desc_dqo.h @@ -1,6 +1,6 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC + */ /* GVE DQO Descriptor formats */ diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h index 7cb73002f4..92efe3c594 100644 --- a/drivers/net/gve/base/gve_osdep.h +++ b/drivers/net/gve/base/gve_osdep.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + */ #ifndef _GVE_OSDEP_H_ diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h index c674167f31..3ee4e65815 100644 --- a/drivers/net/gve/base/gve_register.h +++ b/drivers/net/gve/base/gve_register.h @@ -1,6 +1,6 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC + */ #ifndef _GVE_REGISTER_H_ diff --git a/license/exceptions.txt b/license/exceptions.txt index 1ded290eee..1bd4dbf8f7 100644 --- a/license/exceptions.txt +++ b/license/exceptions.txt @@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name 2.BSD-2-Clause 10/23/201912/18/2019 lib/eal/windows/include/getopt.h 3.ISC AND BSD-2-Clause 10/23/201912/18/2019 lib/eal/windows/getopt.c -4. MIT 10/19/202210/18/2022drivers/net/gve/base/* --- -- 2.34.1
[PATCH v2 0/3] update license and copyright holders
This patch set contains: 1. switch license from MIT to BSD-3 for GVE base code. 2. remove MIT license exception 3. add maintainers 4. update copyright holders for GVE v2: 1. correct patch title & commit log 2. separate the maintainers' file update into a different patch Junfeng Guo (3): net/gve: switch license from MIT to BSD-3 net/gve: update copyright holders net/gve: add maintainers for GVE .mailmap| 1 + MAINTAINERS | 3 +++ drivers/net/gve/base/gve.h | 5 ++--- drivers/net/gve/base/gve_adminq.c | 5 ++--- drivers/net/gve/base/gve_adminq.h | 6 +++--- drivers/net/gve/base/gve_desc.h | 6 +++--- drivers/net/gve/base/gve_desc_dqo.h | 6 +++--- drivers/net/gve/base/gve_osdep.h| 3 ++- drivers/net/gve/base/gve_register.h | 6 +++--- drivers/net/gve/gve_ethdev.c| 4 +++- drivers/net/gve/gve_ethdev.h| 3 ++- drivers/net/gve/gve_logs.h | 4 +++- drivers/net/gve/gve_rx.c| 4 +++- drivers/net/gve/gve_tx.c| 4 +++- drivers/net/gve/meson.build | 3 ++- license/exceptions.txt | 1 - 16 files changed, 38 insertions(+), 26 deletions(-) -- 2.34.1
[PATCH v2 2/3] net/gve: update copyright holders
Add Google LLC as one of the copyright holders for GVE. Signed-off-by: Rushil Gupta Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst --- drivers/net/gve/gve_ethdev.c | 4 +++- drivers/net/gve/gve_ethdev.h | 3 ++- drivers/net/gve/gve_logs.h | 4 +++- drivers/net/gve/gve_rx.c | 4 +++- drivers/net/gve/gve_tx.c | 4 +++- drivers/net/gve/meson.build | 3 ++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index cf28a4a3b7..65b634e04f 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation + */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 42a02cf5d4..64d5bb0f78 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #ifndef _GVE_ETHDEV_H_ diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h index 0d02da46e1..fd89cd550e 100644 --- a/drivers/net/gve/gve_logs.h +++ b/drivers/net/gve/gve_logs.h @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation + */ #ifndef _GVE_LOGS_H_ diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c index 8d8f94efff..0475d00a20 100644 --- a/drivers/net/gve/gve_rx.c +++ b/drivers/net/gve/gve_rx.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation + */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c index fee3b939c7..b35bad56a6 100644 --- a/drivers/net/gve/gve_tx.c +++ b/drivers/net/gve/gve_tx.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation + */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build index af0010c01c..9cacccf2aa 100644 --- a/drivers/net/gve/meson.build +++ b/drivers/net/gve/meson.build @@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2022 Intel Corporation +# Copyright (c) 2022-2023 Google LLC +# Copyright (c) 2022-2023 Intel Corporation if is_windows build = false -- 2.34.1
[PATCH v2 3/3] net/gve: add maintainers for GVE
Add maintainers from Google for GVE. Signed-off-by: Junfeng Guo --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1a33ad8592..988c7aecfa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini Google Virtual Ethernet M: Junfeng Guo +M: Jeroen de Borst +M: Rushil Gupta +M: Joshua Washington F: drivers/net/gve/ F: doc/guides/nics/gve.rst F: doc/guides/nics/features/gve.ini -- 2.34.1
[PATCH v1] app/testpmd: set srv6 header without any TLV
When the type field of the IPv6 routing extension is 4, it means
segment routing header.
In this case, set the last_entry to be segment_left minus 1 if the
user doesn't specify the header length explicitly.
Signed-off-by: Rongwei Liu
---
app/test-pmd/cmdline_flow.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 5fbc450849..64549c037d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -12817,6 +12817,9 @@ cmd_set_raw_parsed(const struct buffer *in)
size = sizeof(struct rte_ipv6_routing_ext) +
(ext->hdr.segments_left << 4);
ext->hdr.hdr_len = ext->hdr.segments_left << 1;
+ /* Srv6 without TLV. */
+ if (ext->hdr.type == 4)
+ ext->hdr.last_entry =
ext->hdr.segments_left - 1;
} else {
size = sizeof(struct rte_ipv6_routing_ext) +
(ext->hdr.hdr_len << 3);
--
2.27.0
[PATCH v3 0/3] update license and copyright holders
This patch set contains: 1. switch license from MIT to BSD-3 for GVE base code. 2. remove MIT license exception 3. add maintainers 4. update copyright holders for GVE v3: 1. remove redundant blank line v2: 1. correct patch title & commit log 2. separate the maintainers' file update into a different patch Junfeng Guo (3): net/gve: switch license from MIT to BSD-3 net/gve: update copyright holders net/gve: add maintainers for GVE .mailmap| 1 + MAINTAINERS | 3 +++ drivers/net/gve/base/gve.h | 5 ++--- drivers/net/gve/base/gve_adminq.c | 5 ++--- drivers/net/gve/base/gve_adminq.h | 5 ++--- drivers/net/gve/base/gve_desc.h | 5 ++--- drivers/net/gve/base/gve_desc_dqo.h | 5 ++--- drivers/net/gve/base/gve_osdep.h| 2 +- drivers/net/gve/base/gve_register.h | 5 ++--- drivers/net/gve/gve_ethdev.c| 3 ++- drivers/net/gve/gve_ethdev.h| 3 ++- drivers/net/gve/gve_logs.h | 3 ++- drivers/net/gve/gve_rx.c| 3 ++- drivers/net/gve/gve_tx.c| 3 ++- drivers/net/gve/meson.build | 3 ++- license/exceptions.txt | 1 - 16 files changed, 29 insertions(+), 26 deletions(-) -- 2.34.1
[PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
Switch license from MIT to BSD-3 for GVE base code. In the meantime, remove MIT license exception for GVE driver. Signed-off-by: Rushil Gupta Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst --- .mailmap| 1 + drivers/net/gve/base/gve.h | 5 ++--- drivers/net/gve/base/gve_adminq.c | 5 ++--- drivers/net/gve/base/gve_adminq.h | 5 ++--- drivers/net/gve/base/gve_desc.h | 5 ++--- drivers/net/gve/base/gve_desc_dqo.h | 5 ++--- drivers/net/gve/base/gve_osdep.h| 2 +- drivers/net/gve/base/gve_register.h | 5 ++--- license/exceptions.txt | 1 - 9 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.mailmap b/.mailmap index dc30369117..9d66fa727c 100644 --- a/.mailmap +++ b/.mailmap @@ -588,6 +588,7 @@ Jens Freimann Jeremy Plsek Jeremy Spewock Jerin Jacob +Jeroen de Borst Jerome Jutteau Jerry Hao OS Jerry Lilijun diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h index 2dc4507acb..55b7c2688e 100644 --- a/drivers/net/gve/base/gve.h +++ b/drivers/net/gve/base/gve.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_H_ diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c index e745b709b2..3519a2217f 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #include "../gve_ethdev.h" diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h index 05550119de..e6907fc16f 100644 --- a/drivers/net/gve/base/gve_adminq.h +++ b/drivers/net/gve/base/gve_adminq.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_ADMINQ_H diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h index 006b36442f..c62563f754 100644 --- a/drivers/net/gve/base/gve_desc.h +++ b/drivers/net/gve/base/gve_desc.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ /* GVE Transmit Descriptor formats */ diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h index ee1afdecb8..d0887778d3 100644 --- a/drivers/net/gve/base/gve_desc_dqo.h +++ b/drivers/net/gve/base/gve_desc_dqo.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ /* GVE DQO Descriptor formats */ diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h index 7cb73002f4..f7d87fec16 100644 --- a/drivers/net/gve/base/gve_osdep.h +++ b/drivers/net/gve/base/gve_osdep.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_OSDEP_H_ diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h index c674167f31..615ceffc88 100644 --- a/drivers/net/gve/base/gve_register.h +++ b/drivers/net/gve/base/gve_register.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_REGISTER_H_ diff --git a/license/exceptions.txt b/license/exceptions.txt index 1ded290eee..1bd4dbf8f7 100644 --- a/license/exceptions.txt +++ b/license/exceptions.txt @@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name 2.BSD-2-Clause 10/23/201912/18/2019 lib/eal/windows/include/getopt.h 3.ISC AND BSD-2-Clause 10/23/201912/18/2019 lib/eal/windows/getopt.c -4. MIT 10/19/202210/18/2022drivers/net/gve/base/* --- -- 2.34.1
[PATCH v3 2/3] net/gve: update copyright holders
Add Google LLC as one of the copyright holders for GVE. Signed-off-by: Rushil Gupta Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst --- drivers/net/gve/gve_ethdev.c | 3 ++- drivers/net/gve/gve_ethdev.h | 3 ++- drivers/net/gve/gve_logs.h | 3 ++- drivers/net/gve/gve_rx.c | 3 ++- drivers/net/gve/gve_tx.c | 3 ++- drivers/net/gve/meson.build | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index cf28a4a3b7..e1998cc864 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 42a02cf5d4..64d5bb0f78 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #ifndef _GVE_ETHDEV_H_ diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h index 0d02da46e1..997a508f22 100644 --- a/drivers/net/gve/gve_logs.h +++ b/drivers/net/gve/gve_logs.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #ifndef _GVE_LOGS_H_ diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c index 8d8f94efff..e8d5a8723b 100644 --- a/drivers/net/gve/gve_rx.c +++ b/drivers/net/gve/gve_rx.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c index fee3b939c7..bbb954c9ea 100644 --- a/drivers/net/gve/gve_tx.c +++ b/drivers/net/gve/gve_tx.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build index af0010c01c..9cacccf2aa 100644 --- a/drivers/net/gve/meson.build +++ b/drivers/net/gve/meson.build @@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2022 Intel Corporation +# Copyright (c) 2022-2023 Google LLC +# Copyright (c) 2022-2023 Intel Corporation if is_windows build = false -- 2.34.1
[PATCH v3 3/3] net/gve: add maintainers for GVE
Add maintainers from Google for GVE. Signed-off-by: Junfeng Guo --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1a33ad8592..988c7aecfa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini Google Virtual Ethernet M: Junfeng Guo +M: Jeroen de Borst +M: Rushil Gupta +M: Joshua Washington F: drivers/net/gve/ F: doc/guides/nics/gve.rst F: doc/guides/nics/features/gve.ini -- 2.34.1
RE: [PATCH v3 3/3] net/gve: add maintainers for GVE
+ Rushil Gupta > -Original Message- > From: Guo, Junfeng > Sent: Tuesday, March 28, 2023 17:45 > To: Zhang, Qi Z ; Wu, Jingjing > ; ferruh.yi...@amd.com; Xing, Beilei > > Cc: dev@dpdk.org; Guo, Junfeng > Subject: [PATCH v3 3/3] net/gve: add maintainers for GVE > > Add maintainers from Google for GVE. > > Signed-off-by: Junfeng Guo > --- > MAINTAINERS | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 1a33ad8592..988c7aecfa 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini > > Google Virtual Ethernet > M: Junfeng Guo > +M: Jeroen de Borst > +M: Rushil Gupta > +M: Joshua Washington > F: drivers/net/gve/ > F: doc/guides/nics/gve.rst > F: doc/guides/nics/features/gve.ini > -- > 2.34.1
Re: [PATCH 2/2] net/gve: update copyright holders
On 3/28/2023 10:35 AM, Guo, Junfeng wrote: > > >> -Original Message- >> From: Ferruh Yigit >> Sent: Tuesday, March 28, 2023 16:57 >> To: Guo, Junfeng ; Zhang, Qi Z >> ; Wu, Jingjing ; Xing, >> Beilei >> Cc: dev@dpdk.org; Rushil Gupta ; Joshua >> Washington ; Jeroen de Borst >> >> Subject: Re: [PATCH 2/2] net/gve: update copyright holders >> >> On 3/28/2023 3:08 AM, Junfeng Guo wrote: >>> Add Google LLC as one of the copyright holders for GVE. >>> >>> Signed-off-by: Rushil Gupta >>> Signed-off-by: Joshua Washington >>> Signed-off-by: Junfeng Guo >>> Signed-off-by: Jeroen de Borst >>> --- >>> drivers/net/gve/gve_ethdev.c | 32 >> ++-- >>> drivers/net/gve/gve_ethdev.h | 32 >> ++-- >>> drivers/net/gve/gve_logs.h | 32 ++- >> - >>> drivers/net/gve/gve_rx.c | 32 ++-- >>> drivers/net/gve/gve_tx.c | 32 ++-- >>> drivers/net/gve/meson.build | 31 >> ++- >>> 6 files changed, 180 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/net/gve/gve_ethdev.c >> b/drivers/net/gve/gve_ethdev.c >>> index cf28a4a3b7..1b8f0fde8f 100644 >>> --- a/drivers/net/gve/gve_ethdev.c >>> +++ b/drivers/net/gve/gve_ethdev.c >>> @@ -1,5 +1,33 @@ >>> -/* SPDX-License-Identifier: BSD-3-Clause >>> - * Copyright(C) 2022 Intel Corporation >>> +/* >>> + * SPDX-License-Identifier: BSD-3-Clause >>> + * >>> + * Copyright (c) 2022-2023 Google LLC >>> + * Copyright (c) 2022-2023 Intel Corporation >>> + * >>> + * Redistribution and use in source and binary forms, with or without >> modification, >>> + * are permitted provided that the following conditions are met: >>> + * >>> + * 1. Redistributions of source code must retain the above copyright >> notice, this >>> + *list of conditions and the following disclaimer. >>> + * >>> + * 2. Redistributions in binary form must reproduce the above >> copyright notice, >>> + *this list of conditions and the following disclaimer in the >> documentation >>> + *and/or other materials provided with the distribution. >>> + * >>> + * 3. Neither the name of the copyright holder nor the names of its >> contributors >>> + *may be used to endorse or promote products derived from this >> software without >>> + *specific prior written permission. >>> + * >>> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND >> CONTRIBUTORS "AS IS" AND >>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >> LIMITED TO, THE IMPLIED >>> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A >> PARTICULAR PURPOSE ARE >>> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR >> CONTRIBUTORS BE LIABLE FOR >>> + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >> CONSEQUENTIAL DAMAGES >>> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >> SUBSTITUTE GOODS OR SERVICES; >>> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> HOWEVER CAUSED AND ON >>> + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT >> LIABILITY, OR TORT >>> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY >> OUT OF THE USE OF THIS >>> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH >> DAMAGE. >>> */ >> >> Can you please separate the patches that updates license and copyright? > > Sure. > > The background is that, in the past (DPDK 22.11) we didn't get the approval > of license from Google, thus chose the MIT License for the base code, and > BSD-3 License for GVE common code (without the files in /base folder). > We also left the copyright holder of base code just to Google Inc, and made > Intel as the copyright holder of GVE common code (without /base folder). > > Today we are working together for GVE dev and maintaining. And we got > the approval of BSD-3 License from Google for the base code. > Thus we dicided to 1) switch the License of GVE base code from MIT to BSD-3; > 2) add Google LLC as one of the copyright holders for GVE common code. > +1 to switch the DPDK common BSD-3 license, instead of having an exception for the driver, it simplifies things. Thank you for following this up.
Re: [PATCH v1] app/testpmd: set srv6 header without any TLV
28/03/2023 11:36, Rongwei Liu: > When the type field of the IPv6 routing extension is 4, it means > segment routing header. Can we replace this raw value with a #define in lib/net/ ?
[PATCH v1 1/1] cryptodev: support EDDSA
Asymmetric crypto library is extended to add EDDSA. Edwards curve
operation params are introduced.
Signed-off-by: Sachin Yaligar
Change-Id: I939d7646f95723113fa9f3bdbc01c0aeb4620e74
---
.mailmap | 1 +
doc/guides/cryptodevs/features/default.ini | 1 +
doc/guides/prog_guide/cryptodev_lib.rst| 2 +-
lib/cryptodev/rte_crypto_asym.h| 39 +-
4 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index cac02a6f48..6d92b56560 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1169,6 +1169,7 @@ Rushil Gupta
Ryan E Hall
Sabyasachi Sengupta
Sachin Saxena
+Sachin Yaligar
Sagar Abhang
Sagi Grimberg
Saikrishna Edupuganti
diff --git a/doc/guides/cryptodevs/features/default.ini
b/doc/guides/cryptodevs/features/default.ini
index 523da0cfa8..247a56be6e 100644
--- a/doc/guides/cryptodevs/features/default.ini
+++ b/doc/guides/cryptodevs/features/default.ini
@@ -125,6 +125,7 @@ Diffie-hellman =
ECDSA =
ECPM=
ECDH=
+EDDSA =
;
; Supported Operating systems of a default crypto driver.
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst
b/doc/guides/prog_guide/cryptodev_lib.rst
index 2b513bbf82..358dbbc768 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -927,7 +927,7 @@ Asymmetric Cryptography
The cryptodev library currently provides support for the following asymmetric
Crypto operations; RSA, Modular exponentiation and inversion, Diffie-Hellman
and
Elliptic Curve Diffie-Hellman public and/or private key generation and shared
-secret compute, DSA Signature generation and verification.
+secret compute, DSA and Edward's curve DSA Signature generation and
verification.
Session and Session Management
~~
diff --git a/lib/cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h
index 989f38323f..fc7172b070 100644
--- a/lib/cryptodev/rte_crypto_asym.h
+++ b/lib/cryptodev/rte_crypto_asym.h
@@ -69,7 +69,9 @@ enum rte_crypto_curve_id {
RTE_CRYPTO_EC_GROUP_SECP224R1 = 21,
RTE_CRYPTO_EC_GROUP_SECP256R1 = 23,
RTE_CRYPTO_EC_GROUP_SECP384R1 = 24,
- RTE_CRYPTO_EC_GROUP_SECP521R1 = 25
+ RTE_CRYPTO_EC_GROUP_SECP521R1 = 25,
+ RTE_CRYPTO_EC_GROUP_ED25519 = 29,
+ RTE_CRYPTO_EC_GROUP_ED448 = 30
};
/**
@@ -113,6 +115,10 @@ enum rte_crypto_asym_xform_type {
/**< Elliptic Curve Digital Signature Algorithm
* Perform Signature Generation and Verification.
*/
+ RTE_CRYPTO_ASYM_XFORM_EDDSA,
+ /**< Edwards Curve Digital Signature Algorithm
+* Perform Signature Generation and Verification.
+*/
RTE_CRYPTO_ASYM_XFORM_ECDH,
/**< Elliptic Curve Diffie Hellman */
RTE_CRYPTO_ASYM_XFORM_ECPM,
@@ -591,6 +597,36 @@ struct rte_crypto_ecdsa_op_param {
*/
};
+/**
+ * EDDSA operation params
+ */
+struct rte_crypto_eddsa_op_param {
+ enum rte_crypto_asym_op_type op_type;
+ /**< Signature generation or verification */
+
+ rte_crypto_uint pkey;
+ /**< Private key of the signer for signature generation */
+
+ struct rte_crypto_ec_point q;
+ /**< Public key of the signer derived from private key
+* h = hash(pkey), q = (h[0-31] * B)
+*/
+
+ rte_crypto_param message;
+ /**< Input message digest to be signed or verified */
+
+ rte_crypto_uint r;
+ /**< r component of edward curve signature
+* output : for signature generation
+* input : for signature verification
+*/
+ rte_crypto_uint s;
+ /**< s component of edward curve signature
+* output : for signature generation
+* input : for signature verification
+*/
+};
+
/**
* Structure for EC point multiplication operation param
*/
@@ -664,6 +700,7 @@ struct rte_crypto_asym_op {
struct rte_crypto_ecdh_op_param ecdh;
struct rte_crypto_dsa_op_param dsa;
struct rte_crypto_ecdsa_op_param ecdsa;
+ struct rte_crypto_eddsa_op_param eddsa;
struct rte_crypto_ecpm_op_param ecpm;
};
uint16_t flags;
--
2.40.0
Re: [PATCH v3 3/3] net/gve: add maintainers for GVE
On 3/28/2023 11:00 AM, Guo, Junfeng wrote: > + Rushil Gupta > >> -Original Message- >> From: Guo, Junfeng >> Sent: Tuesday, March 28, 2023 17:45 >> To: Zhang, Qi Z ; Wu, Jingjing >> ; ferruh.yi...@amd.com; Xing, Beilei >> >> Cc: dev@dpdk.org; Guo, Junfeng >> Subject: [PATCH v3 3/3] net/gve: add maintainers for GVE >> >> Add maintainers from Google for GVE. >> >> Signed-off-by: Junfeng Guo >> --- >> MAINTAINERS | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 1a33ad8592..988c7aecfa 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini >> >> Google Virtual Ethernet >> M: Junfeng Guo >> +M: Jeroen de Borst >> +M: Rushil Gupta >> +M: Joshua Washington >> F: drivers/net/gve/ >> F: doc/guides/nics/gve.rst >> F: doc/guides/nics/features/gve.ini New maintainers were not part of the upstreaming process, so we don't know much about the engagement and commitment level of them. However, as far as I understand they are the base code owners, which means we can trust their technical expertise that is why good to have them on board. Primarily for due diligence, would it be OK to get explicit Ack from the new maintainers, to confirm they are aware of and agree to the responsibilities they are accepting?
Re: [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
On 3/28/2023 10:45 AM, Junfeng Guo wrote: > diff --git a/drivers/net/gve/base/gve_osdep.h > b/drivers/net/gve/base/gve_osdep.h > index 7cb73002f4..f7d87fec16 100644 > --- a/drivers/net/gve/base/gve_osdep.h > +++ b/drivers/net/gve/base/gve_osdep.h > @@ -1,5 +1,5 @@ > /* SPDX-License-Identifier: BSD-3-Clause > - * Copyright(C) 2022 Intel Corporation > + * Copyright (c) 2022-2023 Google LLC > */ Is this intentional to move Copyright from Intel to Google?
Re: [PATCH v3 2/3] net/gve: update copyright holders
On 3/28/2023 10:45 AM, Junfeng Guo wrote: > Add Google LLC as one of the copyright holders for GVE. > > Signed-off-by: Rushil Gupta > Signed-off-by: Joshua Washington > Signed-off-by: Junfeng Guo > Signed-off-by: Jeroen de Borst Acked-by: Ferruh Yigit
Re: [EXT] [PATCH] vhost: add device op to offload the interrupt kick
On 27 Mar 2023, at 18:35, Maxime Coquelin wrote:
> On 3/27/23 18:04, Eelco Chaudron wrote:
>>
>>
>> On 27 Mar 2023, at 17:16, Gowrishankar Muthukrishnan wrote:
>>
>>> Hi Eelco,
>>>
+void
+rte_vhost_notify_guest(int vid, uint16_t queue_id) {
+ struct virtio_net *dev = get_device(vid);
+ struct vhost_virtqueue *vq;
+
+ if (!dev || queue_id >= VHOST_MAX_VRING)
+ return;
+
+ vq = dev->virtqueue[queue_id];
+ if (!vq)
+ return;
+
+ rte_spinlock_lock(&vq->access_lock);
+
>>>
>>> Is spin lock needed here before system call ?
>>
>> I assumed access_lock is protecting all the following fields in this
>> structure, so I need the lock to read the vq->callfd, however, I can/should
>> move the eventfd_write outside of the lock.
>
> The FD might be closed between the check and the call to eventfd_write
> though, but I agree this is not optimal to call the eventfd_write under
> the spinlock in your case, as you will block the pmd thread if it tries
> to enqueue/dequeue packets on this queue, defeating the purpose of this
> patch.
>
> Maybe the solution is to change to read-write locks for the access_lock
> spinlock. The datapath (rte_vhost_enqueue_burst/rte_vhost_dequeue_burst)
> and this API would use the read version, meaning they won't lock each
> other, and the control path (lib/vhost/vhost_user.c) will use the write
> version.
>
> Does that make sense?
Yes, this makes sense, let me investigate this and get back.
+ if (vq->callfd >= 0)
+ eventfd_write(vq->callfd, (eventfd_t)1);
+
+ rte_spinlock_unlock(&vq->access_lock);
+}
+
>>>
>>> Thanks.
>>
[PATCH v2] app/testpmd: set srv6 header without any TLV
When the type field of the IPv6 routing extension is 4, it means
segment routing header.
In this case, set the last_entry to be segment_left minus 1 if the
user doesn't specify the header length explicitly.
Signed-off-by: Rongwei Liu
v2: add macro definition for segment routing header.
---
app/test-pmd/cmdline_flow.c | 3 +++
lib/net/rte_ip.h| 3 +++
2 files changed, 6 insertions(+)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 5fbc450849..09f417b76e 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -12817,6 +12817,9 @@ cmd_set_raw_parsed(const struct buffer *in)
size = sizeof(struct rte_ipv6_routing_ext) +
(ext->hdr.segments_left << 4);
ext->hdr.hdr_len = ext->hdr.segments_left << 1;
+ /* Srv6 without TLV. */
+ if (ext->hdr.type == RTE_IPV6_SRCRT_TYPE_4)
+ ext->hdr.last_entry =
ext->hdr.segments_left - 1;
} else {
size = sizeof(struct rte_ipv6_routing_ext) +
(ext->hdr.hdr_len << 3);
diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index 337fad15d7..cfdbfb86ba 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -540,6 +540,9 @@ struct rte_ipv6_hdr {
uint8_t dst_addr[16]; /**< IP address of destination host(s). */
} __rte_packed;
+/* IPv6 routing extension type definition. */
+#define RTE_IPV6_SRCRT_TYPE_4 4
+
/**
* IPv6 Routing Extension Header
*/
--
2.27.0
[Bug 1201] virtphys sometimes causing bluescreen
https://bugs.dpdk.org/show_bug.cgi?id=1201 Bug ID: 1201 Summary: virtphys sometimes causing bluescreen Product: DPDK Version: 22.11 Hardware: x86 OS: Windows Status: UNCONFIRMED Severity: critical Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: a.polle...@deltacast.tv Target Milestone: --- Created attachment 247 --> https://bugs.dpdk.org/attachment.cgi?id=247&action=edit bluescreen When using DPDK on windows server 2019 sometimes we get a bluescreen. This bluescreen seams to be caused by virt2phys.sys The issue has only been reproduced on Windows server 2019. On windows 10,11 and server 2022 no bluescreen. To reproduce this issue only test-pmd is necessary. Bellow the crash analyse: Microsoft (R) Windows Debugger Version 10.0.22621.755 AMD64 Copyright (c) Microsoft Corporation. All rights reserved. Loading Dump File [C:\Users\ja\Desktop\BSOD VCS\MEMORY.DMP] Kernel Bitmap Dump File: Kernel address space is available, User address space may not be available. WARNING: Whitespace at start of path element * Path validation summary ** Response Time (ms) Location Deferred .sympath cache*C:\MySymbols Deferred srv*https://msdl.microsoft.com/download/symbols WARNING: Whitespace at start of path element Symbol search path is: .sympath cache*C:\MySymbols;srv*https://msdl.microsoft.com/download/symbols; C:\local\github\dpdk-kmods\windows\virt2phys\x64\Release Executable search path is: WARNING: Whitespace at start of path element Windows 10 Kernel Version 17763 MP (8 procs) Free x64 Product: Server, suite: TerminalServer SingleUserTS Edition build lab: 17763.1.amd64fre.rs5_release.180914-1434 Machine Name: Kernel base = 0xf803`07eba000 PsLoadedModuleList = 0xf803`082d24d0 Debug session time: Fri Mar 24 13:59:11.850 2023 (UTC + 1:00) System Uptime: 0 days 0:04:38.551 Loading Kernel Symbols .Page 197e55 not present in the dump file. Type ".hh dbgerr004" for details .. .. Loading User Symbols PEB is paged out (Peb.Ldr = 00cd`0513b018). Type ".hh dbgerr001" for details Loading unloaded module list For analysis of this file, run !analyze -v 0: kd> !analyze -v *** * * *Bugcheck Analysis* * * *** SYSTEM_SERVICE_EXCEPTION (3b) An exception happened while executing a system service routine. Arguments: Arg1: c005, Exception code that caused the BugCheck Arg2: f8030afe2542, Address of the instruction which caused the BugCheck Arg3: ce0bfaf2e3f0, Address of the context record for the exception that caused the BugCheck Arg4: , zero. Debugging Details: -- KEY_VALUES_STRING: 1 Key : Analysis.CPU.mSec Value: 2280 Key : Analysis.DebugAnalysisManager Value: Create Key : Analysis.Elapsed.mSec Value: 14939 Key : Analysis.Init.CPU.mSec Value: 4796 Key : Analysis.Init.Elapsed.mSec Value: 85415 Key : Analysis.Memory.CommitPeak.Mb Value: 126 Key : WER.OS.Branch Value: rs5_release Key : WER.OS.Timestamp Value: 2018-09-14T14:34:00Z Key : WER.OS.Version Value: 10.0.17763.1 FILE_IN_CAB: MEMORY.DMP BUGCHECK_CODE: 3b BUGCHECK_P1: c005 BUGCHECK_P2: f8030afe2542 BUGCHECK_P3: ce0bfaf2e3f0 BUGCHECK_P4: 0 CONTEXT: ce0bfaf2e3f0 -- (.cxr 0xce0bfaf2e3f0) rax=e78772ee6000 rbx=a787ff756b60cddd rcx=a787ff756b60cde5 rdx=ce0bfaf2f300 rsi=01f55b60 rdi=e7876c3cde20 rip=f8030afe2542 rsp=ce0bfaf2ede0 rbp=01d4 r8= r9=7fffe787726cafd8 r10=7ffc r11=e78771bd6080 r12=e78772282080 r13=e7876ad78940 r14=0020 r15=01f55b60 iopl=0 nv up ei ng nz na pe nc cs=0010 ss=0018 ds=002b es=002b fs=0053 gs=002b efl=00010282 virt2phys!virt2phys_process_find_block+0xa [inlined in virt2phys!virt2phys_translate+0xd2]: f803`0afe2542 488b03 mov rax,qword ptr [rbx] ds:002b:a787ff75`6b60cddd= Resetting default scope BLACKBOXBSD: 1 (!blackboxbsd) BLACKBOXPNP: 1 (!blackboxpnp) PROCESS_NAME: vcs.exe STACK_TEXT: ce0b`faf2ede0 f803`0afe15c6 : 1878`8e199398 ce0b`faf2eeb9 e787`71e66c60 1878`8e199398 : virt2phys!vi
Re: [PATCH] devtools: move mailmap check after patch applied
On Mon, Mar 27, 2023 at 4:52 PM Thomas Monjalon wrote:
>
> The names in a patch were possibly checked with checkpatches.sh
> before applying the patch, so before .mailmap file was updated.
>
> The check is moved and translated in check-git-log.sh,
> which is run only on a repository, not a detached patch file.
>
> Fixes: e83d41f0694d ("mailmap: add list of contributors")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Thomas Monjalon
I don't really like how we rely on the IFS= change in the middle of
check-git-log.sh, but this change works.
Reviewed-by: David Marchand
--
David Marchand
Link Bonding of VFs and PF admin down
Hello Team, I have two X710 NICs in the hypervisor and created the VFs on those NICs. PF is managed by the Linux kernel, while the VF is managed by DPDK. I am using the "test-pmd" application to test the bonding functionality, especially ACTIVE-BACKUP mode. I have created the bond interface and added the slaves in such a way that the one VFs from each of the PF is added to the bond interface. The goal is to achieve uninterrupted traffic flow even when one of the PF is down. As part of my testing, I made one of the PF admin down using the command "ip link set down". Even after waiting for a few minutes, the link status is not propagated to the VF, and the link bonding still takes the PF which is down as the primary slave and tries to send the packet out of that interface. While debugging I found out that the link status of VF is still up. Is this the expected behaviour? As per the link: https://www.intel.in/content/www/in/en/support/articles/36776/ethernet-products.html it is the expected behaviour. It may work well if the use case is VF-to-VF communication. But if the use case is to communicate to the other system - (Switch/Routers), then this behaviour will break the link bonding functionality. My use case: PF is managed by Linux kernel is connected to the external Router, VF is added to the VM, and the DPDK application is supposed to send/read the packet from the VF. Let me know your thoughts. Thanks, Bharath This electronic message and any files transmitted with it contains information from ST Engineering iDirect, which may be privileged, proprietary and/or confidential. It is intended solely for the use of the individual or entity to whom they are addressed. If you are not the original recipient or the person responsible for delivering the email to the intended recipient, be advised that you have received this email in error, and that any use, dissemination, forwarding, printing, or copying of this email is strictly prohibited. If you received this email in error, please delete it and immediately notify the sender.
Re: [PATCH] devtools: move mailmap check after patch applied
On 3/28/2023 2:52 PM, David Marchand wrote:
> On Mon, Mar 27, 2023 at 4:52 PM Thomas Monjalon wrote:
>>
>> The names in a patch were possibly checked with checkpatches.sh
>> before applying the patch, so before .mailmap file was updated.
>>
>> The check is moved and translated in check-git-log.sh,
>> which is run only on a repository, not a detached patch file.
>>
>> Fixes: e83d41f0694d ("mailmap: add list of contributors")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Thomas Monjalon
>
> I don't really like how we rely on the IFS= change in the middle of
> check-git-log.sh, but this change works.
>
> Reviewed-by: David Marchand
>
>
Tested-by: Ferruh Yigit
DPDK Userspace 2023 Survey
Dear DPDK Community Members, We hope this message finds each of you well. We are in the midst of planning DPDK’s live two-day Userspace conference for mid-September of 2023, and eyeing Dublin, Ireland as the location. This will likely be a hybrid event, with a live component and a remote component. However we first need to get a sense of the breadth of interest in in-person attendance vs. remote (virtual) attendance, as well as the feasibility of travel for you. This will give us a better sense of projected headcount. As soon as you have the opportunity, can you please fill out the following five-question survey? https://docs.google.com/forms/d/1104swKV4-_nNT6GimkRBNVac1uAqX7o2P936bcGsgMc/edit Thanks in advance for your time and input. The DPDK Leadership Team
Re: [PATCH 1/1] app/mldev: add internal function for file read
On Thu, 23 Mar 2023 08:28:01 -0700
Srikanth Yalavarthi wrote:
> + if (fseek(fp, 0, SEEK_END) == 0) {
> + file_size = ftell(fp);
> + if (file_size == -1) {
> + ret = -EIO;
> + goto error;
> + }
> +
> + file_buffer = rte_malloc(NULL, file_size, RTE_CACHE_LINE_SIZE);
> + if (file_buffer == NULL) {
> + ml_err("Failed to allocate memory: %s\n", file);
> + ret = -ENOMEM;
> + goto error;
> + }
> +
> + if (fseek(fp, 0, SEEK_SET) != 0) {
> + ret = -EIO;
> + goto error;
> + }
> +
> + if (fread(file_buffer, sizeof(char), file_size, fp) !=
> (unsigned long)file_size) {
> + ml_err("Failed to read file : %s\n", file);
> + ret = -EIO;
> + goto error;
> + }
> + fclose(fp);
> + } else {
> + ret = -EIO;
> + goto error;
> + }
> +
> + *buffer = file_buffer;
> + *size = file_size;
> +
> + return 0;
Granted this only test code, but is the slowest way to do this.
Stdio is buffered (in 4K chunks). And using rte_malloc comes from hugepages.
Three levels of improvement are possible:
1. don't use rte_malloc() use malloc() instead.
2. use direct system call for I/O
3. use mmap() to directly map in the file instead read
Re: [PATCH v1] doc/guides/nics: remove limitation of ipn3ke
24/03/2023 02:29, Huang, Wei: > From: Thomas Monjalon > > 23/03/2023 02:00, Wei Huang: > > > Now ipn3ke is not evaluation in 19.05 . > > > > What do you mean? It is not considered for evaluation since 19.05? > > Do you want to backport? > > > No backport, this limitation is out of date, just to remove it. Applied
Re: [PATCH] pdump: fix build issue with GCC 12
27/03/2023 09:07, Joyce Kong:
> The following warning is observed with GCC12 compilation
> with release 20.11:
>
> In function ‘__rte_ring_enqueue_elems_64’,
> inlined from ‘__rte_ring_enqueue_elems’ at
> ../lib/librte_ring/rte_ring_elem.h:225:3,
> inlined from ‘__rte_ring_do_enqueue_elem’ at
> ../lib/librte_ring/rte_ring_elem.h:424:2,
> inlined from ‘rte_ring_mp_enqueue_burst_elem’ at
> ../lib/librte_ring/rte_ring_elem.h:884:9,
> inlined from ‘rte_ring_enqueue_burst_elem’ at
> ../lib/librte_ring/rte_ring_elem.h:946:10,
> inlined from ‘rte_ring_enqueue_burst’ at
> ../lib/librte_ring/rte_ring.h:721:9,
> inlined from ‘pdump_copy’ at
> ../lib/librte_pdump/rte_pdump.c:94:13:
> ../lib/librte_ring/rte_ring_elem.h:162:40: warning: ‘*dup_bufs.36_42
> + _89’ may be used uninitialized [-Wmaybe-uninitialized]
> 162 | ring[idx] = obj[i];
> | ~~~^~~
> ../lib/librte_ring/rte_ring_elem.h:163:44: warning: ‘*dup_bufs.36_42
> + _98’ may be used uninitialized [-Wmaybe-uninitialized]
> 163 | ring[idx + 1] = obj[i + 1];
> | ~~~^~~
> ../lib/librte_ring/rte_ring_elem.h:164:44: warning: ‘*dup_bufs.36_42
> + _107’ may be used uninitialized [-Wmaybe-uninitialized]
> 164 | ring[idx + 2] = obj[i + 2];
> | ~~~^~~
> ../lib/librte_ring/rte_ring_elem.h:165:44: warning: ‘*dup_bufs.36_42
> + _116’ may be used uninitialized [-Wmaybe-uninitialized]
> 165 | ring[idx + 3] = obj[i + 3];
> | ~~~^~~
> ../lib/librte_ring/rte_ring_elem.h:169:42: warning: ‘*dup_bufs.36_42
> + _129’ may be used uninitialized [-Wmaybe-uninitialized]
> 169 | ring[idx++] = obj[i++]; /* fallthrough */
> | ~~~^
> ../lib/librte_ring/rte_ring_elem.h:171:42: warning: ‘*dup_bufs.36_42
> + _139’ may be used uninitialized [-Wmaybe-uninitialized]
> 171 | ring[idx++] = obj[i++]; /* fallthrough */
> | ~~~^
> ../lib/librte_ring/rte_ring_elem.h:173:42: warning: ‘*dup_bufs.36_42
> + _149’ may be used uninitialized [-Wmaybe-uninitialized]
> 173 | ring[idx++] = obj[i++];
>
> Actually, this is an alias warning as -O3 enables strict alias.
> This patch fixes it by replacing 'dup_bufs' with '&dup_bufs[0]'
> as the compiler represents them differently.
>
> Fixes: 278f945402c5 ("pdump: add new library for packet capture")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Joyce Kong
> Reviewed-by: Ruifeng Wang
Acked-by: Reshma Pattan
Acked-by: Tyler Retzlaff
Applied, thanks.
Re: [PATCH] acl: fix autotest failures on ppc64le with gcc 11
22/03/2023 18:29, David Christensen: > Original acl implementation of Altivec optimized code included an > explicit -O2 optimization level for a particular inlined function. > When DPDK is built with the default -O3 optimization level on gcc > 11.x or later, the resulting code may generate a segmentation > fault as observed in acl_autotest. > > Since there is no explicit reason given for the local function > optimization level in the original commit, and testing with gcc > versions 8.x through 12.x results in working code at all -O > optimization settings, the local optimization is removed. > > Bugzilla ID: 1197 > Cc: sta...@dpdk.org > > Signed-off-by: David Christensen > Tested-by: Thinh Tran Applied, thanks.
[PATCH] common/sfc_efx/base: support link status change v2 events
FW should send link status change events in either v1 or
v2 format depending on the preference which the driver
can express during CMD_DRV_ATTACH stage. At the moment,
libefx does not request v2, so v1 events must arrive.
However, FW does not honour this choice and always
sends v2 events. So teach libefx to parse such and
add v2 request to CMD_DRV_ATTACH, correspondingly.
Signed-off-by: Ivan Malov
Reviewed-by: Andy Moreton
---
drivers/common/sfc_efx/base/ef10_ev.c | 6 +-
drivers/common/sfc_efx/base/ef10_impl.h | 1 +
drivers/common/sfc_efx/base/ef10_phy.c | 28 +++--
drivers/common/sfc_efx/base/efx_mcdi.c | 10 +++--
4 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/drivers/common/sfc_efx/base/ef10_ev.c
b/drivers/common/sfc_efx/base/ef10_ev.c
index ba078940b6..011ef49de7 100644
--- a/drivers/common/sfc_efx/base/ef10_ev.c
+++ b/drivers/common/sfc_efx/base/ef10_ev.c
@@ -868,6 +868,7 @@ ef10_ev_mcdi(
efx_nic_t *enp = eep->ee_enp;
unsigned int code;
boolean_t should_abort = B_FALSE;
+ boolean_t ev_is_v2 = B_FALSE;
EFX_EV_QSTAT_INCR(eep, EV_MCDI_RESPONSE);
@@ -905,10 +906,13 @@ ef10_ev_mcdi(
break;
#endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */
+ case MCDI_EVENT_CODE_LINKCHANGE_V2:
+ ev_is_v2 = B_TRUE;
+ /* Fallthrough */
case MCDI_EVENT_CODE_LINKCHANGE: {
efx_link_mode_t link_mode;
- ef10_phy_link_ev(enp, eqp, &link_mode);
+ ef10_phy_link_ev(enp, eqp, ev_is_v2, &link_mode);
should_abort = eecp->eec_link_change(arg, link_mode);
break;
}
diff --git a/drivers/common/sfc_efx/base/ef10_impl.h
b/drivers/common/sfc_efx/base/ef10_impl.h
index 2aae208f27..017e561f19 100644
--- a/drivers/common/sfc_efx/base/ef10_impl.h
+++ b/drivers/common/sfc_efx/base/ef10_impl.h
@@ -753,6 +753,7 @@ extern void
ef10_phy_link_ev(
__inefx_nic_t *enp,
__inefx_qword_t *eqp,
+ __inboolean_t ev_is_v2,
__out efx_link_mode_t *link_modep);
LIBEFX_INTERNAL
diff --git a/drivers/common/sfc_efx/base/ef10_phy.c
b/drivers/common/sfc_efx/base/ef10_phy.c
index 954436b9e0..49babdecd5 100644
--- a/drivers/common/sfc_efx/base/ef10_phy.c
+++ b/drivers/common/sfc_efx/base/ef10_phy.c
@@ -166,6 +166,7 @@ mcdi_phy_decode_link_mode(
ef10_phy_link_ev(
__inefx_nic_t *enp,
__inefx_qword_t *eqp,
+ __inboolean_t ev_is_v2,
__out efx_link_mode_t *link_modep)
{
efx_port_t *epp = &(enp->en_port);
@@ -174,13 +175,31 @@ ef10_phy_link_ev(
unsigned int fcntl;
efx_phy_fec_type_t fec = MC_CMD_FEC_NONE;
efx_link_mode_t link_mode;
+ unsigned int ev_lp_cap;
+ unsigned int ev_fcntl;
+ unsigned int ev_speed;
uint32_t lp_cap_mask;
+ if (ev_is_v2) {
+ link_flags = (1 << MC_CMD_GET_LINK_OUT_FULL_DUPLEX_LBN);
+ if (MCDI_EV_FIELD(eqp, LINKCHANGE_V2_FLAGS_LINK_UP))
+ link_flags |= (1 << MC_CMD_GET_LINK_OUT_LINK_UP_LBN);
+
+ ev_lp_cap = MCDI_EV_FIELD(eqp, LINKCHANGE_V2_LP_CAP);
+ ev_fcntl = MCDI_EV_FIELD(eqp, LINKCHANGE_V2_FCNTL);
+ ev_speed = MCDI_EV_FIELD(eqp, LINKCHANGE_V2_SPEED);
+ } else {
+ link_flags = MCDI_EV_FIELD(eqp, LINKCHANGE_LINK_FLAGS);
+ ev_lp_cap = MCDI_EV_FIELD(eqp, LINKCHANGE_LP_CAP);
+ ev_fcntl = MCDI_EV_FIELD(eqp, LINKCHANGE_FCNTL);
+ ev_speed = MCDI_EV_FIELD(eqp, LINKCHANGE_SPEED);
+ }
+
/*
* Convert the LINKCHANGE speed enumeration into mbit/s, in the
* same way as GET_LINK encodes the speed
*/
- switch (MCDI_EV_FIELD(eqp, LINKCHANGE_SPEED)) {
+ switch (ev_speed) {
case MCDI_EVENT_LINKCHANGE_SPEED_100M:
speed = 100;
break;
@@ -207,13 +226,10 @@ ef10_phy_link_ev(
break;
}
- link_flags = MCDI_EV_FIELD(eqp, LINKCHANGE_LINK_FLAGS);
- mcdi_phy_decode_link_mode(enp, link_flags, speed,
- MCDI_EV_FIELD(eqp, LINKCHANGE_FCNTL),
+ mcdi_phy_decode_link_mode(enp, link_flags, speed, ev_fcntl,
MC_CMD_FEC_NONE, &link_mode,
&fcntl, &fec);
- mcdi_phy_decode_cap(MCDI_EV_FIELD(eqp, LINKCHANGE_LP_CAP),
- &lp_cap_mask);
+ mcdi_phy_decode_cap(ev_lp_cap, &lp_cap_mask);
/*
* It's safe to update ep_lp_cap_mask without the driver's port lock
diff --git a/drivers/common/sfc_efx/base/efx_mcdi.c
b/drivers/common/sfc_efx/base/efx_mcdi.c
index 6274cf6bac..acf7f02246 100644
--- a/drivers/common/sfc_efx/base/efx_mcdi.c
+++ b/drivers/common/sfc_efx/base/efx_mcdi.c
@@ -1620,
Re: [PATCH 00/33] Update net driver documentation
22/03/2023 00:59, Ferruh Yigit:
> Some PMDs has "Pre-Installation Configuration" section in their documentation,
> although section is not clear I assume that is historical from times compile
> time parameters and 'make' build system used, where common make target was
> 'install', so section refers to compile time configuration.
>
> Right now device arguments ("Runtime configuration") is documented under this
> section which is confusing, so updating section name
> from "Pre-Installation Configuration" to "Configuration".
>
> While touching documents trying to keep following template in the documents,
> with section names and order, to have consistent documents without being
> too strict on applying the template:
>
> [Overview]
> Supported Devices
> Supported Features
> Prerequisites
> Configuration
> Compilation Options
> Environment variables
> Runtime Configuration
> Debugging
> Limitations or Known issues
> Testpmd driver specific commands
>
> Note: Patch sent as each driver separately to help review, it can be squashed
> while merging.
Squashed and applied, thanks.
> Other further improvements not covered here can be visiting
> "Building DPDK" sections which has redundant and less useful information,
> and "Usage example" section which has testpmd log, most of the part is same
> for
> all drivers.
Yes, good idea to remove redundant information and replace with good links.
Re: [PATCH] devtools: move mailmap check after patch applied
28/03/2023 16:27, Ferruh Yigit:
> On 3/28/2023 2:52 PM, David Marchand wrote:
> > On Mon, Mar 27, 2023 at 4:52 PM Thomas Monjalon wrote:
> >>
> >> The names in a patch were possibly checked with checkpatches.sh
> >> before applying the patch, so before .mailmap file was updated.
> >>
> >> The check is moved and translated in check-git-log.sh,
> >> which is run only on a repository, not a detached patch file.
> >>
> >> Fixes: e83d41f0694d ("mailmap: add list of contributors")
> >> Cc: sta...@dpdk.org
> >>
> >> Signed-off-by: Thomas Monjalon
> >
> > I don't really like how we rely on the IFS= change in the middle of
> > check-git-log.sh, but this change works.
> >
> > Reviewed-by: David Marchand
>
> Tested-by: Ferruh Yigit
Applied
Re: [PATCH v2 0/2] ABI check updates
23/03/2023 18:15, David Marchand: > This series moves ABI exceptions in a single configuration file and > simplifies the ABI check so that no artefact depending on libabigail > version is stored in the CI. Applied, thanks.
Re: [PATCH] devtools: add E-Switch keyword for commit checks
24/02/2022 20:20, Ajit Khaparde: > On Thu, Feb 24, 2022 at 3:07 AM Raslan Darawsheh wrote: > > > > ++ adding more people here, > > > > From: Thomas Monjalon > > > 24/02/2022 10:26, Raslan Darawsheh: > > > > This adds the syntax for E-Switch to have check on how it suppose to > > > > be for commits > > > [...] > > > > +E-Switch > > > > > > It looks Mellanox people use this syntax in Linux kernel as well. > > > Where does it come from? Is it a Mellanox-only wording? > > I think it was coined around the time when Mellanox submitted the > kernel driver patchset in 2015. > https://lwn.net/Articles/666180/ > > I think it has become a fairly used term since that time. > > > > > > I don't think it's a Mellanox only wording see the following: > > https://www.kernel.org/doc/html/latest/networking/devlink/devlink-port.html?#devlink-port > > https://www.kernel.org/doc/html/latest/networking/switchdev.html > > > > > Intuitively, I would have written it eSwitch generally. > > I would go with E-Switch > > > It means "embedded switch", right? > > In kernel, it's Ethernet Switch device. > > https://www.kernel.org/doc/html/latest/networking/switchdev.html Forgotten and Applied (very late), thanks.
Re: rte_atomic API compatibility & standard atomics
On Mon, Mar 27, 2023 at 10:08:10PM +0200, Morten Brørup wrote:
> > From: Tyler Retzlaff [mailto:roret...@linux.microsoft.com]
> > Sent: Monday, 27 March 2023 21.39
> >
> > Hi folks,
> >
> > I don't think we discussed it specifically but what is the expectation
> > in relation to converting to standard atomics and compatibility of the
> > legacy rte_atomic APIs?
> >
> > We can't really convert the inline function implementations of the
> > rte_atomic APIs because doing so would break compatibility. This is
> > because if the implementation uses standard atomics APIs then we are
> > required to pass _Atomic types to the generic atomic intrinsics.
> >
> > We can choose to just leave the rte_atomic API implementations as they
> > are using the GCC builtins and i'm fine with that, but I do need some
> > help with what to do with msvc then since it doesn't have those
> > builtins.
> >
> > The options seem to be as follows.
> >
> > 1.
> > Just cast the non-atomic types in the rte_atomic APIs implementation
> > to _Atomic which may work but i'm pretty sure is undefined behavior
> > since
> > you can't qualify a non _Atomic type to suddenly be _Atomic.
> >
> > 2.
> > We could conditionally compile (hide) the legacy rte_atomic APIs when
> > msvc is in use, this seems not bad since there technically aren't any
> > Windows/MSVC consumers, but if someone wanted to port an existing
> > application they would have to adapt the code to avoid use of
> > rte_atomic.
> >
> > For now I think the safest option is to go with 2 since it doesn't
> > impose any compatibility risk and conditional compilation only exists
> > until we deprecate and remove the old rte_atomic APIs.
> >
> > Are there any other options i'm missing here?
> >
> > Thanks
>
> As a variant of your second option, you could make most of the legacy
> rte_atomic APIs available to MSVC by changing the atomic counter types from
> volatile to _Atomic. Then only the atomic cmpset() and exchange() functions
> are unavailable for the application. E.g. for the 32 bit atomic counter type:
>
> typedef struct {
> - volatile int32_t cnt; /**< An internal counter value. */
> + _Atomic int32_t cnt; /**< An internal counter value. */
> } rte_atomic32_t;
>
it's a good suggestion. but i'm not sure i want to get bogged down
making an old api available that hopefully we will remove soon.
though i'm still torn because i would really like the path to use msvc
for any application to be lower burden.
unless there are objections i think i'll do 2 as is. if good progress is
made we can re-evaluate doing the extra work to make available the old apis
as you suggest or potentially leave them unavailable forever subject to
any plans to deprecate and remove them.
thanks!
Re: [PATCH] doc: update pipeline example path in the user guide
28/11/2022 00:03, Harshad Narayane: > Updated the pipeline example path in the Sample Application User Guide. > > Signed-off-by: Harshad Narayane > Signed-off-by: Kamalakannan R > Acked-by: Cristian Dumitrescu > --- > -$ .//examples/dpdk-pipeline -c 0x3 -- -s examples/vxlan.cli > +$ .//examples/dpdk-pipeline -c 0x3 -- -s > examples/pipeline/examples/vxlan.cli Applied, thanks.
Re: [PATCH] doc: add capability to access physical addresses
19/01/2023 22:24, Dmitry Kozlyuk:
> DAC_READ_SEARCH or DAC_OVERRIDE capability is required to access
> /proc/self/pagemap, but the Linux guide mentioned neither one.
> Recommend DAC_READ_SEARCH as less impactful.
>
> Fixes: 979bb5d493fb ("doc: add more instructions for running as non-root")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Dmitry Kozlyuk
> Reported-by: Boris Ouretskey
> Reported-by: Isaac Boukris
Applied, thanks.
release candidate 23.03-rc4
A new DPDK release candidate is ready for testing: https://git.dpdk.org/dpdk/tag/?id=v23.03-rc4 There are 42 new patches in this snapshot. Release notes: https://doc.dpdk.org/guides/rel_notes/release_23_03.html This is the last release candidate. Only documentation should be updated before the release. Reviews of deprecation notices are required: https://patches.dpdk.org/bundle/dmarchand/deprecation_notices You may share some release validation results by replying to this message at dev@dpdk.org and by adding tested hardware in the release notes. Please think about sharing your roadmap now for DPDK 23.07. Thank you everyone
Re: [PATCH v3 2/3] net/gve: update copyright holders
On Tue, Mar 28, 2023 at 3:37 AM Ferruh Yigit wrote: > On 3/28/2023 10:45 AM, Junfeng Guo wrote: > > Add Google LLC as one of the copyright holders for GVE. > > > > Signed-off-by: Rushil Gupta > > Signed-off-by: Joshua Washington > > Signed-off-by: Junfeng Guo > > Signed-off-by: Jeroen de Borst > > Acked-by: Ferruh Yigit > Acked-by: Rushil Gupta
RE: [PATCH] net/iavf: fix VLAN offload with AVX512
> -Original Message-
> From: Michal Schmidt
> Sent: Monday, March 27, 2023 6:08 PM
> To: dev@dpdk.org
> Cc: Richardson, Bruce ; Konstantin Ananyev
> ; Wu, Jingjing ;
> Xing, Beilei ; Rong, Leyi ; Lu,
> Wenzhuo ; sta...@dpdk.org
> Subject: [PATCH] net/iavf: fix VLAN offload with AVX512
>
> It has been observed that mbufs of some received VLAN packets had the VLAN
> tag correctly set in vlan_tci, but ol_flags were missing the VLAN-indicating
> flags.
>
> _mm256_shuffle_epi8 operates as two independent 128-bit operations, not as
> a single 256-bit operation. To have the RTE_MBUF_F_RX_VLAN* flags reflected
> in the resulting vlan_flags for all 8 rx descriptors, the input
> l2tag2_flags_shuf
> must contain the required pattern in both 128-bit halves.
>
> This fix is for the AVX512 Rx path. The same bug in AVX2 was fixed by commit
> eb24917428a1 ("net/iavf: fix VLAN offload with AVX2").
>
> Fixes: 4b64ccb328c9 ("net/iavf: fix VLAN extraction in AVX512 path")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Michal Schmidt
Acked-by: Wenzhuo Lu
Re: [PATCH 01/16] net/hns3: fix possible truncation of hash key when config
在 2023/3/11 3:36, Ferruh Yigit 写道:
On 3/10/2023 9:35 AM, Dongdong Liu wrote:
From: Huisong Li
The hash key length of hns3 driver is obtained from firmware. If the
length isn't a multiple of HNS3_RSS_HASH_KEY_NUM (16), the last part
of hash key will be truncated.
I am not sure if the explanation is correct, according below code last
part of the key is truncated if key_len *is* multiple of
HNS3_RSS_HASH_KEY_NUM.
Because code assumes "key_len % HNS3_RSS_HASH_KEY_NUM" will give the
remaining part of the key, but when key_len is multiple of
HNS3_RSS_HASH_KEY_NUM it gives 0, causing last HNS3_RSS_HASH_KEY_NUM
chunk truncated.
If above understanding correct, I can fix commit log while merging.
Sorry for my late reply. Your understanding correct. Thanks.
Fixes: 4a7384e3c34d ("net/hns3: refactor set RSS hash algorithm and key
interface")
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Cc: sta...@dpdk.org
I am not sure if `c37ca66f2b27 ("net/hns3: support RSS")` is needed
here, issue seems because of commit 4a7384e3c34d, so this should be:
Fixes: 4a7384e3c34d ("net/hns3: refactor set RSS hash algorithm and key
interface")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Signed-off-by: Dongdong Liu
---
drivers/net/hns3/hns3_rss.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index d6e0754273..2011c18b9b 100644
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -301,7 +301,8 @@ hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo,
req->hash_config |= (hash_algo & HNS3_RSS_HASH_ALGO_MASK);
req->hash_config |= (idx << HNS3_RSS_HASH_KEY_OFFSET_B);
- if (idx == max_bd_num - 1)
+ if (idx == max_bd_num - 1 &&
+ (key_len % HNS3_RSS_HASH_KEY_NUM) != 0)
cur_key_size = key_len % HNS3_RSS_HASH_KEY_NUM;
else
cur_key_size = HNS3_RSS_HASH_KEY_NUM;
.
Re: [PATCH 06/16] net/hns3: separate the setting of hash algorithm
在 2023/3/11 3:36, Ferruh Yigit 写道:
On 3/10/2023 9:35 AM, Dongdong Liu wrote:
From: Huisong Li
Currently, the setting of hash algorithm comes from the
default configuration in driver and the rte_flow interface.
The hash algorithm that is set to hardware in both ways is
saved in hw->rss_info.conf.func.
But the 'func' in struct rte_flow_action_rss is usually used
in rte flow interface. And the ethdev ops interface may also
set hash algorithm in the future. It is not appropriate and
is a little messy for ethdev ops interface and driver default
configuration to use struct rte_flow_action_rss. So we have
to separate the RSS configuration from ethdev ops and rte
flow interface to make codes more easier to maintain.
Agree that it is not ideal to have two different ways for same/similar
control path functionality in ethdev.
+Ori to discuss if this is a common problem and can be resolved in
ethdev layer.
This patchset is aimed to decouple the configuration API and the
structure used by
ethdev ops and rte flow API in driver. I think this can be ignored.
I can see some of remaining patches are related to this ethdev / flow
API RSS separation. I will continue with this set, but I believe it is
better if this issue addressed in higher level.
As far as I know, the priority of rte flow hash rule is higher than
ethdev ops by default,
and there are many other rules.
But the implementation guide documentation about it is not clear.
It may be better if we can clarify the documentation to guide driver coding.
This patch separates hash algorithm by following ways:
1) 'hash_algo' in struct hns3_rss_conf is used for ethdev ops
interface or default configuration in driver.
2) Add a 'rte_flow_hash_algo' field in struct hns3_rss_conf
to save algorithm from rte flow interface. The main reasons
are as follows:
Currently, only the last rule is used to restore the rte
flow rule. If 'func' in RSS action is 'DEFAULT', it means
that this rule doesn't modify algorithm and driver need to
save current algorithm for restoring algorithm during reset
phase.
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Signed-off-by: Dongdong Liu
<...>
.
RE: [PATCH v4 1/3] ethdev: add API for buffer recycle mode
Hi, Morten
> -Original Message-
> From: Morten Brørup
> Sent: Thursday, March 23, 2023 7:42 PM
> To: Feifei Wang ; tho...@monjalon.net; Ferruh
> Yigit ; Andrew Rybchenko
>
> Cc: dev@dpdk.org; konstantin.v.anan...@yandex.ru; nd ;
> Honnappa Nagarahalli ; Ruifeng Wang
>
> Subject: RE: [PATCH v4 1/3] ethdev: add API for buffer recycle mode
>
> > From: Feifei Wang [mailto:feifei.wa...@arm.com]
> > Sent: Thursday, 23 March 2023 11.43
> >
>
> [...]
>
> > +static inline uint16_t rte_eth_rx_descriptors_refill(uint16_t port_id,
> > + uint16_t queue_id, uint16_t nb)
> > +{
> > + struct rte_eth_fp_ops *p;
> > + void *qd;
> > +
> > +#ifdef RTE_ETHDEV_DEBUG_RX
> > + if (port_id >= RTE_MAX_ETHPORTS ||
> > + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
> > + RTE_ETHDEV_LOG(ERR,
> > + "Invalid port_id=%u or queue_id=%u\n",
> > + port_id, queue_id);
> > + rte_errno = ENODEV;
> > + return 0;
> > + }
> > +#endif
> > +
> > + p = &rte_eth_fp_ops[port_id];
> > + qd = p->rxq.data[queue_id];
> > +
> > +#ifdef RTE_ETHDEV_DEBUG_RX
> > + if (!rte_eth_dev_is_valid_port(port_id)) {
> > + RTE_ETHDEV_LOG(ERR, "Invalid Rx port_id=%u\n", port_id);
> > + rte_errno = ENODEV;
> > + return 0;
> > +
> > + if (qd == NULL) {
> > + RTE_ETHDEV_LOG(ERR, "Invalid Rx queue_id=%u for
> port_id=%u\n",
> > + queue_id, port_id);
> > + rte_errno = ENODEV;
> > + return 0;
> > + }
> > +#endif
> > +
> > + if (!p->rx_descriptors_refill)
>
> Compare to NULL instead: if (p->rx_descriptors_refill == NULL)
>
Ack.
> > + return 0;
> > +
> > + return p->rx_descriptors_refill(qd, nb); }
> > +
> > /**@{@name Rx hardware descriptor states
> > * @see rte_eth_rx_descriptor_status
> > */
> > @@ -6483,6 +6597,122 @@ rte_eth_tx_buffer(uint16_t port_id, uint16_t
> queue_id,
> > return rte_eth_tx_buffer_flush(port_id, queue_id, buffer); }
> >
> > +/**
> > + * @internal
> > + * Tx routine for rte_eth_dev_buf_recycle().
> > + * Stash Tx used buffers into Rx buffer ring in buffer recycle mode.
> > + *
> > + * @note
> > + * This API can only be called by rte_eth_dev_buf_recycle().
> > + * After calling this API, rte_eth_rx_descriptors_refill() should be
> > + * called to refill Rx ring descriptors.
> > + *
> > + * When this functionality is not implemented in the driver, the
> > +return
> > + * buffer number is 0.
> > + *
> > + * @param port_id
> > + * The port identifier of the Ethernet device.
> > + * @param queue_id
> > + * The index of the transmit queue.
> > + * The value must be in the range [0, nb_tx_queue - 1] previously
> supplied
> > + * to rte_eth_dev_configure().
> > + * @param rxq_buf_recycle_info
> > + * A pointer to a structure of Rx queue buffer ring information in buffer
> > + * recycle mode.
> > + *
> > + * @return
> > + * The number buffers correct to be filled in the Rx buffer ring.
> > + * - ENODEV: bad port or queue (only if compiled with debug).
> > + */
> > +static inline uint16_t rte_eth_tx_buf_stash(uint16_t port_id,
> > +uint16_t
> > queue_id,
> > + struct rte_eth_rxq_buf_recycle_info *rxq_buf_recycle_info)
> {
> > + struct rte_eth_fp_ops *p;
> > + void *qd;
> > +
> > +#ifdef RTE_ETHDEV_DEBUG_TX
> > + if (port_id >= RTE_MAX_ETHPORTS ||
> > + queue_id >= RTE_MAX_QUEUES_PER_PORT) {
> > + RTE_ETHDEV_LOG(ERR,
> > + "Invalid port_id=%u or queue_id=%u\n",
> > + port_id, queue_id);
> > + rte_errno = ENODEV;
> > + return 0;
> > + }
> > +#endif
> > +
> > + p = &rte_eth_fp_ops[port_id];
> > + qd = p->txq.data[queue_id];
> > +
> > +#ifdef RTE_ETHDEV_DEBUG_TX
> > + if (!rte_eth_dev_is_valid_port(port_id)) {
> > + RTE_ETHDEV_LOG(ERR, "Invalid Tx port_id=%u\n", port_id);
> > + rte_errno = ENODEV;
> > + return 0;
> > +
> > + if (qd == NULL) {
> > + RTE_ETHDEV_LOG(ERR, "Invalid Tx queue_id=%u for
> port_id=%u\n",
> > + queue_id, port_id);
> > + rte_erno = ENODEV;
> > + return 0;
> > + }
> > +#endif
> > +
> > + if (p->tx_buf_stash == NULL)
> > + return 0;
> > +
> > + return p->tx_buf_stash(qd, rxq_buf_recycle_info); }
> > +
> > +/**
> > + * @warning
> > + * @b EXPERIMENTAL: this API may change, or be removed, without prior
> > +notice
> > + *
> > + * Buffer recycle mode can let Tx queue directly put used buffers
> > +into Rx
> > buffer
> > + * ring. This avoids freeing buffers into mempool and allocating
> > +buffers from
> > + * mempool.
> > + *
> > + * @param rx_port_id
> > + * Port identifying the receive side.
> > + * @param rx_queue_id
> > + * The index of the receive queue identifying the receive side.
> > + * The value must be in the range [0, nb_rx_queue - 1] previously
> supplied
> > + * to rte_eth_dev_configure().
[PATCH v4 1/3] net/gve: switch license from MIT to BSD-3
Switch license from MIT to BSD-3 for GVE base code. In the meantime, remove MIT license exception for GVE driver. Signed-off-by: Rushil Gupta Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst --- .mailmap| 1 + drivers/net/gve/base/gve.h | 5 ++--- drivers/net/gve/base/gve_adminq.c | 5 ++--- drivers/net/gve/base/gve_adminq.h | 5 ++--- drivers/net/gve/base/gve_desc.h | 5 ++--- drivers/net/gve/base/gve_desc_dqo.h | 5 ++--- drivers/net/gve/base/gve_register.h | 5 ++--- license/exceptions.txt | 1 - 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.mailmap b/.mailmap index dc30369117..9d66fa727c 100644 --- a/.mailmap +++ b/.mailmap @@ -588,6 +588,7 @@ Jens Freimann Jeremy Plsek Jeremy Spewock Jerin Jacob +Jeroen de Borst Jerome Jutteau Jerry Hao OS Jerry Lilijun diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h index 2dc4507acb..55b7c2688e 100644 --- a/drivers/net/gve/base/gve.h +++ b/drivers/net/gve/base/gve.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_H_ diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c index e745b709b2..3519a2217f 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #include "../gve_ethdev.h" diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h index 05550119de..e6907fc16f 100644 --- a/drivers/net/gve/base/gve_adminq.h +++ b/drivers/net/gve/base/gve_adminq.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_ADMINQ_H diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h index 006b36442f..c62563f754 100644 --- a/drivers/net/gve/base/gve_desc.h +++ b/drivers/net/gve/base/gve_desc.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ /* GVE Transmit Descriptor formats */ diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h index ee1afdecb8..d0887778d3 100644 --- a/drivers/net/gve/base/gve_desc_dqo.h +++ b/drivers/net/gve/base/gve_desc_dqo.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ /* GVE DQO Descriptor formats */ diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h index c674167f31..615ceffc88 100644 --- a/drivers/net/gve/base/gve_register.h +++ b/drivers/net/gve/base/gve_register.h @@ -1,6 +1,5 @@ -/* SPDX-License-Identifier: MIT - * Google Virtual Ethernet (gve) driver - * Copyright (C) 2015-2022 Google, Inc. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022-2023 Google LLC */ #ifndef _GVE_REGISTER_H_ diff --git a/license/exceptions.txt b/license/exceptions.txt index 1ded290eee..1bd4dbf8f7 100644 --- a/license/exceptions.txt +++ b/license/exceptions.txt @@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name 2.BSD-2-Clause 10/23/201912/18/2019 lib/eal/windows/include/getopt.h 3.ISC AND BSD-2-Clause 10/23/201912/18/2019 lib/eal/windows/getopt.c -4. MIT 10/19/202210/18/2022drivers/net/gve/base/* --- -- 2.34.1
[PATCH v4 0/3] update license and copyright holders
This patch set contains: 1. switch license from MIT to BSD-3 for GVE base code. 2. remove MIT license exception 3. add maintainers 4. update copyright holders for GVE v4: - update copyright holder for *_osdep.h file v3: - remove redundant blank line v2: - correct patch title & commit log - separate the maintainers' file update into a different patch Junfeng Guo (3): net/gve: switch license from MIT to BSD-3 net/gve: update copyright holders net/gve: add maintainers for GVE .mailmap| 1 + MAINTAINERS | 3 +++ drivers/net/gve/base/gve.h | 5 ++--- drivers/net/gve/base/gve_adminq.c | 5 ++--- drivers/net/gve/base/gve_adminq.h | 5 ++--- drivers/net/gve/base/gve_desc.h | 5 ++--- drivers/net/gve/base/gve_desc_dqo.h | 5 ++--- drivers/net/gve/base/gve_osdep.h| 3 ++- drivers/net/gve/base/gve_register.h | 5 ++--- drivers/net/gve/gve_ethdev.c| 3 ++- drivers/net/gve/gve_ethdev.h| 3 ++- drivers/net/gve/gve_logs.h | 3 ++- drivers/net/gve/gve_rx.c| 3 ++- drivers/net/gve/gve_tx.c| 3 ++- drivers/net/gve/meson.build | 3 ++- license/exceptions.txt | 1 - 16 files changed, 30 insertions(+), 26 deletions(-) -- 2.34.1
[PATCH v4 2/3] net/gve: update copyright holders
Add Google LLC as one of the copyright holders for GVE. Signed-off-by: Rushil Gupta Signed-off-by: Joshua Washington Signed-off-by: Junfeng Guo Signed-off-by: Jeroen de Borst Acked-by: Ferruh Yigit Acked-by: Rushil Gupta --- drivers/net/gve/base/gve_osdep.h | 3 ++- drivers/net/gve/gve_ethdev.c | 3 ++- drivers/net/gve/gve_ethdev.h | 3 ++- drivers/net/gve/gve_logs.h | 3 ++- drivers/net/gve/gve_rx.c | 3 ++- drivers/net/gve/gve_tx.c | 3 ++- drivers/net/gve/meson.build | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h index 7cb73002f4..02993d833b 100644 --- a/drivers/net/gve/base/gve_osdep.h +++ b/drivers/net/gve/base/gve_osdep.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #ifndef _GVE_OSDEP_H_ diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index cf28a4a3b7..e1998cc864 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 42a02cf5d4..64d5bb0f78 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #ifndef _GVE_ETHDEV_H_ diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h index 0d02da46e1..997a508f22 100644 --- a/drivers/net/gve/gve_logs.h +++ b/drivers/net/gve/gve_logs.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #ifndef _GVE_LOGS_H_ diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c index 8d8f94efff..e8d5a8723b 100644 --- a/drivers/net/gve/gve_rx.c +++ b/drivers/net/gve/gve_rx.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c index fee3b939c7..bbb954c9ea 100644 --- a/drivers/net/gve/gve_tx.c +++ b/drivers/net/gve/gve_tx.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2022 Intel Corporation + * Copyright (c) 2022-2023 Google LLC + * Copyright (c) 2022-2023 Intel Corporation */ #include "gve_ethdev.h" diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build index af0010c01c..9cacccf2aa 100644 --- a/drivers/net/gve/meson.build +++ b/drivers/net/gve/meson.build @@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2022 Intel Corporation +# Copyright (c) 2022-2023 Google LLC +# Copyright (c) 2022-2023 Intel Corporation if is_windows build = false -- 2.34.1
[PATCH v4 3/3] net/gve: add maintainers for GVE
Add maintainers from Google for GVE. Signed-off-by: Junfeng Guo Signed-off-by: Rushil Gupta --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1a33ad8592..988c7aecfa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini Google Virtual Ethernet M: Junfeng Guo +M: Jeroen de Borst +M: Rushil Gupta +M: Joshua Washington F: drivers/net/gve/ F: doc/guides/nics/gve.rst F: doc/guides/nics/features/gve.ini -- 2.34.1
RE: [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
> -Original Message- > From: Ferruh Yigit > Sent: Tuesday, March 28, 2023 18:36 > To: Guo, Junfeng ; Zhang, Qi Z > ; Wu, Jingjing ; Xing, > Beilei > Cc: dev@dpdk.org; Rushil Gupta ; Joshua > Washington ; Jeroen de Borst > > Subject: Re: [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3 > > On 3/28/2023 10:45 AM, Junfeng Guo wrote: > > diff --git a/drivers/net/gve/base/gve_osdep.h > b/drivers/net/gve/base/gve_osdep.h > > index 7cb73002f4..f7d87fec16 100644 > > --- a/drivers/net/gve/base/gve_osdep.h > > +++ b/drivers/net/gve/base/gve_osdep.h > > @@ -1,5 +1,5 @@ > > /* SPDX-License-Identifier: BSD-3-Clause > > - * Copyright(C) 2022 Intel Corporation > > + * Copyright (c) 2022-2023 Google LLC > > */ > > Is this intentional to move Copyright from Intel to Google? Oh, sorry! This is updated by mistake. In tradition, the osdep.h file is in Intel's copyright with BSD-3 License. So it should not be included in the patch as no License update for this file. I'll fix this and put this change into 2nd one of patch set. Thanks for the careful review!
RE: [PATCH v3 3/3] net/gve: add maintainers for GVE
> -Original Message- > From: Ferruh Yigit > Sent: Tuesday, March 28, 2023 18:35 > To: Guo, Junfeng ; Zhang, Qi Z > ; Wu, Jingjing ; Xing, > Beilei ; rush...@google.com > Cc: dev@dpdk.org; Jeroen de Borst ; Rushil > Gupta ; Joshua Washington > ; Thomas Monjalon > Subject: Re: [PATCH v3 3/3] net/gve: add maintainers for GVE > > On 3/28/2023 11:00 AM, Guo, Junfeng wrote: > > + Rushil Gupta > > > >> -Original Message- > >> From: Guo, Junfeng > >> Sent: Tuesday, March 28, 2023 17:45 > >> To: Zhang, Qi Z ; Wu, Jingjing > >> ; ferruh.yi...@amd.com; Xing, Beilei > >> > >> Cc: dev@dpdk.org; Guo, Junfeng > >> Subject: [PATCH v3 3/3] net/gve: add maintainers for GVE > >> > >> Add maintainers from Google for GVE. > >> > >> Signed-off-by: Junfeng Guo > >> --- > >> MAINTAINERS | 3 +++ > >> 1 file changed, 3 insertions(+) > >> > >> diff --git a/MAINTAINERS b/MAINTAINERS > >> index 1a33ad8592..988c7aecfa 100644 > >> --- a/MAINTAINERS > >> +++ b/MAINTAINERS > >> @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini > >> > >> Google Virtual Ethernet > >> M: Junfeng Guo > >> +M: Jeroen de Borst > >> +M: Rushil Gupta > >> +M: Joshua Washington > >> F: drivers/net/gve/ > >> F: doc/guides/nics/gve.rst > >> F: doc/guides/nics/features/gve.ini > > > New maintainers were not part of the upstreaming process, so we don't > know much about the engagement and commitment level of them. > > However, as far as I understand they are the base code owners, which > means we can trust their technical expertise that is why good to have > them on board. > > > Primarily for due diligence, would it be OK to get explicit Ack from the > new maintainers, to confirm they are aware of and agree to the > responsibilities they are accepting? Sure, that make sense. Thanks for your concern! As you see, we have sent out the RFC code in past two months. https://patchwork.dpdk.org/project/dpdk/list/?series=27056&state=* Part of the code (e.g., base code update) are contributed by Google team (also shown in the commit message Signed-off-by part). At this point, as DPDK 23.07 window is coming. We decide to refine the RFC code and upsteam them at this coming release. To make things easier, this patch set is the first part to be upstream-ed. This patch set mainly contains the license and copyright holders update. And the following patch set for GVE enhancement will coming before the V1 window. So we may need your help to review this in advance and even get this merged first. Thanks again for your careful review!
RE: [PATCH v3] net/iavf: fix iavf query stats in intr thread
> -Original Message-
> From: Ferruh Yigit
> Sent: Monday, March 27, 2023 8:32 PM
> To: Deng, KaiwenX ; dev@dpdk.org
> Cc: sta...@dpdk.org; Yang, Qiming ; Zhou, YidingX
> ; Chas Williams ; Min Hu (Connor)
> ; Wu, Jingjing ; Xing, Beilei
> ; Mike Pattrick ; Zhang, Qi Z
> ; Doherty, Declan ;
> Mrzyglod, Daniel T ; Dapeng Yu
>
> Subject: Re: [PATCH v3] net/iavf: fix iavf query stats in intr thread
>
> On 3/27/2023 6:31 AM, Deng, KaiwenX wrote:
> >
> >
> >> -Original Message-
> >> From: Ferruh Yigit
> >> Sent: Thursday, March 23, 2023 11:39 PM
> >> To: Deng, KaiwenX ; dev@dpdk.org
> >> Cc: sta...@dpdk.org; Yang, Qiming ; Zhou,
> >> YidingX ; Chas Williams ; Min
> >> Hu (Connor) ; Wu, Jingjing
> >> ; Xing, Beilei ; Mike
> >> Pattrick ; Zhang, Qi Z ;
> >> Doherty, Declan ; Mrzyglod, Daniel T
> >> ; Dapeng Yu
> >> Subject: Re: [PATCH v3] net/iavf: fix iavf query stats in intr thread
> >>
> >> On 3/22/2023 7:26 AM, Kaiwen Deng wrote:
> >>> When iavf send query-stats command in eal-intr-thread through
> >>> virtual channel, there will be no response received from
> >>> iavf_dev_virtchnl_handler for this command during block and wait.
> >>> Because iavf_dev_virtchnl_handler is also registered in eal-intr-thread.
> >>>
> >>> When vf device is bonded as BONDING_MODE_TLB mode, the slave
> device
> >>> update callback will registered in alarm and called by
> >>> eal-intr-thread, it would also raise the above issue.
> >>>
> >>> This commit add to poll the response for VIRTCHNL_OP_GET_STATS
> when
> >> it
> >>> is called by eal-intr-thread to fix this issue.
> >>>
> >>> Fixes: 91bf37d250aa ("net/iavf: add lock for VF commands")
> >>> Fixes: 22b123a36d07 ("net/avf: initialize PMD")
> >>> Fixes: 7c76a747e68c ("bond: add mode 5")
> >>> Fixes: 435d523112cc ("net/iavf: fix multi-process shared data")
> >>> Fixes: cb5c1b91f76f ("net/iavf: add thread for event callbacks")
> >>
> >>
> >> Hi Kaiwen,
> >>
> >> Above commit already seems trying to address same issue, it creates
> >> "iavf- event-thread" control thread to asyncroniously handle the
> >> interrupts, in non- interrupt context, why it is not working?
> >>
> >> Instead of adding 'rte_thread_is_intr()' checks, can't you make sure
> >> all interrupts handled in control tread?
> >>
> >> And can you please provide a stack trace in commit log, to describe
> >> the issue better?
> > Hi Ferru,
> > Sorry for my late reply, And thanks for your review.
> >
> > The above commit does not fix this issue when we need to get the
> returned data.
> > If we call iavf_query_stats and wait for response statistics in the
> > intr-thread.
> > iavf_handle_virtchnl_msg is also registered in the intr_thread and
> > will not be executed while waiting.
> >
>
> Got it, since return value is required, API can't be called asyncroniously.
>
>
>
> I think 'rte_thread_is_intr()' checks may cause more trouble for you in long
> term,
>
> - why 'iavf_query_stats()' is called in the iterrupt thread, can it be
> prevented?
>
> - does it make sense to allways poll messages from PF (for simplification)?
>
Virtual channel commands sometimes need to be registered to alarm
so that they can be called periodically, and alarm is registered to be
called in interrupt threads.
For some commands that do not require a return value, It cannot
support asynchronous if allways poll messages from PF.
>
> If answer to both are 'No', I am OK to continue with current proposal if you
> are happy with it.
>
>
> > This commit I changed it to polling for replies to commands executed in the
> interrupt thread.
> >
> > main thread
> >interrupt
> thread
> > |
> > |
> > |
> > |
> > iavf_query_stats
> > |
> > iavf_execute_vf_cmd
> > |
> > iavf_aq_send_msg_to_pf and wait handle complete
> >|
> > |
> > |
> >
> > |---
> ->|
> > |
> > |
> > |
> iavf_handle_virtchnl_msg
> > |
> >|
> >
> > |<
[PATCH v3 00/15] graph enhancement for multi-core dispatch
V3: Fix CI build issues about TLS and typo. V2: Use git mv to keep git history. Use TLS for per-thread local storage. Change model name to mcore dispatch. Change API with specific mode name. Split big patch. Fix CI issues. Rebase l3fwd-graph example. Update doc and maintainers files. Currently, rte_graph supports RTC (Run-To-Completion) model within each of a single core. RTC is one of the typical model of packet processing. Others like Pipeline or Hybrid are lack of support. The patch set introduces a 'multicore dispatch' model selection which is a self-reacting scheme according to the core affinity. The new model enables a cross-core dispatching mechanism which employs a scheduling work-queue to dispatch streams to other worker cores which being associated with the destination node. When core flavor of the destination node is a default 'current', the stream can be continue executed as normal. Example: 3-node graph targets 3-core budget RTC: Graph: node-0 -> node-1 -> node-2 @Core0. + - - - - - - - - - - - - - - - - - - - - - + 'Core #0/1/2' ' ' ' ++ +-+ ++ ' ' | Node-0 | --> | Node-1 | --> | Node-2 | ' ' ++ +-+ ++ ' ' ' + - - - - - - - - - - - - - - - - - - - - - + Dispatch: Graph topo: node-0 -> Core1; node-1 -> node-2; node-2 -> node-3. Config graph: node-0 @Core0; node-1/3 @Core1; node-2 @Core2. .. code-block:: diff + - - - - - -+ +- - - - - - - - - - - - - + + - - - - - -+ ' Core #0 ' ' Core #1 ' ' Core #2 ' '' ' ' '' ' ++ ' ' ++++ ' ' ++ ' ' | Node-0 | - - - ->| Node-1 || Node-3 |<- - - - | Node-2 | ' ' ++ ' ' ++++ ' ' ++ ' '' ' |' ' ^ ' + - - - - - -+ +- - -|- - - - - - - - - - + + - - -|- - -+ | | + - - - - - - - - - - - - - - - - + The patch set has been break down as below: 1. Split graph worker into common and default model part. 2. Inline graph node processing to make it reusable. 3. Add set/get APIs to choose worker model. 4. Introduce core affinity API to set the node run on specific worker core. (only use in new model) 5. Introduce graph affinity API to bind one graph with specific worker core. 6. Introduce graph clone API. 7. Introduce stream moving with scheduler work-queue in patch 8~12. 8. Add stats for new models. 9. Abstract default graph config process and integrate new model into example/l3fwd-graph. Add new parameters for model choosing. We could run with new worker model by this: ./dpdk-l3fwd-graph -l 8,9,10,11 -n 4 -- -p 0x1 --config="(0,0,9)" -P --model="dispatch" References: https://static.sched.com/hosted_files/dpdkuserspace22/a6/graph%20introduce%20remote%20dispatch%20for%20mult-core%20scaling.pdf Zhirun Yan (15): graph: rename rte_graph_work as common graph: split graph worker into common and default model graph: move node process into inline function graph: add get/set graph worker model APIs graph: introduce graph node core affinity API graph: introduce graph bind unbind API graph: introduce graph clone API for other worker core graph: add struct for stream moving between cores graph: introduce stream moving cross cores graph: enable create and destroy graph scheduling workqueue graph: introduce graph walk by cross-core dispatch graph: enable graph multicore dispatch scheduler model graph: add stats for corss-core dispatching examples/l3fwd-graph: introduce multicore dispatch worker model doc: update multicore dispatch model in graph guides MAINTAINERS | 1 + doc/guides/prog_guide/graph_lib.rst | 59 ++- examples/l3fwd-graph/main.c | 237 +--- lib/graph/graph.c| 179 + lib/graph/graph_debug.c | 6 + lib/graph/graph_populate.c | 1 + lib/graph/graph_private.h| 44 +++ lib/graph/graph_stats.c | 74 +++- lib/graph/meson.build| 4 +- lib/graph/node.c | 1 + lib/graph/rte_graph.h| 44 +++ lib/graph/rte_graph_model_dispatch.c | 179 + lib/graph/rte_graph_model_dispatch.h | 120 ++ lib/graph/rte_graph_model_rtc.h | 45 +++ lib/graph/rte_graph_worker.c | 54 +++ lib/graph/rte_graph_worker.h | 498 + lib/graph/rte_graph_worker_common.h | 536 +++ lib/graph/version.map| 8 + 18 files changed, 1546 insertions(+), 544 deletions(-) create mode 100644 lib/graph/rte_graph_model_dispatch.c create mode 100644
[PATCH v3 01/15] graph: rename rte_graph_work as common
Rename rte_graph_work.h to rte_graph_work_common.h for supporting
multiple graph worker model.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
MAINTAINERS | 1 +
lib/graph/graph_pcap.c | 2 +-
lib/graph/graph_private.h | 2 +-
lib/graph/meson.build | 2 +-
lib/graph/{rte_graph_worker.h => rte_graph_worker_common.h} | 6 +++---
5 files changed, 7 insertions(+), 6 deletions(-)
rename lib/graph/{rte_graph_worker.h => rte_graph_worker_common.h} (99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 280058adfc..9d9467dd00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1714,6 +1714,7 @@ F: doc/guides/prog_guide/bpf_lib.rst
Graph - EXPERIMENTAL
M: Jerin Jacob
M: Kiran Kumar K
+M: Zhirun Yan
F: lib/graph/
F: doc/guides/prog_guide/graph_lib.rst
F: app/test/test_graph*
diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c
index 6c43330029..8a220370fa 100644
--- a/lib/graph/graph_pcap.c
+++ b/lib/graph/graph_pcap.c
@@ -10,7 +10,7 @@
#include
#include
-#include "rte_graph_worker.h"
+#include "rte_graph_worker_common.h"
#include "graph_pcap_private.h"
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 7d1b30b8ac..f08dbc7e9d 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -12,7 +12,7 @@
#include
#include "rte_graph.h"
-#include "rte_graph_worker.h"
+#include "rte_graph_worker_common.h"
extern int rte_graph_logtype;
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 3526d1b5d4..4e2b612ad3 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -16,6 +16,6 @@ sources = files(
'graph_populate.c',
'graph_pcap.c',
)
-headers = files('rte_graph.h', 'rte_graph_worker.h')
+headers = files('rte_graph.h', 'rte_graph_worker_common.h')
deps += ['eal', 'pcapng']
diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker_common.h
similarity index 99%
rename from lib/graph/rte_graph_worker.h
rename to lib/graph/rte_graph_worker_common.h
index 438595b15c..0bad2938f3 100644
--- a/lib/graph/rte_graph_worker.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -2,8 +2,8 @@
* Copyright(C) 2020 Marvell International Ltd.
*/
-#ifndef _RTE_GRAPH_WORKER_H_
-#define _RTE_GRAPH_WORKER_H_
+#ifndef _RTE_GRAPH_WORKER_COMMON_H_
+#define _RTE_GRAPH_WORKER_COMMON_H_
/**
* @file rte_graph_worker.h
@@ -518,4 +518,4 @@ rte_node_next_stream_move(struct rte_graph *graph, struct
rte_node *src,
}
#endif
-#endif /* _RTE_GRAPH_WORKER_H_ */
+#endif /* _RTE_GRAPH_WORKER_COIMMON_H_ */
--
2.37.2
[PATCH v3 02/15] graph: split graph worker into common and default model
To support multiple graph worker model, split graph into common
and default. Naming the current walk function as rte_graph_model_rtc
cause the default model is RTC(Run-to-completion).
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph_pcap.c | 2 +-
lib/graph/graph_private.h | 2 +-
lib/graph/meson.build | 2 +-
lib/graph/rte_graph_model_rtc.h | 61 +
lib/graph/rte_graph_worker.h| 34
lib/graph/rte_graph_worker_common.h | 57 ---
6 files changed, 98 insertions(+), 60 deletions(-)
create mode 100644 lib/graph/rte_graph_model_rtc.h
create mode 100644 lib/graph/rte_graph_worker.h
diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c
index 8a220370fa..6c43330029 100644
--- a/lib/graph/graph_pcap.c
+++ b/lib/graph/graph_pcap.c
@@ -10,7 +10,7 @@
#include
#include
-#include "rte_graph_worker_common.h"
+#include "rte_graph_worker.h"
#include "graph_pcap_private.h"
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index f08dbc7e9d..7d1b30b8ac 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -12,7 +12,7 @@
#include
#include "rte_graph.h"
-#include "rte_graph_worker_common.h"
+#include "rte_graph_worker.h"
extern int rte_graph_logtype;
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 4e2b612ad3..3526d1b5d4 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -16,6 +16,6 @@ sources = files(
'graph_populate.c',
'graph_pcap.c',
)
-headers = files('rte_graph.h', 'rte_graph_worker_common.h')
+headers = files('rte_graph.h', 'rte_graph_worker.h')
deps += ['eal', 'pcapng']
diff --git a/lib/graph/rte_graph_model_rtc.h b/lib/graph/rte_graph_model_rtc.h
new file mode 100644
index 00..665560f831
--- /dev/null
+++ b/lib/graph/rte_graph_model_rtc.h
@@ -0,0 +1,61 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#include "rte_graph_worker_common.h"
+
+/**
+ * Perform graph walk on the circular buffer and invoke the process function
+ * of the nodes and collect the stats.
+ *
+ * @param graph
+ * Graph pointer returned from rte_graph_lookup function.
+ *
+ * @see rte_graph_lookup()
+ */
+static inline void
+rte_graph_walk_rtc(struct rte_graph *graph)
+{
+ const rte_graph_off_t *cir_start = graph->cir_start;
+ const rte_node_t mask = graph->cir_mask;
+ uint32_t head = graph->head;
+ struct rte_node *node;
+ uint64_t start;
+ uint16_t rc;
+ void **objs;
+
+ /*
+* Walk on the source node(s) ((cir_start - head) -> cir_start) and then
+* on the pending streams (cir_start -> (cir_start + mask) -> cir_start)
+* in a circular buffer fashion.
+*
+* +-+ <= cir_start - head [number of source nodes]
+* | |
+* | ... | <= source nodes
+* | |
+* +-+ <= cir_start [head = 0] [tail = 0]
+* | |
+* | ... | <= pending streams
+* | |
+* +-+ <= cir_start + mask
+*/
+ while (likely(head != graph->tail)) {
+ node = (struct rte_node *)RTE_PTR_ADD(graph,
cir_start[(int32_t)head++]);
+ RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
+ objs = node->objs;
+ rte_prefetch0(objs);
+
+ if (rte_graph_has_stats_feature()) {
+ start = rte_rdtsc();
+ rc = node->process(graph, node, objs, node->idx);
+ node->total_cycles += rte_rdtsc() - start;
+ node->total_calls++;
+ node->total_objs += rc;
+ } else {
+ node->process(graph, node, objs, node->idx);
+ }
+ node->idx = 0;
+ head = likely((int32_t)head > 0) ? head & mask : head;
+ }
+ graph->tail = 0;
+}
diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
new file mode 100644
index 00..7ea18ba80a
--- /dev/null
+++ b/lib/graph/rte_graph_worker.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_GRAPH_WORKER_H_
+#define _RTE_GRAPH_WORKER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rte_graph_model_rtc.h"
+
+/**
+ * Perform graph walk on the circular buffer and invoke the process function
+ * of the nodes and collect the stats.
+ *
+ * @param graph
+ * Graph pointer returned from rte_graph_lookup function.
+ *
+ * @see rte_graph_lookup()
+ */
+__rte_experimental
+static inline void
+rte_graph_walk(struct rte_graph *graph)
+{
+ rte_graph_walk_rtc(graph);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_GRAPH_WORKER_H_ */
diff --git a/lib/graph/
[PATCH v3 03/15] graph: move node process into inline function
Node process is a single and reusable block, move the code into an inline
function.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/rte_graph_model_rtc.h | 20 ++---
lib/graph/rte_graph_worker_common.h | 33 +
2 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/lib/graph/rte_graph_model_rtc.h b/lib/graph/rte_graph_model_rtc.h
index 665560f831..0dcb7151e9 100644
--- a/lib/graph/rte_graph_model_rtc.h
+++ b/lib/graph/rte_graph_model_rtc.h
@@ -20,9 +20,6 @@ rte_graph_walk_rtc(struct rte_graph *graph)
const rte_node_t mask = graph->cir_mask;
uint32_t head = graph->head;
struct rte_node *node;
- uint64_t start;
- uint16_t rc;
- void **objs;
/*
* Walk on the source node(s) ((cir_start - head) -> cir_start) and then
@@ -41,21 +38,8 @@ rte_graph_walk_rtc(struct rte_graph *graph)
*/
while (likely(head != graph->tail)) {
node = (struct rte_node *)RTE_PTR_ADD(graph,
cir_start[(int32_t)head++]);
- RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
- objs = node->objs;
- rte_prefetch0(objs);
-
- if (rte_graph_has_stats_feature()) {
- start = rte_rdtsc();
- rc = node->process(graph, node, objs, node->idx);
- node->total_cycles += rte_rdtsc() - start;
- node->total_calls++;
- node->total_objs += rc;
- } else {
- node->process(graph, node, objs, node->idx);
- }
- node->idx = 0;
- head = likely((int32_t)head > 0) ? head & mask : head;
+ __rte_node_process(graph, node);
+ head = likely((int32_t)head > 0) ? head & mask : head;
}
graph->tail = 0;
}
diff --git a/lib/graph/rte_graph_worker_common.h
b/lib/graph/rte_graph_worker_common.h
index b58f8f6947..41428974db 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -130,6 +130,39 @@ void __rte_node_stream_alloc_size(struct rte_graph *graph,
/* Fast path helper functions */
+/**
+ * @internal
+ *
+ * Enqueue a given node to the tail of the graph reel.
+ *
+ * @param graph
+ * Pointer Graph object.
+ * @param node
+ * Pointer to node object to be enqueued.
+ */
+static __rte_always_inline void
+__rte_node_process(struct rte_graph *graph, struct rte_node *node)
+{
+ uint64_t start;
+ uint16_t rc;
+ void **objs;
+
+ RTE_ASSERT(node->fence == RTE_GRAPH_FENCE);
+ objs = node->objs;
+ rte_prefetch0(objs);
+
+ if (rte_graph_has_stats_feature()) {
+ start = rte_rdtsc();
+ rc = node->process(graph, node, objs, node->idx);
+ node->total_cycles += rte_rdtsc() - start;
+ node->total_calls++;
+ node->total_objs += rc;
+ } else {
+ node->process(graph, node, objs, node->idx);
+ }
+ node->idx = 0;
+}
+
/**
* @internal
*
--
2.37.2
[PATCH v3 04/15] graph: add get/set graph worker model APIs
Add new get/set APIs to configure graph worker model which is used to
determine which model will be chosen.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/meson.build | 1 +
lib/graph/rte_graph_worker.c| 54 +
lib/graph/rte_graph_worker_common.h | 19 ++
lib/graph/version.map | 3 ++
4 files changed, 77 insertions(+)
create mode 100644 lib/graph/rte_graph_worker.c
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 3526d1b5d4..9fab8243da 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -15,6 +15,7 @@ sources = files(
'graph_stats.c',
'graph_populate.c',
'graph_pcap.c',
+'rte_graph_worker.c',
)
headers = files('rte_graph.h', 'rte_graph_worker.h')
diff --git a/lib/graph/rte_graph_worker.c b/lib/graph/rte_graph_worker.c
new file mode 100644
index 00..692ee1b0d2
--- /dev/null
+++ b/lib/graph/rte_graph_worker.c
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#include "rte_graph_worker_common.h"
+
+RTE_DEFINE_PER_LCORE(enum rte_graph_worker_model, worker_model) =
RTE_GRAPH_MODEL_DEFAULT;
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ * Set the graph worker model
+ *
+ * @note This function does not perform any locking, and is only safe to call
+ *before graph running.
+ *
+ * @param name
+ * Name of the graph worker model.
+ *
+ * @return
+ * 0 on success, -1 otherwise.
+ */
+inline int
+rte_graph_worker_model_set(enum rte_graph_worker_model model)
+{
+ if (model >= RTE_GRAPH_MODEL_LIST_END)
+ goto fail;
+
+ RTE_PER_LCORE(worker_model) = model;
+ return 0;
+
+fail:
+ RTE_PER_LCORE(worker_model) = RTE_GRAPH_MODEL_DEFAULT;
+ return -1;
+}
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Get the graph worker model
+ *
+ * @param name
+ * Name of the graph worker model.
+ *
+ * @return
+ * Graph worker model on success.
+ */
+inline
+enum rte_graph_worker_model
+rte_graph_worker_model_get(void)
+{
+ return RTE_PER_LCORE(worker_model);
+}
diff --git a/lib/graph/rte_graph_worker_common.h
b/lib/graph/rte_graph_worker_common.h
index 41428974db..1526da6e2c 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -95,6 +96,16 @@ struct rte_node {
struct rte_node *nodes[] __rte_cache_min_aligned; /**< Next nodes. */
} __rte_cache_aligned;
+/** Graph worker models */
+enum rte_graph_worker_model {
+ RTE_GRAPH_MODEL_DEFAULT,
+ RTE_GRAPH_MODEL_RTC = RTE_GRAPH_MODEL_DEFAULT,
+ RTE_GRAPH_MODEL_MCORE_DISPATCH,
+ RTE_GRAPH_MODEL_LIST_END
+};
+
+RTE_DECLARE_PER_LCORE(enum rte_graph_worker_model, worker_model);
+
/**
* @internal
*
@@ -490,6 +501,14 @@ rte_node_next_stream_move(struct rte_graph *graph, struct
rte_node *src,
}
}
+__rte_experimental
+enum rte_graph_worker_model
+rte_graph_worker_model_get(void);
+
+__rte_experimental
+int
+rte_graph_worker_model_set(enum rte_graph_worker_model model);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 13b838752d..eea73ec9ca 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -43,5 +43,8 @@ EXPERIMENTAL {
rte_node_next_stream_put;
rte_node_next_stream_move;
+ rte_graph_worker_model_set;
+ rte_graph_worker_model_get;
+
local: *;
};
--
2.37.2
[PATCH v3 05/15] graph: introduce graph node core affinity API
Add lcore_id for node to hold affinity core id and impl
rte_graph_model_dispatch_lcore_affinity_set to set node affinity
with specific lcore.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph_private.h| 1 +
lib/graph/meson.build| 1 +
lib/graph/node.c | 1 +
lib/graph/rte_graph_model_dispatch.c | 31
lib/graph/rte_graph_model_dispatch.h | 43
lib/graph/version.map| 2 ++
6 files changed, 79 insertions(+)
create mode 100644 lib/graph/rte_graph_model_dispatch.c
create mode 100644 lib/graph/rte_graph_model_dispatch.h
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 7d1b30b8ac..409eed3284 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -50,6 +50,7 @@ struct node {
STAILQ_ENTRY(node) next; /**< Next node in the list. */
char name[RTE_NODE_NAMESIZE]; /**< Name of the node. */
uint64_t flags; /**< Node configuration flag. */
+ unsigned int lcore_id;/**< Node runs on the Lcore ID */
rte_node_process_t process; /**< Node process function. */
rte_node_init_t init; /**< Node init function. */
rte_node_fini_t fini; /**< Node fini function. */
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 9fab8243da..c729d984b6 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -16,6 +16,7 @@ sources = files(
'graph_populate.c',
'graph_pcap.c',
'rte_graph_worker.c',
+'rte_graph_model_dispatch.c',
)
headers = files('rte_graph.h', 'rte_graph_worker.h')
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 149414dcd9..339b4a0da5 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -100,6 +100,7 @@ __rte_node_register(const struct rte_node_register *reg)
goto free;
}
+ node->lcore_id = RTE_MAX_LCORE;
node->id = node_id++;
/* Add the node at tail */
diff --git a/lib/graph/rte_graph_model_dispatch.c
b/lib/graph/rte_graph_model_dispatch.c
new file mode 100644
index 00..4a2f99496d
--- /dev/null
+++ b/lib/graph/rte_graph_model_dispatch.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#include "graph_private.h"
+#include "rte_graph_model_dispatch.h"
+
+int
+rte_graph_model_dispatch_lcore_affinity_set(const char *name, unsigned int
lcore_id)
+{
+ struct node *node;
+ int ret = -EINVAL;
+
+ if (lcore_id >= RTE_MAX_LCORE)
+ return ret;
+
+ graph_spinlock_lock();
+
+ STAILQ_FOREACH(node, node_list_head_get(), next) {
+ if (strncmp(node->name, name, RTE_NODE_NAMESIZE) == 0) {
+ node->lcore_id = lcore_id;
+ ret = 0;
+ break;
+ }
+ }
+
+ graph_spinlock_unlock();
+
+ return ret;
+}
+
diff --git a/lib/graph/rte_graph_model_dispatch.h
b/lib/graph/rte_graph_model_dispatch.h
new file mode 100644
index 00..179624e972
--- /dev/null
+++ b/lib/graph/rte_graph_model_dispatch.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_GRAPH_MODEL_DISPATCH_H_
+#define _RTE_GRAPH_MODEL_DISPATCH_H_
+
+/**
+ * @file rte_graph_model_dispatch.h
+ *
+ * @warning
+ * @b EXPERIMENTAL:
+ * All functions in this file may be changed or removed without prior notice.
+ *
+ * This API allows to set core affinity with the node.
+ */
+#include "rte_graph_worker_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Set lcore affinity with the node.
+ *
+ * @param name
+ * Valid node name. In the case of the cloned node, the name will be
+ * "parent node name" + "-" + name.
+ * @param lcore_id
+ * The lcore ID value.
+ *
+ * @return
+ * 0 on success, error otherwise.
+ */
+__rte_experimental
+int rte_graph_model_dispatch_lcore_affinity_set(const char *name,
+ unsigned int lcore_id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_GRAPH_MODEL_DISPATCH_H_ */
diff --git a/lib/graph/version.map b/lib/graph/version.map
index eea73ec9ca..1f090be74e 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -46,5 +46,7 @@ EXPERIMENTAL {
rte_graph_worker_model_set;
rte_graph_worker_model_get;
+ rte_graph_model_dispatch_lcore_affinity_set;
+
local: *;
};
--
2.37.2
[PATCH v3 06/15] graph: introduce graph bind unbind API
Add lcore_id for graph to hold affinity core id where graph would run on.
Add bind/unbind API to set/unset graph affinity attribute. lcore_id will
be set as MAX by default, it means not enable this attribute.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph.c | 59 +++
lib/graph/graph_private.h | 2 ++
lib/graph/rte_graph.h | 22 +++
lib/graph/version.map | 2 ++
4 files changed, 85 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index a839a2803b..b39a99aac6 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -254,6 +254,64 @@ graph_mem_fixup_secondary(struct rte_graph *graph)
return graph_mem_fixup_node_ctx(graph);
}
+static __rte_always_inline bool
+graph_src_node_avail(struct graph *graph)
+{
+ struct graph_node *graph_node;
+
+ STAILQ_FOREACH(graph_node, &graph->node_list, next)
+ if ((graph_node->node->flags & RTE_NODE_SOURCE_F) &&
+ (graph_node->node->lcore_id == RTE_MAX_LCORE ||
+graph->lcore_id == graph_node->node->lcore_id))
+ return true;
+
+ return false;
+}
+
+int
+rte_graph_model_dispatch_core_bind(rte_graph_t id, int lcore)
+{
+ struct graph *graph;
+
+ GRAPH_ID_CHECK(id);
+ if (!rte_lcore_is_enabled(lcore))
+ SET_ERR_JMP(ENOLINK, fail,
+ "lcore %d not enabled\n",
+ lcore);
+
+ STAILQ_FOREACH(graph, &graph_list, next)
+ if (graph->id == id)
+ break;
+
+ graph->lcore_id = lcore;
+ graph->socket = rte_lcore_to_socket_id(lcore);
+
+ /* check the availability of source node */
+ if (!graph_src_node_avail(graph))
+ graph->graph->head = 0;
+
+ return 0;
+
+fail:
+ return -rte_errno;
+}
+
+void
+rte_graph_model_dispatch_core_unbind(rte_graph_t id)
+{
+ struct graph *graph;
+
+ GRAPH_ID_CHECK(id);
+ STAILQ_FOREACH(graph, &graph_list, next)
+ if (graph->id == id)
+ break;
+
+ graph->lcore_id = RTE_MAX_LCORE;
+
+fail:
+ return;
+}
+
struct rte_graph *
rte_graph_lookup(const char *name)
{
@@ -340,6 +398,7 @@ rte_graph_create(const char *name, struct rte_graph_param
*prm)
graph->src_node_count = src_node_count;
graph->node_count = graph_nodes_count(graph);
graph->id = graph_id;
+ graph->lcore_id = RTE_MAX_LCORE;
graph->num_pkt_to_capture = prm->num_pkt_to_capture;
if (prm->pcap_filename)
rte_strscpy(graph->pcap_filename, prm->pcap_filename,
RTE_GRAPH_PCAP_FILE_SZ);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index 409eed3284..ad1d058945 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -98,6 +98,8 @@ struct graph {
/**< Circular buffer mask for wrap around. */
rte_graph_t id;
/**< Graph identifier. */
+ unsigned int lcore_id;
+ /**< Lcore identifier where the graph prefer to run on. */
size_t mem_sz;
/**< Memory size of the graph. */
int socket;
diff --git a/lib/graph/rte_graph.h b/lib/graph/rte_graph.h
index c9a77297fc..c523809d1f 100644
--- a/lib/graph/rte_graph.h
+++ b/lib/graph/rte_graph.h
@@ -285,6 +285,28 @@ char *rte_graph_id_to_name(rte_graph_t id);
__rte_experimental
int rte_graph_export(const char *name, FILE *f);
+/**
+ * Bind graph with specific lcore
+ *
+ * @param id
+ * Graph id to get the pointer of graph object
+ * @param lcore
+ * The lcore where the graph will run on
+ * @return
+ * 0 on success, error otherwise.
+ */
+__rte_experimental
+int rte_graph_model_dispatch_core_bind(rte_graph_t id, int lcore);
+
+/**
+ * Unbind graph with lcore
+ *
+ * @param id
+ * Graph id to get the pointer of graph object
+ */
+__rte_experimental
+void rte_graph_model_dispatch_core_unbind(rte_graph_t id);
+
/**
* Get graph object from its name.
*
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 1f090be74e..7de6f08f59 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -18,6 +18,8 @@ EXPERIMENTAL {
rte_graph_node_get_by_name;
rte_graph_obj_dump;
rte_graph_walk;
+ rte_graph_model_dispatch_core_bind;
+ rte_graph_model_dispatch_core_unbind;
rte_graph_cluster_stats_create;
rte_graph_cluster_stats_destroy;
--
2.37.2
[PATCH v3 07/15] graph: introduce graph clone API for other worker core
This patch adds graph API for supporting to clone the graph object for
a specified worker core. The new graph will also clone all nodes.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph.c | 110 ++
lib/graph/graph_private.h | 2 +
lib/graph/rte_graph.h | 20 +++
lib/graph/version.map | 1 +
4 files changed, 133 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index b39a99aac6..90eaad0378 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -398,6 +398,7 @@ rte_graph_create(const char *name, struct rte_graph_param
*prm)
graph->src_node_count = src_node_count;
graph->node_count = graph_nodes_count(graph);
graph->id = graph_id;
+ graph->parent_id = RTE_GRAPH_ID_INVALID;
graph->lcore_id = RTE_MAX_LCORE;
graph->num_pkt_to_capture = prm->num_pkt_to_capture;
if (prm->pcap_filename)
@@ -462,6 +463,115 @@ rte_graph_destroy(rte_graph_t id)
return rc;
}
+static int
+clone_name(struct graph *graph, struct graph *parent_graph, const char *name)
+{
+ ssize_t sz, rc;
+
+#define SZ RTE_GRAPH_NAMESIZE
+ rc = rte_strscpy(graph->name, parent_graph->name, SZ);
+ if (rc < 0)
+ goto fail;
+ sz = rc;
+ rc = rte_strscpy(graph->name + sz, "-", RTE_MAX((int16_t)(SZ - sz), 0));
+ if (rc < 0)
+ goto fail;
+ sz += rc;
+ sz = rte_strscpy(graph->name + sz, name, RTE_MAX((int16_t)(SZ - sz),
0));
+ if (sz < 0)
+ goto fail;
+
+ return 0;
+fail:
+ rte_errno = E2BIG;
+ return -rte_errno;
+}
+
+static rte_graph_t
+graph_clone(struct graph *parent_graph, const char *name)
+{
+ struct graph_node *graph_node;
+ struct graph *graph;
+
+ graph_spinlock_lock();
+
+ /* Don't allow to clone a node from a cloned graph */
+ if (parent_graph->parent_id != RTE_GRAPH_ID_INVALID)
+ SET_ERR_JMP(EEXIST, fail, "A cloned graph is not allowed to be
cloned");
+
+ /* Create graph object */
+ graph = calloc(1, sizeof(*graph));
+ if (graph == NULL)
+ SET_ERR_JMP(ENOMEM, fail, "Failed to calloc cloned graph
object");
+
+ /* Naming ceremony of the new graph. name is node->name + "-" + name */
+ if (clone_name(graph, parent_graph, name))
+ goto free;
+
+ /* Check for existence of duplicate graph */
+ if (rte_graph_from_name(graph->name) != RTE_GRAPH_ID_INVALID)
+ SET_ERR_JMP(EEXIST, free, "Found duplicate graph %s",
+ graph->name);
+
+ /* Clone nodes from parent graph firstly */
+ STAILQ_INIT(&graph->node_list);
+ STAILQ_FOREACH(graph_node, &parent_graph->node_list, next) {
+ if (graph_node_add(graph, graph_node->node))
+ goto graph_cleanup;
+ }
+
+ /* Just update adjacency list of all nodes in the graph */
+ if (graph_adjacency_list_update(graph))
+ goto graph_cleanup;
+
+ /* Initialize the graph object */
+ graph->src_node_count = parent_graph->src_node_count;
+ graph->node_count = parent_graph->node_count;
+ graph->parent_id = parent_graph->id;
+ graph->lcore_id = parent_graph->lcore_id;
+ graph->socket = parent_graph->socket;
+ graph->id = graph_id;
+
+ /* Allocate the Graph fast path memory and populate the data */
+ if (graph_fp_mem_create(graph))
+ goto graph_cleanup;
+
+ /* Call init() of the all the nodes in the graph */
+ if (graph_node_init(graph))
+ goto graph_mem_destroy;
+
+ /* All good, Lets add the graph to the list */
+ graph_id++;
+ STAILQ_INSERT_TAIL(&graph_list, graph, next);
+
+ graph_spinlock_unlock();
+ return graph->id;
+
+graph_mem_destroy:
+ graph_fp_mem_destroy(graph);
+graph_cleanup:
+ graph_cleanup(graph);
+free:
+ free(graph);
+fail:
+ graph_spinlock_unlock();
+ return RTE_GRAPH_ID_INVALID;
+}
+
+rte_graph_t
+rte_graph_clone(rte_graph_t id, const char *name)
+{
+ struct graph *graph;
+
+ GRAPH_ID_CHECK(id);
+ STAILQ_FOREACH(graph, &graph_list, next)
+ if (graph->id == id)
+ return graph_clone(graph, name);
+
+fail:
+ return RTE_GRAPH_ID_INVALID;
+}
+
rte_graph_t
rte_graph_from_name(const char *name)
{
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index ad1d058945..d28a5af93e 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -98,6 +98,8 @@ struct graph {
/**< Circular buffer mask for wrap around. */
rte_graph_t id;
/**< Graph identifier. */
+ rte_graph_t parent_id;
+ /**< Parent graph identifier. */
unsigned int lcore_id;
/**< Lcore identifier where the graph prefer to run on. *
[PATCH v3 08/15] graph: add struct for stream moving between cores
Add graph_sched_wq_node to hold graph scheduling workqueue
node.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph.c | 1 +
lib/graph/graph_populate.c | 1 +
lib/graph/graph_private.h | 12
lib/graph/rte_graph_worker_common.h | 21 +
4 files changed, 35 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 90eaad0378..dd3d69dbf7 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -284,6 +284,7 @@ rte_graph_model_dispatch_core_bind(rte_graph_t id, int
lcore)
break;
graph->lcore_id = lcore;
+ graph->graph->lcore_id = graph->lcore_id;
graph->socket = rte_lcore_to_socket_id(lcore);
/* check the availability of source node */
diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c
index 2c0844ce92..7dcf1420c1 100644
--- a/lib/graph/graph_populate.c
+++ b/lib/graph/graph_populate.c
@@ -89,6 +89,7 @@ graph_nodes_populate(struct graph *_graph)
}
node->id = graph_node->node->id;
node->parent_id = pid;
+ node->lcore_id = graph_node->node->lcore_id;
nb_edges = graph_node->node->nb_edges;
node->nb_edges = nb_edges;
off += sizeof(struct rte_node);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index d28a5af93e..b66b18ebbc 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -60,6 +60,18 @@ struct node {
char next_nodes[][RTE_NODE_NAMESIZE]; /**< Names of next nodes. */
};
+/**
+ * @internal
+ *
+ * Structure that holds the graph scheduling workqueue node stream.
+ * Used for mcore dispatch model.
+ */
+struct graph_sched_wq_node {
+ rte_graph_off_t node_off;
+ uint16_t nb_objs;
+ void *objs[RTE_GRAPH_BURST_SIZE];
+} __rte_cache_aligned;
+
/**
* @internal
*
diff --git a/lib/graph/rte_graph_worker_common.h
b/lib/graph/rte_graph_worker_common.h
index 1526da6e2c..dc0a0b5554 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -30,6 +30,13 @@
extern "C" {
#endif
+/**
+ * @internal
+ *
+ * Singly-linked list head for graph schedule run-queue.
+ */
+SLIST_HEAD(rte_graph_rq_head, rte_graph);
+
/**
* @internal
*
@@ -41,6 +48,15 @@ struct rte_graph {
uint32_t cir_mask; /**< Circular buffer wrap around mask. */
rte_node_t nb_nodes; /**< Number of nodes in the graph. */
rte_graph_off_t *cir_start; /**< Pointer to circular buffer. */
+ /* Graph schedule */
+ struct rte_graph_rq_head *rq __rte_cache_aligned; /* The run-queue */
+ struct rte_graph_rq_head rq_head; /* The head for run-queue list */
+
+ SLIST_ENTRY(rte_graph) rq_next; /* The next for run-queue list */
+ unsigned int lcore_id; /**< The graph running Lcore. */
+ struct rte_ring *wq;/**< The work-queue for pending streams. */
+ struct rte_mempool *mp; /**< The mempool for scheduling streams. */
+ /* Graph schedule area */
rte_graph_off_t nodes_start; /**< Offset at which node memory starts. */
rte_graph_t id; /**< Graph identifier. */
int socket; /**< Socket ID where memory is allocated. */
@@ -74,6 +90,11 @@ struct rte_node {
/** Original process function when pcap is enabled. */
rte_node_process_t original_process;
+ RTE_STD_C11
+ union {
+ /* Fast schedule area for mcore dispatch model */
+ unsigned int lcore_id; /**< Node running lcore. */
+ };
/* Fast path area */
#define RTE_NODE_CTX_SZ 16
uint8_t ctx[RTE_NODE_CTX_SZ] __rte_cache_aligned; /**< Node Context. */
--
2.37.2
[PATCH v3 09/15] graph: introduce stream moving cross cores
This patch introduces key functions to allow a worker thread to
enable enqueue and move streams of objects to the next nodes over
different cores.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph_private.h| 27 +
lib/graph/meson.build| 2 +-
lib/graph/rte_graph_model_dispatch.c | 145 +++
lib/graph/rte_graph_model_dispatch.h | 35 +++
4 files changed, 208 insertions(+), 1 deletion(-)
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index b66b18ebbc..e1a2a4bfd8 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -366,4 +366,31 @@ void graph_dump(FILE *f, struct graph *g);
*/
void node_dump(FILE *f, struct node *n);
+/**
+ * @internal
+ *
+ * Create the graph schedule work queue. And all cloned graphs attached to the
+ * parent graph MUST be destroyed together for fast schedule design limitation.
+ *
+ * @param _graph
+ * The graph object
+ * @param _parent_graph
+ * The parent graph object which holds the run-queue head.
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Graph schedule work queue related error.
+ */
+int graph_sched_wq_create(struct graph *_graph, struct graph *_parent_graph);
+
+/**
+ * @internal
+ *
+ * Destroy the graph schedule work queue.
+ *
+ * @param _graph
+ * The graph object
+ */
+void graph_sched_wq_destroy(struct graph *_graph);
+
#endif /* _RTE_GRAPH_PRIVATE_H_ */
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index c729d984b6..e21affa280 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -20,4 +20,4 @@ sources = files(
)
headers = files('rte_graph.h', 'rte_graph_worker.h')
-deps += ['eal', 'pcapng']
+deps += ['eal', 'pcapng', 'mempool', 'ring']
diff --git a/lib/graph/rte_graph_model_dispatch.c
b/lib/graph/rte_graph_model_dispatch.c
index 4a2f99496d..b46dd156ac 100644
--- a/lib/graph/rte_graph_model_dispatch.c
+++ b/lib/graph/rte_graph_model_dispatch.c
@@ -5,6 +5,151 @@
#include "graph_private.h"
#include "rte_graph_model_dispatch.h"
+int
+graph_sched_wq_create(struct graph *_graph, struct graph *_parent_graph)
+{
+ struct rte_graph *parent_graph = _parent_graph->graph;
+ struct rte_graph *graph = _graph->graph;
+ unsigned int wq_size;
+
+ wq_size = GRAPH_SCHED_WQ_SIZE(graph->nb_nodes);
+ wq_size = rte_align32pow2(wq_size + 1);
+
+ graph->wq = rte_ring_create(graph->name, wq_size, graph->socket,
+ RING_F_SC_DEQ);
+ if (graph->wq == NULL)
+ SET_ERR_JMP(EIO, fail, "Failed to allocate graph WQ");
+
+ graph->mp = rte_mempool_create(graph->name, wq_size,
+ sizeof(struct graph_sched_wq_node),
+ 0, 0, NULL, NULL, NULL, NULL,
+ graph->socket, MEMPOOL_F_SP_PUT);
+ if (graph->mp == NULL)
+ SET_ERR_JMP(EIO, fail_mp,
+ "Failed to allocate graph WQ schedule entry");
+
+ graph->lcore_id = _graph->lcore_id;
+
+ if (parent_graph->rq == NULL) {
+ parent_graph->rq = &parent_graph->rq_head;
+ SLIST_INIT(parent_graph->rq);
+ }
+
+ graph->rq = parent_graph->rq;
+ SLIST_INSERT_HEAD(graph->rq, graph, rq_next);
+
+ return 0;
+
+fail_mp:
+ rte_ring_free(graph->wq);
+ graph->wq = NULL;
+fail:
+ return -rte_errno;
+}
+
+void
+graph_sched_wq_destroy(struct graph *_graph)
+{
+ struct rte_graph *graph = _graph->graph;
+
+ if (graph == NULL)
+ return;
+
+ rte_ring_free(graph->wq);
+ graph->wq = NULL;
+
+ rte_mempool_free(graph->mp);
+ graph->mp = NULL;
+}
+
+static __rte_always_inline bool
+__graph_sched_node_enqueue(struct rte_node *node, struct rte_graph *graph)
+{
+ struct graph_sched_wq_node *wq_node;
+ uint16_t off = 0;
+ uint16_t size;
+
+submit_again:
+ if (rte_mempool_get(graph->mp, (void **)&wq_node) < 0)
+ goto fallback;
+
+ size = RTE_MIN(node->idx, RTE_DIM(wq_node->objs));
+ wq_node->node_off = node->off;
+ wq_node->nb_objs = size;
+ rte_memcpy(wq_node->objs, &node->objs[off], size * sizeof(void *));
+
+ while (rte_ring_mp_enqueue_bulk_elem(graph->wq, (void *)&wq_node,
+ sizeof(wq_node), 1, NULL) == 0)
+ rte_pause();
+
+ off += size;
+ node->idx -= size;
+ if (node->idx > 0)
+ goto submit_again;
+
+ return true;
+
+fallback:
+ if (off != 0)
+ memmove(&node->objs[0], &node->objs[off],
+ node->idx * sizeof(void *));
+
+ return false;
+}
+
+bool __rte_noinline
+__rte_graph_sched_node_enqueue(struct rte_node *node,
+ struct rte_graph_rq_head *rq)
+{
+ const unsigned int lcore_id
[PATCH v3 10/15] graph: enable create and destroy graph scheduling workqueue
This patch enables to create and destroy scheduling workqueue into
common graph operations.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index dd3d69dbf7..1f1ee9b622 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -443,6 +443,10 @@ rte_graph_destroy(rte_graph_t id)
while (graph != NULL) {
tmp = STAILQ_NEXT(graph, next);
if (graph->id == id) {
+ /* Destroy the schedule work queue if has */
+ if (rte_graph_worker_model_get() ==
RTE_GRAPH_MODEL_MCORE_DISPATCH)
+ graph_sched_wq_destroy(graph);
+
/* Call fini() of the all the nodes in the graph */
graph_node_fini(graph);
/* Destroy graph fast path memory */
@@ -537,6 +541,11 @@ graph_clone(struct graph *parent_graph, const char *name)
if (graph_fp_mem_create(graph))
goto graph_cleanup;
+ /* Create the graph schedule work queue */
+ if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH &&
+ graph_sched_wq_create(graph, parent_graph))
+ goto graph_mem_destroy;
+
/* Call init() of the all the nodes in the graph */
if (graph_node_init(graph))
goto graph_mem_destroy;
--
2.37.2
[PATCH v3 11/15] graph: introduce graph walk by cross-core dispatch
This patch introduces the task scheduler mechanism to enable dispatching
tasks to another worker cores. Currently, there is only a local work
queue for one graph to walk. We introduce a scheduler worker queue in
each worker core for dispatching tasks. It will perform the walk on
scheduler work queue first, then handle the local work queue.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/rte_graph_model_dispatch.h | 42
1 file changed, 42 insertions(+)
diff --git a/lib/graph/rte_graph_model_dispatch.h
b/lib/graph/rte_graph_model_dispatch.h
index 7cbdf2fdcf..764c4ecfd0 100644
--- a/lib/graph/rte_graph_model_dispatch.h
+++ b/lib/graph/rte_graph_model_dispatch.h
@@ -71,6 +71,48 @@ __rte_experimental
int rte_graph_model_dispatch_lcore_affinity_set(const char *name,
unsigned int lcore_id);
+/**
+ * Perform graph walk on the circular buffer and invoke the process function
+ * of the nodes and collect the stats.
+ *
+ * @param graph
+ * Graph pointer returned from rte_graph_lookup function.
+ *
+ * @see rte_graph_lookup()
+ */
+__rte_experimental
+static inline void
+rte_graph_walk_mcore_dispatch(struct rte_graph *graph)
+{
+ const rte_graph_off_t *cir_start = graph->cir_start;
+ const rte_node_t mask = graph->cir_mask;
+ uint32_t head = graph->head;
+ struct rte_node *node;
+
+ if (graph->wq != NULL)
+ __rte_graph_sched_wq_process(graph);
+
+ while (likely(head != graph->tail)) {
+ node = (struct rte_node *)RTE_PTR_ADD(graph,
cir_start[(int32_t)head++]);
+
+ /* skip the src nodes which not bind with current worker */
+ if ((int32_t)head < 0 && node->lcore_id != graph->lcore_id)
+ continue;
+
+ /* Schedule the node until all task/objs are done */
+ if (node->lcore_id != RTE_MAX_LCORE &&
+ graph->lcore_id != node->lcore_id && graph->rq != NULL &&
+ __rte_graph_sched_node_enqueue(node, graph->rq))
+ continue;
+
+ __rte_node_process(graph, node);
+
+ head = likely((int32_t)head > 0) ? head & mask : head;
+ }
+
+ graph->tail = 0;
+}
+
#ifdef __cplusplus
}
#endif
--
2.37.2
[PATCH v3 12/15] graph: enable graph multicore dispatch scheduler model
This patch enables to chose new scheduler model.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/rte_graph_worker.h | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h
index 7ea18ba80a..d608c7513e 100644
--- a/lib/graph/rte_graph_worker.h
+++ b/lib/graph/rte_graph_worker.h
@@ -10,6 +10,7 @@ extern "C" {
#endif
#include "rte_graph_model_rtc.h"
+#include "rte_graph_model_dispatch.h"
/**
* Perform graph walk on the circular buffer and invoke the process function
@@ -24,7 +25,13 @@ __rte_experimental
static inline void
rte_graph_walk(struct rte_graph *graph)
{
- rte_graph_walk_rtc(graph);
+ int model = rte_graph_worker_model_get();
+
+ if (model == RTE_GRAPH_MODEL_DEFAULT ||
+ model == RTE_GRAPH_MODEL_RTC)
+ rte_graph_walk_rtc(graph);
+ else if (model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+ rte_graph_walk_mcore_dispatch(graph);
}
#ifdef __cplusplus
--
2.37.2
[PATCH v3 13/15] graph: add stats for cross-core dispatching
Add stats for cross-core dispatching scheduler if stats collection is
enabled.
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
lib/graph/graph_debug.c | 6 +++
lib/graph/graph_stats.c | 74 +---
lib/graph/rte_graph.h| 2 +
lib/graph/rte_graph_model_dispatch.c | 3 ++
lib/graph/rte_graph_worker_common.h | 2 +
5 files changed, 79 insertions(+), 8 deletions(-)
diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c
index b84412f5dd..7dcf07b080 100644
--- a/lib/graph/graph_debug.c
+++ b/lib/graph/graph_debug.c
@@ -74,6 +74,12 @@ rte_graph_obj_dump(FILE *f, struct rte_graph *g, bool all)
fprintf(f, " size=%d\n", n->size);
fprintf(f, " idx=%d\n", n->idx);
fprintf(f, " total_objs=%" PRId64 "\n", n->total_objs);
+ if (rte_graph_worker_model_get() ==
RTE_GRAPH_MODEL_MCORE_DISPATCH) {
+ fprintf(f, " total_sched_objs=%" PRId64 "\n",
+ n->total_sched_objs);
+ fprintf(f, " total_sched_fail=%" PRId64 "\n",
+ n->total_sched_fail);
+ }
fprintf(f, " total_calls=%" PRId64 "\n", n->total_calls);
for (i = 0; i < n->nb_edges; i++)
fprintf(f, " edge[%d] <%s>\n", i,
diff --git a/lib/graph/graph_stats.c b/lib/graph/graph_stats.c
index c0140ba922..aa22cc403c 100644
--- a/lib/graph/graph_stats.c
+++ b/lib/graph/graph_stats.c
@@ -40,13 +40,19 @@ struct rte_graph_cluster_stats {
struct cluster_node clusters[];
} __rte_cache_aligned;
+#define boarder_model_dispatch()
\
+ fprintf(f, "+---+---+" \
+ "---+---+---+---+" \
+ "---+---+-" \
+ "--+\n")
+
#define boarder()
\
fprintf(f, "+---+---+" \
"---+---+---+---+-" \
"--+\n")
static inline void
-print_banner(FILE *f)
+print_banner_default(FILE *f)
{
boarder();
fprintf(f, "%-32s%-16s%-16s%-16s%-16s%-16s%-16s\n", "|Node", "|calls",
@@ -55,6 +61,27 @@ print_banner(FILE *f)
boarder();
}
+static inline void
+print_banner_dispatch(FILE *f)
+{
+ boarder_model_dispatch();
+ fprintf(f, "%-32s%-16s%-16s%-16s%-16s%-16s%-16s%-16s%-16s\n",
+ "|Node", "|calls",
+ "|objs", "|sched objs", "|sched fail",
+ "|realloc_count", "|objs/call", "|objs/sec(10E6)",
+ "|cycles/call|");
+ boarder_model_dispatch();
+}
+
+static inline void
+print_banner(FILE *f)
+{
+ if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+ print_banner_dispatch(f);
+ else
+ print_banner_default(f);
+}
+
static inline void
print_node(FILE *f, const struct rte_graph_cluster_node_stats *stat)
{
@@ -76,11 +103,21 @@ print_node(FILE *f, const struct
rte_graph_cluster_node_stats *stat)
objs_per_sec = ts_per_hz ? (objs - prev_objs) / ts_per_hz : 0;
objs_per_sec /= 100;
- fprintf(f,
- "|%-31s|%-15" PRIu64 "|%-15" PRIu64 "|%-15" PRIu64
- "|%-15.3f|%-15.6f|%-11.4f|\n",
- stat->name, calls, objs, stat->realloc_count, objs_per_call,
- objs_per_sec, cycles_per_call);
+ if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH) {
+ fprintf(f,
+ "|%-31s|%-15" PRIu64 "|%-15" PRIu64 "|%-15" PRIu64
+ "|%-15" PRIu64 "|%-15" PRIu64
+ "|%-15.3f|%-15.6f|%-11.4f|\n",
+ stat->name, calls, objs, stat->sched_objs,
+ stat->sched_fail, stat->realloc_count, objs_per_call,
+ objs_per_sec, cycles_per_call);
+ } else {
+ fprintf(f,
+ "|%-31s|%-15" PRIu64 "|%-15" PRIu64 "|%-15" PRIu64
+ "|%-15.3f|%-15.6f|%-11.4f|\n",
+ stat->name, calls, objs, stat->realloc_count,
objs_per_call,
+ objs_per_sec, cycles_per_call);
+ }
}
static int
@@ -88,13 +125,20 @@ graph_cluster_stats_cb(bool is_first, bool is_last, void
*cookie,
const struct rte_graph_cluster_node_stats *stat)
{
FILE *f = cookie;
+ int model;
+
+ model = rte_graph_worker_model_get();
if (unlikely(is_first))
print_banner(f);
if (stat->objs)
print_node(f, stat);
-
[PATCH v3 14/15] examples/l3fwd-graph: introduce multicore dispatch worker model
Add new parameter "model" to choose dispatch or rtc worker model.
And in dispatch model, the node will affinity to worker core successively.
Note:
only support one RX node for remote model in current implementation.
./dpdk-l3fwd-graph -l 8,9,10,11 -n 4 -- -p 0x1 --config="(0,0,9)" -P
--model="dispatch"
Signed-off-by: Haiyue Wang
Signed-off-by: Cunming Liang
Signed-off-by: Zhirun Yan
---
examples/l3fwd-graph/main.c | 237 +---
1 file changed, 195 insertions(+), 42 deletions(-)
diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c
index 5feeab4f0f..cfa78003f4 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -55,6 +55,9 @@
#define NB_SOCKETS 8
+/* Graph module */
+#define WORKER_MODEL_RTC "rtc"
+#define WORKER_MODEL_MCORE_DISPATCH "dispatch"
/* Static global variables used within this file. */
static uint16_t nb_rxd = RX_DESC_DEFAULT;
static uint16_t nb_txd = TX_DESC_DEFAULT;
@@ -88,6 +91,10 @@ struct lcore_rx_queue {
char node_name[RTE_NODE_NAMESIZE];
};
+struct model_conf {
+ enum rte_graph_worker_model model;
+};
+
/* Lcore conf */
struct lcore_conf {
uint16_t n_rx_queue;
@@ -153,6 +160,19 @@ static struct ipv4_l3fwd_lpm_route
ipv4_l3fwd_lpm_route_array[] = {
{RTE_IPV4(198, 18, 6, 0), 24, 6}, {RTE_IPV4(198, 18, 7, 0), 24, 7},
};
+static int
+check_worker_model_params(void)
+{
+ if (rte_graph_worker_model_get() == RTE_GRAPH_MODEL_MCORE_DISPATCH &&
+ nb_lcore_params > 1) {
+ printf("Exceeded max number of lcore params for remote model:
%hu\n",
+ nb_lcore_params);
+ return -1;
+ }
+
+ return 0;
+}
+
static int
check_lcore_params(void)
{
@@ -276,6 +296,7 @@ print_usage(const char *prgname)
" --eth-dest=X,MM:MM:MM:MM:MM:MM: Ethernet destination for "
"port X\n"
" --max-pkt-len PKTLEN: maximum packet length in decimal
(64-9600)\n"
+ " --model NAME: walking model name, dispatch or rtc(by
default)\n"
" --no-numa: Disable numa awareness\n"
" --per-port-pool: Use separate buffer pool per port\n"
" --pcap-enable: Enables pcap capture\n"
@@ -318,6 +339,20 @@ parse_max_pkt_len(const char *pktlen)
return len;
}
+static int
+parse_worker_model(const char *model)
+{
+ if (strcmp(model, WORKER_MODEL_MCORE_DISPATCH) == 0) {
+ rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
+ return RTE_GRAPH_MODEL_MCORE_DISPATCH;
+ } else if (strcmp(model, WORKER_MODEL_RTC) == 0)
+ return RTE_GRAPH_MODEL_RTC;
+
+ rte_exit(EXIT_FAILURE, "Invalid worker model: %s", model);
+
+ return RTE_GRAPH_MODEL_LIST_END;
+}
+
static int
parse_portmask(const char *portmask)
{
@@ -434,6 +469,8 @@ static const char short_options[] = "p:" /* portmask */
#define CMD_LINE_OPT_PCAP_ENABLE "pcap-enable"
#define CMD_LINE_OPT_NUM_PKT_CAP "pcap-num-cap"
#define CMD_LINE_OPT_PCAP_FILENAME "pcap-file-name"
+#define CMD_LINE_OPT_WORKER_MODEL "model"
+
enum {
/* Long options mapped to a short option */
@@ -449,6 +486,7 @@ enum {
CMD_LINE_OPT_PARSE_PCAP_ENABLE,
CMD_LINE_OPT_PARSE_NUM_PKT_CAP,
CMD_LINE_OPT_PCAP_FILENAME_CAP,
+ CMD_LINE_OPT_WORKER_MODEL_TYPE,
};
static const struct option lgopts[] = {
@@ -460,6 +498,7 @@ static const struct option lgopts[] = {
{CMD_LINE_OPT_PCAP_ENABLE, 0, 0, CMD_LINE_OPT_PARSE_PCAP_ENABLE},
{CMD_LINE_OPT_NUM_PKT_CAP, 1, 0, CMD_LINE_OPT_PARSE_NUM_PKT_CAP},
{CMD_LINE_OPT_PCAP_FILENAME, 1, 0, CMD_LINE_OPT_PCAP_FILENAME_CAP},
+ {CMD_LINE_OPT_WORKER_MODEL, 1, 0, CMD_LINE_OPT_WORKER_MODEL_TYPE},
{NULL, 0, 0, 0},
};
@@ -551,6 +590,11 @@ parse_args(int argc, char **argv)
printf("Pcap file name: %s\n", pcap_filename);
break;
+ case CMD_LINE_OPT_WORKER_MODEL_TYPE:
+ printf("Use new worker model: %s\n", optarg);
+ parse_worker_model(optarg);
+ break;
+
default:
print_usage(prgname);
return -1;
@@ -726,15 +770,15 @@ print_stats(void)
static int
graph_main_loop(void *conf)
{
+ struct model_conf *mconf = conf;
struct lcore_conf *qconf;
struct rte_graph *graph;
uint32_t lcore_id;
- RTE_SET_USED(conf);
-
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
graph = qconf->graph;
+ rte_graph_worker_model_set(mconf->model);
if (!graph) {
RTE_LOG(INFO, L3FWD_GRAPH, "Lcore %u has nothing to do\n",
@@ -788,6 +832,141 @@ config_port_max_pkt_len(struct rte_eth_conf *conf,
return 0;
}
+static void
+graph_config_mcore_dispatch(struct rte_graph_param gra
[PATCH v3 15/15] doc: update multicore dispatch model in graph guides
Update graph documentation to introduce new multicore dispatch model. Signed-off-by: Haiyue Wang Signed-off-by: Cunming Liang Signed-off-by: Zhirun Yan --- doc/guides/prog_guide/graph_lib.rst | 59 +++-- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 1cfdc86433..72e26f3a5a 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -189,14 +189,65 @@ In the above example, A graph object will be created with ethdev Rx node of port 0 and queue 0, all ipv4* nodes in the system, and ethdev tx node of all ports. -Multicore graph processing -~~ -In the current graph library implementation, specifically, -``rte_graph_walk()`` and ``rte_node_enqueue*`` fast path API functions +graph model chossing + +Currently, there are 2 different walking model. Use +``rte_graph_worker_model_set()`` to set the walking model. + +RTC (Run-To-Completion) +^^^ +This is the default graph walking model. specifically, +``rte_graph_walk_rtc()`` and ``rte_node_enqueue*`` fast path API functions are designed to work on single-core to have better performance. The fast path API works on graph object, So the multi-core graph processing strategy would be to create graph object PER WORKER. +Example: + +Graph: node-0 -> node-1 -> node-2 @Core0. + +.. code-block:: diff + ++ - - - - - - - - - - - - - - - - - - - - - + +' Core #0 ' +' ' +' ++ +-+ ++ ' +' | Node-0 | --> | Node-1 | --> | Node-2 | ' +' ++ +-+ ++ ' +' ' ++ - - - - - - - - - - - - - - - - - - - - - + + +Dispatch model +^^ +The dispatch model enables a cross-core dispatching mechanism which employs +a scheduling work-queue to dispatch streams to other worker cores which +being associated with the destination node. + +Use ``rte_graph_model_dispatch_lcore_affinity_set()`` to set lcore affinity +with the node. +Each worker core will have a graph repetition. Use ``rte_graph_clone()`` to +clone graph for each worker and use``rte_graph_model_dispatch_core_bind()`` +to bind graph with the worker core. + +Example: + +Graph topo: node-0 -> Core1; node-1 -> node-2; node-2 -> node-3. +Config graph: node-0 @Core0; node-1/3 @Core1; node-2 @Core2. + +.. code-block:: diff + ++ - - - - - -+ +- - - - - - - - - - - - - + + - - - - - -+ +' Core #0 ' ' Core #1 ' ' Core #2 ' +'' ' ' '' +' ++ ' ' ++++ ' ' ++ ' +' | Node-0 | - - - ->| Node-1 || Node-3 |<- - - - | Node-2 | ' +' ++ ' ' ++++ ' ' ++ ' +'' ' |' ' ^ ' ++ - - - - - -+ +- - -|- - - - - - - - - - + + - - -|- - -+ + | | + + - - - - - - - - - - - - - - - - + + + In fast path Typical fast-path code looks like below, where the application -- 2.37.2
Reg: Link Bonding of VFs and PF admin down
Hello Team, I have two X710 NICs in the hypervisor and created the VFs on those NICs. PF is managed by the Linux kernel, while the VF is managed by DPDK. I am using the "test-pmd" application to test the bonding functionality, especially ACTIVE-BACKUP mode. I have created the bond interface and added the slaves in such a way that the one VFs from each of the PF is added to the bond interface. The goal is to achieve uninterrupted traffic flow even when one of the PF is down. As part of my testing, I made one of the PF admin down using the command "ip link set down". Even after waiting for a few minutes, the link status is not propagated to the VF, and the link bonding still takes the PF which is down as the primary slave and tries to send the packet out of that interface. While debugging I found out that the link status of VF is still up. Is this the expected behaviour? As per the link: https://www.intel.in/content/www/in/en/support/articles/36776/ethernet-products.html it is the expected behaviour. It may work well if the use case is VF-to-VF communication. But if the use case is to communicate to the other system - (Switch/Routers), then this behaviour will break the link bonding functionality, as the peer's interface would be operationally down, once the PF is made admin down. My use case: PF is managed by Linux kernel is connected to the external Router, VF is added to the VM, and the DPDK application is supposed to send/read the packet from the VF. DPDK version used: DPDK-22.11.1 OS: centos-7 Let me know your thoughts. -- Regards, Bharath
