From patchwork Thu Oct 19 22:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 155736 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp699031vqb; Thu, 19 Oct 2023 15:56:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwxUclOYPoD2Q2h3pDHv6uaSGv0VY4djvH8gozo2lBrda3kwvB0UdOP5pP5t/lNeXEBC4j X-Received: by 2002:a17:903:18a:b0:1c9:cf26:8d91 with SMTP id z10-20020a170903018a00b001c9cf268d91mr308423plg.8.1697756179580; Thu, 19 Oct 2023 15:56:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697756179; cv=none; d=google.com; s=arc-20160816; b=E+5o5EUHZZ27WAFjTvcPb2EmXA3FI3C/15dvLfjLYGYGTLphs1LZM2oHEtUWCd16RW Z6tniQO4hOYHffs8roaFxgXQEXhmu2vsITk1mIWvZNbWYPLBZ/GqTZwVTvOf9Rvr9MPx mKQzNPbo4vuQKdEdpmc5/jCFGACU//4D3CmUoszowKIq/Wiv5khW7CJ/PfZaD6GGWOuq jQTlvbjMWJPZAqZHe++cYE+rTvqFhT8NuimJIoUjKio/LKHt0DuCQztcUYQL0lXfvaS1 heFgzaHOMjlDcCmcGJV+194OR1MfdDcFqXiE7rVI6g6zwPt0YDA30Mg3xdmLgg5kG2pd RBcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=y1KwfJjJzwSt9NrrtAyc2/Wpa50oBD8kLBiaGTTPdeA=; fh=0sD7u+6ZeVLabXSJ0/ta2yf8mUfUXWwh1sJBhHvFyso=; b=PVWTtPCQ344tVPwhUDb21SdPiiBBwnaiO0nQAR4PrYpWuwNc5SuTtj2L4DpKqPXMZV uyKXoD/mUrck/D2VmiIqzmObHBKK5Z0EReyeEUzhlKaV5oLNIssmjWUaos5jZsiuVkjS n8XYzcQNYaJLbqEtxeWUHgR1snVILGAu55hDAp9e7ieD4ZG4gy6Aa4euISfdkoW43g64 304Iwb5SIMKH/bqhMiRdKfA3rYXkJDPhLnEUx0aGFtOrvjl9qVDprOEm3E5BNjbfq6Pg fwNRLLESVt9rgvXAc7Yx2Eql8Q1IiEjXrbzlus5IX7fZM+pYsL5dGyn5tjJjkGbWFHJJ s6kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=tDTOjE7D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id t2-20020a170902bc4200b001c36705bce1si424643plz.474.2023.10.19.15.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 15:56:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=tDTOjE7D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9F68E806E5DE; Thu, 19 Oct 2023 15:55:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346712AbjJSWyV (ORCPT + 26 others); Thu, 19 Oct 2023 18:54:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346700AbjJSWyS (ORCPT ); Thu, 19 Oct 2023 18:54:18 -0400 Received: from out-200.mta0.migadu.com (out-200.mta0.migadu.com [91.218.175.200]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D73F6FA for ; Thu, 19 Oct 2023 15:54:15 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1697756054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y1KwfJjJzwSt9NrrtAyc2/Wpa50oBD8kLBiaGTTPdeA=; b=tDTOjE7DTyy4cSZ1350GJsSA3an2i9cqKy1Q4g2SjTywV4u7mYWzqZBqKvIOjqWS/umloV Nq23nSYhq58l4XAmk6FYdMmmNVtkWSCRU7hLVRIZugprr05e2F0LexTYgAcqIDzRXPLir3 PMy2G1M3GhmwtZ5YIE+BY24OtDtLYO8= From: Roman Gushchin To: Andrew Morton Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Dennis Zhou , David Rientjes , Vlastimil Babka , Naresh Kamboju , Roman Gushchin Subject: [PATCH v5 1/6] mm: kmem: optimize get_obj_cgroup_from_current() Date: Thu, 19 Oct 2023 15:53:41 -0700 Message-ID: <20231019225346.1822282-2-roman.gushchin@linux.dev> In-Reply-To: <20231019225346.1822282-1-roman.gushchin@linux.dev> References: <20231019225346.1822282-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 19 Oct 2023 15:55:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780226383847165051 X-GMAIL-MSGID: 1780226383847165051 Manually inline memcg_kmem_bypass() and active_memcg() to speed up get_obj_cgroup_from_current() by avoiding duplicate in_task() checks and active_memcg() readings. Also add a likely() macro to __get_obj_cgroup_from_memcg(): obj_cgroup_tryget() should succeed at almost all times except a very unlikely race with the memcg deletion path. Signed-off-by: Roman Gushchin (Cruise) Tested-by: Naresh Kamboju Acked-by: Shakeel Butt Acked-by: Johannes Weiner Reviewed-by: Vlastimil Babka --- mm/memcontrol.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9741d62d0424..16ac2a5838fb 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1068,19 +1068,6 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) } EXPORT_SYMBOL(get_mem_cgroup_from_mm); -static __always_inline bool memcg_kmem_bypass(void) -{ - /* Allow remote memcg charging from any context. */ - if (unlikely(active_memcg())) - return false; - - /* Memcg to charge can't be determined. */ - if (!in_task() || !current->mm || (current->flags & PF_KTHREAD)) - return true; - - return false; -} - /** * mem_cgroup_iter - iterate over memory cgroup hierarchy * @root: hierarchy root @@ -3007,7 +2994,7 @@ static struct obj_cgroup *__get_obj_cgroup_from_memcg(struct mem_cgroup *memcg) for (; !mem_cgroup_is_root(memcg); memcg = parent_mem_cgroup(memcg)) { objcg = rcu_dereference(memcg->objcg); - if (objcg && obj_cgroup_tryget(objcg)) + if (likely(objcg && obj_cgroup_tryget(objcg))) break; objcg = NULL; } @@ -3016,16 +3003,23 @@ static struct obj_cgroup *__get_obj_cgroup_from_memcg(struct mem_cgroup *memcg) __always_inline struct obj_cgroup *get_obj_cgroup_from_current(void) { - struct obj_cgroup *objcg = NULL; struct mem_cgroup *memcg; + struct obj_cgroup *objcg; - if (memcg_kmem_bypass()) - return NULL; + if (in_task()) { + memcg = current->active_memcg; + + /* Memcg to charge can't be determined. */ + if (likely(!memcg) && (!current->mm || (current->flags & PF_KTHREAD))) + return NULL; + } else { + memcg = this_cpu_read(int_active_memcg); + if (likely(!memcg)) + return NULL; + } rcu_read_lock(); - if (unlikely(active_memcg())) - memcg = active_memcg(); - else + if (!memcg) memcg = mem_cgroup_from_task(current); objcg = __get_obj_cgroup_from_memcg(memcg); rcu_read_unlock();