Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=69a73829dbb10e7c8554e66a80cb4fde57347fff
Commit:     69a73829dbb10e7c8554e66a80cb4fde57347fff
Parent:     81566e8322c3f6c6f9a2277fe0e440fee8d917bd
Author:     Eric Dumazet <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 22 06:18:34 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:10:41 2008 -0800

    [DST]: shrinks sizeof(struct rtable) by 64 bytes on x86_64
    
    On x86_64, sizeof(struct rtable) is 0x148, which is rounded up to
    0x180 bytes by SLAB allocator.
    
    We can reduce this to exactly 0x140 bytes, without alignment overhead,
    and store 12 struct rtable per PAGE instead of 10.
    
    rate_tokens is currently defined as an "unsigned long", while its
    content should not exceed 6*HZ. It can safely be converted to an
    unsigned int.
    
    Moving tclassid right after rate_tokens to fill the 4 bytes hole
    permits to save 8 bytes on 'struct dst_entry', which finally permits
    to save 8 bytes on 'struct rtable'
    
    Signed-off-by: Eric Dumazet <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 include/net/dst.h |   10 +++++-----
 net/ipv4/icmp.c   |   13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/include/net/dst.h b/include/net/dst.h
index c45dcc3..e3ac7d0 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -56,7 +56,11 @@ struct dst_entry
        struct dst_entry        *path;
 
        unsigned long           rate_last;      /* rate limiting for ICMP */
-       unsigned long           rate_tokens;
+       unsigned int            rate_tokens;
+
+#ifdef CONFIG_NET_CLS_ROUTE
+       __u32                   tclassid;
+#endif
 
        struct neighbour        *neighbour;
        struct hh_cache         *hh;
@@ -65,10 +69,6 @@ struct dst_entry
        int                     (*input)(struct sk_buff*);
        int                     (*output)(struct sk_buff*);
 
-#ifdef CONFIG_NET_CLS_ROUTE
-       __u32                   tclassid;
-#endif
-
        struct  dst_ops         *ops;
                
        unsigned long           lastuse;
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index e57f167..37cdea0 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -275,18 +275,19 @@ static inline void icmp_xmit_unlock(void)
 #define XRLIM_BURST_FACTOR 6
 int xrlim_allow(struct dst_entry *dst, int timeout)
 {
-       unsigned long now;
+       unsigned long now, token = dst->rate_tokens;
        int rc = 0;
 
        now = jiffies;
-       dst->rate_tokens += now - dst->rate_last;
+       token += now - dst->rate_last;
        dst->rate_last = now;
-       if (dst->rate_tokens > XRLIM_BURST_FACTOR * timeout)
-               dst->rate_tokens = XRLIM_BURST_FACTOR * timeout;
-       if (dst->rate_tokens >= timeout) {
-               dst->rate_tokens -= timeout;
+       if (token > XRLIM_BURST_FACTOR * timeout)
+               token = XRLIM_BURST_FACTOR * timeout;
+       if (token >= timeout) {
+               token -= timeout;
                rc = 1;
        }
+       dst->rate_tokens = token;
        return rc;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to