linux-kernel - Re: [PATCH v3 3/9] mm, hugetlb: clean-up alloc_huge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJd=RBA7iFOHvX6aOP517tyrWReSsLfC4zmV8PvVfE8px1WEMg@mail.gmail.com>
Date:	Mon, 29 Jul 2013 17:20:39 +0800
From:	Hillf Danton <dhillf@...il.com>
To:	Joonsoo Kim <iamjoonsoo.kim@....com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Rik van Riel <riel@...hat.com>, Mel Gorman <mgorman@...e.de>,
	Michal Hocko <mhocko@...e.cz>,
	"Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
	Hugh Dickins <hughd@...gle.com>,
	Davidlohr Bueso <davidlohr.bueso@...com>,
	David Gibson <david@...son.dropbear.id.au>, linux-mm@...ck.org,
	linux-kernel@...r.kernel.org, Joonsoo Kim <js1304@...il.com>,
	Wanpeng Li <liwanp@...ux.vnet.ibm.com>,
	Naoya Horiguchi <n-horiguchi@...jp.nec.com>
Subject: Re: [PATCH v3 3/9] mm, hugetlb: clean-up alloc_huge_page()

On Mon, Jul 29, 2013 at 1:28 PM, Joonsoo Kim <iamjoonsoo.kim@....com> wrote:
> This patch unifies successful allocation paths to make the code more
> readable. There are no functional changes.
>
> Acked-by: Michal Hocko <mhocko@...e.cz>
> Reviewed-by: Wanpeng Li <liwanp@...ux.vnet.ibm.com>
> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com>
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@....com>
>
Acked-by: Hillf Danton <dhillf@...il.com>

> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 51564a8..31d78c5 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -1149,12 +1149,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
>         }
>         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) {
> @@ -1165,11 +1160,11 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
>                         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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/