* [PATCH net] sfc: fix ef100 design-param checking
@ 2020-08-12 9:32 Edward Cree
2020-08-12 15:23 ` Guenter Roeck
2020-08-12 20:06 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Edward Cree @ 2020-08-12 9:32 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: netdev, Guenter Roeck
The handling of the RXQ/TXQ size granularity design-params had two
problems: it had a 64-bit divide that didn't build on 32-bit platforms,
and it could divide by zero if the NIC supplied 0 as the value of the
design-param. Fix both by checking for 0 and for a granularity bigger
than our min-size; if the granularity <= EFX_MIN_DMAQ_SIZE then it fits
in 32 bits, so we can cast it to u32 for the divide.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
I've only build-tested this, and then only on 64-bit, since our lab's
cooling system can't cope with the heatwave and we keep having to shut
everything down :(
drivers/net/ethernet/sfc/ef100_nic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index 36598d0542ed..206d70f9d95b 100644
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -979,7 +979,8 @@ static int ef100_process_design_param(struct efx_nic *efx,
* EFX_MIN_DMAQ_SIZE is divisible by GRANULARITY.
* This is very unlikely to fail.
*/
- if (EFX_MIN_DMAQ_SIZE % reader->value) {
+ if (!reader->value || reader->value > EFX_MIN_DMAQ_SIZE ||
+ EFX_MIN_DMAQ_SIZE % (u32)reader->value) {
netif_err(efx, probe, efx->net_dev,
"%s size granularity is %llu, can't guarantee safety\n",
reader->type == ESE_EF100_DP_GZ_RXQ_SIZE_GRANULARITY ? "RXQ" : "TXQ",
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] sfc: fix ef100 design-param checking
2020-08-12 9:32 [PATCH net] sfc: fix ef100 design-param checking Edward Cree
@ 2020-08-12 15:23 ` Guenter Roeck
2020-08-12 20:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2020-08-12 15:23 UTC (permalink / raw)
To: Edward Cree; +Cc: linux-net-drivers, davem, netdev
On Wed, Aug 12, 2020 at 10:32:49AM +0100, Edward Cree wrote:
> The handling of the RXQ/TXQ size granularity design-params had two
> problems: it had a 64-bit divide that didn't build on 32-bit platforms,
> and it could divide by zero if the NIC supplied 0 as the value of the
> design-param. Fix both by checking for 0 and for a granularity bigger
> than our min-size; if the granularity <= EFX_MIN_DMAQ_SIZE then it fits
> in 32 bits, so we can cast it to u32 for the divide.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Edward Cree <ecree@solarflare.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> I've only build-tested this, and then only on 64-bit, since our lab's
> cooling system can't cope with the heatwave and we keep having to shut
> everything down :(
>
> drivers/net/ethernet/sfc/ef100_nic.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
> index 36598d0542ed..206d70f9d95b 100644
> --- a/drivers/net/ethernet/sfc/ef100_nic.c
> +++ b/drivers/net/ethernet/sfc/ef100_nic.c
> @@ -979,7 +979,8 @@ static int ef100_process_design_param(struct efx_nic *efx,
> * EFX_MIN_DMAQ_SIZE is divisible by GRANULARITY.
> * This is very unlikely to fail.
> */
> - if (EFX_MIN_DMAQ_SIZE % reader->value) {
> + if (!reader->value || reader->value > EFX_MIN_DMAQ_SIZE ||
> + EFX_MIN_DMAQ_SIZE % (u32)reader->value) {
> netif_err(efx, probe, efx->net_dev,
> "%s size granularity is %llu, can't guarantee safety\n",
> reader->type == ESE_EF100_DP_GZ_RXQ_SIZE_GRANULARITY ? "RXQ" : "TXQ",
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] sfc: fix ef100 design-param checking
2020-08-12 9:32 [PATCH net] sfc: fix ef100 design-param checking Edward Cree
2020-08-12 15:23 ` Guenter Roeck
@ 2020-08-12 20:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-08-12 20:06 UTC (permalink / raw)
To: ecree; +Cc: linux-net-drivers, netdev, linux
From: Edward Cree <ecree@solarflare.com>
Date: Wed, 12 Aug 2020 10:32:49 +0100
> The handling of the RXQ/TXQ size granularity design-params had two
> problems: it had a 64-bit divide that didn't build on 32-bit platforms,
> and it could divide by zero if the NIC supplied 0 as the value of the
> design-param. Fix both by checking for 0 and for a granularity bigger
> than our min-size; if the granularity <= EFX_MIN_DMAQ_SIZE then it fits
> in 32 bits, so we can cast it to u32 for the divide.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Edward Cree <ecree@solarflare.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-12 20:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-12 9:32 [PATCH net] sfc: fix ef100 design-param checking Edward Cree
2020-08-12 15:23 ` Guenter Roeck
2020-08-12 20:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).