sock: add net to prot->enter_memory_pressure callback

xemul · davem330 · commit 5c52ba170f81 · 2008-07-16T20:28:10.000-07:00
The tcp_enter_memory_pressure calls NET_INC_STATS, but doesn't
have where to get the net from.

I decided to add a sk argument, not the net itself, only to factor
all the required sock_net(sk) calls inside the enter_memory_pressure 
callback itself.

Signed-off-by: Pavel Emelyanov &lt;xemul@openvz.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/sock.h b/include/net/sock.h
@@ -565,7 +565,7 @@ struct proto {
 #endif
 
 	/* Memory pressure */
-	void			(*enter_memory_pressure)(void);
+	void			(*enter_memory_pressure)(struct sock *sk);
 	atomic_t		*memory_allocated;	/* Current allocated memory. */
 	atomic_t		*sockets_allocated;	/* Current number of sockets. */
 	/*
@@ -1210,7 +1210,7 @@ static inline struct page *sk_stream_alloc_page(struct sock *sk)
 
 	page = alloc_pages(sk->sk_allocation, 0);
 	if (!page) {
-		sk->sk_prot->enter_memory_pressure();
+		sk->sk_prot->enter_memory_pressure(sk);
 		sk_stream_moderate_sndbuf(sk);
 	}
 	return page;
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -975,7 +975,7 @@ static inline void tcp_openreq_init(struct request_sock *req,
 	ireq->rmt_port = tcp_hdr(skb)->source;
 }
 
-extern void tcp_enter_memory_pressure(void);
+extern void tcp_enter_memory_pressure(struct sock *sk);
 
 static inline int keepalive_intvl_when(const struct tcp_sock *tp)
 {
diff --git a/net/core/sock.c b/net/core/sock.c
@@ -1442,7 +1442,7 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind)
 	/* Under pressure. */
 	if (allocated > prot->sysctl_mem[1])
 		if (prot->enter_memory_pressure)
-			prot->enter_memory_pressure();
+			prot->enter_memory_pressure(sk);
 
 	/* Over hard limit. */
 	if (allocated > prot->sysctl_mem[2])
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
@@ -451,7 +451,7 @@ static void dn_destruct(struct sock *sk)
 
 static int dn_memory_pressure;
 
-static void dn_enter_memory_pressure(void)
+static void dn_enter_memory_pressure(struct sock *sk)
 {
 	if (!dn_memory_pressure) {
 		dn_memory_pressure = 1;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
@@ -316,7 +316,7 @@ int tcp_memory_pressure __read_mostly;
 
 EXPORT_SYMBOL(tcp_memory_pressure);
 
-void tcp_enter_memory_pressure(void)
+void tcp_enter_memory_pressure(struct sock *sk)
 {
 	if (!tcp_memory_pressure) {
 		NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES);
@@ -649,7 +649,7 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp)
 		}
 		__kfree_skb(skb);
 	} else {
-		sk->sk_prot->enter_memory_pressure();
+		sk->sk_prot->enter_memory_pressure(sk);
 		sk_stream_moderate_sndbuf(sk);
 	}
 	return NULL;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
@@ -116,7 +116,7 @@ static int sctp_memory_pressure;
 static atomic_t sctp_memory_allocated;
 static atomic_t sctp_sockets_allocated;
 
-static void sctp_enter_memory_pressure(void)
+static void sctp_enter_memory_pressure(struct sock *sk)
 {
 	sctp_memory_pressure = 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ static inline void tcp_openreq_init(struct request_sock *req,`
`975`	`975`	`ireq->rmt_port = tcp_hdr(skb)->source;`
`976`	`976`	`}`
`977`	`977`
`978`		`-extern void tcp_enter_memory_pressure(void);`
	`978`	`+extern void tcp_enter_memory_pressure(struct sock *sk);`
`979`	`979`
`980`	`980`	`static inline int keepalive_intvl_when(const struct tcp_sock *tp)`
`981`	`981`	`{`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ static void dn_destruct(struct sock *sk)`
`451`	`451`
`452`	`452`	`static int dn_memory_pressure;`
`453`	`453`
`454`		`-static void dn_enter_memory_pressure(void)`
	`454`	`+static void dn_enter_memory_pressure(struct sock *sk)`
`455`	`455`	`{`
`456`	`456`	`if (!dn_memory_pressure) {`
`457`	`457`	`dn_memory_pressure = 1;`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ int tcp_memory_pressure __read_mostly;`
`316`	`316`
`317`	`317`	`EXPORT_SYMBOL(tcp_memory_pressure);`
`318`	`318`
`319`		`-void tcp_enter_memory_pressure(void)`
	`319`	`+void tcp_enter_memory_pressure(struct sock *sk)`
`320`	`320`	`{`
`321`	`321`	`if (!tcp_memory_pressure) {`
`322`	`322`	`NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES);`
`@@ -649,7 +649,7 @@ struct sk_buff sk_stream_alloc_skb(struct sock sk, int size, gfp_t gfp)`
`649`	`649`	`}`
`650`	`650`	`__kfree_skb(skb);`
`651`	`651`	`} else {`
`652`		`- sk->sk_prot->enter_memory_pressure();`
	`652`	`+ sk->sk_prot->enter_memory_pressure(sk);`
`653`	`653`	`sk_stream_moderate_sndbuf(sk);`
`654`	`654`	`}`
`655`	`655`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ static int sctp_memory_pressure;`
`116`	`116`	`static atomic_t sctp_memory_allocated;`
`117`	`117`	`static atomic_t sctp_sockets_allocated;`
`118`	`118`
`119`		`-static void sctp_enter_memory_pressure(void)`
	`119`	`+static void sctp_enter_memory_pressure(struct sock *sk)`
`120`	`120`	`{`
`121`	`121`	`sctp_memory_pressure = 1;`
`122`	`122`	`}`