From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757433AbZCJVqY (ORCPT ); Tue, 10 Mar 2009 17:46:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756176AbZCJVqL (ORCPT ); Tue, 10 Mar 2009 17:46:11 -0400 Received: from mail-fx0-f176.google.com ([209.85.220.176]:58527 "EHLO mail-fx0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756208AbZCJVqJ (ORCPT ); Tue, 10 Mar 2009 17:46:09 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=nqniovKlIbz9yASqeEMVI02KTZ5JgX7AyoURgj8ocuISHdGejZW0ueAtdLGbHliviI YNVSZh3k0c2kT4Ls6R+uBNjQhkKdvqJJz3y4C25LKyHAL0z3xTka7VTYY/5wwNPBCyBO L1OzkuUIGe898u33E1kiPJ48GBOQ47aRGJK1M= Date: Wed, 11 Mar 2009 00:53:05 +0300 From: Alexey Dobriyan To: Dave Hansen Cc: Andrew Morton , mpm@selenic.com, containers@lists.linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, viro@zeniv.linux.org.uk, linux-api@vger.kernel.org, mingo@elte.hu, torvalds@linux-foundation.org, tglx@linutronix.de, xemul@openvz.org Subject: Re: How much of a mess does OpenVZ make? ;) Was: What can OpenVZ do? Message-ID: <20090310215305.GA2078@x200.localdomain> References: <1233076092-8660-1-git-send-email-orenl@cs.columbia.edu> <1234285547.30155.6.camel@nimitz> <20090211141434.dfa1d079.akpm@linux-foundation.org> <1234462282.30155.171.camel@nimitz> <1234467035.3243.538.camel@calx> <20090212114207.e1c2de82.akpm@linux-foundation.org> <1234475483.30155.194.camel@nimitz> <20090212141014.2cd3d54d.akpm@linux-foundation.org> <1234479845.30155.220.camel@nimitz> <20090226155755.GA1456@x200.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090226155755.GA1456@x200.localdomain> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 26, 2009 at 06:57:55PM +0300, Alexey Dobriyan wrote: > On Thu, Feb 12, 2009 at 03:04:05PM -0800, Dave Hansen wrote: > > dave@nimitz:~/kernels/linux-2.6-openvz$ git diff v2.6.27.10... kernel/cpt/ | diffstat > > 47 files changed, 20702 insertions(+) > > > > One important thing that leaves out is the interaction that this code > > has with the rest of the kernel. That's critically important when > > considering long-term maintenance, and I'd be curious how the OpenVZ > > folks view it. > > OpenVZ as-is in some cases wants some functions to be made global > (and if C/R code will be modular, exported). Or probably several > iterators added. > > But it's negligible amount of changes compared to main code. Here is what C/R code wants from pid allocator. With the introduction of hierarchical PID namespaces, struct pid can have not one but many numbers -- tuple (pid_0, pid_1, ..., pid_N), where pid_i is pid number in pid_ns which has level i. Now root pid_ns of container has level n -- numbers from level n to N inclusively should be dumped and restored. During struct pid creation first n-1 numbers can be anything, because the're outside of pid_ns, but the rest should be the same. Code will be ifdeffed and commented, but anyhow, this is an example of change C/R will require from the rest of the kernel. --- a/kernel/pid.c +++ b/kernel/pid.c @@ -182,6 +182,34 @@ static int alloc_pidmap(struct pid_namespace *pid_ns) return -1; } +static int set_pidmap(struct pid_namespace *pid_ns, pid_t pid) +{ + int offset; + struct pidmap *map; + + offset = pid & BITS_PER_PAGE_MASK; + map = &pid_ns->pidmap[pid/BITS_PER_PAGE]; + if (unlikely(!map->page)) { + void *page = kzalloc(PAGE_SIZE, GFP_KERNEL); + /* + * Free the page if someone raced with us + * installing it: + */ + spin_lock_irq(&pidmap_lock); + if (map->page) + kfree(page); + else + map->page = page; + spin_unlock_irq(&pidmap_lock); + if (unlikely(!map->page)) + return -ENOMEM; + } + if (test_and_set_bit(offset, map->page)) + return -EBUSY; + atomic_dec(&map->nr_free); + return pid; +} + int next_pidmap(struct pid_namespace *pid_ns, int last) { int offset; @@ -239,7 +267,7 @@ void free_pid(struct pid *pid) call_rcu(&pid->rcu, delayed_put_pid); } -struct pid *alloc_pid(struct pid_namespace *ns) +struct pid *alloc_pid(struct pid_namespace *ns, int *cr_nr, unsigned int cr_level) { struct pid *pid; enum pid_type type; @@ -253,7 +281,10 @@ struct pid *alloc_pid(struct pid_namespace *ns) tmp = ns; for (i = ns->level; i >= 0; i--) { - nr = alloc_pidmap(tmp); + if (cr_nr && ns->level - i <= cr_level) + nr = set_pidmap(tmp, cr_nr[ns->level - i]); + else + nr = alloc_pidmap(tmp); if (nr < 0) goto out_free;