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 D35D8E77184 for ; Tue, 17 Dec 2024 18:19:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 55F906B0082; Tue, 17 Dec 2024 13:19:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 50FC56B0083; Tue, 17 Dec 2024 13:19:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FDF46B0088; Tue, 17 Dec 2024 13:19:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 220E36B0082 for ; Tue, 17 Dec 2024 13:19:49 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CE73343DDF for ; Tue, 17 Dec 2024 18:19:48 +0000 (UTC) X-FDA: 82905264120.02.10D224E Received: from out-185.mta1.migadu.com (out-185.mta1.migadu.com [95.215.58.185]) by imf24.hostedemail.com (Postfix) with ESMTP id 007EE18000A for ; Tue, 17 Dec 2024 18:19:42 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=wyz1PN7J; spf=pass (imf24.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.185 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734459566; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=90cmCkJH8sbTboIFC394aI8JGeyjUNZJnQeP7FThfM4=; b=KiJo9BYEplnQryoUHawJVjQBzZpNq92jd6EhANV70XuQj1USAw3Wvp14xQDn4BqrT5k2X8 4pDR0Vo20h9U8HbKiCSLLI7rlkbHjh4nMKANY5Wz0B2mvx3aJLBlY66TPRXiFPoE810amS lbk9r97b1REFgaiSFbWmw76Z5geEruY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=wyz1PN7J; spf=pass (imf24.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.185 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734459566; a=rsa-sha256; cv=none; b=EPpcSdgV+zWjGPH1R3KLqMwbdUiDA0gMV7rym2W8i79jb8GD30aljb5eN9pv+F4rd5vghs dh8g8rZQEqmTwP62U11ZH2NWRNUIpcZpJrShkFcLJ4X91UKMW2OqKJrJK8url8LLaPv9fX BLemNbVu7xHJeuKdvJJz0kyvZBXLtRI= Date: Tue, 17 Dec 2024 10:19:38 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1734459585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=90cmCkJH8sbTboIFC394aI8JGeyjUNZJnQeP7FThfM4=; b=wyz1PN7JIA6uNzud5GRqCX2eaXCis/C7BrkZhH1eKxmlPyM4bbVu2v7u5c4YMpFJgMfnsb OvNzlZhgGvWjIs5V/EFZCZXMJhL0ijrBq6gyXwdxGHpMwZadpWke2qAzeW1amQrhd88G4L 7eIONPeJRYnLgoIz/eW9UOe2Z07I1lc= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Chen Ridong Cc: akpm@linux-foundation.org, mhocko@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, roman.gushchin@linux.dev, muchun.song@linux.dev, davidf@vimeo.com, vbabka@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, chenridong@huawei.com, wangweiyang2@huawei.com Subject: Re: [next -v1 4/5] memcg: factor out the __refill_obj_stock function Message-ID: References: <20241206013512.2883617-1-chenridong@huaweicloud.com> <20241206013512.2883617-5-chenridong@huaweicloud.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241206013512.2883617-5-chenridong@huaweicloud.com> X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam05 X-Stat-Signature: gsge7ctz6hihroctm8sqfca5ynjopns1 X-Rspamd-Queue-Id: 007EE18000A X-Rspam-User: X-HE-Tag: 1734459582-43572 X-HE-Meta: U2FsdGVkX19cegzpnx0MqWBtC3GReIcu1dctEdOO+MN/wR105CR1+AduPZz19uR6s2NT84BVHPtSN7EeycHYCMnU5DmSllJT6j2SVoz8PCjQuHqR/IOtpuNSRIiVPgXaV/0UiwNNtQHyWuWYAfDpMSWOowiM1Gp6nuUvQlWKQhTyMk5cVCJlrWaiy21TwnyQ8Qanz77SkY3+HmPuD7+419RZROm4NxJFFDiX117GrBif7LImFH2x/wVnb8xPYqGArpJfaZ30FwtlNKdxvvuW8Uxy39ZoPGhf8v4PG3iJoyIfcBTeILHVGtB5ZiX6VtgG3In1gXB4nAGkOBzJcb+GW/DHV/owC9XGEik/BXCjM1CvbOz4peK8IQqNzAEo1AJkPsGGko1wNIeLzrpcjo7zWN19PXECb/4IZYa0JZfe9T7NzCk/Ei3O696N7+QjGo95z8Z3cFf55b3rGofIIOh1C95Ed0c9t7i103GIkEDf4shNntv7iHfuYbn3HsDAkHNBDk+I1gV7/9a4AMkxVC8/HtvTD2FbymtaHMlAp8AJ177lSFqZSavWBNiX7E2/4+MsPPcPdDlG1LWtFswhZ+tOGvkhYAUQRnMDVzJQIoQZvKRHstS9wLlCkAKsHrERaU1GfuncJyNwoGZt4C/EVW+DnwYqo4R87Qwxex89hV/7UFtY1bMwYkQyUk9hDSZaoSPvf0UZ/uHitmv4B7oLVkBhJ86ftHw6ZcTqwLUX6GyZVviVvMwLasLybBbgA61pZCrSgDRnBtWsKbuo2XGO/6f8S2rUREW8bXvApiyjGT3h9pKHaic/IqvxrTIIIB2zRZwNdpucenZdv+Gbwq62Z44VFyB+TCS0Uh8sfJF499fhnYZbAoPkpn2SExclspDJ9i8Qd4zFkvfnbhON0m5CqxUUrxqUUl1QXMPRywhq+OSKesshuQWB/w7ApGGAXJa//YamHzSI+7Um2N/6bJcsvpD dmkrMjJw uYXhsJv4+CCdOnNs1Seq9gZXcRiRRRfsOVrLG6PO880NuEREddklBrJoCVA6JV+3X98DgzUdfAX7Y1Ws0U8P4iGA4/pYsDPj1SyVzYmcIo3SQIj7ohcr99YOZrIWXdRq/BkSkJ3AYx/EXJuwnq0WGxEskg01K3EtG+MsUcQFaq+zOXPDL+hCukZeM22um5lYhyxZGGOuHS+72NP/ZFmxvv6QUGg== 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 Fri, Dec 06, 2024 at 01:35:11AM +0000, Chen Ridong wrote: > From: Chen Ridong > > Factor out the '__refill_obj_stock' function to make the code more > cohesive. > > Signed-off-by: Chen Ridong > --- > mm/memcontrol.c | 31 ++++++++++++++++++------------- > 1 file changed, 18 insertions(+), 13 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index f977e0be1c04..0c9331d7b606 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2697,6 +2697,21 @@ void __memcg_kmem_uncharge_page(struct page *page, int order) > obj_cgroup_put(objcg); > } > > +/* If the cached_objcg was refilled, return true; otherwise, return false */ > +static bool __refill_obj_stock(struct memcg_stock_pcp *stock, > + struct obj_cgroup *objcg, struct obj_cgroup **old_objcg) > +{ > + if (READ_ONCE(stock->cached_objcg) != objcg) { Keep the above check in the calling functions and make this a void function. Also I think we need a better name. > + *old_objcg = drain_obj_stock(stock); > + obj_cgroup_get(objcg); > + stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) > + ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; > + WRITE_ONCE(stock->cached_objcg, objcg); > + return true; > + } > + return false; > +} > + > static void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat, > enum node_stat_item idx, int nr) > { > @@ -2713,12 +2728,7 @@ static void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat, > * accumulating over a page of vmstat data or when pgdat or idx > * changes. > */ > - if (READ_ONCE(stock->cached_objcg) != objcg) { > - old = drain_obj_stock(stock); > - obj_cgroup_get(objcg); > - stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) > - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; > - WRITE_ONCE(stock->cached_objcg, objcg); > + if (__refill_obj_stock(stock, objcg, &old)) { > stock->cached_pgdat = pgdat; > } else if (stock->cached_pgdat != pgdat) { > /* Flush the existing cached vmstat data */ > @@ -2871,14 +2881,9 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes, > local_lock_irqsave(&memcg_stock.stock_lock, flags); > > stock = this_cpu_ptr(&memcg_stock); > - if (READ_ONCE(stock->cached_objcg) != objcg) { /* reset if necessary */ > - old = drain_obj_stock(stock); > - obj_cgroup_get(objcg); > - WRITE_ONCE(stock->cached_objcg, objcg); > - stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) > - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; > + if (__refill_obj_stock(stock, objcg, &old)) > allow_uncharge = true; /* Allow uncharge when objcg changes */ > - } > + > stock->nr_bytes += nr_bytes; > > if (allow_uncharge && (stock->nr_bytes > PAGE_SIZE)) { > -- > 2.34.1 >