ipvs: use explicitly signed chars
Subsystems (5)
PATCH 1/1 ipvs: use explicitly signed chars
The char type with no explicit sign is sometimes signed and sometimes unsigned. This code will break on platforms such as arm, where char is unsigned. So mark it here as explicitly signed, so that the todrop_counter decrement and subsequent comparison is correct.
--- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -1249,40 +1249,40 @@ static const struct seq_operations ip_vs_conn_sync_seq_ops = { .next = ip_vs_conn_seq_next, .stop = ip_vs_conn_seq_stop, .show = ip_vs_conn_sync_seq_show, };#endif /* Randomly drop connection entries before running out of memory * Can be used for DATA and CTL conns. For TPL conns there are exceptions: * - traffic for services in OPS mode increases ct->in_pkts, so it is supported * - traffic for services not in OPS mode does not increase ct->in_pkts in * all cases, so it is not supported */ static inline int todrop_entry (struct ip_vs_conn *cp) {/* * The drop rate array needs tuning for real environments. * Called from timer bh only => no locking */ -static const char todrop_rate[9 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 }; -static char todrop_counter[9 ] = {0 }; +static const signed char todrop_rate[9 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 }; +static signed char todrop_counter[9 ] = {0 };int i;/* if the conn entry hasn't lasted for 60 seconds, don't drop it. This will leave enough time for normal connection to get through. */ if (time_before (cp->timeout + jiffies, cp->timer.expires +60 *HZ ))return 0 ;/* Don't drop the entry if its number of incoming packets is not located in [0, 8] */ i =atomic_read (&cp->in_pkts);if (i >8 || i <0 )return 0 ;if (!todrop_rate[i])return 0 ;if (--todrop_counter[i] >0 )return 0 ; todrop_counter[i] = todrop_rate[i];return 1 ; }
Signature · 1 line
2.38.1
Hello,
Quoted 10 lines · Jason A. Donenfeld
The
chartype with no explicit sign is sometimes signed and sometimes unsigned. This code will break on platforms such as arm, where char is unsigned. So mark it here as explicitly signed, so that thetodrop_counterdecrement and subsequent comparison is correct.Cc Pablo Neira Ayuso <[email protected]>Cc Julian Anastasov <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Looks good to me for -next, thanks!
Quoted 53 lines
--- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)net/netfilter/ipvs/ip_vs_conn.c +2
-2@@ -1249,40 +1249,40 @@ static const struct seq_operations ip_vs_conn_sync_seq_ops = { .next = ip_vs_conn_seq_next, .stop = ip_vs_conn_seq_stop, .show = ip_vs_conn_sync_seq_show, };#endif /* Randomly drop connection entries before running out of memory * Can be used for DATA and CTL conns. For TPL conns there are exceptions: * - traffic for services in OPS mode increases ct->in_pkts, so it is supported * - traffic for services not in OPS mode does not increase ct->in_pkts in * all cases, so it is not supported */ static inline int todrop_entry (struct ip_vs_conn *cp) {/* * The drop rate array needs tuning for real environments. * Called from timer bh only => no locking */ -static const char todrop_rate[9 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 }; -static char todrop_counter[9 ] = {0 }; +static const signed char todrop_rate[9 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 }; +static signed char todrop_counter[9 ] = {0 };int i;/* if the conn entry hasn't lasted for 60 seconds, don't drop it. This will leave enough time for normal connection to get through. */ if (time_before (cp->timeout + jiffies, cp->timer.expires +60 *HZ ))return 0 ;/* Don't drop the entry if its number of incoming packets is not located in [0, 8] */ i =atomic_read (&cp->in_pkts);if (i >8 || i <0 )return 0 ;if (!todrop_rate[i])return 0 ;if (--todrop_counter[i] >0 )return 0 ; todrop_counter[i] = todrop_rate[i];return 1 ; }Signature · 1 line
2.38.1
Regards
--
Julian Anastasov <[email protected]>
Quoted 10 lines · Julian Anastasov
Hello,
Quoted 5 lines · Jason A. Donenfeld
The
chartype with no explicit sign is sometimes signed and sometimes unsigned. This code will break on platforms such as arm, where char is unsigned. So mark it here as explicitly signed, so that thetodrop_counterdecrement and subsequent comparison is correct.
Quoted 7 lines
Quoted 5 lines
Cc Pablo Neira Ayuso <[email protected]>Cc Julian Anastasov <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>Looks good to me for -next, thanks!
This is actually net.git material, not net-next.git material, considering it fixes a bug on arm and many other archs, and is marked with a stable@ tag.
Quoted 62 lines
Acked-by Julian Anastasov <[email protected]>Quoted 53 lines
--- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)net/netfilter/ipvs/ip_vs_conn.c +2
-2@@ -1249,40 +1249,40 @@ static const struct seq_operations ip_vs_conn_sync_seq_ops = { .next = ip_vs_conn_seq_next, .stop = ip_vs_conn_seq_stop, .show = ip_vs_conn_sync_seq_show, };#endif /* Randomly drop connection entries before running out of memory * Can be used for DATA and CTL conns. For TPL conns there are exceptions: * - traffic for services in OPS mode increases ct->in_pkts, so it is supported * - traffic for services not in OPS mode does not increase ct->in_pkts in * all cases, so it is not supported */ static inline int todrop_entry (struct ip_vs_conn *cp) {/* * The drop rate array needs tuning for real environments. * Called from timer bh only => no locking */ -static const char todrop_rate[9 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 }; -static char todrop_counter[9 ] = {0 }; +static const signed char todrop_rate[9 ] = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 }; +static signed char todrop_counter[9 ] = {0 };int i;/* if the conn entry hasn't lasted for 60 seconds, don't drop it. This will leave enough time for normal connection to get through. */ if (time_before (cp->timeout + jiffies, cp->timer.expires +60 *HZ ))return 0 ;/* Don't drop the entry if its number of incoming packets is not located in [0, 8] */ i =atomic_read (&cp->in_pkts);if (i >8 || i <0 )return 0 ;if (!todrop_rate[i])return 0 ;if (--todrop_counter[i] >0 )return 0 ; todrop_counter[i] = todrop_rate[i];return 1 ; }Signature · 1 line
2.38.1Regards
--
Julian Anastasov <[email protected]>
Julian Anastasov
maintainerHello,
Quoted 17 lines · Jason A. Donenfeld
Quoted 16 lines · Julian Anastasov
Hello,
Quoted 10 lines · Jason A. Donenfeld
The
chartype with no explicit sign is sometimes signed and sometimes unsigned. This code will break on platforms such as arm, where char is unsigned. So mark it here as explicitly signed, so that thetodrop_counterdecrement and subsequent comparison is correct.Cc Pablo Neira Ayuso <[email protected]>Cc Julian Anastasov <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Quoted 5 lines
Quoted 1 line
Looks good to me for -next, thanks!
This is actually net.git material, not net-next.git material, considering it fixes a bug on arm and many other archs, and is marked with a stable@ tag.
OK. As algorithm is not SMP safe, the problem is
not just for the first 256 packets on these platforms.
Regards
--
Julian Anastasov <[email protected]>
Hi Pablo,
Quoted 11 lines · Jason A. Donenfeld
The
chartype with no explicit sign is sometimes signed and sometimes unsigned. This code will break on platforms such as arm, where char is unsigned. So mark it here as explicitly signed, so that thetodrop_counterdecrement and subsequent comparison is correct.Cc Pablo Neira Ayuso <[email protected]>Cc Julian Anastasov <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Wondering if you planned on taking this into nf.git for 6.1?
Thanks,
Jason
Quoted 4 lines · Jason A. Donenfeld
The
chartype with no explicit sign is sometimes signed and sometimes unsigned. This code will break on platforms such as arm, where char is unsigned. So mark it here as explicitly signed, so that thetodrop_counterdecrement and subsequent comparison is correct.
Applied, thanks