Avoid integer divides where not necessary in include/net/sock.h
Subsystems (3)
Because sk_wmem_queued, sk_sndbuf are signed, a divide per two forces compiler to use an integer divide. We can instead use a right shift.
SK_STREAM_MEM_QUANTUM deserves to be declared as an unsigned quantity, so that sk_stream_pages() and __sk_stream_mem_reclaim() can use right shifts instead of integer divides.
include/net/sock.h +4 -4
@@ -445,7 +445,7 @@ static inline int sk_acceptq_is_full(struct sock *sk)*/ static inline int sk_stream_min_wspace (struct sock *sk) { -return sk->sk_wmem_queued /2 ; +return sk->sk_wmem_queued >>1 ; }static inline int sk_stream_wspace (struct sock *sk)
@@ -715,7 +715,7 @@ static inline struct inode *SOCK_INODE(struct socket *socket)extern void __sk_stream_mem_reclaim (struct sock *sk);extern int sk_stream_mem_schedule (struct sock *sk,int size,int kind); -#define SK_STREAM_MEM_QUANTUM ((int)PAGE_SIZE) +#define SK_STREAM_MEM_QUANTUM ((unsigned int)PAGE_SIZE)static inline int sk_stream_pages (int amt) {
@@ -1187,7 +1187,7 @@ static inline void sk_wake_async(struct sock *sk, int how, int band)static inline void sk_stream_moderate_sndbuf (struct sock *sk) {if (!(sk->sk_userlocks &SOCK_SNDBUF_LOCK )) { - sk->sk_sndbuf =min (sk->sk_sndbuf, sk->sk_wmem_queued /2 ); + sk->sk_sndbuf =min (sk->sk_sndbuf, sk->sk_wmem_queued >>1 ); sk->sk_sndbuf =max (sk->sk_sndbuf,SOCK_MIN_SNDBUF ); } }
@@ -1211,7 +1211,7 @@ static inline struct page *sk_stream_alloc_page(struct sock *sk)*/ static inline int sock_writeable (const struct sock *sk) { -return atomic_read (&sk->sk_wmem_alloc) < (sk->sk_sndbuf /2 ); +return atomic_read (&sk->sk_wmem_alloc) < (sk->sk_sndbuf >>1 ); }static inline gfp_t gfp_any (void )
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Fri, 21 Dec 2007 07:18:40 +0100
Quoted 9 lines
Because
sk_wmem_queued,sk_sndbufare signed, a divide per two forces compiler to use an integer divide. We can instead use a right shift.
SK_STREAM_MEM_QUANTUMdeserves to be declared as an unsigned quantity, so thatsk_stream_pages()and__sk_stream_mem_reclaim()can use right shifts instead of integer divides.Signed-off-by Eric Dumazet <[email protected]>
Everything that works with SK_STREAM_MEM_QUANTUM is an int.
We do a DIV_ROUND_UP() using SK_STREAM_MEM_QUANTUM and an int.
We do sk->sk_forward_alloc modifications using multiplies on SK_STREAM_MEM_QUANTUM and an int, sk_forward_alloc is an int too.
Changing the type of SK_STREAM_MEM_QUANTUM does nothing more than create an exception in the typing used in these operations for no real gain, in fact it makes this code's correctness harder to verify.
I'm fine with the rest of your change, so please resubmit this patch with the type change removed.
Thanks.
Quoted 21 lines · On Fri, 21 Dec 2007 01:55:43 -0800 (PST) David Miller <[email protected]>…
From: Eric Dumazet <[email protected]>
Date: Fri, 21 Dec 2007 07:18:40 +0100Quoted 9 lines
Because
sk_wmem_queued,sk_sndbufare signed, a divide per two forces compiler to use an integer divide. We can instead use a right shift.
SK_STREAM_MEM_QUANTUMdeserves to be declared as an unsigned quantity, so thatsk_stream_pages()and__sk_stream_mem_reclaim()can use right shifts instead of integer divides.Signed-off-by Eric Dumazet <[email protected]>Everything that works with
SK_STREAM_MEM_QUANTUMis an int.We do a
DIV_ROUND_UP()usingSK_STREAM_MEM_QUANTUMand an int.We do
sk->sk_forward_allocmodifications using multiplies onSK_STREAM_MEM_QUANTUMand an int,sk_forward_allocis an int too.
Quoted 6 lines
Changing the type of
SK_STREAM_MEM_QUANTUMdoes nothing more than create an exception in the typing used in these operations for no real gain, in fact it makes this code's correctness harder to verify.I'm fine with the rest of your change, so please resubmit this patch with the type change removed.
I cannot remove underlying divide without telling compiler *something* is unsigned, or adding a new _SHIFT macro
We currently do
int_value / int_constant
I was suggesting
int_value / uint_constant
Since you prefer to keep sk_forward_alloc as signed, the only clean (without casts) way is to do :
int_value >> SK_STREAM_MEM_QUANTUM_SHIFT
Please tell me if you are OK with this solution, or if you prefer I change sk_forward_alloc to be unsigned :)
Thank you
Here is the patch handling the change on sk_wmem_queued, sk_sndbuf. Keeping small patches may help future bisection anyway...
[SOCK] Avoid integer divides where not necessary in include/net/sock.h
Because sk_wmem_queued, sk_sndbuf are signed, a divide per two may force compiler to use an integer divide.
We can instead use a right shift.
include/net/sock.h +3 -3
@@ -445,7 +445,7 @@ static inline int sk_acceptq_is_full(struct sock *sk)*/ static inline int sk_stream_min_wspace (struct sock *sk) { -return sk->sk_wmem_queued /2 ; +return sk->sk_wmem_queued >>1 ; }static inline int sk_stream_wspace (struct sock *sk)
@@ -1187,7 +1187,7 @@ static inline void sk_wake_async(struct sock *sk, int how, int band)static inline void sk_stream_moderate_sndbuf (struct sock *sk) {if (!(sk->sk_userlocks &SOCK_SNDBUF_LOCK )) { - sk->sk_sndbuf =min (sk->sk_sndbuf, sk->sk_wmem_queued /2 ); + sk->sk_sndbuf =min (sk->sk_sndbuf, sk->sk_wmem_queued >>1 ); sk->sk_sndbuf =max (sk->sk_sndbuf,SOCK_MIN_SNDBUF ); } }
@@ -1211,7 +1211,7 @@ static inline struct page *sk_stream_alloc_page(struct sock *sk)*/ static inline int sock_writeable (const struct sock *sk) { -return atomic_read (&sk->sk_wmem_alloc) < (sk->sk_sndbuf /2 ); +return atomic_read (&sk->sk_wmem_alloc) < (sk->sk_sndbuf >>1 ); }static inline gfp_t gfp_any (void )
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Fri, 21 Dec 2007 11:40:51 +0100
Quoted 5 lines
On Fri, 21 Dec 2007 01:55:43 -0800 (PST)
David Miller <[email protected]> wrote:Please tell me if you are OK with this solution, or if you prefer I change
sk_forward_allocto be unsigned :)
When I was playing with this crap a long time ago I think I remember that sk->sk_forward_alloc can become negative in some circumstances.
Or maybe that was just a bug :-)
Quoted 11 lines
Here is the patch handling the change on
sk_wmem_queued,sk_sndbuf. Keeping small patches may help future bisection anyway...[SOCK] Avoid integer divides where not necessary in
include/net/sock.hBecause
sk_wmem_queued,sk_sndbufare signed, a divide per two may force compiler to use an integer divide.We can instead use a right shift.
Signed-off-by Eric Dumazet <[email protected]>
I'll apply this, thanks Eric.
Quoted 6 lines · David Miller
When I was playing with this crap a long time ago I think I remember that
sk->sk_forward_alloccan become negative in some circumstances.Or maybe that was just a bug :-)
Yeah we had a few bugs there in the early days of TSO but it's been quiet for the last 18 months.
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt