ipvs: fix type warning in do_div() on 32 bit
authorJakub Kicinski <kuba@kernel.org>
Tue, 13 Dec 2022 03:20:37 +0000 (19:20 -0800)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 13 Dec 2022 09:44:02 +0000 (10:44 +0100)
32 bit platforms without 64bit div generate the following warning:

net/netfilter/ipvs/ip_vs_est.c: In function 'ip_vs_est_calc_limits':
include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast
  222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
      |                                   ^~
net/netfilter/ipvs/ip_vs_est.c:694:17: note: in expansion of macro 'do_div'
  694 |                 do_div(val, loops);
      |                 ^~~~~~
include/asm-generic/div64.h:222:35: warning: comparison of distinct pointer types lacks a cast
  222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
      |                                   ^~
net/netfilter/ipvs/ip_vs_est.c:700:33: note: in expansion of macro 'do_div'
  700 |                                 do_div(val, min_est);
      |                                 ^~~~~~

first argument of do_div() should be unsigned. We can't just cast
as do_div() updates it as well, so we need an lval.
Make val unsigned in the first place, all paths check that the value
they assign to this variables are non-negative already.

Fixes: 705dd3444081 ("ipvs: use kthreads for stats estimation")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20221213032037.844517-1-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/netfilter/ipvs/ip_vs_est.c

index df56073bb2828cdd1cca60857de292e0533dad9b..ce2a1549b30439edc56f37b7865659e17a1365b7 100644 (file)
@@ -640,9 +640,10 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs, int *chain_max)
        int i, loops, ntest;
        s32 min_est = 0;
        ktime_t t1, t2;
-       s64 diff, val;
        int max = 8;
        int ret = 1;
+       s64 diff;
+       u64 val;
 
        INIT_HLIST_HEAD(&chain);
        mutex_lock(&__ip_vs_mutex);