From patchwork Tue Apr 13 06:51:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12199455 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.5 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,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 33D46C433ED for ; Tue, 13 Apr 2021 06:57:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CA9A360FDB for ; Tue, 13 Apr 2021 06:57:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA9A360FDB 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 6D09D6B0036; Tue, 13 Apr 2021 02:57:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A5336B0099; Tue, 13 Apr 2021 02:57:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 546C86B009B; Tue, 13 Apr 2021 02:57:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id 384F66B0036 for ; Tue, 13 Apr 2021 02:57:46 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F3E0D8249980 for ; Tue, 13 Apr 2021 06:57:45 +0000 (UTC) X-FDA: 78026438490.22.8A8D4CD Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf04.hostedemail.com (Postfix) with ESMTP id 03F4D13A for ; Tue, 13 Apr 2021 06:57:43 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id d124so10788212pfa.13 for ; Mon, 12 Apr 2021 23:57:45 -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=OtjjYxy6fbQMjrzo3+4P30oz5j5AuPoBCZ8FaKjHWIE=; b=y1rkSqiViCIp3wTOZ5QlJPLXK+Id87VZYWjp1ZyjjVXGVoEX1B6l280oeHYcRpB1KY 9ESkPxUcqthFMWeaWmpwBsPAs3AcKDJrYuUE9hbn1eTCht6iIiiMtfmCcApQBtZCaikL 5dqWFDHSIebonXesBLGxJVCC/6inWWBnQ4RI/iagNc9h3ODaXBWPgo9+IvWilMCTYrpe iQNvJUteDMc1T/AO22JtRuTo36GFapFcy5LB2fzqZTqtpysOxnQsFFqjKSt5VJlECY+I 1pI6Cizi6IduIfyUxUUxlQRg9UqWAuAupLaQsD8V9H8d8Ra3B1qX4jDQpnVQsFnvvMnT yZqA== 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=OtjjYxy6fbQMjrzo3+4P30oz5j5AuPoBCZ8FaKjHWIE=; b=Lc+AcNCG8Ijhc0VxTTCI8A6cuuzxuzf5hJYrgzeTeMFUb9JvopO0pBlKaqf0Utgcnt PgTRyHKMTKzf7lEyIhbR8fYkyati7ay8pKjGWJC5UVgVg3IuX4Dy5Gx876JJ5gS7E0J7 x2usEB7zwmMAC1eRXFRknj8V8VoY5cAeHydpuCVSTewq/x9bmeoFMvbt7WcnkDe7q/BT v7QrgA9IYHwsqPTNuWDHFEcCNhPuAnmTejGWU9lP7rrPCHAbjCunZVaUGN3Vfl/tzZcJ Huu8aYWVTVYQw7uqv9jwzjm4K9w3Woa1YjXwrLc77frbRTU6dLhybJE7a/4YP4Ya/qHd zRTw== X-Gm-Message-State: AOAM5330wnJNj6/ntzfe9G2K824s5E7rGXWmcYD3QwwhwTvkwbZilMs9 Zi3PX+8uvYPGsQ1ULR5VlocF+g== X-Google-Smtp-Source: ABdhPJy7qTBayD0MjKH9mpcq9ysXSWq3mVkOTjl13qDTm/tP1B8q6Px9uYLgupMSHVay7ks/UL7ooQ== X-Received: by 2002:a62:7b0e:0:b029:24c:3d81:8028 with SMTP id w14-20020a627b0e0000b029024c3d818028mr9200627pfc.58.1618297064697; Mon, 12 Apr 2021 23:57:44 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.241]) by smtp.gmail.com with ESMTPSA id 78sm11508562pfu.40.2021.04.12.23.57.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Apr 2021 23:57:44 -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, fam.zheng@bytedance.com, Muchun Song Subject: [PATCH 2/7] mm: memcontrol: bail out early when !mm in get_mem_cgroup_from_mm Date: Tue, 13 Apr 2021 14:51:48 +0800 Message-Id: <20210413065153.63431-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210413065153.63431-1-songmuchun@bytedance.com> References: <20210413065153.63431-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 03F4D13A X-Stat-Signature: 5ftojkz5a9brexo1foubh8o9iggd1y93 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from=""; helo=mail-pf1-f181.google.com; client-ip=209.85.210.181 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618297063-794004 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: When mm is NULL, we do not need to hold rcu lock and call css_tryget for the root memcg. And we also do not need to check !mm in every loop of while. So bail out early when !mm. Signed-off-by: Muchun Song Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Acked-by: Michal Hocko --- mm/memcontrol.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f229de925aa5..9cbfff59b171 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -901,20 +901,19 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) if (mem_cgroup_disabled()) return NULL; + /* + * Page cache insertions can happen without an + * actual mm context, e.g. during disk probing + * on boot, loopback IO, acct() writes etc. + */ + if (unlikely(!mm)) + return root_mem_cgroup; + rcu_read_lock(); do { - /* - * Page cache insertions can happen without an - * actual mm context, e.g. during disk probing - * on boot, loopback IO, acct() writes etc. - */ - if (unlikely(!mm)) + memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); + if (unlikely(!memcg)) memcg = root_mem_cgroup; - else { - memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); - if (unlikely(!memcg)) - memcg = root_mem_cgroup; - } } while (!css_tryget(&memcg->css)); rcu_read_unlock(); return memcg;