[PATCH v1 1/1] net/iavf: fix order of inclusion in vector code

[PATCH v1 1/1] net/iavf: fix order of inclusion in vector code

[Anatoly Burakov]

IAVF driver does not support 16-byte descriptors (because there is no PF
that can support a VF using 16-byte descriptor), but if IAVF is built with
a flag that enables 16-byte descriptors, this flag is then propagated
through the inclusion chain in certain cases, because IAVF includes common
vector code before IAVF-specific common code (which in turn includes
`iavf_rxtx.h` which disables 16-byte descriptor support).

Fix the inclusion order to include IAVF-specific vector header first, which
will fix the compilation error due to correctly disabling 16-byte Rx
descriptor support.

Bugzilla ID: 1749

Fixes: 11276ec5e042 ("net/iavf: use common Rx rearm")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c   | 2 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
index 73a6ae5c41..9344dcc725 100644
--- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
@@ -2,8 +2,8 @@
  * Copyright(c) 2019 Intel Corporation
  */
 
-#include "../common/rx_vec_x86.h"
 #include "iavf_rxtx_vec_common.h"
+#include "../common/rx_vec_x86.h"
 
 #include <rte_vect.h>
 
diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
index 9a029ecbe0..b29e3ac0f1 100644
--- a/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
@@ -2,8 +2,8 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
-#include "../common/rx_vec_x86.h"
 #include "iavf_rxtx_vec_common.h"
+#include "../common/rx_vec_x86.h"
 
 #include <rte_vect.h>
 
-- 
2.47.1

Re: [PATCH v1 1/1] net/iavf: fix order of inclusion in vector code

[Bruce Richardson]

On Wed, Jul 09, 2025 at 02:06:29PM +0100, Anatoly Burakov wrote:
> IAVF driver does not support 16-byte descriptors (because there is no PF
> that can support a VF using 16-byte descriptor), but if IAVF is built with
> a flag that enables 16-byte descriptors, this flag is then propagated
> through the inclusion chain in certain cases, because IAVF includes common
> vector code before IAVF-specific common code (which in turn includes
> `iavf_rxtx.h` which disables 16-byte descriptor support).
> 
> Fix the inclusion order to include IAVF-specific vector header first, which
> will fix the compilation error due to correctly disabling 16-byte Rx
> descriptor support.
> 
> Bugzilla ID: 1749
> 
> Fixes: 11276ec5e042 ("net/iavf: use common Rx rearm")
> 
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> ---
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Re: [PATCH v1 1/1] net/iavf: fix order of inclusion in vector code

[Thomas Monjalon]

09/07/2025 15:28, Bruce Richardson:
> On Wed, Jul 09, 2025 at 02:06:29PM +0100, Anatoly Burakov wrote:
> > IAVF driver does not support 16-byte descriptors (because there is no PF
> > that can support a VF using 16-byte descriptor), but if IAVF is built with
> > a flag that enables 16-byte descriptors, this flag is then propagated
> > through the inclusion chain in certain cases, because IAVF includes common
> > vector code before IAVF-specific common code (which in turn includes
> > `iavf_rxtx.h` which disables 16-byte descriptor support).
> > 
> > Fix the inclusion order to include IAVF-specific vector header first, which
> > will fix the compilation error due to correctly disabling 16-byte Rx
> > descriptor support.
> > 
> > Bugzilla ID: 1749
> > 
> > Fixes: 11276ec5e042 ("net/iavf: use common Rx rearm")
> > 
> > Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> > ---
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Applied, thanks.