From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813Ab1IZWxI (ORCPT ); Mon, 26 Sep 2011 18:53:08 -0400 Received: from mx2.parallels.com ([64.131.90.16]:46229 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288Ab1IZWxG (ORCPT ); Mon, 26 Sep 2011 18:53:06 -0400 Message-ID: <4E810224.4060204@parallels.com> Date: Mon, 26 Sep 2011 19:52:20 -0300 From: Glauber Costa User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0.2) Gecko/20110906 Thunderbird/6.0.2 MIME-Version: 1.0 To: CC: , , , , , , , , , Subject: Re: [PATCH v3 4/7] per-cgroup tcp buffers control References: <1316393805-3005-1-git-send-email-glommer@parallels.com> <1316393805-3005-5-git-send-email-glommer@parallels.com> <4E808EA6.4000301@gmail.com> In-Reply-To: <4E808EA6.4000301@gmail.com> Content-Type: text/plain; charset="KOI8-R"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [201.82.135.174] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/26/2011 11:39 AM, Andrew Vagin wrote: > We can't change net.ipv4.tcp_mem if a cgroup with memory controller > isn't mounted. > > [root@dhcp-10-30-20-19 ~]# sysctl -w net.ipv4.tcp_mem="3 2 3" > error: "Invalid argument" setting key "net.ipv4.tcp_mem" > > It's because tcp_max_memory is initialized in mem_cgroup_populate: > > mem_cgroup_populate->register_kmem_files->sockets_populate->tcp_init_cgroup Thank you, will fix it >> +int sockets_populate(struct cgroup *cgrp, struct cgroup_subsys *ss) >> +{ >> + struct proto *proto; >> + int ret = 0; >> + >> + read_lock(&proto_list_lock); >> + list_for_each_entry(proto,&proto_list, node) { >> + if (proto->init_cgroup) >> + ret |= proto->init_cgroup(proto, cgrp, ss); >> + } >> + if (!ret) >> + goto out; >> + >> + list_for_each_entry_continue_reverse(proto,&proto_list, node) >> + if (proto->destroy_cgroup) >> + proto->destroy_cgroup(proto, cgrp, ss); >> + >> +out: >> + read_unlock(&proto_list_lock); >> + return ret; >> +} > >> @@ -198,6 +203,21 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write, >> if (ret) >> return ret; >> >> +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM >> + rcu_read_lock(); >> + cg = mem_cgroup_from_task(current); >> + for (i = 0; i< 3; i++) >> + if (vec[i]> tcp_max_memory(cg)) { >> + rcu_read_unlock(); >> + return -EINVAL; >> + } >