From patchwork Fri May 18 04:32:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TSUKADA Koutaro X-Patchwork-Id: 10408173 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB27D602CB for ; Fri, 18 May 2018 04:32:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B1A32857E for ; Fri, 18 May 2018 04:32:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F1D028857; Fri, 18 May 2018 04:32:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3A922857E for ; Fri, 18 May 2018 04:32:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 257ED6B056C; Fri, 18 May 2018 00:32:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2068C6B056D; Fri, 18 May 2018 00:32:50 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11E766B056E; Fri, 18 May 2018 00:32:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id C7D136B056C for ; Fri, 18 May 2018 00:32:49 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id l85-v6so3988386pfb.18 for ; Thu, 17 May 2018 21:32:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:to:cc :references:from:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=TfxfsnE7uzR8EPmcD2Te8/FMrh9et0QYe0NYdw9bECE=; b=ST+DQFdRt/he99Oy59uRchoW02mbWEW71CZ+b1P8l2YVdZD/qD+eS/NkSO3ewS1kT7 E/UcuX1+erIm0teDYzz+vsFE/EO3IWbbuiVIQUTudOnRETVdQJvdNS27ehtQG+miDjQl 4wV0vTzniiGXlmnWHkLDvxnlf5VFbw1uH2qYLnxJtLBELKc1XknWemHbgEE3JPBFHToe zuvP+uPXe4ZpnTp1mRZs2vE0ehmrTah86s+2bm7iqmbmeqlag4TAQmOHAAwJ2ZwXcm2c kb3oZmmn7XuZ/RpwUjgZ3VCC4/vwNmk5KZ1OqfBOjGykLGBocUpINifiTCCDSuU+mKf4 Xtjg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of tsukada@ascade.co.jp designates 218.224.228.194 as permitted sender) smtp.mailfrom=tsukada@ascade.co.jp X-Gm-Message-State: ALKqPwcr70KLm4Kq+lmStwRYFkI/g21jNLb+M6SOMyHOARhiTrFzvp3a Js1h32ZwA/aAVEwm2VvEqBvituobTIObQn3C21DN7z88eQN8aO6/KTm0T6wuN+x+jwO2dMBqeLG 0AAxsd5yqXnoiUYLCtBmyxvbIixJpqA6ewBEXG5wOTAasnNSSbKx5RrXyjkNKIzq0sQ== X-Received: by 2002:a17:902:274a:: with SMTP id j10-v6mr8111573plg.393.1526617969503; Thu, 17 May 2018 21:32:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqy8V6tFlHggngeB4cTWNBBehsDv4NcDYhXiOTJX3E4MuToMUqpK6QVybrXaYEFkkgfn4JL X-Received: by 2002:a17:902:274a:: with SMTP id j10-v6mr8111550plg.393.1526617968946; Thu, 17 May 2018 21:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526617968; cv=none; d=google.com; s=arc-20160816; b=Mrt6pBRMKgzGnPPQ6978B8z3T2fraf8XKoSbYnn6PdxrZ5DFzy+gd5h7BvXanw1GPG rNgzWz0lTmseW+/8Tb+crRFrXIeGvmJmiliLVXyd0JOZ6gyzpAxJbf+4IwQ0aU9NEEsi 3jWSBiYgDSwehqshaAQwZxFJc3tcsj7C4Y76ncW9F4btzQiOpFf8jW1hAwVdIqMvdWzK WXR1eA017GT/LFyHO6fQvtxoGmjdB/SmPklexwNj4s+G0Ziz3U5nMIwIjjvnZe28ze0N ByiDBV0q3vq7lqonT/h0NZLvw3/2M3q7h1H+p1qyvrh9Sku5c2YVwTkH8jdHDQ/GUK8q OyjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :arc-authentication-results; bh=TfxfsnE7uzR8EPmcD2Te8/FMrh9et0QYe0NYdw9bECE=; b=NOSYRzrQuOnhS2osjFWavpuOlOEMS8uJFCL07RqljviRMP10dfHVaK4aNDB8q0MnaG 3XT0D5Hrne+0x53rAHPcOasmexpM6rGJh9k9E6LrAM7eB1HRpfgbdVXyQZhVOOgbRBGB ySUFK+swehe2b9v4at+ttMaoHl2cjw7aVVgTETeMVkpUSErI8QAWA6Ang6gVleyZe9FV kk3uiIWNySZ8ofPBnFlbvCTI/A95QXWgJ2NXAnYfLWFVPlWuHcEBjTjOWVpU6GDtLq5S a91hJuw9bx72eYl7VKQOwyU7kPylYHbH7MrYVCVEnFMRv6K0xrG1svtsNHt15y34wRnO YvrQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of tsukada@ascade.co.jp designates 218.224.228.194 as permitted sender) smtp.mailfrom=tsukada@ascade.co.jp Received: from ns.ascade.co.jp (ext-host0001.ascade.co.jp. [218.224.228.194]) by mx.google.com with ESMTP id g34-v6si6581258pld.411.2018.05.17.21.32.48 for ; Thu, 17 May 2018 21:32:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of tsukada@ascade.co.jp designates 218.224.228.194 as permitted sender) client-ip=218.224.228.194; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of tsukada@ascade.co.jp designates 218.224.228.194 as permitted sender) smtp.mailfrom=tsukada@ascade.co.jp Received: from server0001.ascade.co.jp (server0001.ascade.co.jp [10.1.1.63]) by ns.ascade.co.jp (Postfix) with ESMTP id DA91B993D0; Fri, 18 May 2018 13:32:47 +0900 (JST) Received: from [IPv6:::1] (server0001.ascade.co.jp [10.1.1.63]) by server0001.ascade.co.jp (Postfix) with ESMTP id 8F36A1004E1; Fri, 18 May 2018 13:32:46 +0900 (JST) Subject: [PATCH v2 2/7] hugetlb: support migrate charging for surplus hugepages To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Jonathan Corbet , "Luis R. Rodriguez" , Kees Cook Cc: Andrew Morton , Roman Gushchin , David Rientjes , Mike Kravetz , "Aneesh Kumar K.V" , Naoya Horiguchi , Anshuman Khandual , Marc-Andre Lureau , Punit Agrawal , Dan Williams , Vlastimil Babka , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, tsukada@ascade.co.jp References: From: TSUKADA Koutaro Message-ID: <48877585-85de-ad4b-6b35-8e6dd24a43c0@ascade.co.jp> Date: Fri, 18 May 2018 13:32:41 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Surplus hugepages allocated for migration also charge to memory cgroup. Signed-off-by: TSUKADA Koutaro --- hugetlb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 679c151f..2e7b543 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1687,6 +1687,8 @@ static struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask, if (!page) return NULL; + surplus_hugepage_set_charge(h, page); + /* * We do not account these pages as surplus because they are only * temporary and will be released properly on the last reference