net/bnxt: fix build issue
diff mbox series

Message ID 20200709081504.12336-1-david.marchand@redhat.com
State Changes Requested, archived
Delegated to: Ajit Khaparde
Headers show
Series
  • net/bnxt: fix build issue
Related show

Checks

Context Check Description
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/checkpatch success coding style OK

Commit Message

David Marchand July 9, 2020, 8:15 a.m. UTC
In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
Testing against a n value does not work and we end up with a link issue:

/usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
.../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
 to `tf_em_ext_alloc'
/usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
.../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
 to `tf_em_ext_free'
collect2: error: ld returned 1 exit status
gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
 Error 1
gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2

Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/bnxt/tf_core/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Ferruh Yigit July 9, 2020, 12:10 p.m. UTC | #1
On 7/9/2020 9:15 AM, David Marchand wrote:
> In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
> Testing against a n value does not work and we end up with a link issue:
> 
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
>  to `tf_em_ext_alloc'
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
>  to `tf_em_ext_free'
> collect2: error: ld returned 1 exit status
> gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
>  Error 1
> gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
> 
> Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  drivers/net/bnxt/tf_core/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile
> index b4fbdd00fc..806471427c 100644
> --- a/drivers/net/bnxt/tf_core/Makefile
> +++ b/drivers/net/bnxt/tf_core/Makefile
> @@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
> -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
>  else
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
>  endif
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
> 

Functionally this is same so no objection to the change,
but I wonder why 'RTE_LIBRTE_BNXT_PMD_SYSTEM' is unset.

"CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM=n" is added to 'config/common_base' in the
same patch that updates the Makefile, so it should be set.


Btw, @Ajit, @Peter, how this new flagged managed via meson?
Ajit Khaparde July 9, 2020, 2:33 p.m. UTC | #2
On Thu, Jul 9, 2020 at 5:11 AM Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> On 7/9/2020 9:15 AM, David Marchand wrote:
> > In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
> > Testing against a n value does not work and we end up with a link issue:
> >
> > /usr/bin/ld: tf_core/tf_em_common.o: in function
> `tf_em_ext_common_alloc':
> > .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined
> reference
> >  to `tf_em_ext_alloc'
> > /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
> > .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined
> reference
> >  to `tf_em_ext_free'
> > collect2: error: ld returned 1 exit status
> > gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
> >  Error 1
> > gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
> >
> > Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> >  drivers/net/bnxt/tf_core/Makefile | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/bnxt/tf_core/Makefile
> b/drivers/net/bnxt/tf_core/Makefile
> > index b4fbdd00fc..806471427c 100644
> > --- a/drivers/net/bnxt/tf_core/Makefile
> > +++ b/drivers/net/bnxt/tf_core/Makefile
> > @@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) +=
> tf_core/tf_msg.c
> >  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
> >  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
> >  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
> > -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
> > -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> > +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
> > +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
> >  else
> > -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
> > +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> >  endif
> >  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
> >  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
> >
>
> Functionally this is same so no objection to the change,
> but I wonder why 'RTE_LIBRTE_BNXT_PMD_SYSTEM' is unset.
>
> "CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM=n" is added to 'config/common_base' in
> the
> same patch that updates the Makefile, so it should be set.
>
>
> Btw, @Ajit, @Peter, how this new flagged managed via meson?
>
I will sync with Peter and others in the team and we will get back on this.
Ajit Khaparde July 9, 2020, 2:34 p.m. UTC | #3
On Thu, Jul 9, 2020 at 1:15 AM David Marchand <david.marchand@redhat.com>
wrote:

> In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
> Testing against a n value does not work and we end up with a link issue:
>
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
>  to `tf_em_ext_alloc'
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
>  to `tf_em_ext_free'
> collect2: error: ld returned 1 exit status
> gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
>  Error 1
> gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
>
> Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>


> ---
>  drivers/net/bnxt/tf_core/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/bnxt/tf_core/Makefile
> b/drivers/net/bnxt/tf_core/Makefile
> index b4fbdd00fc..806471427c 100644
> --- a/drivers/net/bnxt/tf_core/Makefile
> +++ b/drivers/net/bnxt/tf_core/Makefile
> @@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
> -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
>  else
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
>  endif
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
> --
> 2.23.0
>
>
Ajit Khaparde July 10, 2020, 1:55 p.m. UTC | #4
On Thu, Jul 9, 2020 at 7:34 AM Ajit Khaparde <ajit.khaparde@broadcom.com>
wrote:

>
>
> On Thu, Jul 9, 2020 at 1:15 AM David Marchand <david.marchand@redhat.com>
> wrote:
>
>> In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
>> Testing against a n value does not work and we end up with a link issue:
>>
>> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
>> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
>>  to `tf_em_ext_alloc'
>> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
>> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
>>  to `tf_em_ext_free'
>> collect2: error: ld returned 1 exit status
>> gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
>>  Error 1
>> gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
>>
>> Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
>>
>> Signed-off-by: David Marchand <david.marchand@redhat.com>
>>
> Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
>
Patch applied to dpdk-next-net-brcm. Thanks


>
>
>> ---
>>  drivers/net/bnxt/tf_core/Makefile | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/bnxt/tf_core/Makefile
>> b/drivers/net/bnxt/tf_core/Makefile
>> index b4fbdd00fc..806471427c 100644
>> --- a/drivers/net/bnxt/tf_core/Makefile
>> +++ b/drivers/net/bnxt/tf_core/Makefile
>> @@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
>>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
>>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
>>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
>> -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
>> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
>> +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
>> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
>>  else
>> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
>> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
>>  endif
>>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
>>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
>> --
>> 2.23.0
>>
>>
Ajit Khaparde July 29, 2020, 12:48 a.m. UTC | #5
On Thu, Jul 9, 2020 at 1:15 AM David Marchand <david.marchand@redhat.com>
wrote:

> In existing build env, RTE_LIBRTE_BNXT_PMD_SYSTEM is unset.
> Testing against a n value does not work and we end up with a link issue:
>
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_alloc':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1040: undefined reference
>  to `tf_em_ext_alloc'
> /usr/bin/ld: tf_core/tf_em_common.o: in function `tf_em_ext_common_free':
> .../dpdk/drivers/net/bnxt/tf_core/tf_em_common.c:1047: undefined reference
>  to `tf_em_ext_free'
> collect2: error: ld returned 1 exit status
> gmake[4]: *** [.../dpdk/mk/rte.lib.mk:95: librte_pmd_bnxt.so.20.0.3]
>  Error 1
> gmake[3]: *** [.../dpdk/mk/rte.subdir.mk:35: bnxt] Error 2
>
> Fixes: b2da02480cb7 ("net/bnxt: support EEM system memory")
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
>

David,
I have submitted a patch [1]. With that memory management for
Extended Exact Match is simplified. We won't need any config or meson option
with that change.

[1] https://patchwork.dpdk.org/patch/74964/


> ---
>  drivers/net/bnxt/tf_core/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/bnxt/tf_core/Makefile
> b/drivers/net/bnxt/tf_core/Makefile
> index b4fbdd00fc..806471427c 100644
> --- a/drivers/net/bnxt/tf_core/Makefile
> +++ b/drivers/net/bnxt/tf_core/Makefile
> @@ -16,10 +16,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
> -ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
> +ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
>  else
> -SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
> +SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
>  endif
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
>  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
> --
> 2.23.0
>
>
David Marchand July 29, 2020, 6:56 a.m. UTC | #6
Hello Ajit,

On Wed, Jul 29, 2020 at 2:48 AM Ajit Khaparde
<ajit.khaparde@broadcom.com> wrote:
> I have submitted a patch [1]. With that memory management for
> Extended Exact Match is simplified. We won't need any config or meson option
> with that change.
>

Thanks for removing a build option :-).
You can drop my patch then.

Patch
diff mbox series

diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile
index b4fbdd00fc..806471427c 100644
--- a/drivers/net/bnxt/tf_core/Makefile
+++ b/drivers/net/bnxt/tf_core/Makefile
@@ -16,10 +16,10 @@  SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
-ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM), n)
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
+ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM),y)
+SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_system.c
 else
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD_SYSTEM) += tf_core/tf_em_system.c
+SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
 endif
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c