From patchwork Fri Feb 28 02:23:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 13995479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA94AC19F32 for ; Fri, 28 Feb 2025 02:24:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FB25280003; Thu, 27 Feb 2025 21:24:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5ABEC280001; Thu, 27 Feb 2025 21:24:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C1B4280003; Thu, 27 Feb 2025 21:24:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2FD9D280001 for ; Thu, 27 Feb 2025 21:24:10 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AAA6516208A for ; Fri, 28 Feb 2025 02:24:09 +0000 (UTC) X-FDA: 83167758618.30.D3B6DBA Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) by imf18.hostedemail.com (Postfix) with ESMTP id C125A1C000C for ; Fri, 28 Feb 2025 02:24:07 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rs+9tShZ; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740709448; a=rsa-sha256; cv=none; b=Ia6BSfp3TUmnju1tk2eDik56vIeX5Bsylgg3zzxR8btkH9AQ03ziKFJXwphopMFZZ4H5aO 0iAzmXdzOoD3L35KidSO13FgbHgpBsDTw2uOtEXlTCmk3RpzwNMib49Ad92+6LO1dUfBKp z9NYLKT3ClV8+3BJwSbPiVCLJlwD90I= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=rs+9tShZ; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf18.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740709448; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=9qFzyRfTPW1C1fRHIqsxr2Zjz7ISCd8XwmKzi9XRiC8=; b=lcNd3En5hIDL21Jk4q/MJ3WjOWXUhy1+A6StBg78m/tnG0+fqpT0ch50c18+kg1lI5qdeA y2Q/DHD/xFv571jDdpVyE8A8q+wS40AQGbUgaoIui4VOa2FVnwq8vQvzRbsnMnUeCnLCJR SR9/5yfn5y8ju31qHTZ7pbrxgIPiV04= 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=1740709445; 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; bh=9qFzyRfTPW1C1fRHIqsxr2Zjz7ISCd8XwmKzi9XRiC8=; b=rs+9tShZb+fPHx4CoGGzSymGkA9Ypd47eJItJS1loSkNgOz0npB/+TJ2u8BwU1qUfKNZnn reOdn3qAUbVW/fTm7504Fg1fGf1w8nbCzlM7EETpDR98cfdRcrfif3oWRmNJI5UkgY4oGI B9InCh/wppTkkvPwDWT3J6jkS7AJ348= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH] memcg: bypass root memcg check for skmem charging Date: Thu, 27 Feb 2025 18:23:54 -0800 Message-ID: <20250228022354.2624249-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: C125A1C000C X-Stat-Signature: 97j4g46wiw54w7ca6hzfqpss9xqchxpb X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1740709447-642770 X-HE-Meta: U2FsdGVkX19OU3KDbDYWRbVEPJQ5/Z6hpGH5YNbfR2WleETWXiap64AMPgEMAuHCgsypCmfMSJhZ1fBf+FA7ICSiWoZK+NPvI+kLRZGKRIcpo3TVOaTxQnfmpvXjpEFmw34Sd3b70gv5mvohlIdqqiQMOnBEY4lxws7JtLU8OlWEH0UyybLv5LHXSHMyjkyB3RnvSaEeSWQ8/Qe3CzObzawZUc3+8XW5tLSmhejR2WbTBFoqxwGMrZKTnqP9jm7mWlAoP8XleD6smNmy9H99oQz7KOEclzCV4EGFXOli/OlgOpG9TvR1ABwGOYMs++Eaewhop80jnpJp1uPMgJXHKivo6vqVKf2HxFLYfLhawYHR9hq7ui9P07YGZPe7UVmv4gXrpREnEUAu0GaWkijv3W5nSGk+/2hdJQ9DiJIoRiGBT0I6LW5Tiab6MxoySr4Xh+jfvSRkpFfcrx54EraqMV8QT7wdPxKWoUGBZWU5VnY/o4ik3H2hqEbKrj5mKP5LCr0EyTonZgsA5KpxNdY6uCbMO+Qh7MF7SAWHLOGC+zDsjTCbCfYhj8zAlNM1nBnBX+hkzKSzilk2xFMymA4dE+d0YLshDAghSRZp3E86cL+ZfYMOZDZfuQU5yA6fBhRMicDHzN/1wEvYZkJzcx3Zliv8+xcy9ofq+WNzZZSTYN2gKsVMxyZSTxenWDQv8ma7hGekVnQ0oxF9qCeKQ8IL717lXDm7zVVt2TbB9dgFljc4HNZJKhNUdRlHiko6dWazMzuNPnv3VNRd5ERdgRU1UL7/xVwys+6cVz0uIM8YNJXqy8PfB8wnv7gfj7EjTjtK3Cq1k3PH7HKT3B8QIT424QJqp0OQrg3iAxFjgw0SCxSx8w1Yblo5u55BP0EC4R3EC4LL7zxZcPfioTlaIja85yfIDSRRohEiifWUwf9Lt7AouY3uAApyY7WOfXmlGoAxpNSzv7UV5PlTrKCHPqw 0+F/w3n+ VxgMZPt/Ow1JB2kyrir0RzsKn4Y0RtxnEW+c9YTCzmn2gKsZ9MIgPRSiWz4ZrOUd2AQ7InE7SHU9uSQkoeWCLRKRIoBxImHlAl4fgOxrjmqSipPJPteIc7Ny5nhBJPRGW9ohsldcg1NELGFewChbbzUNVLAste1oyD/rnWmiHrrEWNFk= 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: List-Subscribe: List-Unsubscribe: The root memcg is never associated with a socket in mem_cgroup_sk_alloc, so there is no need to check if the given memcg is root for the skmem charging code path. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f571c67ab088..55b0e9482c00 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4879,7 +4879,7 @@ bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages, if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) return memcg1_charge_skmem(memcg, nr_pages, gfp_mask); - if (try_charge(memcg, gfp_mask, nr_pages) == 0) { + if (try_charge_memcg(memcg, gfp_mask, nr_pages) == 0) { mod_memcg_state(memcg, MEMCG_SOCK, nr_pages); return true; }