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 AD22BE77188 for ; Thu, 19 Dec 2024 01:55:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 438DE6B0085; Wed, 18 Dec 2024 20:55:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C02D6B0088; Wed, 18 Dec 2024 20:55:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2612F6B0089; Wed, 18 Dec 2024 20:55:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 07BEC6B0085 for ; Wed, 18 Dec 2024 20:55:09 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 92D0B1612CE for ; Thu, 19 Dec 2024 01:55:08 +0000 (UTC) X-FDA: 82910039142.03.F044AFA Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf16.hostedemail.com (Postfix) with ESMTP id 8B6CA180002 for ; Thu, 19 Dec 2024 01:54:30 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734573270; 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; bh=i/4l++tpEd2X73skU85QOIK3OpqY6Wb78+C/NVTThW4=; b=le+aYy6ijvJCDy49I+S4p0Fhh9/ks+ZeTDSEuP/fnJhyf4JWU9InbV8GGgYE+jBCKegxUU iKH4nVrrJIulqmLIGzIj3rt2lMisRkveh4WC5abyYi3KN9UwY8DvESqvC4nSpSwbrPUupu UKBKkgfPQNiNgwNarSy1zN8LS5cbtms= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734573270; a=rsa-sha256; cv=none; b=UmdMsN0hfgnAm6Yluwm8l4tXRuUkpPL9l7lgq8hO3MCneVPeUoBSAWURnZabwVMFpvnbqM KFdjHkpow1C2IjZawjAxhNwl/BxJLgRk1HouKHI+6Dbjjqvfx10yniKeiWB5/+fy0eHz9E 6HorZyJ4zfD26GzvXQwoJiPaeooHWJk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YDDBH2010z4f3lfG for ; Thu, 19 Dec 2024 09:54:31 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id D48551A0359 for ; Thu, 19 Dec 2024 09:54:51 +0800 (CST) Received: from [10.67.109.79] (unknown [10.67.109.79]) by APP4 (Coremail) with SMTP id gCh0CgCXcobqfGNndZsDFA--.17867S2; Thu, 19 Dec 2024 09:54:51 +0800 (CST) Message-ID: <2a28dc42-bd9c-4799-9fe8-0298f5341093@huaweicloud.com> Date: Thu, 19 Dec 2024 09:54:50 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [next -v1 4/5] memcg: factor out the __refill_obj_stock function To: Shakeel Butt 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 References: <20241206013512.2883617-1-chenridong@huaweicloud.com> <20241206013512.2883617-5-chenridong@huaweicloud.com> Content-Language: en-US From: Chen Ridong In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgCXcobqfGNndZsDFA--.17867S2 X-Coremail-Antispam: 1UD129KBjvJXoWxWr45JrWfGFWUZF1DAw43ZFb_yoW5ur1rpr ZrWa4UKw48ZrW2grsI9F47Zr1rZr4vqFnFkr4Iq34xCFna9Fn0qryjka4jya48Jr93tF4x Jr4qvFn2kF4UGa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUv0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcVAKI48JM4IIrI8v6xkF7I0E8cxan2IY04v7MxkF7I0En4kS 14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I 8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8 ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x 0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_ Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU1 7KsUUUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ X-Rspamd-Queue-Id: 8B6CA180002 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: 3hwodhij3tdfpy4qyhe83eb3i5z7q5b8 X-HE-Tag: 1734573270-783472 X-HE-Meta: U2FsdGVkX18v0i8xg6Nxq2tjVKc76us5yEQgEUBFMxUUpUq6gQYKEs1dwbRM2zrTg9Pbf3bwdMGiqRwsPBJr68ERd8tZXxyTWGxd7POJQ1mDLSDTZ9QKPSFe60DHo3Y/dQfqCj/Wle/yNH9aDLcEHovc7oKKb4Kr8yqXCP/8ClxHw2jHxqEe/RbObxwS2kg8sodGf1zyRsM/q9SNfwZYExywVjvCExRTPbKLft2PaoHpq612wCNAELdIKOhFklCPECXcwfIBtSGEGRD4MmiUV0um/9AJxKXuCvn7tPnt7h/XHlHCcMJDLKMf8VjSRZ2nj8dgKjeC7YrBTafxJKtdeY4CrBV7AAl5DD+SVaeHl5kx5nBWCaIKbksQZa/y/vplPV1tmKi31iiVqo8BZ7EDKS3BBZmZM3fEbBT7MvJtwrIEiJDfEvNdXeBx4fAVR27CvpkSreQo6hcqO2XAOxqNveMQmkEl0xSa6qI7Z+NPcyk/DlYxBoeMQIu5J22f1u83KJhnXaw3DzwJRnFCT0ClOV3toe7ZxJbmwKURBwRyrDykMb9kQRM1EaZkKO1x1W/2GCD+hUM4zRV1ny9QA1IT5qNfMvmOIldBQNA6KlpjAacSykghM7ZWefYISNJm1YQOZw3HeEjvrLBBvkpUwoACi/+mYhWT2NDAv72+MDbUaz0ZmlrfaZAPSrkYUVGwijZ6vFU/a8ieN7kjphOsdbSi0ug42ZHlNVZO4D5E3oHolE9mj0jmmgdrOt2MHDdiHPdmjcWCYOuJ63LpJxUq+YT36k88JUhbuizCP0RgNC1DRpFh9JIX03IIos6NTalY7lBqWy7pv706ic7objkUtHgyym6gaRKmf0/3ZImC/dVwpTa0Sx5VnSDy02NTvHGt+bzorRpwDZ1KSp4sdmhTJXHriV83MH0Kt+6pv87ntqCOMeP+AgWDaq3Evl3p3AHlsdXcUzMMvKPsHJueoENvlBr sxwbDhAv RgHtAD0/tP4jVHKwYB82HuFfAgZ9MxWcTKCz9U1CNyZ2LePxNtHSL/o5tFQEl3j+iEW07Hw70bgVkcWmM9bp1uzP5CjfniYSltdBcCsgisK2BODtZUiTS2hDUgJuT7QcGVy++guD9KVfFQ0pA7LKkuXa0+nSd4YIoA1F9GCdkCGTp9jfZDHYrZb5jilUCmLE9A3FaycbSbus1RYwrrJV5iNBJhXXDUaDgZ1hYPJ6brs3+B+L8b5WPbFA/QX3kTSJkhPO/ 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 2024/12/18 2:19, Shakeel Butt wrote: > 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. > Thank you for your review。 How about keeping the check in the calling functions and renaming like that: /* Replace the stock objcg with objcg, return the old objcg */ static obj_cgroup *replace_stock_objcg (struct memcg_stock_pcp *stock, struct obj_cgroup *objcg) Best regards, Ridong >> + *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 >>