Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933243AbdC3Ax5 (ORCPT ); Wed, 29 Mar 2017 20:53:57 -0400 Received: from mga01.intel.com ([192.55.52.88]:49777 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932971AbdC3Axz (ORCPT ); Wed, 29 Mar 2017 20:53:55 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,244,1486454400"; d="scan'208";a="1148604354" From: "Huang\, Ying" To: Johannes Weiner Cc: "Huang\, Ying" , Andrew Morton , , , Andrea Arcangeli , "Kirill A . Shutemov" , Vladimir Davydov , Michal Hocko , Tejun Heo , Subject: Re: [PATCH -mm -v7 2/9] mm, memcg: Support to charge/uncharge multiple swap entries References: <20170328053209.25876-1-ying.huang@intel.com> <20170328053209.25876-3-ying.huang@intel.com> <20170329165722.GB31821@cmpxchg.org> Date: Thu, 30 Mar 2017 08:53:50 +0800 In-Reply-To: <20170329165722.GB31821@cmpxchg.org> (Johannes Weiner's message of "Wed, 29 Mar 2017 12:57:22 -0400") Message-ID: <87k277twip.fsf@yhuang-dev.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1625 Lines: 42 Johannes Weiner writes: > On Tue, Mar 28, 2017 at 01:32:02PM +0800, Huang, Ying wrote: >> @@ -5908,16 +5907,19 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) >> css_put(&memcg->css); >> } >> >> -/* >> - * mem_cgroup_try_charge_swap - try charging a swap entry >> +/** >> + * mem_cgroup_try_charge_swap - try charging a set of swap entries >> * @page: page being added to swap >> - * @entry: swap entry to charge >> + * @entry: the first swap entry to charge >> + * @nr_entries: the number of swap entries to charge >> * >> - * Try to charge @entry to the memcg that @page belongs to. >> + * Try to charge @nr_entries swap entries starting from @entry to the >> + * memcg that @page belongs to. >> * >> * Returns 0 on success, -ENOMEM on failure. >> */ >> -int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry) >> +int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry, >> + unsigned int nr_entries) > > I've pointed this out before, Yes. And I have replied to your original comments too :-) > but there doesn't seem to be a reason to > pass @nr_entries when we have the struct page. Why can't this function > just check PageTransHuge() by itself? Because sometimes we need to charge one swap entry for a THP. Please take a look at the original add_to_swap() implementation. For a THP, one swap entry will be allocated and charged to the mem cgroup before the THP is split. And I think it is not easy to change this, because we don't want to split THP if the mem cgroup for swap exceeds its limit. Best Regards, Huang, Ying