From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F5D0C3DA49 for ; Mon, 29 Jul 2024 02:02:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC7C76B0096; Sun, 28 Jul 2024 22:02:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B77216B0098; Sun, 28 Jul 2024 22:02:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3EDA6B0099; Sun, 28 Jul 2024 22:02:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 86A806B0096 for ; Sun, 28 Jul 2024 22:02:45 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 29972801BC for ; Mon, 29 Jul 2024 02:02:45 +0000 (UTC) X-FDA: 82391141490.21.00B4256 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by imf10.hostedemail.com (Postfix) with ESMTP id 4E547C0006 for ; Mon, 29 Jul 2024 02:02:43 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=H5MYsvXG; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.167.180 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722218520; a=rsa-sha256; cv=none; b=tfpvye1OKi+2MasyJHLvDhB3WcsJIy81HHqixMaxtn78MTJUCikc5HwwzkG1+5w+u1ajh+ DUwBw810MdWxV2JpyTiWvnZHiFivSH1PZVNfgluJakfMxRSrmpDnDxVWGpiPbrVfpZaFYg ztciKMN6MNi+JvNxA5Ge6dsfYHA6+OI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=H5MYsvXG; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.167.180 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722218520; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=w0Xs54xhNptzJ7kEs2W7vD9Vy/50H6OFe/81vEtsNLU=; b=1Ejlssxn1tWU5SfxBW4/AIB1kD+KR7mtygCBpTrwZ8DEAU82rakqj8D7bcHPAA7Z2dO1sR paKlciALSzCjBQg9ouFZGk26Nz41impEn75eq68kxvV5IuBk1LfmO4MTfdnj5mcoGhbaN6 MYc99mES3V9puab8DNuRe0JbHqkScGA= Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-3db12a2f530so1893067b6e.1 for ; Sun, 28 Jul 2024 19:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722218562; x=1722823362; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w0Xs54xhNptzJ7kEs2W7vD9Vy/50H6OFe/81vEtsNLU=; b=H5MYsvXGMHDRXVl3dZ4GIYvhf0VRYvEmIrfGxEXPZE8IUnB68Jdti2Idha4CHIJ2n6 VTORvjQHEKo+VVK+556lSp9/U77Le0wzpwibuGPNKRR0lcEZ0ezALA1MkeWFfGKnnGEi +WE3Akk+djEs4nlZm4x+796Zat7hISC4de6JJ7UgNMyAhNd3EZlzsDbV/LFX6e9aTQ3h CKTsP8QvMgBGBVOy0vXYybvuu0694m/1sA7/v7RaqsFPQgzEcn83o9LuQE96Ws1a8Qqt 0sdILOhHElNuAQE/UFg3okWajIUIKpg+mWLwk0bF4SCVXH2m68VzbBB8+/AKmQg099u3 ivHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722218562; x=1722823362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w0Xs54xhNptzJ7kEs2W7vD9Vy/50H6OFe/81vEtsNLU=; b=LX8RaRxHFaT1syhKx/7Mz9djzhDQ08SwjQtTPa4m2sktiaL707yCbCPN88drcn3lfM VhqudcyFfNv0byLT2WnN7l/p7d5rZTIp5a4jDc2Imctfn41cdTVLsSHm+fQxCYtWTc2I PcJytFfFwWhs4Flj7dLd9FxWudzKWOo3GmG3CTFDhzdZnQrwUu5dCYONaH3vd8AYMlk+ ojzf0hmLvMP5s7AN+/CZM0ZTaTh9XuR777ugl+NPmYIjT3CFJimEptalFIjETtJgNKtm t2TRKaxX4IAOCbGfAdGAu2etEQXDDNyFH1QsdzTNurE9PPhKsCHijNpQ0yu4a+hLapVI gaGA== X-Forwarded-Encrypted: i=1; AJvYcCXI27EuKtUPdsXQBNE3CRftXhpvcexPmRYrnS1/pWjvWTzOaTGWIxi7Llfg/BpuEIrbO6zYzDXGfK2cQQ7XdeKiu8A= X-Gm-Message-State: AOJu0YxwSr66UdVexhFzxKAFj07MQhHqpxMgjTJBrGDn3FFf+bvPUfa2 vmyi7QiMTA3c9RWwmqcdTvwFrlE/1vJvnKk6zbNhZHhuRS/g4kna X-Google-Smtp-Source: AGHT+IEEQ3h5PiPfvkL2+Trqbvmnj1O3vhpxd50O8OTo03Q8+SBGPKRJeszyw8lTwBb8pQUA6mEIAg== X-Received: by 2002:a05:6808:130b:b0:3db:18c8:feb3 with SMTP id 5614622812f47-3db23ac024bmr8836380b6e.20.1722218562080; Sun, 28 Jul 2024 19:02:42 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead71592bsm5840176b3a.86.2024.07.28.19.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 19:02:41 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: yosryahmed@google.com Cc: 21cnbao@gmail.com, akpm@linux-foundation.org, baolin.wang@linux.alibaba.com, chrisl@kernel.org, david@redhat.com, hannes@cmpxchg.org, hughd@google.com, kaleshsingh@google.com, kasong@tencent.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhocko@suse.com, minchan@kernel.org, nphamcs@gmail.com, ryan.roberts@arm.com, senozhatsky@chromium.org, shakeel.butt@linux.dev, shy828301@gmail.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, xiang@kernel.org, ying.huang@intel.com Subject: Re: [PATCH v5 2/4] mm: Introduce mem_cgroup_swapin_uncharge_swap_nr() helper for large folios swap-in Date: Mon, 29 Jul 2024 14:02:22 +1200 Message-Id: <20240729020222.36389-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 4E547C0006 X-Stat-Signature: 64bc15ocjibb3g61qwce84uzuzy5ubi9 X-Rspam-User: X-HE-Tag: 1722218563-849933 X-HE-Meta: U2FsdGVkX19xmdIEpX2+TjZ3V0a80T+fzp5JfHPZSYS5tDvWGL3VViNYrxJKwONuBvALytSMZ2w/CBI/m6+XMLWIf86NQHSHysd08L6EdBkDM7XOI3B/hnhTb7tL9Zp8xSeq8sBKc5JVE48kf+dJMTdP3xb9l1AAaBBoWfkNAyM/LgcgEZCJfZr/HGmS7KT++/7H4TxkDRjgBsCDTC9gt8n/FZcI6CmGJ7IaVun9OZ/FDsAMfeT/yT8fELco7aFtXFEyXCHB1gtbtZ4TMYWeteaKXojgXtQEHyTtkBPLFqJex+NT6reLmedfIDkK83Upo6F0dY02cfxcpKD6CIFiZFip1zUb5nfxEaF1Tb6qCeNEDHDYycQOPcSRuNhaoJArQRfufpGjbpWrdaEwgwM0XplGrjml+kHVeT74aq05l8gsIIuSXRtvJcNHQuGRIgQQOwRKzwdvOfo3uFvqgucCij2SPgMEU7rdP/SFdsxnfWA5MdtX+a3+0nkwD9No+BNBIipnFB4Hqr19bmopqZFOfgMdyJo2dazB3LZI4WRbk6Ndg1Dh3ChdAkmi/dTbv2P0sOQzxiMQGCvY+BF4FACLbHh+mtjlN5K6dtufxXnVVM+htSxezP3E4zWtGvgeVD7Nc/qmNmOzkJteYcnhknr53ffQjscBCMC+Dz4e/cTkbXYowfWZq5Vm7FporM6rRMmd6u0kZVcu1NxBWPCnKGnm1tdYqD3hoh2jKi0FwZqQTGrXKZnlZqzbCggHwoy3lckYdBXYG13ZsGxGQUH3y3bYE+46mGI1oW7rsUNhbdIzxvuFhiLxGgxcCrPyjInQDMpzFPoIPsc8rgYaLhJ+MFTlQDmLfzWt1UGKjRL0O2KbPe7SnKKBfen7xXuVGke2gxxAJI3nGuNhz3XWZVfJYYLVjDgs13FiMBMsviyr+gxsVdRgNabmtQl5+9bznD6qeWrkOGPG3lBQCoQU8RvfliG OTyxUa2j o9Z2frsbczWkLc+Oj8IGZX7uyN92SVnu6522ZBPbxvmav3Scdq5dVZAvsQ15LU6ccjeVnlV3fTd2Bl8eXIMlzhoAsSZAa9dRXciXQTayXt/j6JivN6asBzJjaJwlUoWlYWddpfv7T6hREiQfI6wB5O1s9SxQzRB+lv4FqNqEdS1ElFMVDm2hCtdGk3zOh7NlM3DcnE+UmXtOPWC3GytxFbsU49bg5IaMO0sPyBcqALsoelqiDRa5ZCDxk2DMZU8Q/D1nJAqol9h+JBuCRAcpV+JZH7zUdQZzRLA0MgjKSZelpuR3lMpNaRlGKDiERHGhpeEyGDiE15r2qz2iJf6g530G5V+rnx4YPqXih38HBiBuaLG3+4eVwnqJ0vZ49K/cfuCvoYxA2KsikZrMVvnNPiZniumAGN+oa1rXPpv1wZSn3bgne+7OfzL4nQxvs8gMFrNm6+68/as3aXZK6GlH38ayvbbXnXE/SlF7MtYOj5zNE2LJTuaY5+TOLY2zpQrdW0YyAuYz4QIoc2WdNILb6iVfYFw== 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: List-Subscribe: List-Unsubscribe: On Sat, Jul 27, 2024 at 4:31 AM Yosry Ahmed wrote: > > On Fri, Jul 26, 2024 at 2:47 AM Barry Song <21cnbao@gmail.com> wrote: > > > > From: Barry Song > > > > With large folios swap-in, we might need to uncharge multiple entries > > all together, it is better to introduce a helper for that. > > > > Signed-off-by: Barry Song > > --- > > include/linux/memcontrol.h | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > > index 1b79760af685..55958cbce61b 100644 > > --- a/include/linux/memcontrol.h > > +++ b/include/linux/memcontrol.h > > @@ -684,6 +684,14 @@ int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, > > gfp_t gfp, swp_entry_t entry); > > void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); > > > > +static inline void mem_cgroup_swapin_uncharge_swap_nr(swp_entry_t entry, int nr) > > +{ > > + int i; > > + > > + for (i = 0; i < nr; i++, entry.val++) > > + mem_cgroup_swapin_uncharge_swap(entry); > > mem_cgroup_swapin_uncharge_swap() calls mem_cgroup_uncharge_swap() > which already takes in nr_pages, but we currently only pass 1. Would > it be better if we just make mem_cgroup_swapin_uncharge_swap() take in > nr_pages as well and pass it along to mem_cgroup_uncharge_swap(), > instead of calling it in a loop? > > This would batch the page counter, stats updates, and refcount updates > in mem_cgroup_uncharge_swap(). You may be able to observe a bit of a > performance gain with this. Good suggestion. I'll send the v6 version below after waiting for some comments on the other patches. >From 92dfbf300fd51b427d2a6833226d1b777e0b5fee Mon Sep 17 00:00:00 2001 From: Barry Song Date: Fri, 26 Jul 2024 14:33:54 +1200 Subject: [PATCH v6 2/4] mm: Introduce mem_cgroup_swapin_uncharge_swap_nr() helper for large folios swap-in With large folios swap-in, we might need to uncharge multiple entries all together, it is better to introduce a helper for that. Signed-off-by: Barry Song --- include/linux/memcontrol.h | 10 ++++++++-- mm/memcontrol.c | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 1b79760af685..f5dd1e34654a 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -682,7 +682,8 @@ int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp, int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, gfp_t gfp, swp_entry_t entry); -void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); + +void mem_cgroup_swapin_uncharge_swap_nr(swp_entry_t entry, unsigned int nr_pages); void __mem_cgroup_uncharge(struct folio *folio); @@ -1181,7 +1182,7 @@ static inline int mem_cgroup_swapin_charge_folio(struct folio *folio, return 0; } -static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) +static inline void mem_cgroup_swapin_uncharge_swap_nr(swp_entry_t entry, int nr) { } @@ -1796,6 +1797,11 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, #endif /* CONFIG_MEMCG */ +static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) +{ + mem_cgroup_swapin_uncharge_swap_nr(entry, 1); +} + #if defined(CONFIG_MEMCG) && defined(CONFIG_ZSWAP) bool obj_cgroup_may_zswap(struct obj_cgroup *objcg); void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index eb92c21615eb..25657d6a133f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4573,14 +4573,15 @@ int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm, /* * mem_cgroup_swapin_uncharge_swap - uncharge swap slot - * @entry: swap entry for which the page is charged + * @entry: the first swap entry for which the pages are charged + * @nr_pages: number of pages which will be uncharged * * Call this function after successfully adding the charged page to swapcache. * * Note: This function assumes the page for which swap slot is being uncharged * is order 0 page. */ -void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) +void mem_cgroup_swapin_uncharge_swap_nr(swp_entry_t entry, unsigned int nr_pages) { /* * Cgroup1's unified memory+swap counter has been charged with the @@ -4600,7 +4601,7 @@ void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) * let's not wait for it. The page already received a * memory+swap charge, drop the swap entry duplicate. */ - mem_cgroup_uncharge_swap(entry, 1); + mem_cgroup_uncharge_swap(entry, nr_pages); } } -- 2.34.1 > > > +} > > + > > void __mem_cgroup_uncharge(struct folio *folio); > > > > /** > > @@ -1185,6 +1193,10 @@ static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry) > > { > > } > > > > +static inline void mem_cgroup_swapin_uncharge_swap_nr(swp_entry_t entry, int nr) > > +{ > > +} > > + > > static inline void mem_cgroup_uncharge(struct folio *folio) > > { > > } > > -- > > 2.34.1 > >