From patchwork Wed Oct 30 01:36:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 11218927 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF65914DB for ; Wed, 30 Oct 2019 01:37:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6EBA02086A for ; Wed, 30 Oct 2019 01:37:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Mk9A2s+V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EBA02086A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5373F6B000D; Tue, 29 Oct 2019 21:37:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4E9C36B000E; Tue, 29 Oct 2019 21:37:23 -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 3FE8D6B0010; Tue, 29 Oct 2019 21:37:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0175.hostedemail.com [216.40.44.175]) by kanga.kvack.org (Postfix) with ESMTP id 1AD9E6B000D for ; Tue, 29 Oct 2019 21:37:23 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 97E6E6130 for ; Wed, 30 Oct 2019 01:37:22 +0000 (UTC) X-FDA: 76098738324.10.wire35_40594c07be839 X-Spam-Summary: 2,0,0,675e5f9d438ecaf1,d41d8cd98f00b204,3uem4xqskcpocnocut0okpciqqing.eqonkpwz-oomxcem.qti@flex--almasrymina.bounces.google.com,:mike.kravetz@oracle.com:shuah@kernel.org:almasrymina@google.com:linux-kernel@vger.kernel.org::linux-kselftest@vger.kernel.org:cgroups@vger.kernel.org:aneesh.kumar@linux.vnet.ibm.com,RULES_HIT:41:152:355:379:541:800:960:966:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1543:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2890:3138:3139:3140:3141:3142:3152:3353:3865:3866:3867:3868:3870:3871:3872:4042:4117:4321:4385:4605:5007:6261:6653:9969:10004:10400:11026:11473:11658:11914:12043:12291:12296:12297:12438:12555:12895:13161:13229:14096:14097:14181:14394:14659:14721:21080:21444:21450:21627:30054:30070,0,RBL:209.85.214.202:@flex--almasrymina.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral ,Custom_ X-HE-Tag: wire35_40594c07be839 X-Filterd-Recvd-Size: 6125 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 30 Oct 2019 01:37:22 +0000 (UTC) Received: by mail-pl1-f202.google.com with SMTP id s24so591938plp.3 for ; Tue, 29 Oct 2019 18:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=GL9Xhy7auTZAhL7LZXwL8avj9iHl4q0U3M40OgeObhE=; b=Mk9A2s+VDeLN9SO5/y6PDx1MOdEtWWd7Itp4QHrRujBXntkM/xloWXUcu0lUqVvCXV i4nWuGHCYOVdIy7S5tr5r7+TiWVjWOQ2HGriAa7K/btJY/cppsKtyf+oiDgW7PJCb6W6 oGY8EEKEgxNuhJur1z2CEzO5VOC7fZrxhzrq3qIsLS9bA9HkaWvj6/HeDlI9Tl5sNUiV ktbhNgl23IZlPuI6GGuc/TFWaoMmd25kymPG0QrmvXFLSz8k1dv8+HPx4BtrezkRt3+p /Zokn/6vanoKP4GyVnlL+WVN9ydBxSByL0pTutxFrolB5gpbMs6qfj/47WWLFWLay934 vkHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=GL9Xhy7auTZAhL7LZXwL8avj9iHl4q0U3M40OgeObhE=; b=Qh6zvv2BCymgv/1l6iEsliYJ2d6QIH4L7vYBwxaORmBypfqInGFe/o2vNcK73zoosc 7NYSTSMpqxB6kLnz8Y/SRHfRDTs0rxf6BHhaTX3ju6PXGan+fsSr2vthQ9+NNyue0YIF L0eK9037ZUbxfRTOz9E3hZ/sLC/9O/CDEowRZbNyh+NgqLKzvqisPm8UGOuPnbZKdMpH Iy6vUjQiWQvs4aEaJR+cjkWwhxvMJzuCIrGGimnTShMUjXSmnXHonc8us11tZW3kg8qc RuhYleSJ8Dg2hlK3HW0zeHzVZbvXflC22HMe8P9G0PegxgyZG/EGdMJmfcG1nZe0MeE0 Damg== X-Gm-Message-State: APjAAAV8q/7TUdlrrmAMyg9qwHUOYD6T6cg4JXDwrKjhRyK0cqnYaTvz D99yiNICarSCbkC0HYU/60NKKqWpzEzUOtPCXA== X-Google-Smtp-Source: APXvYqx0xCVQw28iTo77367/q6/8SaLgZWWR/dF/5ipf2JtRR+atF//keaaYtQH7ZE54eCIl4VTbU9MNbPQanGYGGg== X-Received: by 2002:a63:2cc8:: with SMTP id s191mr965140pgs.79.1572399441085; Tue, 29 Oct 2019 18:37:21 -0700 (PDT) Date: Tue, 29 Oct 2019 18:36:59 -0700 In-Reply-To: <20191030013701.39647-1-almasrymina@google.com> Message-Id: <20191030013701.39647-7-almasrymina@google.com> Mime-Version: 1.0 References: <20191030013701.39647-1-almasrymina@google.com> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog Subject: [PATCH v8 7/9] hugetlb_cgroup: support noreserve mappings From: Mina Almasry To: mike.kravetz@oracle.com Cc: shuah@kernel.org, almasrymina@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, cgroups@vger.kernel.org, aneesh.kumar@linux.vnet.ibm.com X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Support MAP_NORESERVE accounting as part of the new counter. For each hugepage allocation, at allocation time we check if there is a reservation for this allocation or not. If there is a reservation for this allocation, then this allocation was charged at reservation time, and we don't re-account it. If there is no reserevation for this allocation, we charge the appropriate hugetlb_cgroup. The hugetlb_cgroup to uncharge for this allocation is stored in page[3].private. We use new APIs added in an earlier patch to set this pointer. Signed-off-by: Mina Almasry --- mm/hugetlb.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) -- 2.24.0.rc1.363.gb1bccd3e3d-goog diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 40f4b85de59c4..cb06b3d5bd4d7 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1309,6 +1309,7 @@ static void update_and_free_page(struct hstate *h, struct page *page) 1 << PG_writeback); } VM_BUG_ON_PAGE(hugetlb_cgroup_from_page(page, false), page); + VM_BUG_ON_PAGE(hugetlb_cgroup_from_page(page, true), page); set_compound_page_dtor(page, NULL_COMPOUND_DTOR); set_page_refcounted(page); if (hstate_is_gigantic(h)) { @@ -1420,6 +1421,9 @@ void free_huge_page(struct page *page) clear_page_huge_active(page); hugetlb_cgroup_uncharge_page(hstate_index(h), pages_per_huge_page(h), page, false); + hugetlb_cgroup_uncharge_page(hstate_index(h), pages_per_huge_page(h), + page, true); + if (restore_reserve) h->resv_huge_pages++; @@ -1446,6 +1450,7 @@ static void prep_new_huge_page(struct hstate *h, struct page *page, int nid) set_compound_page_dtor(page, HUGETLB_PAGE_DTOR); spin_lock(&hugetlb_lock); set_hugetlb_cgroup(page, NULL, false); + set_hugetlb_cgroup(page, NULL, true); h->nr_huge_pages++; h->nr_huge_pages_node[nid]++; spin_unlock(&hugetlb_lock); @@ -2241,10 +2246,19 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, gbl_chg = 1; } + /* If this allocation is not consuming a reservation, charge it now. + */ + if (map_chg || avoid_reserve || !vma_resv_map(vma)) { + ret = hugetlb_cgroup_charge_cgroup(idx, pages_per_huge_page(h), + &h_cg, true); + if (ret) + goto out_subpool_put; + } + ret = hugetlb_cgroup_charge_cgroup(idx, pages_per_huge_page(h), &h_cg, false); if (ret) - goto out_subpool_put; + goto out_uncharge_cgroup_reservation; spin_lock(&hugetlb_lock); /* @@ -2268,6 +2282,11 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, } hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page, false); + if (!vma_resv_map(vma) || map_chg || avoid_reserve) { + hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, + page, true); + } + spin_unlock(&hugetlb_lock); set_page_private(page, (unsigned long)spool); @@ -2293,6 +2312,10 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, out_uncharge_cgroup: hugetlb_cgroup_uncharge_cgroup(idx, pages_per_huge_page(h), h_cg, false); +out_uncharge_cgroup_reservation: + if (map_chg || avoid_reserve || !vma_resv_map(vma)) + hugetlb_cgroup_uncharge_cgroup(idx, pages_per_huge_page(h), + h_cg, true); out_subpool_put: if (map_chg || avoid_reserve) hugepage_subpool_put_pages(spool, 1);