The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-123.1.2.vz7.5.10 ------> commit f22980954a2d765ca6ca03c11b2eac8f3fe1d105 Author: Pavel Emelyanov <xe...@parallels.com> Date: Fri Jun 5 23:55:57 2015 +0400
unix: Charge outgoing buffers into cg memory For unix sockets there's no such thing as "read buffers" as all the data is accounted on the send paths. Fortunate enough most of the stuff is already kmem-auto-charged except one thing -- paged dgram skbs. https://jira.sw.ru/browse/PSBM-33584 Signed-off-by: Pavel Emelyanov <xe...@parallels.com> --- net/core/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/sock.c b/net/core/sock.c index 7b7c804..e552442 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1767,7 +1767,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, for (i = 0; i < npages; i++) { struct page *page; - page = alloc_pages(sk->sk_allocation, 0); + page = alloc_kmem_pages(sk->sk_allocation, 0); if (!page) { err = -ENOBUFS; skb_shinfo(skb)->nr_frags = i; _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel