From patchwork Fri Apr 16 05:14:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12206709 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,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 E002BC43460 for ; Fri, 16 Apr 2021 05:16:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8AB776113D for ; Fri, 16 Apr 2021 05:16:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AB776113D 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 2964B6B0081; Fri, 16 Apr 2021 01:16:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26F7C6B0082; Fri, 16 Apr 2021 01:16:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E85C6B0083; Fri, 16 Apr 2021 01:16:15 -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 DF1CC6B0081 for ; Fri, 16 Apr 2021 01:16:14 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id AA9AE182371AB for ; Fri, 16 Apr 2021 05:16:14 +0000 (UTC) X-FDA: 78037069068.25.EC90D7C Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf28.hostedemail.com (Postfix) with ESMTP id D6D952000261 for ; Fri, 16 Apr 2021 05:16:15 +0000 (UTC) Received: by mail-pl1-f169.google.com with SMTP id e2so9038576plh.8 for ; Thu, 15 Apr 2021 22:16:14 -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=y8TwextheIbDJq4JEPMsgtPW4imrEmOBZladzG6/EIY=; b=HoswKfBgJEUAeaMh1rPnmApf19VxOGH4LxCzAAWsLcCDsEJ8GosQcQPJblt+T7JZQN r71ipPvNggvX+8yVTjlCBkzMqiV9mO1+R0ztqecdTYYhVEYAdxJCRsulXBT29kTm5GMF yIIw/0cWyOm7IL4zWeV8RMSiZx4ntXvj6H4+sCRnDq7GheeYJUNEq2Fo+0HV63X4l9mk 9Bd+o5MXhoiGnagKy7YFgSOjH4P5wsMdUUQiXFiVo997n7F1nZvBadfLSDtkCr+1xJgs aQJ4kVAQAaUaXgzq/bo9yvy+PMbauZJycOroQXYvrMj8bT8zseAK4eESsLH38n9wC1o/ BXCA== 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=y8TwextheIbDJq4JEPMsgtPW4imrEmOBZladzG6/EIY=; b=EPHLkPbyNMnn8kYNEAJscbeO+VNsIX8NLskosMCLa3OGAwyrllSNTgiYi0AKcBHpOZ /hnHwrLkmuAMA0PC+Tktyuvp2Cc0E1wlDqcj7MnBJ7axIknrFcgrpweqEACqc2aFF7Lw VmixphdPw1BQl9znL/vbcTicaTU1mb5S6H082nuS7+kirRPmPNV6x8TZ2YO1bXjnyZet Di/MKuNO+9ZMSYKkHdRBDxNlde4rE2w7EqE1lrA6WCgCvAaWq2kstB/EGYbb84DKVbRQ tefmKlanzZTV5TQbUXuLA4Bfxy53XenV2p2JdsGkNGtcFhAjyJ5lQpW/tE5vyIAFNRxj /3GQ== X-Gm-Message-State: AOAM532fH6Mzc0F/5/HKgQ0Z6mUQcR8Yf6bpVtB8+GbSxHWTu7Wzrh/L Dr0FT1MAlEf0gHAoV4Mui/Afmg== X-Google-Smtp-Source: ABdhPJw9GKAMCuwJ22HjA/xotV/FWoBOFr8YI7Kfw+R1/pWOK3g+g9MUgjT0ClJCL20xK6itrBQIPA== X-Received: by 2002:a17:902:b602:b029:e6:cabb:10b9 with SMTP id b2-20020a170902b602b02900e6cabb10b9mr7627812pls.47.1618550173628; Thu, 15 Apr 2021 22:16:13 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.235]) by smtp.gmail.com with ESMTPSA id j7sm3518540pfd.129.2021.04.15.22.16.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Apr 2021 22:16:13 -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: [PATCH v2 7/8] mm: memcontrol: move obj_cgroup_uncharge_pages() out of css_set_lock Date: Fri, 16 Apr 2021 13:14:06 +0800 Message-Id: <20210416051407.54878-8-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210416051407.54878-1-songmuchun@bytedance.com> References: <20210416051407.54878-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D6D952000261 X-Stat-Signature: xa7kat7q841naoohdey97gn1t7asbaps X-Rspamd-Server: rspam02 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf28; identity=mailfrom; envelope-from=""; helo=mail-pl1-f169.google.com; client-ip=209.85.214.169 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618550175-238066 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: The css_set_lock is used to guard the list of inherited objcgs. So there is no need to uncharge kernel memory under css_set_lock. Just move it out of the lock. Signed-off-by: Muchun Song Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Acked-by: Johannes Weiner --- mm/memcontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c4eebe2a2914..e0c398fe7443 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -289,9 +289,10 @@ static void obj_cgroup_release(struct percpu_ref *ref) WARN_ON_ONCE(nr_bytes & (PAGE_SIZE - 1)); nr_pages = nr_bytes >> PAGE_SHIFT; - spin_lock_irqsave(&css_set_lock, flags); if (nr_pages) obj_cgroup_uncharge_pages(objcg, nr_pages); + + spin_lock_irqsave(&css_set_lock, flags); list_del(&objcg->list); spin_unlock_irqrestore(&css_set_lock, flags);