Signed-off-by: Satoshi Oshima Signed-off-by: Hideo Aoki include/net/sock.h | 7 +++++++ include/net/udp.h | 2 ++ net/ipv4/proc.c | 3 ++- net/ipv4/udp.c | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff -pruN linux-2.6.24-rc1-mem003-ipv4-dev-p1/include/net/sock.h linux-2.6.24-rc1-mem003-ipv4-dev-p2/include/net/sock.h --- linux-2.6.24-rc1-mem003-ipv4-dev-p1/include/net/sock.h 2007-10-24 11:34:32.000000000 -0400 +++ linux-2.6.24-rc1-mem003-ipv4-dev-p2/include/net/sock.h 2007-10-24 11:47:51.000000000 -0400 @@ -727,6 +727,13 @@ static inline int sk_stream_wmem_schedul sk_stream_mem_schedule(sk, size, 0); } +#define SK_DATAGRAM_MEM_QUANTUM ((int)PAGE_SIZE) + +static inline int sk_datagram_pages(int amt) +{ + return DIV_ROUND_UP(amt, SK_DATAGRAM_MEM_QUANTUM); +} + /* Used by processes to "lock" a socket state, so that * interrupts and bottom half handlers won't change it * from under us. It essentially blocks any incoming diff -pruN linux-2.6.24-rc1-mem003-ipv4-dev-p1/include/net/udp.h linux-2.6.24-rc1-mem003-ipv4-dev-p2/include/net/udp.h --- linux-2.6.24-rc1-mem003-ipv4-dev-p1/include/net/udp.h 2007-10-10 11:49:42.000000000 -0400 +++ linux-2.6.24-rc1-mem003-ipv4-dev-p2/include/net/udp.h 2007-10-24 11:47:51.000000000 -0400 @@ -65,6 +65,8 @@ extern rwlock_t udp_hash_lock; extern struct proto udp_prot; +extern atomic_t udp_memory_allocated; + struct sk_buff; /* diff -pruN linux-2.6.24-rc1-mem003-ipv4-dev-p1/net/ipv4/proc.c linux-2.6.24-rc1-mem003-ipv4-dev-p2/net/ipv4/proc.c --- linux-2.6.24-rc1-mem003-ipv4-dev-p1/net/ipv4/proc.c 2007-10-24 11:34:34.000000000 -0400 +++ linux-2.6.24-rc1-mem003-ipv4-dev-p2/net/ipv4/proc.c 2007-10-24 11:47:51.000000000 -0400 @@ -67,7 +67,8 @@ static int sockstat_seq_show(struct seq_ fold_prot_inuse(&tcp_prot), atomic_read(&tcp_orphan_count), tcp_death_row.tw_count, atomic_read(&tcp_sockets_allocated), atomic_read(&tcp_memory_allocated)); - seq_printf(seq, "UDP: inuse %d\n", fold_prot_inuse(&udp_prot)); + seq_printf(seq, "UDP: inuse %d mem %d\n", fold_prot_inuse(&udp_prot), + atomic_read(&udp_memory_allocated)); seq_printf(seq, "UDPLITE: inuse %d\n", fold_prot_inuse(&udplite_prot)); seq_printf(seq, "RAW: inuse %d\n", fold_prot_inuse(&raw_prot)); seq_printf(seq, "FRAG: inuse %d memory %d\n", diff -pruN linux-2.6.24-rc1-mem003-ipv4-dev-p1/net/ipv4/udp.c linux-2.6.24-rc1-mem003-ipv4-dev-p2/net/ipv4/udp.c --- linux-2.6.24-rc1-mem003-ipv4-dev-p1/net/ipv4/udp.c 2007-10-24 11:34:35.000000000 -0400 +++ linux-2.6.24-rc1-mem003-ipv4-dev-p2/net/ipv4/udp.c 2007-10-24 12:27:37.000000000 -0400 @@ -114,6 +114,8 @@ DEFINE_SNMP_STAT(struct udp_mib, udp_sta struct hlist_head udp_hash[UDP_HTABLE_SIZE]; DEFINE_RWLOCK(udp_hash_lock); +atomic_t udp_memory_allocated; + static inline int __udp_lib_lport_inuse(__u16 num, const struct hlist_head udptable[]) {