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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68B67C433DB for ; Tue, 30 Mar 2021 10:21:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EC60361955 for ; Tue, 30 Mar 2021 10:21:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC60361955 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 70E476B0080; Tue, 30 Mar 2021 06:21:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BDEC6B0089; Tue, 30 Mar 2021 06:21:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 537006B008A; Tue, 30 Mar 2021 06:21:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0069.hostedemail.com [216.40.44.69]) by kanga.kvack.org (Postfix) with ESMTP id 33F046B0080 for ; Tue, 30 Mar 2021 06:21:19 -0400 (EDT) Received: from smtpin39.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E6E57181AF5C7 for ; Tue, 30 Mar 2021 10:21:18 +0000 (UTC) X-FDA: 77976148236.39.4B8A7A7 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by imf20.hostedemail.com (Postfix) with ESMTP id 9C76AF0 for ; Tue, 30 Mar 2021 10:21:13 +0000 (UTC) Received: by mail-pg1-f180.google.com with SMTP id v186so11383642pgv.7 for ; Tue, 30 Mar 2021 03:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R5veAUhSS6Fz26qMprH/wcKOq7j9SHcNjy/OxtDgU18=; b=zmgA6N0P6xL+V29cMSaEkKDyFRe4H8XPXlM0+f6dCOZP38p5f58whv0lg+2tRIU9n4 c7E0IsyjDNrfjBv7A2czlzFODQekAnNcftnNDdPW6e/iO1sELVQOI+fvR4OmbdsMdlGo EpZQGi3QbqjgKvnRW/cPYp/u/RcPZJFYSwm9w3jZd8BEQwDv0XPB8spHV94sM0kVpkNo kLXnRkq5NWdv7IrJugk0nfOtvEmSvWLglNZiHd9gj9sUg2/VkVFQPSSAxdWsv6xzqBUT IoMJVPGAVMtWEj/TwGv9tX+5ZzPz/mU5edg6TFzXtxGDV+EDqe7fjL8CQotZiyXl6TrA lGoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R5veAUhSS6Fz26qMprH/wcKOq7j9SHcNjy/OxtDgU18=; b=dx0QKeP+UMNsTETeb2WF9m+8PlXQWbU7hMHI0z2XBgXVzlMo0wd6Plf1C/TXq34vSi H+7Fw+xWvBctM19f2Kiv47ll2w0K+IYUdX+Q7NSNnKkVgyhmTkqMoC3vnekEoIuxaGNx fOXpXZgwJm8Ap9ubg3wYYn+waUrtLMAbQhVtTfVI3TeRl5OELRdE1Z9Z7aPm5jgt/Cj/ /9BewyqObyW05JZ46VI5q89yjcd+c3t2MPvO8ik5IxuWUPVaBLMJshugd6dEGPGwIPAz CPJGv8GkpbjnNufjQx3oGRJiC/9Odi4lik2HEI6lhaRaspGgrUNb8cpAj9E/AyZ7e+hu qnRQ== X-Gm-Message-State: AOAM533kwSaba/9+3n4UfDkF2U1htoUy7/ENksxZpKLe7WnaouXUfwXG SC+RDxoT/SLk5sAxOQJLBB76OQ== X-Google-Smtp-Source: ABdhPJz286lp8BRJWYf0CYMLqNmJOod7UzXekLsRaYeQsUYB9g/aG3ON62ct8biWttlwrCYtmaA77g== X-Received: by 2002:a62:fc10:0:b029:1ef:141f:609 with SMTP id e16-20020a62fc100000b02901ef141f0609mr28684092pfh.78.1617099675662; Tue, 30 Mar 2021 03:21:15 -0700 (PDT) Received: from localhost.localdomain ([2408:8445:ad30:68d8:c87f:ca1b:dc00:4730]) by smtp.gmail.com with ESMTPSA id k10sm202259pfk.205.2021.03.30.03.21.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Mar 2021 03:21:15 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, Muchun Song Subject: [RFC PATCH 04/15] mm: memcontrol: use lruvec_memcg in lruvec_holds_page_lru_lock Date: Tue, 30 Mar 2021 18:15:20 +0800 Message-Id: <20210330101531.82752-5-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210330101531.82752-1-songmuchun@bytedance.com> References: <20210330101531.82752-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 9C76AF0 X-Stat-Signature: 6pcd6xcyyd5k6wdza9he91mrbrd7xsc7 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=mail-pg1-f180.google.com; client-ip=209.85.215.180 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617099673-479822 Content-Transfer-Encoding: quoted-printable 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: We already have a helper lruvec_memcg() to get the memcg from lruvec, we do not need to do it ourselves in the lruvec_holds_page_lru_lock(). So us= e lruvec_memcg() instead. Signed-off-by: Muchun Song --- include/linux/memcontrol.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index a35a22994cf7..6e3283828391 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -744,20 +744,20 @@ static inline struct lruvec *mem_cgroup_page_lruvec= (struct page *page) return mem_cgroup_lruvec(memcg, pgdat); } =20 +static inline struct mem_cgroup *lruvec_memcg(struct lruvec *lruvec); + static inline bool lruvec_holds_page_lru_lock(struct page *page, struct lruvec *lruvec) { pg_data_t *pgdat =3D page_pgdat(page); const struct mem_cgroup *memcg; - struct mem_cgroup_per_node *mz; =20 if (mem_cgroup_disabled()) return lruvec =3D=3D &pgdat->__lruvec; =20 - mz =3D container_of(lruvec, struct mem_cgroup_per_node, lruvec); memcg =3D page_memcg(page) ? : root_mem_cgroup; =20 - return lruvec->pgdat =3D=3D pgdat && mz->memcg =3D=3D memcg; + return lruvec->pgdat =3D=3D pgdat && lruvec_memcg(lruvec) =3D=3D memcg; } =20 struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); --=20 2.11.0