The patch titled
per-cpufy-net-proto structures: proto.memory_allocated
has been removed from the -mm tree. Its filename is
per-cpufy-net-proto-structures-protomemory_allocated.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: per-cpufy-net-proto structures: proto.memory_allocated
From: Ravikiran G Thirumalai <kiran@xxxxxxxxxxxx>
Change struct proto->memory_allocated to a batching per-CPU counter
(percpu_counter) from an atomic_t. A batching counter is better than a
plain per-CPU counter as this field is read often.
Changes: Use percpu_counter_sum() at critical places
Signed-off-by: Pravin B. Shelar <pravins@xxxxxxxxxxxxxx>
Signed-off-by: Ravikiran Thirumalai <kiran@xxxxxxxxxxxx>
Signed-off-by: Shai Fultheim <shai@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/net/sock.h | 4 +++-
include/net/tcp.h | 2 +-
net/core/sock.c | 5 +++--
net/core/stream.c | 19 +++++++++++--------
net/decnet/af_decnet.c | 4 +++-
net/ipv4/proc.c | 4 ++--
net/ipv4/tcp.c | 6 ++++--
net/ipv4/tcp_input.c | 4 ++--
net/ipv4/tcp_timer.c | 2 +-
9 files changed, 30 insertions(+), 20 deletions(-)
diff -puN include/net/sock.h~per-cpufy-net-proto-structures-protomemory_allocated include/net/sock.h
--- devel/include/net/sock.h~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/include/net/sock.h 2006-05-17 13:09:47.000000000 -0700
@@ -47,6 +47,7 @@
#include <linux/netdevice.h>
#include <linux/skbuff.h> /* struct sk_buff */
#include <linux/security.h>
+#include <linux/percpu_counter.h>
#include <linux/filter.h>
@@ -549,8 +550,9 @@ struct proto {
/* Memory pressure */
void (*enter_memory_pressure)(void);
- atomic_t *memory_allocated; /* Current allocated memory. */
+ struct percpu_counter *memory_allocated; /* Current allocated memory. */
atomic_t *sockets_allocated; /* Current number of sockets. */
+
/*
* Pressure flag: try to collapse.
* Technical note: it is used by multiple contexts non atomically.
diff -puN include/net/tcp.h~per-cpufy-net-proto-structures-protomemory_allocated include/net/tcp.h
--- devel/include/net/tcp.h~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/include/net/tcp.h 2006-05-17 13:09:47.000000000 -0700
@@ -225,7 +225,7 @@ extern int sysctl_tcp_mtu_probing;
extern int sysctl_tcp_base_mss;
extern int sysctl_tcp_workaround_signed_windows;
-extern atomic_t tcp_memory_allocated;
+extern struct percpu_counter tcp_memory_allocated;
extern atomic_t tcp_sockets_allocated;
extern int tcp_memory_pressure;
diff -puN net/core/sock.c~per-cpufy-net-proto-structures-protomemory_allocated net/core/sock.c
--- devel/net/core/sock.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/core/sock.c 2006-05-17 13:09:47.000000000 -0700
@@ -1752,12 +1752,13 @@ static char proto_method_implemented(con
static void proto_seq_printf(struct seq_file *seq, struct proto *proto)
{
- seq_printf(seq, "%-9s %4u %6d %6d %-3s %6u %-3s %-10s "
+ seq_printf(seq, "%-9s %4u %6d %6lu %-3s %6u %-3s %-10s "
"%2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c\n",
proto->name,
proto->obj_size,
proto->sockets_allocated != NULL ? atomic_read(proto->sockets_allocated) : -1,
- proto->memory_allocated != NULL ? atomic_read(proto->memory_allocated) : -1,
+ proto->memory_allocated != NULL ?
+ percpu_counter_read_positive(proto->memory_allocated) : -1,
proto->memory_pressure != NULL ? *proto->memory_pressure ? "yes" : "no" : "NI",
proto->max_header,
proto->slab == NULL ? "no" : "yes",
diff -puN net/core/stream.c~per-cpufy-net-proto-structures-protomemory_allocated net/core/stream.c
--- devel/net/core/stream.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/core/stream.c 2006-05-17 13:09:47.000000000 -0700
@@ -197,11 +197,11 @@ EXPORT_SYMBOL(sk_stream_error);
void __sk_stream_mem_reclaim(struct sock *sk)
{
if (sk->sk_forward_alloc >= SK_STREAM_MEM_QUANTUM) {
- atomic_sub(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM,
- sk->sk_prot->memory_allocated);
+ percpu_counter_mod_bh(sk->sk_prot->memory_allocated,
+ -(sk->sk_forward_alloc / SK_STREAM_MEM_QUANTUM));
sk->sk_forward_alloc &= SK_STREAM_MEM_QUANTUM - 1;
if (*sk->sk_prot->memory_pressure &&
- (atomic_read(sk->sk_prot->memory_allocated) <
+ (percpu_counter_read(sk->sk_prot->memory_allocated) <
sk->sk_prot->sysctl_mem[0]))
*sk->sk_prot->memory_pressure = 0;
}
@@ -214,23 +214,26 @@ int sk_stream_mem_schedule(struct sock *
int amt = sk_stream_pages(size);
sk->sk_forward_alloc += amt * SK_STREAM_MEM_QUANTUM;
- atomic_add(amt, sk->sk_prot->memory_allocated);
+ percpu_counter_mod_bh(sk->sk_prot->memory_allocated, amt);
/* Under limit. */
- if (atomic_read(sk->sk_prot->memory_allocated) < sk->sk_prot->sysctl_mem[0]) {
+ if (percpu_counter_read(sk->sk_prot->memory_allocated) <
+ sk->sk_prot->sysctl_mem[0]) {
if (*sk->sk_prot->memory_pressure)
*sk->sk_prot->memory_pressure = 0;
return 1;
}
/* Over hard limit. */
- if (atomic_read(sk->sk_prot->memory_allocated) > sk->sk_prot->sysctl_mem[2]) {
+ if (percpu_counter_exceeds(sk->sk_prot->memory_allocated,
+ sk->sk_prot->sysctl_mem[2])) {
sk->sk_prot->enter_memory_pressure();
goto suppress_allocation;
}
/* Under pressure. */
- if (atomic_read(sk->sk_prot->memory_allocated) > sk->sk_prot->sysctl_mem[1])
+ if (percpu_counter_read(sk->sk_prot->memory_allocated) >
+ sk->sk_prot->sysctl_mem[1])
sk->sk_prot->enter_memory_pressure();
if (kind) {
@@ -260,7 +263,7 @@ suppress_allocation:
/* Alas. Undo changes. */
sk->sk_forward_alloc -= amt * SK_STREAM_MEM_QUANTUM;
- atomic_sub(amt, sk->sk_prot->memory_allocated);
+ percpu_counter_mod_bh(sk->sk_prot->memory_allocated, -amt);
return 0;
}
diff -puN net/decnet/af_decnet.c~per-cpufy-net-proto-structures-protomemory_allocated net/decnet/af_decnet.c
--- devel/net/decnet/af_decnet.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/decnet/af_decnet.c 2006-05-17 13:09:47.000000000 -0700
@@ -154,7 +154,7 @@ static const struct proto_ops dn_proto_o
static DEFINE_RWLOCK(dn_hash_lock);
static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE];
static struct hlist_head dn_wild_sk;
-static atomic_t decnet_memory_allocated;
+static struct percpu_counter decnet_memory_allocated;
static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen, int flags);
static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags);
@@ -2384,6 +2384,7 @@ static int __init decnet_init(void)
if (rc != 0)
goto out;
+ percpu_counter_init(&decnet_memory_allocated);
dn_neigh_init();
dn_dev_init();
dn_route_init();
@@ -2424,6 +2425,7 @@ static void __exit decnet_exit(void)
proc_net_remove("decnet");
proto_unregister(&dn_proto);
+ percpu_counter_destroy(&decnet_memory_allocated);
}
module_exit(decnet_exit);
#endif
diff -puN net/ipv4/proc.c~per-cpufy-net-proto-structures-protomemory_allocated net/ipv4/proc.c
--- devel/net/ipv4/proc.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/ipv4/proc.c 2006-05-17 13:09:47.000000000 -0700
@@ -61,10 +61,10 @@ static int fold_prot_inuse(struct proto
static int sockstat_seq_show(struct seq_file *seq, void *v)
{
socket_seq_show(seq);
- seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n",
+ seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %lu\n",
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));
+ percpu_counter_read_positive(&tcp_memory_allocated));
seq_printf(seq, "UDP: inuse %d\n", fold_prot_inuse(&udp_prot));
seq_printf(seq, "RAW: inuse %d\n", fold_prot_inuse(&raw_prot));
seq_printf(seq, "FRAG: inuse %d memory %d\n", ip_frag_nqueues,
diff -puN net/ipv4/tcp.c~per-cpufy-net-proto-structures-protomemory_allocated net/ipv4/tcp.c
--- devel/net/ipv4/tcp.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/ipv4/tcp.c 2006-05-17 13:09:47.000000000 -0700
@@ -284,7 +284,7 @@ EXPORT_SYMBOL(sysctl_tcp_mem);
EXPORT_SYMBOL(sysctl_tcp_rmem);
EXPORT_SYMBOL(sysctl_tcp_wmem);
-atomic_t tcp_memory_allocated; /* Current allocated memory. */
+struct percpu_counter tcp_memory_allocated; /* Current allocated memory. */
atomic_t tcp_sockets_allocated; /* Current number of TCP sockets. */
EXPORT_SYMBOL(tcp_memory_allocated);
@@ -1600,7 +1600,7 @@ adjudge_to_death:
sk_stream_mem_reclaim(sk);
if (atomic_read(sk->sk_prot->orphan_count) > sysctl_tcp_max_orphans ||
(sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
- atomic_read(&tcp_memory_allocated) > sysctl_tcp_mem[2])) {
+ percpu_counter_exceeds(&tcp_memory_allocated, sysctl_tcp_mem[2]))) {
if (net_ratelimit())
printk(KERN_INFO "TCP: too many of orphaned "
"sockets\n");
@@ -2177,6 +2177,8 @@ void __init tcp_init(void)
"(established %d bind %d)\n",
tcp_hashinfo.ehash_size << 1, tcp_hashinfo.bhash_size);
+ percpu_counter_init(&tcp_memory_allocated);
+
tcp_register_congestion_control(&tcp_reno);
}
diff -puN net/ipv4/tcp_input.c~per-cpufy-net-proto-structures-protomemory_allocated net/ipv4/tcp_input.c
--- devel/net/ipv4/tcp_input.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/ipv4/tcp_input.c 2006-05-17 13:09:47.000000000 -0700
@@ -333,7 +333,7 @@ static void tcp_clamp_window(struct sock
if (sk->sk_rcvbuf < sysctl_tcp_rmem[2] &&
!(sk->sk_userlocks & SOCK_RCVBUF_LOCK) &&
!tcp_memory_pressure &&
- atomic_read(&tcp_memory_allocated) < sysctl_tcp_mem[0]) {
+ percpu_counter_read(&tcp_memory_allocated) < sysctl_tcp_mem[0]) {
sk->sk_rcvbuf = min(atomic_read(&sk->sk_rmem_alloc),
sysctl_tcp_rmem[2]);
}
@@ -3557,7 +3557,7 @@ static int tcp_should_expand_sndbuf(stru
return 0;
/* If we are under soft global TCP memory pressure, do not expand. */
- if (atomic_read(&tcp_memory_allocated) >= sysctl_tcp_mem[0])
+ if (percpu_counter_read(&tcp_memory_allocated) >= sysctl_tcp_mem[0])
return 0;
/* If we filled the congestion window, do not expand. */
diff -puN net/ipv4/tcp_timer.c~per-cpufy-net-proto-structures-protomemory_allocated net/ipv4/tcp_timer.c
--- devel/net/ipv4/tcp_timer.c~per-cpufy-net-proto-structures-protomemory_allocated 2006-05-17 13:09:47.000000000 -0700
+++ devel-akpm/net/ipv4/tcp_timer.c 2006-05-17 13:09:47.000000000 -0700
@@ -80,7 +80,7 @@ static int tcp_out_of_resources(struct s
if (orphans >= sysctl_tcp_max_orphans ||
(sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
- atomic_read(&tcp_memory_allocated) > sysctl_tcp_mem[2])) {
+ percpu_counter_exceeds(&tcp_memory_allocated, sysctl_tcp_mem[2]))) {
if (net_ratelimit())
printk(KERN_INFO "Out of socket memory\n");
_
Patches currently in -mm which might be from kiran@xxxxxxxxxxxx are
avoid-tasklist_lock-at-getrusage-for-multithreaded-case-too.patch
percpu-counters-add-percpu_counter_exceeds.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
