[v2,2/2] eal: fix build issue
Checks
Commit Message
Some toolchain has fls() definition in string.h as argument type int,
which is conflicting uint32_t argument type.
/export/dpdk.org/lib/librte_eal/common/rte_reciprocal.c:47:19:
error: conflicting types for ‘fls’
static inline int fls(uint32_t x)
^~~
/opt/marvell-tools-201/aarch64-marvell-elf/include/strings.h:59:6:
note: previous declaration of ‘fls’ was here
int fls(int) __pure2;
FreeBSD string.h also has fls() with argument as int type.
https://www.freebsd.org/cgi/man.cgi?query=fls&sektion=3
Fixing the conflict by using rte version of fls.
Fixes: ffe3ec811ef5 ("sched: introduce reciprocal divide")
Fixes: faf2b25c9f80 ("fm10k: support VMDQ in multi-queue configuration")
Cc: stable@dpdk.org
Suggested-by: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
v2:
- Introduce and use rte version of fls(Thomas Monjalon)
---
drivers/net/fm10k/fm10k_ethdev.c | 11 +++--------
lib/librte_eal/common/rte_reciprocal.c | 17 +----------------
2 files changed, 4 insertions(+), 24 deletions(-)
Comments
07/11/2018 07:59, Jerin Jacob:
> drivers/net/fm10k/fm10k_ethdev.c | 11 +++--------
> lib/librte_eal/common/rte_reciprocal.c | 17 +----------------
> 2 files changed, 4 insertions(+), 24 deletions(-)
This patch is corrupted, please check.
-----Original Message-----
> Date: Mon, 12 Nov 2018 02:37:15 +0100
> From: Thomas Monjalon <thomas@monjalon.net>
> To: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> Cc: stable@dpdk.org, "dev@dpdk.org" <dev@dpdk.org>, Qi Zhang
> <qi.z.zhang@intel.com>, Xiao Wang <xiao.w.wang@intel.com>,
> "sthemmin@microsoft.com" <sthemmin@microsoft.com>, "shaopeng.he@intel.com"
> <shaopeng.he@intel.com>, "Jacob, Jerin"
> <Jerin.JacobKollanukkaran@cavium.com>
> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v2 2/2] eal: fix build issue
>
>
> 07/11/2018 07:59, Jerin Jacob:
> > drivers/net/fm10k/fm10k_ethdev.c | 11 +++--------
> > lib/librte_eal/common/rte_reciprocal.c | 17 +----------------
> > 2 files changed, 4 insertions(+), 24 deletions(-)
>
> This patch is corrupted, please check.
Looks like it is working, can you check from patchwork.
➜ [j] $ pwclient get 47915
Saved patch to v2-1-2-eal-introduce-rte-version-of-fls
➜ [j] $ pwclient get 47916
Saved patch to v2-2-2-eal-fix-build-issue
➜ [master][dpdk.org] $ git am -3 /tmp/j/v2-*
Applying: eal: introduce rte version of fls
Applying: eal: fix build issue
➜ [master]laptop [dpdk.org] $ echo $?
0
>
>
On 11/12/2018 4:50 AM, Jerin Jacob wrote:
> -----Original Message-----
>> Date: Mon, 12 Nov 2018 02:37:15 +0100
>> From: Thomas Monjalon <thomas@monjalon.net>
>> To: Jerin Jacob <jerin.jacob@caviumnetworks.com>
>> Cc: stable@dpdk.org, "dev@dpdk.org" <dev@dpdk.org>, Qi Zhang
>> <qi.z.zhang@intel.com>, Xiao Wang <xiao.w.wang@intel.com>,
>> "sthemmin@microsoft.com" <sthemmin@microsoft.com>, "shaopeng.he@intel.com"
>> <shaopeng.he@intel.com>, "Jacob, Jerin"
>> <Jerin.JacobKollanukkaran@cavium.com>
>> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v2 2/2] eal: fix build issue
>>
>>
>> 07/11/2018 07:59, Jerin Jacob:
>>> drivers/net/fm10k/fm10k_ethdev.c | 11 +++--------
>>> lib/librte_eal/common/rte_reciprocal.c | 17 +----------------
>>> 2 files changed, 4 insertions(+), 24 deletions(-)
>>
>> This patch is corrupted, please check.
>
> Looks like it is working, can you check from patchwork.
>
> ➜ [j] $ pwclient get 47915
> Saved patch to v2-1-2-eal-introduce-rte-version-of-fls
> ➜ [j] $ pwclient get 47916
> Saved patch to v2-2-2-eal-fix-build-issue
>
> ➜ [master][dpdk.org] $ git am -3 /tmp/j/v2-*
> Applying: eal: introduce rte version of fls
> Applying: eal: fix build issue
>
> ➜ [master]laptop [dpdk.org] $ echo $?
> 0
Also works for me:
$ git-pw series apply 2306
12/11/2018 10:01, Ferruh Yigit:
> On 11/12/2018 4:50 AM, Jerin Jacob wrote:
> > -----Original Message-----
> >> Date: Mon, 12 Nov 2018 02:37:15 +0100
> >> From: Thomas Monjalon <thomas@monjalon.net>
> >> To: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> >> Cc: stable@dpdk.org, "dev@dpdk.org" <dev@dpdk.org>, Qi Zhang
> >> <qi.z.zhang@intel.com>, Xiao Wang <xiao.w.wang@intel.com>,
> >> "sthemmin@microsoft.com" <sthemmin@microsoft.com>, "shaopeng.he@intel.com"
> >> <shaopeng.he@intel.com>, "Jacob, Jerin"
> >> <Jerin.JacobKollanukkaran@cavium.com>
> >> Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v2 2/2] eal: fix build issue
> >>
> >>
> >> 07/11/2018 07:59, Jerin Jacob:
> >>> drivers/net/fm10k/fm10k_ethdev.c | 11 +++--------
> >>> lib/librte_eal/common/rte_reciprocal.c | 17 +----------------
> >>> 2 files changed, 4 insertions(+), 24 deletions(-)
> >>
> >> This patch is corrupted, please check.
> >
> > Looks like it is working, can you check from patchwork.
> >
> > ➜ [j] $ pwclient get 47915
> > Saved patch to v2-1-2-eal-introduce-rte-version-of-fls
> > ➜ [j] $ pwclient get 47916
> > Saved patch to v2-2-2-eal-fix-build-issue
> >
> > ➜ [master][dpdk.org] $ git am -3 /tmp/j/v2-*
> > Applying: eal: introduce rte version of fls
> > Applying: eal: fix build issue
> >
> > ➜ [master]laptop [dpdk.org] $ echo $?
> > 0
>
> Also works for me:
> $ git-pw series apply 2306
Works for me too :)
The issue I was raising is about the format of the email.
Patch 1 content encoding is quoted-printable and patch 2 is base64.
I think we should all set sendemail.transferEncoding = 8bit
07/11/2018 07:59, Jerin Jacob:
> Some toolchain has fls() definition in string.h as argument type int,
> which is conflicting uint32_t argument type.
>
> /export/dpdk.org/lib/librte_eal/common/rte_reciprocal.c:47:19:
> error: conflicting types for ‘fls’
> static inline int fls(uint32_t x)
> ^~~
>
> /opt/marvell-tools-201/aarch64-marvell-elf/include/strings.h:59:6:
> note: previous declaration of ‘fls’ was here
> int fls(int) __pure2;
>
> FreeBSD string.h also has fls() with argument as int type.
> https://www.freebsd.org/cgi/man.cgi?query=fls&sektion=3
>
> Fixing the conflict by using rte version of fls.
>
> Fixes: ffe3ec811ef5 ("sched: introduce reciprocal divide")
> Fixes: faf2b25c9f80 ("fm10k: support VMDQ in multi-queue configuration")
> Cc: stable@dpdk.org
>
> Suggested-by: Thomas Monjalon <thomas@monjalon.net>
> Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Series applied, thanks
@@ -464,11 +464,6 @@ fm10k_dev_configure(struct rte_eth_dev *dev)
return 0;
}
-/* fls = find last set bit = 32 minus the number of leading zeros */
-#ifndef fls
-#define fls(x) (((x) == 0) ? 0 : (32 - __builtin_clz((x))))
-#endif
-
static void
fm10k_dev_vmdq_rx_configure(struct rte_eth_dev *dev)
{
@@ -1030,8 +1025,8 @@ fm10k_dev_dglort_map_configure(struct rte_eth_dev *dev)
macvlan = FM10K_DEV_PRIVATE_TO_MACVLAN(dev->data->dev_private);
nb_queue_pools = macvlan->nb_queue_pools;
- pool_len = nb_queue_pools ? fls(nb_queue_pools - 1) : 0;
- rss_len = fls(dev->data->nb_rx_queues - 1) - pool_len;
+ pool_len = nb_queue_pools ? rte_fls_u32(nb_queue_pools - 1) : 0;
+ rss_len = rte_fls_u32(dev->data->nb_rx_queues - 1) - pool_len;
/* GLORT 0x0-0x3F are used by PF and VMDQ, 0x40-0x7F used by FD */
dglortdec = (rss_len << FM10K_DGLORTDEC_RSSLENGTH_SHIFT) | pool_len;
@@ -1042,7 +1037,7 @@ fm10k_dev_dglort_map_configure(struct rte_eth_dev *dev)
FM10K_WRITE_REG(hw, FM10K_DGLORTDEC(0), dglortdec);
/* Flow Director configurations, only queue number is valid. */
- dglortdec = fls(dev->data->nb_rx_queues - 1);
+ dglortdec = rte_fls_u32(dev->data->nb_rx_queues - 1);
dglortmask = (GLORT_FD_MASK << FM10K_DGLORTMAP_MASK_SHIFT) |
(hw->mac.dglort_map + GLORT_FD_Q_BASE);
FM10K_WRITE_REG(hw, FM10K_DGLORTMAP(1), dglortmask);
@@ -41,28 +41,13 @@
#include "rte_reciprocal.h"
-/* find largest set bit.
- * portable and slow but does not matter for this usage.
- */
-static inline int fls(uint32_t x)
-{
- int b;
-
- for (b = 31; b >= 0; --b) {
- if (x & (1u << b))
- return b + 1;
- }
-
- return 0;
-}
-
struct rte_reciprocal rte_reciprocal_value(uint32_t d)
{
struct rte_reciprocal R;
uint64_t m;
int l;
- l = fls(d - 1);
+ l = rte_fls_u32(d - 1);
m = ((1ULL << 32) * ((1ULL << l) - d));
m /= d;