From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932318Ab3GVOvw (ORCPT ); Mon, 22 Jul 2013 10:51:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56188 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932237Ab3GVOvv (ORCPT ); Mon, 22 Jul 2013 10:51:51 -0400 Date: Mon, 22 Jul 2013 16:51:50 +0200 From: Michal Hocko To: Joonsoo Kim Cc: Andrew Morton , Rik van Riel , Mel Gorman , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim Subject: Re: [PATCH 3/9] mm, hugetlb: clean-up alloc_huge_page() Message-ID: <20130722145150.GF24400@dhcp22.suse.cz> References: <1373881967-16153-1-git-send-email-iamjoonsoo.kim@lge.com> <1373881967-16153-4-git-send-email-iamjoonsoo.kim@lge.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1373881967-16153-4-git-send-email-iamjoonsoo.kim@lge.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 15-07-13 18:52:41, Joonsoo Kim wrote: > We can unify some codes for succeed allocation. > This makes code more readable. > There is no functional difference. "This patch unifies successful allocation paths to make the code more readable. There are no functional changes." Better? > Signed-off-by: Joonsoo Kim Acked-by: Michal Hocko > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index d21a33a..0067cf4 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1144,29 +1144,25 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, > hugepage_subpool_put_pages(spool, chg); > return ERR_PTR(-ENOSPC); > } > + > spin_lock(&hugetlb_lock); > page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve); > - if (page) { > - /* update page cgroup details */ > - hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), > - h_cg, page); > - spin_unlock(&hugetlb_lock); > - } else { > + if (!page) { > spin_unlock(&hugetlb_lock); > page = alloc_buddy_huge_page(h, NUMA_NO_NODE); > if (!page) { > hugetlb_cgroup_uncharge_cgroup(idx, > - pages_per_huge_page(h), > - h_cg); > + pages_per_huge_page(h), h_cg); > hugepage_subpool_put_pages(spool, chg); > return ERR_PTR(-ENOSPC); > } > + > spin_lock(&hugetlb_lock); > - hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), > - h_cg, page); > list_move(&page->lru, &h->hugepage_activelist); > - spin_unlock(&hugetlb_lock); > + /* Fall through */ > } > + hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page); > + spin_unlock(&hugetlb_lock); > > set_page_private(page, (unsigned long)spool); > > -- > 1.7.9.5 > -- Michal Hocko SUSE Labs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx133.postini.com [74.125.245.133]) by kanga.kvack.org (Postfix) with SMTP id 4C32F6B0036 for ; Mon, 22 Jul 2013 10:51:52 -0400 (EDT) Date: Mon, 22 Jul 2013 16:51:50 +0200 From: Michal Hocko Subject: Re: [PATCH 3/9] mm, hugetlb: clean-up alloc_huge_page() Message-ID: <20130722145150.GF24400@dhcp22.suse.cz> References: <1373881967-16153-1-git-send-email-iamjoonsoo.kim@lge.com> <1373881967-16153-4-git-send-email-iamjoonsoo.kim@lge.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1373881967-16153-4-git-send-email-iamjoonsoo.kim@lge.com> Sender: owner-linux-mm@kvack.org List-ID: To: Joonsoo Kim Cc: Andrew Morton , Rik van Riel , Mel Gorman , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim On Mon 15-07-13 18:52:41, Joonsoo Kim wrote: > We can unify some codes for succeed allocation. > This makes code more readable. > There is no functional difference. "This patch unifies successful allocation paths to make the code more readable. There are no functional changes." Better? > Signed-off-by: Joonsoo Kim Acked-by: Michal Hocko > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index d21a33a..0067cf4 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1144,29 +1144,25 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, > hugepage_subpool_put_pages(spool, chg); > return ERR_PTR(-ENOSPC); > } > + > spin_lock(&hugetlb_lock); > page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve); > - if (page) { > - /* update page cgroup details */ > - hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), > - h_cg, page); > - spin_unlock(&hugetlb_lock); > - } else { > + if (!page) { > spin_unlock(&hugetlb_lock); > page = alloc_buddy_huge_page(h, NUMA_NO_NODE); > if (!page) { > hugetlb_cgroup_uncharge_cgroup(idx, > - pages_per_huge_page(h), > - h_cg); > + pages_per_huge_page(h), h_cg); > hugepage_subpool_put_pages(spool, chg); > return ERR_PTR(-ENOSPC); > } > + > spin_lock(&hugetlb_lock); > - hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), > - h_cg, page); > list_move(&page->lru, &h->hugepage_activelist); > - spin_unlock(&hugetlb_lock); > + /* Fall through */ > } > + hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page); > + spin_unlock(&hugetlb_lock); > > set_page_private(page, (unsigned long)spool); > > -- > 1.7.9.5 > -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org