From patchwork Tue Oct 10 00:09:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 150426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2193456vqo; Mon, 9 Oct 2023 17:17:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkwulDDtFUK0x1p4lgOhG8ADdLt6+ceXv6icsk8jVJFDuP9xYMUFoH6+u8KAIrCy4EPGMX X-Received: by 2002:a05:6870:7196:b0:1d6:7f77:c922 with SMTP id d22-20020a056870719600b001d67f77c922mr19402130oah.28.1696897025987; Mon, 09 Oct 2023 17:17:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696897025; cv=none; d=google.com; s=arc-20160816; b=NeODA0EBt9+iTP4LiPLJTW3dEmMQzSgsEA6/h1oyWu2FMwAOK0SSnVbwv8v+s6yvlT lEryBjTFRBjnnQ/e+GivFzLvDbQsEULWHVGijC+1X+7Q6YBHl8uhe3dfacy7hVpNXaSu +vP67V8HWmD4iovylvYlRCeFSmu0VzFHf2ph99rwj4HGctMie4zjiVsoRB169a/2DFzf e7nObyiuGqcaotQf7vk6tKJU2cajPtqHleY1AAX10qEZ+CRUco8zDIGVM0odFaQ2j/61 xYTH9KvHfhhGAA6iND1ZZiX8bsEz80g4G/XHV8UP/vLmILrzKMAM1bKI2tJzlq4ZleMv FKSA== 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=j6TjL0tOzMm9uw8Y9niPXJ1ezOtPxfS6WilpL+cESRE=; fh=eIV/wktpjV+EeUDLeXhmhAmcuYEtVvgOWNik/7Ld4iQ=; b=DYTPL5mAzwnKTDcJADZOhxoeC/vv0L1F4fHE4IO7yY8J6ygx72mn2azmf6Yz5NMtsM TuNyj+mVP7Orcf9POi8lxZ0z39IHZ7ImtkwAAXPBQxAmz3w/xATMRLsQ/rivD0AHHqcy Cb0NXU43RaYJCnqZGoxpA7F8dqrehEVUuld8cJAbw+yIbKuEwhFWcf/AvKSvqvLgXxq1 hi/LPFDhOU/WmqYFuzsoxjXBpXNbGjX87okDHgPk7yM0VbZAEYCazamN7ycILrYB/G5C gNt20ejWOoNDKQVaZs7mvASl7yUIL5yR/Uvc5sZXUUxq6ghh3mUFN6GmOpMfqQgdpYsW Jm1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ZGPVwiM2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id dc4-20020a056a0035c400b00690cff4a2b6si8116713pfb.112.2023.10.09.17.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 17:17:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ZGPVwiM2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id EA7F680617C3; Mon, 9 Oct 2023 17:16:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379226AbjJJAKZ (ORCPT + 18 others); Mon, 9 Oct 2023 20:10:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379191AbjJJAKV (ORCPT ); Mon, 9 Oct 2023 20:10:21 -0400 Received: from out-210.mta0.migadu.com (out-210.mta0.migadu.com [91.218.175.210]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 994C1BA for ; Mon, 9 Oct 2023 17:10:13 -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=1696896610; 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=j6TjL0tOzMm9uw8Y9niPXJ1ezOtPxfS6WilpL+cESRE=; b=ZGPVwiM2h+XunCiZLqM4FyYGsiSKjC0phq0S+wyUEtVkyO+vvaGmE0lOyAzfhgRkZqIQVI z+aLmjDpmuOiL6ag53Op+5oV0AIkM4FSmAvmbCqi/H5wKmFVEnAUYzw7h9+t++JC6EK5WG wCu/Uex1P/e7AHO9YRFh11WGzRmaLv8= From: Roman Gushchin To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Dennis Zhou , Andrew Morton , David Rientjes , Vlastimil Babka , Naresh Kamboju , Roman Gushchin Subject: [PATCH v2 5/5] percpu: scoped objcg protection Date: Mon, 9 Oct 2023 17:09:29 -0700 Message-ID: <20231010000929.450702-6-roman.gushchin@linux.dev> In-Reply-To: <20231010000929.450702-1-roman.gushchin@linux.dev> References: <20231010000929.450702-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 09 Oct 2023 17:16:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779325495714662913 X-GMAIL-MSGID: 1779325495714662913 Similar to slab and kmem, switch to a scope-based protection of the objcg pointer to avoid. Signed-off-by: Roman Gushchin (Cruise) Acked-by: Shakeel Butt --- mm/percpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/percpu.c b/mm/percpu.c index a7665de8485f..f53ba692d67a 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1628,14 +1628,12 @@ static bool pcpu_memcg_pre_alloc_hook(size_t size, gfp_t gfp, if (!memcg_kmem_online() || !(gfp & __GFP_ACCOUNT)) return true; - objcg = get_obj_cgroup_from_current(); + objcg = current_obj_cgroup(); if (!objcg) return true; - if (obj_cgroup_charge(objcg, gfp, pcpu_obj_full_size(size))) { - obj_cgroup_put(objcg); + if (obj_cgroup_charge(objcg, gfp, pcpu_obj_full_size(size))) return false; - } *objcgp = objcg; return true; @@ -1649,6 +1647,7 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg, return; if (likely(chunk && chunk->obj_cgroups)) { + obj_cgroup_get(objcg); chunk->obj_cgroups[off >> PCPU_MIN_ALLOC_SHIFT] = objcg; rcu_read_lock(); @@ -1657,7 +1656,6 @@ static void pcpu_memcg_post_alloc_hook(struct obj_cgroup *objcg, rcu_read_unlock(); } else { obj_cgroup_uncharge(objcg, pcpu_obj_full_size(size)); - obj_cgroup_put(objcg); } }