2020-04-28 04:51:42

by Gavin Shan

Subject: [PATCH v2] net/ena: Fix build warning in ena_xdp_set()

This fixes the following build warning in ena_xdp_set(), which is
observed on aarch64 with 64KB page size.

In file included from ./include/net/inet_sock.h:19,
from ./include/net/ip.h:27,
from drivers/net/ethernet/amazon/ena/ena_netdev.c:46:
drivers/net/ethernet/amazon/ena/ena_netdev.c: In function \
‘ena_xdp_set’: \
drivers/net/ethernet/amazon/ena/ena_netdev.c:557:6: warning: \
format ‘%lu’ \
expects argument of type ‘long unsigned int’, but argument 4 \
has type ‘int’ \
[-Wformat=] "Failed to set xdp program, the current MTU (%d) is \
larger than the maximum allowed MTU (%lu) while xdp is on",

Signed-off-by: Gavin Shan <[email protected]>
---
v2: Make ENA_PAGE_SIZE to be "unsigned long" and verify on aarch64
with 4KB or 64KB page size configuration
---
drivers/net/ethernet/amazon/ena/ena_netdev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 97dfd0c67e84..9e1860d81908 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -69,7 +69,7 @@
* 16kB.
*/
#if PAGE_SIZE > SZ_16K
-#define ENA_PAGE_SIZE SZ_16K
+#define ENA_PAGE_SIZE (_AC(SZ_16K, UL))
#else
#define ENA_PAGE_SIZE PAGE_SIZE
#endif
--
2.23.0

2020-04-28 14:58:41

by Shay Agroskin

Subject: Re: [PATCH v2] net/ena: Fix build warning in ena_xdp_set()

Gavin Shan <[email protected]> writes:

> This fixes the following build warning in ena_xdp_set(), which is
> observed on aarch64 with 64KB page size.
>
> In file included from ./include/net/inet_sock.h:19,
> from ./include/net/ip.h:27,
> from drivers/net/ethernet/amazon/ena/ena_netdev.c:46:
> drivers/net/ethernet/amazon/ena/ena_netdev.c: In function \
> ‘ena_xdp_set’: \
> drivers/net/ethernet/amazon/ena/ena_netdev.c:557:6: warning: \
> format ‘%lu’ \
> expects argument of type ‘long unsigned int’, but argument 4 \
> has type ‘int’ \
> [-Wformat=] "Failed to set xdp program, the current MTU (%d) is \
> larger than the maximum allowed MTU (%lu) while xdp is on",
>
> Signed-off-by: Gavin Shan <[email protected]>
> ---
> v2: Make ENA_PAGE_SIZE to be "unsigned long" and verify on aarch64
> with 4KB or 64KB page size configuration
> ---
> drivers/net/ethernet/amazon/ena/ena_netdev.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
> index 97dfd0c67e84..9e1860d81908 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
> @@ -69,7 +69,7 @@
> * 16kB.
> */
> #if PAGE_SIZE > SZ_16K
> -#define ENA_PAGE_SIZE SZ_16K
> +#define ENA_PAGE_SIZE (_AC(SZ_16K, UL))
> #else
> #define ENA_PAGE_SIZE PAGE_SIZE
> #endif

thanks for this fix

Acked-by: Shay Agroskin <[email protected]>

2020-04-28 21:00:22

by David Miller

Subject: Re: [PATCH v2] net/ena: Fix build warning in ena_xdp_set()

From: Gavin Shan <[email protected]>
Date: Tue, 28 Apr 2020 14:49:45 +1000

> This fixes the following build warning in ena_xdp_set(), which is
> observed on aarch64 with 64KB page size.
>
> In file included from ./include/net/inet_sock.h:19,
> from ./include/net/ip.h:27,
> from drivers/net/ethernet/amazon/ena/ena_netdev.c:46:
> drivers/net/ethernet/amazon/ena/ena_netdev.c: In function \
> ?ena_xdp_set?: \
> drivers/net/ethernet/amazon/ena/ena_netdev.c:557:6: warning: \
> format ?%lu? \
> expects argument of type ?long unsigned int?, but argument 4 \
> has type ?int? \
> [-Wformat=] "Failed to set xdp program, the current MTU (%d) is \
> larger than the maximum allowed MTU (%lu) while xdp is on",
>
> Signed-off-by: Gavin Shan <[email protected]>
> ---
> v2: Make ENA_PAGE_SIZE to be "unsigned long" and verify on aarch64
> with 4KB or 64KB page size configuration

Applied, thank you.