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 2B2E4C43334 for ; Thu, 23 Jun 2022 07:03:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A949E8E0134; Thu, 23 Jun 2022 03:03:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A45C68E0115; Thu, 23 Jun 2022 03:03:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90C798E0134; Thu, 23 Jun 2022 03:03:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 7C1D38E0115 for ; Thu, 23 Jun 2022 03:03:32 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 4B9261213C5 for ; Thu, 23 Jun 2022 07:03:32 +0000 (UTC) X-FDA: 79608609864.30.205DE47 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf22.hostedemail.com (Postfix) with ESMTP id 43B2CC00BE for ; Thu, 23 Jun 2022 07:03:24 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id q140so18284350pgq.6 for ; Thu, 23 Jun 2022 00:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=aw6abvU+RPzbpQ8yEGTaFOYy5BKz6zLvhQlXywKJAts=; b=21tn1zwaXhP0ni7W1wrOh//pEXWMkviVafEg0WOvGlHNk+RbUMN4MF/wvq9kmiim68 tj0BJgSvhCXNbmSkSDbCs1nm5ug3sW6IW+NXRJ3Veh/eTWUxC5aVbdXyPbXZswq8MXsd FdyM4XC08GIB4CDLUZFifoNxZ1Eyi/XPAZFiz3V6kX19HH5w6KBHMC2blBfI8YOM7dLk +aU6lF6AOpZC27jlnEQGGBsVVVo/YAihTpOF76TfhTzUq3JPpmgY5hlgOOhKxQFPGqUW ECdn3kUIXXx/WMkCUIaJAUi4iOSwHq3VCi+b4shJ4BDnf/0qjA1EIntzauMAezBrOL2o XIJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=aw6abvU+RPzbpQ8yEGTaFOYy5BKz6zLvhQlXywKJAts=; b=WVDQKxphS30gH4iE1qbX/yTP6OLzwETVoyUvCFD5d3bC9+pzJjKFClWmaIw3pYvHH1 j8rEdzQhrQoXajWqjkrQVidxgiUQEzpIgovebTM9fjUfGJmYhX8ol4Z/fKCoi6gbl283 2M0dh0EYpl9TN9NZ/Anooc21pZbmW1IjzSM5nIhDWIpZhTLKgXM/MQ5AU+qthUbHd1sS e0yqtab7c6U5XmNauwpy9dOhM3L57dEv9/p1Ak2A+E892rjYxUX3MC3uBqYeQXu8RNy+ D8A0RH2Z5G/tpvQOjblgoiayZO9lf4ruJbzECGP2YKggUgmomlszPuELXfptRUQrymLR q15g== X-Gm-Message-State: AJIora8VBBtOVinGRUoy1BjCwrur61M5OoksFhNALqbE40GkmWBrI9hx Zq489bsSLdsjhsoaV6HWKMq1xQ== X-Google-Smtp-Source: AGRyM1uD5dXjR9FOuAYlSZOsFirIagjIw4HW8RiDBf7Bfm4Lodi0/bba/WnFntnJWaDIMstTpr1sWQ== X-Received: by 2002:a05:6a00:1584:b0:51c:7932:975a with SMTP id u4-20020a056a00158400b0051c7932975amr39474941pfk.80.1655967803360; Thu, 23 Jun 2022 00:03:23 -0700 (PDT) Received: from localhost ([139.177.225.231]) by smtp.gmail.com with ESMTPSA id y21-20020a056a00191500b005252867671esm5485715pfi.66.2022.06.23.00.03.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 00:03:23 -0700 (PDT) Date: Thu, 23 Jun 2022 15:03:18 +0800 From: Muchun Song To: Miaohe Lin Cc: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, zokeefe@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 13/16] mm/huge_memory: add helper __get_deferred_split_queue Message-ID: References: <20220622170627.19786-1-linmiaohe@huawei.com> <20220622170627.19786-14-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220622170627.19786-14-linmiaohe@huawei.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655967811; a=rsa-sha256; cv=none; b=NPUExqt5K3X+LF1+22PmoBNwl7B4W2P/7uce3GqydR+MhwGaiz3MD6XMdBR1LdpwBI0Vl1 Uc+x6bT0gcrFDUz+StKE3UGahAASkFVRY9MtLik6p7gYJFFTuFhRDuzhvHUmnxy0pj0gFT KdYLqtrTtShyWKOmH6rjOrk32xZ8ruY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=21tn1zwa; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf22.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655967811; 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=aw6abvU+RPzbpQ8yEGTaFOYy5BKz6zLvhQlXywKJAts=; b=yfzhMBVUAzRedIEyXFgYWcLDrdNf4Upy7tWx8cQJhHs3EkSWL0briU7iqObo+KqNYwp1RL gKPm0/AZZuDcHKHXbCYNnqgVX6WuYR6nl1goklEgDhdzucBN8GZoFJBPdTLMPumAUlN9TR w86y57pTaoPnzs1cbx/NVuVi5lVGWoE= X-Rspamd-Queue-Id: 43B2CC00BE X-Rspam-User: Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=21tn1zwa; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf22.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Rspamd-Server: rspam03 X-Stat-Signature: wrgkgxhhrjhxtdx9njaf3p9q8qsgxxfq X-HE-Tag: 1655967804-579328 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: On Thu, Jun 23, 2022 at 01:06:24AM +0800, Miaohe Lin wrote: > Add helper __get_deferred_split_queue to remove the duplicated codes of > getting ds_queue. No functional change intended. > Sorry, I suggest dropping this change since I have reworked the code here [1]. [1] https://lore.kernel.org/all/20220621125658.64935-7-songmuchun@bytedance.com/ > Signed-off-by: Miaohe Lin > --- > mm/huge_memory.c | 35 ++++++++++++----------------------- > 1 file changed, 12 insertions(+), 23 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 0030b4f67cd9..de8155ff584c 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -555,25 +555,23 @@ pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) > return pmd; > } > > -#ifdef CONFIG_MEMCG > -static inline struct deferred_split *get_deferred_split_queue(struct page *page) > +static inline struct deferred_split *__get_deferred_split_queue(struct pglist_data *pgdat, > + struct mem_cgroup *memcg) > { > - struct mem_cgroup *memcg = page_memcg(compound_head(page)); > - struct pglist_data *pgdat = NODE_DATA(page_to_nid(page)); > - > +#ifdef CONFIG_MEMCG > if (memcg) > return &memcg->deferred_split_queue; > - else > - return &pgdat->deferred_split_queue; > +#endif > + return &pgdat->deferred_split_queue; > } > -#else > + > static inline struct deferred_split *get_deferred_split_queue(struct page *page) > { > + struct mem_cgroup *memcg = page_memcg(compound_head(page)); > struct pglist_data *pgdat = NODE_DATA(page_to_nid(page)); > > - return &pgdat->deferred_split_queue; > + return __get_deferred_split_queue(pgdat, memcg); > } > -#endif > > void prep_transhuge_page(struct page *page) > { > @@ -2774,31 +2772,22 @@ void deferred_split_huge_page(struct page *page) > static unsigned long deferred_split_count(struct shrinker *shrink, > struct shrink_control *sc) > { > - struct pglist_data *pgdata = NODE_DATA(sc->nid); > - struct deferred_split *ds_queue = &pgdata->deferred_split_queue; > + struct deferred_split *ds_queue; > > -#ifdef CONFIG_MEMCG > - if (sc->memcg) > - ds_queue = &sc->memcg->deferred_split_queue; > -#endif > + ds_queue = __get_deferred_split_queue(NODE_DATA(sc->nid), sc->memcg); > return READ_ONCE(ds_queue->split_queue_len); > } > > static unsigned long deferred_split_scan(struct shrinker *shrink, > struct shrink_control *sc) > { > - struct pglist_data *pgdata = NODE_DATA(sc->nid); > - struct deferred_split *ds_queue = &pgdata->deferred_split_queue; > + struct deferred_split *ds_queue; > unsigned long flags; > LIST_HEAD(list), *pos, *next; > struct page *page; > int split = 0; > > -#ifdef CONFIG_MEMCG > - if (sc->memcg) > - ds_queue = &sc->memcg->deferred_split_queue; > -#endif > - > + ds_queue = __get_deferred_split_queue(NODE_DATA(sc->nid), sc->memcg); > spin_lock_irqsave(&ds_queue->split_queue_lock, flags); > /* Take pin on all head pages to avoid freeing them under us */ > list_for_each_safe(pos, next, &ds_queue->split_queue) { > -- > 2.23.0 > >