From patchwork Wed Sep 4 13:53:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 11130343 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 202BD14DE for ; Wed, 4 Sep 2019 13:53:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DF8AC21670 for ; Wed, 4 Sep 2019 13:53:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=yandex-team.ru header.i=@yandex-team.ru header.b="m3MD009m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF8AC21670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=yandex-team.ru Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A6E6E6B0007; Wed, 4 Sep 2019 09:53:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9F5D06B0008; Wed, 4 Sep 2019 09:53:18 -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 90FE96B000A; Wed, 4 Sep 2019 09:53:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0241.hostedemail.com [216.40.44.241]) by kanga.kvack.org (Postfix) with ESMTP id 6C4FC6B0007 for ; Wed, 4 Sep 2019 09:53:18 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 1131E688B for ; Wed, 4 Sep 2019 13:53:18 +0000 (UTC) X-FDA: 75897380076.15.seat10_1cb9b28036e21 X-Spam-Summary: 2,0,0,d8439a036ee9ee63,d41d8cd98f00b204,khlebnikov@yandex-team.ru,::linux-kernel@vger.kernel.org:cgroups@vger.kernel.org:mhocko@suse.com:guro@fb.com:hannes@cmpxchg.org,RULES_HIT:41:152:355:379:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3353:3867:3868:3872:4321:4605:5007:6119:6261:6653:7903:8957:9207:10004:10400:11026:11473:11658:11914:12043:12291:12296:12297:12438:12517:12519:12555:12683:12760:12986:14096:14097:14110:14181:14394:14687:14721:14922:21080:21450:21451:21627:30054,0,RBL:95.108.205.193:@yandex-team.ru:.lbl8.mailshell.net-62.2.3.100 66.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:26,LUA_SUMMARY:none X-HE-Tag: seat10_1cb9b28036e21 X-Filterd-Recvd-Size: 4628 Received: from forwardcorp1o.mail.yandex.net (forwardcorp1o.mail.yandex.net [95.108.205.193]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 4 Sep 2019 13:53:17 +0000 (UTC) Received: from mxbackcorp1j.mail.yandex.net (mxbackcorp1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::162]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id 4931F2E1AFB; Wed, 4 Sep 2019 16:53:13 +0300 (MSK) Received: from smtpcorp1j.mail.yandex.net (smtpcorp1j.mail.yandex.net [2a02:6b8:0:1619::137]) by mxbackcorp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id g8uxin0UDo-rCWKDxqx; Wed, 04 Sep 2019 16:53:13 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1567605193; bh=Nk9h8il5OEPYVOEQt3XS8DDQ8EFzu/mVMbOut2gTstg=; h=In-Reply-To:Message-ID:References:Date:To:From:Subject:Cc; b=m3MD009msbTOFyJaC9thdsye5NnOnu3jYpUpiliIYoehZ9INDqRDGTHc3PrykUde1 A1kZlWlicjI2ukKTsXo140gJH7cRyMvTLE4Q8k1CcgCTxV5pRLuHfI7gL5gy9OioCz LjXyuLHHJSpAWh38qPV2sxMPPqkkYM5ftDK9lUwA= Authentication-Results: mxbackcorp1j.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Received: from dynamic-red.dhcp.yndx.net (dynamic-red.dhcp.yndx.net [2a02:6b8:0:40c:c142:79c2:9d86:677a]) by smtpcorp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id pnctDuk8zu-rC78k0tw; Wed, 04 Sep 2019 16:53:12 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) Subject: [PATCH v1 2/7] mm/memcontrol: add mem_cgroup_recharge From: Konstantin Khlebnikov To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Cc: Michal Hocko , Roman Gushchin , Johannes Weiner Date: Wed, 04 Sep 2019 16:53:12 +0300 Message-ID: <156760519254.6560.3180815463616863318.stgit@buzz> In-Reply-To: <156760509382.6560.17364256340940314860.stgit@buzz> References: <156760509382.6560.17364256340940314860.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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: This function tries to move page into other cgroup. Caller must lock page and isolate it from LRU. Signed-off-by: Konstantin Khlebnikov --- include/linux/memcontrol.h | 9 +++++++++ mm/memcontrol.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 2cd4359cb38c..d94950584f60 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -352,6 +352,8 @@ void mem_cgroup_uncharge(struct page *page); void mem_cgroup_uncharge_list(struct list_head *page_list); void mem_cgroup_migrate(struct page *oldpage, struct page *newpage); +int mem_cgroup_try_recharge(struct page *page, struct mm_struct *mm, + gfp_t gfp_mask); static struct mem_cgroup_per_node * mem_cgroup_nodeinfo(struct mem_cgroup *memcg, int nid) @@ -857,6 +859,13 @@ static inline void mem_cgroup_migrate(struct page *old, struct page *new) { } +static inline int mem_cgroup_try_recharge(struct page *page, + struct mm_struct *mm, + gfp_t gfp_mask) +{ + return 0; +} + static inline struct lruvec *mem_cgroup_lruvec(struct pglist_data *pgdat, struct mem_cgroup *memcg) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 40ddc233e973..953a0bbb9f43 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6507,6 +6507,46 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) local_irq_restore(flags); } +/* + * mem_cgroup_try_recharge - try to recharge page to mm's memcg. + * + * Page must be locked and isolated. + */ +int mem_cgroup_try_recharge(struct page *page, struct mm_struct *mm, + gfp_t gfp_mask) +{ + struct mem_cgroup *from, *to; + int nr_pages; + int err = 0; + + VM_BUG_ON_PAGE(!PageLocked(page), page); + VM_BUG_ON_PAGE(PageLRU(page), page); + + if (mem_cgroup_disabled()) + return 0; + + from = page->mem_cgroup; + to = get_mem_cgroup_from_mm(mm); + + if (likely(from == to) || !from) + goto out; + + nr_pages = hpage_nr_pages(page); + err = try_charge(to, gfp_mask, nr_pages); + if (err) + goto out; + + err = mem_cgroup_move_account(page, nr_pages > 1, from, to); + if (err) + cancel_charge(to, nr_pages); + else + cancel_charge(from, nr_pages); +out: + css_put(&to->css); + + return err; +} + DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key); EXPORT_SYMBOL(memcg_sockets_enabled_key);