From patchwork Tue Apr 13 06:51:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12199461 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 61236C433B4 for ; Tue, 13 Apr 2021 06:58:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 00622613AE for ; Tue, 13 Apr 2021 06:58:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00622613AE 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 9681A6B0072; Tue, 13 Apr 2021 02:58:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 93DDB6B009C; Tue, 13 Apr 2021 02:58:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7DE6E6B009D; Tue, 13 Apr 2021 02:58:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0036.hostedemail.com [216.40.44.36]) by kanga.kvack.org (Postfix) with ESMTP id 615106B0072 for ; Tue, 13 Apr 2021 02:58:03 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 1CC37180ACF75 for ; Tue, 13 Apr 2021 06:58:03 +0000 (UTC) X-FDA: 78026439246.24.894E9BE Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 404B7DE for ; Tue, 13 Apr 2021 06:57:58 +0000 (UTC) Received: by mail-pl1-f172.google.com with SMTP id m18so5479020plc.13 for ; Mon, 12 Apr 2021 23:58:02 -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=rlxS2NP/wFG07icClsRwQltSV/pe4IUbel0wnvFN2yM=; b=kKWMZutIU29NqKffRf7Rn3aW5tj6h3ArneM4CjccRqhy83CknU6Gjh1hdO/OGbN9XD /d1X8d4GxEXJfe28RTBxeBtSIC/pRUZCLQ96RzX42IWktE6+V4s0YNzR5GCwuPrtv+ub uA3slpqDt404SoidWY6YzIg5SBoKC+FvmC8b5ADeGs1v85JFo+AoOULYxXA+ndidbZfm 6AzqCNtTMtve4/uLh/ID2es0t1iHBlF2/ac2pnRjtwTpQpO8ZQAq45dVJ5jO52h8Y57A chftzkHYqBMkhc3ji88AaC8sNoUayvBuxLOp6AyqFKxjEglR2CqYIuE5NFz8JkaFA00k PTQw== 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=rlxS2NP/wFG07icClsRwQltSV/pe4IUbel0wnvFN2yM=; b=i4ke688UvLFNFvj6RlF88cjCvcfrUkLWKhF5itkNtfuikLLbeEbTAmvKLifbKAClw9 eN4NMIm23X4C84IAvvGd4nWjoJ8zrUXE1dg2IydXCDpex0SoK2r3a8NaAUf8Y0M8zdnB GRtlpAx0z1OfBbTNmepdtqs7YKCFbsmMpnqWNX0cux8DJufCi08k24a9/dYg4D6kGor1 mWDfcipZ5EiDmdPR0jtVxZxBulkj2XIkxwbI/Fz7IdWJ4UWqSfgNtON5Q5PqCDY4NxQ1 dYc29Rcl5qKBqRhCXQTMVwR/LN1JoGciFrm69q8SNS3kTO1GfgPc75Ub/Oc6c13QFwJK r1Xg== X-Gm-Message-State: AOAM532LzLjV+t1c98lHJTbfWX+IJ1NYfZW7lcjigrLsQG8xvEFzbef5 l6pXKUl+zmk07R9h7J6L8nO3bw== X-Google-Smtp-Source: ABdhPJxxd8+LsLVbpUFdRYV2g1kphK8cC2VJ47h5BOjiz+ON6vX30VKce7mGgwpcf0LEwmJYYA4EKw== X-Received: by 2002:a17:90a:e50a:: with SMTP id t10mr3417568pjy.32.1618297082039; Mon, 12 Apr 2021 23:58:02 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.241]) by smtp.gmail.com with ESMTPSA id 78sm11508562pfu.40.2021.04.12.23.57.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Apr 2021 23:58:01 -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 6/7] mm: memcontrol: move obj_cgroup_uncharge_pages() out of css_set_lock Date: Tue, 13 Apr 2021 14:51:52 +0800 Message-Id: <20210413065153.63431-7-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-Queue-Id: 404B7DE X-Stat-Signature: r5d87q64fzxdhqr6dtxfs3r444uopcqx X-Rspamd-Server: rspam02 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=mail-pl1-f172.google.com; client-ip=209.85.214.172 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618297078-125583 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 42d8c0f4ab1d..d9c7e44abcd0 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);