lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sock: add net to prot->enter_memory_pressure callback

Browse Source 
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 <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2008-07-16 20:28:10 -07:00
committed by David S. Miller
parent cf1100a7a4
commit 5c52ba170f
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/sock.h
View File

@@ -565,7 +565,7 @@ struct proto {
#endif #endif
/* Memory pressure */ /* Memory pressure */
void (*enter_memory_pressure)(void); void (*enter_memory_pressure)(struct sock *sk);
atomic_t *memory_allocated; /* Current allocated memory. */ atomic_t *memory_allocated; /* Current allocated memory. */
atomic_t *sockets_allocated; /* Current number of sockets. */ 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); page = alloc_pages(sk->sk_allocation, 0);
if (!page) { if (!page) {
sk->sk_prot->enter_memory_pressure(); sk->sk_prot->enter_memory_pressure(sk);
sk_stream_moderate_sndbuf(sk); sk_stream_moderate_sndbuf(sk);
} }
return page; return page;

2
include/net/tcp.h
View File

@@ -975,7 +975,7 @@ static inline void tcp_openreq_init(struct request_sock *req,
ireq->rmt_port = tcp_hdr(skb)->source; 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) static inline int keepalive_intvl_when(const struct tcp_sock *tp)
{ {

2
net/core/sock.c
View File

@@ -1442,7 +1442,7 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind)
/* Under pressure. */ /* Under pressure. */
if (allocated > prot->sysctl_mem[1]) if (allocated > prot->sysctl_mem[1])
if (prot->enter_memory_pressure) if (prot->enter_memory_pressure)
prot->enter_memory_pressure(); prot->enter_memory_pressure(sk);
/* Over hard limit. */ /* Over hard limit. */
if (allocated > prot->sysctl_mem[2]) if (allocated > prot->sysctl_mem[2])

2
net/decnet/af_decnet.c
View File

@@ -451,7 +451,7 @@ static void dn_destruct(struct sock *sk)
static int dn_memory_pressure; 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) { if (!dn_memory_pressure) {
dn_memory_pressure = 1; dn_memory_pressure = 1;

4
net/ipv4/tcp.c
View File

@@ -316,7 +316,7 @@ int tcp_memory_pressure __read_mostly;
EXPORT_SYMBOL(tcp_memory_pressure); EXPORT_SYMBOL(tcp_memory_pressure);
void tcp_enter_memory_pressure(void) void tcp_enter_memory_pressure(struct sock *sk)
{ {
if (!tcp_memory_pressure) { if (!tcp_memory_pressure) {
NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES); 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); __kfree_skb(skb);
} else { } else {
sk->sk_prot->enter_memory_pressure(); sk->sk_prot->enter_memory_pressure(sk);
sk_stream_moderate_sndbuf(sk); sk_stream_moderate_sndbuf(sk);
} }
return NULL; return NULL;

2
net/sctp/socket.c
View File

@@ -116,7 +116,7 @@ static int sctp_memory_pressure;
static atomic_t sctp_memory_allocated; static atomic_t sctp_memory_allocated;
static atomic_t sctp_sockets_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; sctp_memory_pressure = 1;
} }