From patchwork Mon Oct 16 22:19:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 153788 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3756124vqb; Mon, 16 Oct 2023 15:20:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjsKyXqbFDKDUyYwT0D3d+2H6T67vXFistKcTWUqoRyp380aWxslorokS+B+oTppx91Doa X-Received: by 2002:a05:6a20:4288:b0:171:737:df97 with SMTP id o8-20020a056a20428800b001710737df97mr474874pzj.2.1697494800183; Mon, 16 Oct 2023 15:20:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697494800; cv=none; d=google.com; s=arc-20160816; b=SWKY87xALv6gzUsCC3/Y56qvRDkuVvzC9DnydYiuqllVjGKxNdotcRjhsfbkTCx/WN +EkvUl8hgaPJWy13pA1SNi3stxytPuxXephP/IIjqT+9S1RTcsjqAaFIsPWfwKGIimiO 56McK2XRTudhzsDZOQgGSBVGm/vRiwrgVw+PogXEQy+pGI7LWrwFj9KLXlcu9FcZnEcF /XfO0EvojfADERgpw+QeiHzMNvXwk5+LoVh3P5HAmAsusMMhL5FRwULiQ9dD12ekhTR8 Qszko+5HMX8StBX37X5EIMmeydQYtW7AeYQZeYe0vf8/1jaPrEjdXqsOTaA/a+fEqNYO dZaw== 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=3kIxRaEQpjFFVG+rl0/tQDkNcffLjJm9ou/emwznPps=; fh=TyPg14X/GXePfX2HFCpC8BoYIRT/2UqYFN7bT1+n50k=; b=JpFzzpJ2Hf96bnM5EjXq9CR6BuRZ34Lpji8nLHjnRBxTc20biFzNxVyGdQvEvhpTk3 ShUo8IEXtcbsSmkAo0kVZnTU1XDiwqJFk6py2jcw20deJZ4Seg/4aJp2rySn4eapkI07 GnTw86Q6bVBiPhnS250z2GDkF/u7aSNNYFI/hAX+sKFoCzT+AJzqDjnLs18p4RExt110 GNUKBJiuSFa6q1gJM9L+XpK+WaR1uWTHn+wW9GDX0s/hHkMlKNkL68gLZd8FdXLl18oe EBA1BzHxqjuKfdm3ttA+22+4ZqVL6Zm1R4rqyxOo5mgE6+2A2uVMTlyR/KvoPcWPkxP8 ARVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linux.dev header.s=key1 header.b=AUkcAyER; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id d12-20020a170902cecc00b001ca4ad8635fsi259248plg.447.2023.10.16.15.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 15:20:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=fail header.i=@linux.dev header.s=key1 header.b=AUkcAyER; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (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 lipwig.vger.email (Postfix) with ESMTP id 29F228038929; Mon, 16 Oct 2023 15:19:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234322AbjJPWTp (ORCPT + 18 others); Mon, 16 Oct 2023 18:19:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234304AbjJPWTj (ORCPT ); Mon, 16 Oct 2023 18:19:39 -0400 Received: from out-191.mta1.migadu.com (out-191.mta1.migadu.com [IPv6:2001:41d0:203:375::bf]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B69E79B for ; Mon, 16 Oct 2023 15:19:36 -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=1697494775; 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=3kIxRaEQpjFFVG+rl0/tQDkNcffLjJm9ou/emwznPps=; b=AUkcAyERB4hjOs5JPnQxOrvAqevb5Ye/YTZ14NxTy/hXzOKKR1ln2/5IM9q7l/vu2I4i4H Uk9W4bOiOxtW9TjZ38qFfyyzfpGSdK17v8XcmOMmSTtvViVbGekkE3dXtgFowX5dW1xCPc 2SN88q3ySEhGI2F8mcSxfcpDQtyxUH0= From: Roman Gushchin To: Andrew Morton Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Johannes Weiner , Michal Hocko , Shakeel@vger.kernel.org, Butt@vger.kernel.org, shakeelb@google.com, Muchun Song , Dennis Zhou , David Rientjes , Vlastimil Babka , Naresh Kamboju , Roman Gushchin Subject: [PATCH v3 5/5] percpu: scoped objcg protection Date: Mon, 16 Oct 2023 15:19:00 -0700 Message-ID: <20231016221900.4031141-6-roman.gushchin@linux.dev> In-Reply-To: <20231016221900.4031141-1-roman.gushchin@linux.dev> References: <20231016221900.4031141-1-roman.gushchin@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Mon, 16 Oct 2023 15:19:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779952307624788150 X-GMAIL-MSGID: 1779952307624788150 Similar to slab and kmem, switch to a scope-based protection of the objcg pointer to avoid. Signed-off-by: Roman Gushchin (Cruise) Tested-by: Naresh Kamboju Acked-by: Shakeel Butt Reviewed-by: Vlastimil Babka --- 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); } }