[PATCH 0/2] fix void function returning a value

[PATCH 0/2] fix void function returning a value

[Andre Muezerie]

This patch avoids warnings like the one below emitted by MSVC:

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Andre Muezerie (2):
  drivers_common: fix void function returning a value
  drivers_net: fix void function returning a value

 drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
 drivers/net/i40e/i40e_rxtx_vec_avx2.c         |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c       |  2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx2.c         |  2 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c           |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

--
2.47.0.vfs.0.3

[PATCH 1/2] drivers_common: fix void function returning a value

[Andre Muezerie]

This patch avoids warnings like the one below emitted by MSVC:

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index b8450b03ae..9ea71c3718 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
 
 	rxdp += rxq->rxrearm_start;
 
-	if (unlikely(cache == NULL))
-		return idpf_singleq_rearm_common(rxq);
+	if (unlikely(cache == NULL)) {
+		idpf_singleq_rearm_common(rxq);
+		return;
+	}
 
 	/* We need to pull 'n' more MBUFs into the software ring from mempool
 	 * We inline the mempool function here, so we can vectorize the copy
@@ -607,8 +609,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)
 
 	rxdp += rx_bufq->rxrearm_start;
 
-	if (unlikely(!cache))
-		return idpf_splitq_rearm_common(rx_bufq);
+	if (unlikely(!cache)) {
+		idpf_splitq_rearm_common(rx_bufq);
+		return;
+	}
 
 	/* We need to pull 'n' more MBUFs into the software ring from mempool
 	 * We inline the mempool function here, so we can vectorize the copy
-- 
2.47.0.vfs.0.3

[PATCH 2/2] drivers_net: fix void function returning a value

[Andre Muezerie]

This patch avoids warnings like the one below emitted by MSVC:

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 drivers/net/i40e/i40e_rxtx_vec_avx2.c   | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx2.c   | 2 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index 19cf0ac718..3e95a6a1df 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -22,7 +22,7 @@
 static __rte_always_inline void
 i40e_rxq_rearm(struct i40e_rx_queue *rxq)
 {
-	return i40e_rxq_rearm_common(rxq, false);
+	i40e_rxq_rearm_common(rxq, false);
 }
 
 #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index 3b2750221b..ae7bcb582b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -24,7 +24,7 @@
 static __rte_always_inline void
 i40e_rxq_rearm(struct i40e_rx_queue *rxq)
 {
-	return i40e_rxq_rearm_common(rxq, true);
+	i40e_rxq_rearm_common(rxq, true);
 }
 
 #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index 49d41af953..cdb48438da 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -13,7 +13,7 @@
 static __rte_always_inline void
 iavf_rxq_rearm(struct iavf_rx_queue *rxq)
 {
-	return iavf_rxq_rearm_common(rxq, false);
+	iavf_rxq_rearm_common(rxq, false);
 }
 
 #define PKTLEN_SHIFT     10
diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c
index d6e88dbb29..02bfb9b15d 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
@@ -14,7 +14,7 @@
 static __rte_always_inline void
 ice_rxq_rearm(struct ice_rx_queue *rxq)
 {
-	return ice_rxq_rearm_common(rxq, false);
+	ice_rxq_rearm_common(rxq, false);
 }
 
 static __rte_always_inline __m256i
-- 
2.47.0.vfs.0.3

[PATCH v2 0/2] fix void function returning a value

[Andre Muezerie]

v2:
 * Updated commit messages to follow standard format.

This patch avoids warnings like the one below emitted by MSVC, and is
needed to get the code to compile cleanly with MSVC.

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Andre Muezerie (2):
  drivers/common: fix void function returning a value
  drivers/net: fix void function returning a value

 drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
 drivers/net/i40e/i40e_rxtx_vec_avx2.c         |  2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c       |  2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx2.c         |  2 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c           |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

--
2.47.2.vfs.0.1

[PATCH v2 1/2] drivers/common: fix void function returning a value

[Andre Muezerie]

This patch avoids warnings like the one below emitted by MSVC:

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index b8450b03ae..9ea71c3718 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
 
 	rxdp += rxq->rxrearm_start;
 
-	if (unlikely(cache == NULL))
-		return idpf_singleq_rearm_common(rxq);
+	if (unlikely(cache == NULL)) {
+		idpf_singleq_rearm_common(rxq);
+		return;
+	}
 
 	/* We need to pull 'n' more MBUFs into the software ring from mempool
 	 * We inline the mempool function here, so we can vectorize the copy
@@ -607,8 +609,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)
 
 	rxdp += rx_bufq->rxrearm_start;
 
-	if (unlikely(!cache))
-		return idpf_splitq_rearm_common(rx_bufq);
+	if (unlikely(!cache)) {
+		idpf_splitq_rearm_common(rx_bufq);
+		return;
+	}
 
 	/* We need to pull 'n' more MBUFs into the software ring from mempool
 	 * We inline the mempool function here, so we can vectorize the copy
-- 
2.47.2.vfs.0.1

[PATCH v2 2/2] drivers/net: fix void function returning a value

[Andre Muezerie]

This patch avoids warnings like the one below emitted by MSVC:

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 drivers/net/i40e/i40e_rxtx_vec_avx2.c   | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_avx2.c   | 2 +-
 drivers/net/ice/ice_rxtx_vec_avx2.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index 19cf0ac718..3e95a6a1df 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -22,7 +22,7 @@
 static __rte_always_inline void
 i40e_rxq_rearm(struct i40e_rx_queue *rxq)
 {
-	return i40e_rxq_rearm_common(rxq, false);
+	i40e_rxq_rearm_common(rxq, false);
 }
 
 #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
index 3b2750221b..ae7bcb582b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c
@@ -24,7 +24,7 @@
 static __rte_always_inline void
 i40e_rxq_rearm(struct i40e_rx_queue *rxq)
 {
-	return i40e_rxq_rearm_common(rxq, true);
+	i40e_rxq_rearm_common(rxq, true);
 }
 
 #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
index 49d41af953..cdb48438da 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c
@@ -13,7 +13,7 @@
 static __rte_always_inline void
 iavf_rxq_rearm(struct iavf_rx_queue *rxq)
 {
-	return iavf_rxq_rearm_common(rxq, false);
+	iavf_rxq_rearm_common(rxq, false);
 }
 
 #define PKTLEN_SHIFT     10
diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c
index d6e88dbb29..02bfb9b15d 100644
--- a/drivers/net/ice/ice_rxtx_vec_avx2.c
+++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
@@ -14,7 +14,7 @@
 static __rte_always_inline void
 ice_rxq_rearm(struct ice_rx_queue *rxq)
 {
-	return ice_rxq_rearm_common(rxq, false);
+	ice_rxq_rearm_common(rxq, false);
 }
 
 static __rte_always_inline __m256i
-- 
2.47.2.vfs.0.1

Re: [PATCH v2 1/2] drivers/common: fix void function returning a value

[Bruce Richardson]

On Wed, Jan 22, 2025 at 07:20:43AM -0800, Andre Muezerie wrote:
> This patch avoids warnings like the one below emitted by MSVC:
> 
> ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
>     warning C4098: 'idpf_singleq_rearm':
>     'void' function returning a value
> 
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> ---
>  drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [PATCH v2 2/2] drivers/net: fix void function returning a value

[Bruce Richardson]

On Wed, Jan 22, 2025 at 07:20:44AM -0800, Andre Muezerie wrote:
> This patch avoids warnings like the one below emitted by MSVC:
> 
> ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
>     warning C4098: 'idpf_singleq_rearm':
>     'void' function returning a value
> 
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> ---
>  drivers/net/i40e/i40e_rxtx_vec_avx2.c   | 2 +-
>  drivers/net/i40e/i40e_rxtx_vec_avx512.c | 2 +-
>  drivers/net/iavf/iavf_rxtx_vec_avx2.c   | 2 +-
>  drivers/net/ice/ice_rxtx_vec_avx2.c     | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [PATCH v2 0/2] fix void function returning a value

[David Marchand]

Hello Bruce,

On Wed, Jan 22, 2025 at 4:21 PM Andre Muezerie
<andremue@linux.microsoft.com> wrote:
>
> v2:
>  * Updated commit messages to follow standard format.
>
> This patch avoids warnings like the one below emitted by MSVC, and is
> needed to get the code to compile cleanly with MSVC.
>
> ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
>     warning C4098: 'idpf_singleq_rearm':
>     'void' function returning a value
>
> Andre Muezerie (2):
>   drivers/common: fix void function returning a value
>   drivers/net: fix void function returning a value
>
>  drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
>  drivers/net/i40e/i40e_rxtx_vec_avx2.c         |  2 +-
>  drivers/net/i40e/i40e_rxtx_vec_avx512.c       |  2 +-
>  drivers/net/iavf/iavf_rxtx_vec_avx2.c         |  2 +-
>  drivers/net/ice/ice_rxtx_vec_avx2.c           |  2 +-
>  5 files changed, 12 insertions(+), 8 deletions(-)

I see the series is delegated to the main repo (Thomas).

This touches only Intel drivers and the code deduplication effort you
started may conflict (though trivially) with such changes depending on
when it lands.

Would you mind merging this fixes from Andre through the
next-net-intel tree, right now?
If so, please mark it as delegated to you in patchwork.


Thanks!

-- 
David Marchand

Re: [PATCH v2 0/2] fix void function returning a value

[Bruce Richardson]

On Thu, Jan 23, 2025 at 01:23:15PM +0100, David Marchand wrote:
> Hello Bruce,
> 
> On Wed, Jan 22, 2025 at 4:21 PM Andre Muezerie
> <andremue@linux.microsoft.com> wrote:
> >
> > v2:
> >  * Updated commit messages to follow standard format.
> >
> > This patch avoids warnings like the one below emitted by MSVC, and is
> > needed to get the code to compile cleanly with MSVC.
> >
> > ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
> >     warning C4098: 'idpf_singleq_rearm':
> >     'void' function returning a value
> >
> > Andre Muezerie (2):
> >   drivers/common: fix void function returning a value
> >   drivers/net: fix void function returning a value
> >
> >  drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
> >  drivers/net/i40e/i40e_rxtx_vec_avx2.c         |  2 +-
> >  drivers/net/i40e/i40e_rxtx_vec_avx512.c       |  2 +-
> >  drivers/net/iavf/iavf_rxtx_vec_avx2.c         |  2 +-
> >  drivers/net/ice/ice_rxtx_vec_avx2.c           |  2 +-
> >  5 files changed, 12 insertions(+), 8 deletions(-)
> 
> I see the series is delegated to the main repo (Thomas).
> 
> This touches only Intel drivers and the code deduplication effort you
> started may conflict (though trivially) with such changes depending on
> when it lands.
> 
> Would you mind merging this fixes from Andre through the
> next-net-intel tree, right now?
> If so, please mark it as delegated to you in patchwork.
> 
> 
> Thanks!
> 
Hi David,

the code deduplication effort patchsets are similarly delegated to the main
repo. I was assuming this was deliberate, but perhaps it isn't? I'm ok to
take these patches in next-net-intel, but just would like to confirm that
neither you, Thomas or Stephen (as net maintainer) want to review the dedup
work ahead of that initial merge?

/Bruce

Re: [PATCH v2 0/2] fix void function returning a value

[David Marchand]

On Thu, Jan 23, 2025 at 1:46 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> On Thu, Jan 23, 2025 at 01:23:15PM +0100, David Marchand wrote:
> > Hello Bruce,
> >
> > On Wed, Jan 22, 2025 at 4:21 PM Andre Muezerie
> > <andremue@linux.microsoft.com> wrote:
> > >
> > > v2:
> > >  * Updated commit messages to follow standard format.
> > >
> > > This patch avoids warnings like the one below emitted by MSVC, and is
> > > needed to get the code to compile cleanly with MSVC.
> > >
> > > ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
> > >     warning C4098: 'idpf_singleq_rearm':
> > >     'void' function returning a value
> > >
> > > Andre Muezerie (2):
> > >   drivers/common: fix void function returning a value
> > >   drivers/net: fix void function returning a value
> > >
> > >  drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
> > >  drivers/net/i40e/i40e_rxtx_vec_avx2.c         |  2 +-
> > >  drivers/net/i40e/i40e_rxtx_vec_avx512.c       |  2 +-
> > >  drivers/net/iavf/iavf_rxtx_vec_avx2.c         |  2 +-
> > >  drivers/net/ice/ice_rxtx_vec_avx2.c           |  2 +-
> > >  5 files changed, 12 insertions(+), 8 deletions(-)
> >
> > I see the series is delegated to the main repo (Thomas).
> >
> > This touches only Intel drivers and the code deduplication effort you
> > started may conflict (though trivially) with such changes depending on
> > when it lands.
> >
> > Would you mind merging this fixes from Andre through the
> > next-net-intel tree, right now?
> > If so, please mark it as delegated to you in patchwork.
> >
> >
> > Thanks!
> >
> Hi David,
>
> the code deduplication effort patchsets are similarly delegated to the main
> repo. I was assuming this was deliberate, but perhaps it isn't? I'm ok to

I suspect it was delegated to main because of the change on
devtools/check-git-log.sh.
But it is really only about net driver changes, so it should go either
through your or Stephen tree.
(we have enough patches waiting in main ;-))


> take these patches in next-net-intel, but just would like to confirm that
> neither you, Thomas or Stephen (as net maintainer) want to review the dedup
> work ahead of that initial merge?

I don't have an objection on this series (on the contrary, I am quite
happy to see such effort).
I'll have a deeper look at it, this afternoon.


-- 
David Marchand

Re: [PATCH v2 0/2] fix void function returning a value

[Bruce Richardson]

On Thu, Jan 23, 2025 at 02:03:29PM +0100, David Marchand wrote:
> On Thu, Jan 23, 2025 at 1:46 PM Bruce Richardson
> <bruce.richardson@intel.com> wrote:
> >
> > On Thu, Jan 23, 2025 at 01:23:15PM +0100, David Marchand wrote:
> > > Hello Bruce,
> > >
> > > On Wed, Jan 22, 2025 at 4:21 PM Andre Muezerie
> > > <andremue@linux.microsoft.com> wrote:
> > > >
> > > > v2:
> > > >  * Updated commit messages to follow standard format.
> > > >
> > > > This patch avoids warnings like the one below emitted by MSVC, and is
> > > > needed to get the code to compile cleanly with MSVC.
> > > >
> > > > ../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
> > > >     warning C4098: 'idpf_singleq_rearm':
> > > >     'void' function returning a value
> > > >
> > > > Andre Muezerie (2):
> > > >   drivers/common: fix void function returning a value
> > > >   drivers/net: fix void function returning a value
> > > >
> > > >  drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
> > > >  drivers/net/i40e/i40e_rxtx_vec_avx2.c         |  2 +-
> > > >  drivers/net/i40e/i40e_rxtx_vec_avx512.c       |  2 +-
> > > >  drivers/net/iavf/iavf_rxtx_vec_avx2.c         |  2 +-
> > > >  drivers/net/ice/ice_rxtx_vec_avx2.c           |  2 +-
> > > >  5 files changed, 12 insertions(+), 8 deletions(-)
> > >
> > > I see the series is delegated to the main repo (Thomas).
> > >
> > > This touches only Intel drivers and the code deduplication effort you
> > > started may conflict (though trivially) with such changes depending on
> > > when it lands.
> > >
> > > Would you mind merging this fixes from Andre through the
> > > next-net-intel tree, right now?
> > > If so, please mark it as delegated to you in patchwork.
> > >
> > >
> > > Thanks!
> > >
> > Hi David,
> >
> > the code deduplication effort patchsets are similarly delegated to the main
> > repo. I was assuming this was deliberate, but perhaps it isn't? I'm ok to
> 
> I suspect it was delegated to main because of the change on
> devtools/check-git-log.sh.
> But it is really only about net driver changes, so it should go either
> through your or Stephen tree.
> (we have enough patches waiting in main ;-))
> 

I'm ok to take it in my tree, unless Stephen would rather in his tree.

> 
> > take these patches in next-net-intel, but just would like to confirm that
> > neither you, Thomas or Stephen (as net maintainer) want to review the dedup
> > work ahead of that initial merge?
> 
> I don't have an objection on this series (on the contrary, I am quite
> happy to see such effort).
> I'll have a deeper look at it, this afternoon.
> 

Thanks.

I'm having it[1] reviewed internally, but I'd appreciate even a cursory
review, especially at the new directory layout and build implications, from
the higher-level directory maintainers.

/Bruce

[1] https://patches.dpdk.org/project/dpdk/list/?series=34398