From patchwork Thu Aug 20 13:03:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 11726263 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 0F22B618 for ; Thu, 20 Aug 2020 13:07:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D03EA207BB for ; Thu, 20 Aug 2020 13:07:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dJ9K69ap"; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BrbwBXWn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D03EA207BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0364B8D001E; Thu, 20 Aug 2020 09:07:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F29328D0001; Thu, 20 Aug 2020 09:07:44 -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 E3FCF8D001E; Thu, 20 Aug 2020 09:07:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id CDDC68D0001 for ; Thu, 20 Aug 2020 09:07:44 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 58B59180ACF0D for ; Thu, 20 Aug 2020 13:07:44 +0000 (UTC) X-FDA: 77170974048.15.match43_36100ec27030 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 5A6E71802ED78 for ; Thu, 20 Aug 2020 13:06:36 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,longman@redhat.com,,RULES_HIT:30054,0,RBL:205.139.110.61:@redhat.com:.lbl8.mailshell.net-66.10.201.10 62.18.0.100;04yrb4n1xia6hprk7woxa7qraggbqyccbg4ygiwm85fsoa8765mxrncnnreig5y.4dxh7xfgfh9s4uq9detjqhnmcjkwzxk7uwcyokc8p8pxq3iwqg3c45d1kghgm88.4-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: match43_36100ec27030 X-Filterd-Recvd-Size: 3716 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Aug 2020 13:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597928656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=9Qlf4jXoP5jt/C4m3Gv4DFULDSZN0cJYKBX7J86Hq4I=; b=dJ9K69apAqkL0vO5C4TdxJp07+o+lN8E1p5rDeqrOv6vVv7x340i1wEl8U4LxbadBf/yuL 3NQ4VVMViYo1oPAWfLt2XCufybliOouJbfYrjCAtsEFd4V/UR86Q6FMs/srlLRqtUefUbQ zaQ/6A2zqecO7zw7JSFTQUrQ15Kd18w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597928787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=9Qlf4jXoP5jt/C4m3Gv4DFULDSZN0cJYKBX7J86Hq4I=; b=BrbwBXWnoErzjLHTl6sQkadVBAMHy6XfenHF+pm9v/LwcCWLlz963eTFrssn787nx4gAnA vGJFbMEZl5wt7bBJmtORDBkU18L7p+HSc5ca8sVUhGI47PEZBoYj1RG5ElLbp440VnTWId /zY092AQu0TFAFYlHQVMrWJJb0J1xEA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-Ip-RVODANsqHupFz5vvTlg-1; Thu, 20 Aug 2020 09:04:12 -0400 X-MC-Unique: Ip-RVODANsqHupFz5vvTlg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 013441006702; Thu, 20 Aug 2020 13:04:11 +0000 (UTC) Received: from llong.com (unknown [10.10.115.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B8DE69C9D; Thu, 20 Aug 2020 13:04:09 +0000 (UTC) From: Waiman Long To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Tejun Heo Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Chris Down , Roman Gushchin , Yafang Shao , Waiman Long Subject: [PATCH 1/3] mm/memcg: Clean up obsolete enum charge_type Date: Thu, 20 Aug 2020 09:03:48 -0400 Message-Id: <20200820130350.3211-2-longman@redhat.com> In-Reply-To: <20200820130350.3211-1-longman@redhat.com> References: <20200820130350.3211-1-longman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Rspamd-Queue-Id: 5A6E71802ED78 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: Since commit 0a31bc97c80c ("mm: memcontrol: rewrite uncharge API") and commit 00501b531c47 ("mm: memcontrol: rewrite charge API") in v3.17, the enum charge_type was no longer used anywhere. However, the enum itself was not removed at that time. Remove the obsolete enum charge_type now. Signed-off-by: Waiman Long Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt --- mm/memcontrol.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b807952b4d43..26b7a48d3afb 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -197,14 +197,6 @@ static struct move_charge_struct { #define MEM_CGROUP_MAX_RECLAIM_LOOPS 100 #define MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS 2 -enum charge_type { - MEM_CGROUP_CHARGE_TYPE_CACHE = 0, - MEM_CGROUP_CHARGE_TYPE_ANON, - MEM_CGROUP_CHARGE_TYPE_SWAPOUT, /* for accounting swapcache */ - MEM_CGROUP_CHARGE_TYPE_DROP, /* a page was unused swap cache */ - NR_CHARGE_TYPE, -}; - /* for encoding cft->private value on file */ enum res_type { _MEM, From patchwork Thu Aug 20 13:03:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 11726259 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 DE5C8913 for ; Thu, 20 Aug 2020 13:04:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A1AF9207BB for ; Thu, 20 Aug 2020 13:04:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dFJ6hAcG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1AF9207BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DCD528D0017; Thu, 20 Aug 2020 09:04:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DA43F8D0001; Thu, 20 Aug 2020 09:04:43 -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 CE1A08D0017; Thu, 20 Aug 2020 09:04:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id B82EF8D0001 for ; Thu, 20 Aug 2020 09:04:43 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 32138364E for ; Thu, 20 Aug 2020 13:04:43 +0000 (UTC) X-FDA: 77170966446.14.smoke47_230033b27030 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 3965B18227CE7 for ; Thu, 20 Aug 2020 13:04:21 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,longman@redhat.com,,RULES_HIT:30054,0,RBL:205.139.110.61:@redhat.com:.lbl8.mailshell.net-62.18.0.100 66.10.201.10;04yrfoppruiubyo8arkfjr6mtgskmoceyf4q6x68tjor4uqz73pcw79o1mo89tc.ynzczzqs3b6cwgh558bzohkzjpaz4g5ghquzj7zajsohczkz75gu1o33wugsg5g.n-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: smoke47_230033b27030 X-Filterd-Recvd-Size: 3488 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Aug 2020 13:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597928656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=kBu3kMgySM1JmJ3UbrHPhytTu9PiX289muKYqVsxxD0=; b=dFJ6hAcGqsQ353B4LC1UDUNKvYuCd8iRQFMnx0C5BiuQyP+iwGNZqw4Lc9xw96J/HPUStF AJwgqqZpeyFxk5l7ONOqlWpk7Ew8/ZP2PFEcAE64LFgo8GLIU7tqhLujoX9vkYwt8WZI/X OM6bs02RFozCe8Y84Bm+bTueaTu1R1E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-_GR2kcr7MCGriJw5680LiA-1; Thu, 20 Aug 2020 09:04:14 -0400 X-MC-Unique: _GR2kcr7MCGriJw5680LiA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F9AE1006296; Thu, 20 Aug 2020 13:04:12 +0000 (UTC) Received: from llong.com (unknown [10.10.115.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E2997A1F4; Thu, 20 Aug 2020 13:04:11 +0000 (UTC) From: Waiman Long To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Tejun Heo Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Chris Down , Roman Gushchin , Yafang Shao , Waiman Long Subject: [PATCH 2/3] mm/memcg: Simplify mem_cgroup_get_max() Date: Thu, 20 Aug 2020 09:03:49 -0400 Message-Id: <20200820130350.3211-3-longman@redhat.com> In-Reply-To: <20200820130350.3211-1-longman@redhat.com> References: <20200820130350.3211-1-longman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Rspamd-Queue-Id: 3965B18227CE7 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: The mem_cgroup_get_max() function used to get memory+swap max from both the v1 memsw and v2 memory+swap page counters & return the maximum of these 2 values. This is redundant and it is more efficient to just get either the v1 or the v2 values depending on which one is currently in use. Signed-off-by: Waiman Long --- mm/memcontrol.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 26b7a48d3afb..d219dca5239f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1633,17 +1633,13 @@ void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) */ unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg) { - unsigned long max; + unsigned long max = READ_ONCE(memcg->memory.max); - max = READ_ONCE(memcg->memory.max); if (mem_cgroup_swappiness(memcg)) { - unsigned long memsw_max; - unsigned long swap_max; - - memsw_max = memcg->memsw.max; - swap_max = READ_ONCE(memcg->swap.max); - swap_max = min(swap_max, (unsigned long)total_swap_pages); - max = min(max + swap_max, memsw_max); + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) + max += READ_ONCE(memcg->swap.max); + else + max = memcg->memsw.max; } return max; } From patchwork Thu Aug 20 13:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 11726261 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 5F591618 for ; Thu, 20 Aug 2020 13:05:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 21CDA207BB for ; Thu, 20 Aug 2020 13:05:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="W5klOx4S" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21CDA207BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 679988D001D; Thu, 20 Aug 2020 09:05:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 651038D0001; Thu, 20 Aug 2020 09:05:06 -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 567AF8D001D; Thu, 20 Aug 2020 09:05:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0060.hostedemail.com [216.40.44.60]) by kanga.kvack.org (Postfix) with ESMTP id 3F2388D0001 for ; Thu, 20 Aug 2020 09:05:06 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0444C181AEF00 for ; Thu, 20 Aug 2020 13:05:06 +0000 (UTC) X-FDA: 77170967412.11.plant82_4b14f7f27030 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id E2ECC180F68C2 for ; Thu, 20 Aug 2020 13:04:32 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,longman@redhat.com,,RULES_HIT:30012:30054,0,RBL:216.205.24.124:@redhat.com:.lbl8.mailshell.net-62.18.0.100 64.10.201.10;04y84n97gnobfngydu4k1oh7a7rojocchdwjhozop595bfdomx3ic6kped5s4zw.jerenqkckr9kctky331ghrmxdwc7hkicdqmb4w5xjm5capjxu53anf1ogpd4i6d.o-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: plant82_4b14f7f27030 X-Filterd-Recvd-Size: 4863 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Aug 2020 13:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597928660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=CJnfEEPsHTayufcqPRv869AJ8y4aZylFQ/z6R8psu84=; b=W5klOx4SzoGp3xt2cs41k4Ao0PscJvQFfKjAeWYhg6TSGR31khyzxJvlk5mIk/0PrU+iFX u6JSjN1x4Y+FWDpVpnjp8hyB9khaFSf/1X2CmPfUDUtn21ze9JqGX++s/VDTxMBuYwQzim yiIn2rAYgTL9BW1S8OhWSwl6mMDQW84= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457-VVfH2K2cNdKSB7y61NNuZA-1; Thu, 20 Aug 2020 09:04:16 -0400 X-MC-Unique: VVfH2K2cNdKSB7y61NNuZA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B42A81F02B; Thu, 20 Aug 2020 13:04:14 +0000 (UTC) Received: from llong.com (unknown [10.10.115.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAC0A600DD; Thu, 20 Aug 2020 13:04:12 +0000 (UTC) From: Waiman Long To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Tejun Heo Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Chris Down , Roman Gushchin , Yafang Shao , Waiman Long Subject: [PATCH 3/3] mm/memcg: Unify swap and memsw page counters Date: Thu, 20 Aug 2020 09:03:50 -0400 Message-Id: <20200820130350.3211-4-longman@redhat.com> In-Reply-To: <20200820130350.3211-1-longman@redhat.com> References: <20200820130350.3211-1-longman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Rspamd-Queue-Id: E2ECC180F68C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: The swap page counter is v2 only while memsw is v1 only. As v1 and v2 controllers cannot be active at the same time, there is no point to keep both swap and memsw page counters in mem_cgroup. The previous patch has made sure that memsw page counter is updated and accessed only when in v1 code paths. So it is now safe to alias the v1 memsw page counter to v2 swap page counter. This saves 14 long's in the size of mem_cgroup. This is a saving of 112 bytes for 64-bit archs. Signed-off-by: Waiman Long --- include/linux/memcontrol.h | 3 +-- mm/memcontrol.c | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d0b036123c6a..d2a819d7db70 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -216,10 +216,9 @@ struct mem_cgroup { /* Accounted resources */ struct page_counter memory; - struct page_counter swap; + struct page_counter swap; /* memsw (memory+swap) for v1 */ /* Legacy consumer-oriented counters */ - struct page_counter memsw; struct page_counter kmem; struct page_counter tcpmem; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d219dca5239f..04c3794cdc98 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -68,6 +68,11 @@ #include +/* + * The v1 memsw page counter is aliased to the v2 swap page counter. + */ +#define memsw swap + struct cgroup_subsys memory_cgrp_subsys __read_mostly; EXPORT_SYMBOL(memory_cgrp_subsys); @@ -5279,13 +5284,11 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) memcg->use_hierarchy = true; page_counter_init(&memcg->memory, &parent->memory); page_counter_init(&memcg->swap, &parent->swap); - page_counter_init(&memcg->memsw, &parent->memsw); page_counter_init(&memcg->kmem, &parent->kmem); page_counter_init(&memcg->tcpmem, &parent->tcpmem); } else { page_counter_init(&memcg->memory, NULL); page_counter_init(&memcg->swap, NULL); - page_counter_init(&memcg->memsw, NULL); page_counter_init(&memcg->kmem, NULL); page_counter_init(&memcg->tcpmem, NULL); /* @@ -5414,7 +5417,6 @@ static void mem_cgroup_css_reset(struct cgroup_subsys_state *css) page_counter_set_max(&memcg->memory, PAGE_COUNTER_MAX); page_counter_set_max(&memcg->swap, PAGE_COUNTER_MAX); - page_counter_set_max(&memcg->memsw, PAGE_COUNTER_MAX); page_counter_set_max(&memcg->kmem, PAGE_COUNTER_MAX); page_counter_set_max(&memcg->tcpmem, PAGE_COUNTER_MAX); page_counter_set_min(&memcg->memory, 0);