From mboxrd@z Thu Jan 1 00:00:00 1970 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 76C9EC282EC for ; Mon, 17 Mar 2025 18:11:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7024E280004; Mon, 17 Mar 2025 14:11:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 68AFB280002; Mon, 17 Mar 2025 14:11:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57A57280004; Mon, 17 Mar 2025 14:11:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0AEFC280002 for ; Mon, 17 Mar 2025 14:11:16 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 89523140498 for ; Mon, 17 Mar 2025 18:11:16 +0000 (UTC) X-FDA: 83231834952.23.9F4B93F Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) by imf02.hostedemail.com (Postfix) with ESMTP id 37FC180004 for ; Mon, 17 Mar 2025 18:11:13 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DX+gdALY; spf=pass (imf02.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742235074; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7003ixVEAkzMyKIkqmqniYWXO52f73tAfAAJHDgPVrY=; b=yqMvhWSmRL4MC3XyKUipwMXAaTaUGITzBsJMaxdYjZnXpyqbV0s6YZv+fSzgJ2m6RjldMh OFe7vgsmfpiOFC8zsI/q51i357x4Wz+jB6qbr65G0cHw4XOPyn+SEI4W3MJqxp5mS9k7Fx QC5l3w0Jf8WAD/ViONn3SWo9dOqhFF0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742235074; a=rsa-sha256; cv=none; b=6dvrxRoAVGZpfN8PQ1rZzVunsWwj8dK/WUinOremVlVhJgFz9XVFgGJc2J0aDqx5O27+7X mDBAs1TVOj1b6ju0u90X/kVISRyhgdo/7h4iGP2aw87Ll1LGlddUj68o1oHNn7wxZoH/YV OSue6q69SRm0S0hcd4+ToYemZeQcfDM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DX+gdALY; spf=pass (imf02.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev Date: Mon, 17 Mar 2025 11:11:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1742235071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7003ixVEAkzMyKIkqmqniYWXO52f73tAfAAJHDgPVrY=; b=DX+gdALYkMPQFfqZil3cgU8zFwGRrpmD5vnZatCf5Pmc/IgE8XQkUHv6XCfYGwyqcsx2bd 3zB2QVuQwiFWbZvDjXCapRHUA7QRGNiqSAE+HNw54UxOB+CZwGLaI0Jr+0tHscjyGj8t0Z fYRwS6SQTREE8mo35ICHd8As3Cvs27Y= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Alexei Starovoitov Cc: Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Vlastimil Babka , Sebastian Andrzej Siewior , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: Re: [PATCH 0/9] memcg: cleanup per-cpu stock Message-ID: References: <20250315174930.1769599-1-shakeel.butt@linux.dev> <20250315205759.c9f9cdfc2c20467e4106c41a@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 37FC180004 X-Stat-Signature: 1s8aunmz9yfuezcj4q1ekzczpb8apsh9 X-HE-Tag: 1742235073-207933 X-HE-Meta: U2FsdGVkX18eiQN5mhH5Ujoj9QlwTh11kDR3pGuLlVuvU2hHTF36k9CG2gDszxurHUe+vlkoAURxowB66qn10j4J56P8IH+6my/M8A68c8/yQFpYTBuRSnplG9ayUQbENk+0n+X41hJfX8DIXa5N39DBo/ayi3ZkEoMQqstpX6Jv/ik4CToQZGbI6MJBAGmZoLPLr+k7K5l9ygi7mKFZzGLGw4gtLxXmWheF7UplOBHwptRcR5SN35ubdJsv1veH9110TaRhPeB4EHShjkuaEi6aopwJWazFhF8THy5lzrJH84j92v4zhaASAGLhLBhKTnL9yapv0x5bV5kzHBR6et+xJeNBhbPSRoEIaThGM25Z5CZis/vmJ3uxcaYEpJIWLd4/pJwJx6sBJ/S5E5SfA9rcd+zEyyYcZu0BN4BM2P0XkdMCtUdf0+q2518uv4hx2i8gB3Iv9kw/RxZDaS5vA6mi/TPBZmqr5Qyc9HuNHB7ntXGwXfFb1RhqqO7DZ0Wu8uLiLUSzhR3vkOhGwZdTLqMAl522/JrDLKsMgQh3IamMn4bkjrdSGd+iswOqAJ2SnNTViwS4cjv1WNUiLsRbd3KZ+VDNudDvokOE9NVx6fAwXrYPoSR+s3wzn8x9qJPqeQ66w1RV3I6dNqhGYu3pEhNyBLa9beGuV9bgzF2BxOH8V/2rkIuLo7aanZSh2uY23yRmt/5rl9BLb1uZHkC4/0GMaZocwPvnHde5ufHg4a0M13uoFet9GyaxCosXo64epi2Ioxw4Olzhnj7pftbWAuQze6r+Q6IruBjazGTkSo0y8m5KljXXXk/YFtSKp0j5+XtdF1gh56/UQMZTjEqcoi+tr89Vlcaoi8hKM2Di3xKZ6v0q2FiIy5klU/HAgZSUlsYQh83UlfiN0eTmlMuzb9OEysXPfQsqO24OELTgcQG6X4EZcqiEYtUc4R6aHRjiCK5dkfAraM/almvzN7k nX4RI9km Nn8uICgzMB5JgC8lPNr2M4zIx2ll0vzV06P18hL9h3e10Fz5ekWWI6e3zaTi2CtG/EH6UduhFvmtrNCGC9QwHPj210Ran4OPTRxq7ewegEPlirQECj0nFsvJ+F6cDxeOB/jOO7KH2SGY7FTJ3ge/zkdQ+hYtOMiDuZzK6/sABH3XOiB5qOebs/gYRJVsSDbWkwJbvFceTEaJiB+ad95rdzUQ7MPqXuVIbtez6xRT1PXqa6eOH/gTRwAAa+opDc4G77sJjD3kcHqhqN6H0ytp9bBy6endS79HyV0IZJS+hNzHj2LLj+KrQwtFLfR0uGME5p31zpf5+W8IlMOI= 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: On Sun, Mar 16, 2025 at 08:59:20AM -0700, Alexei Starovoitov wrote: > On Sat, Mar 15, 2025 at 08:57:59PM -0700, Andrew Morton wrote: > > On Sat, 15 Mar 2025 10:49:21 -0700 Shakeel Butt wrote: > > > > > > > > This is a cleanup series which is trying to simplify the memcg per-cpu > > > stock code, particularly it tries to remove unnecessary dependencies on > > > local_lock of per-cpu memcg stock. The eight patch from Vlastimil > > > optimizes the charge path by combining the charging and accounting. > > > > > > This series is based on next-20250314 plus two following patches: > > > > > > Link: https://lore.kernel.org/all/20250312222552.3284173-1-shakeel.butt@linux.dev/ > > > Link: https://lore.kernel.org/all/20250313054812.2185900-1-shakeel.butt@linux.dev/ > > > > Unfortunately the bpf tree has been making changes in the same area of > > memcontrol.c. 01d37228d331 ("memcg: Use trylock to access memcg > > stock_lock.") > > > > Sigh. We're at -rc7 and I don't think it's worth working around that > > for a cleanup series. So I'm inclined to just defer this series until > > the next -rc cycle. > > > > If BPF merges reasonably early in the next merge window then please > > promptly send this along and I should be able to squeak it into > > 6.15-rc1. > > Ohh. I didn't realize that try_alloc changes are causing so much trouble. > Sorry about that. > > Andrew, > > could you please instead take bpf-next.git try_alloc_pages branch > into your tree and resolve two trivial conflicts: > 1. https://lore.kernel.org/bpf/20250311120422.1d9a8f80@canb.auug.org.au/ > 2. https://lore.kernel.org/bpf/20250312145247.380c2aa5@canb.auug.org.au/ > There are 7 commits there. > You can also squash Vlastimil's fix > "Fix the flipped condition in gfpflags_allow_spinning" into > "Introduce try_alloc_pages" patch or keep everything as-is. > > I'll drop it from bpf-next right after. > > Then Shakeel can rebase/resend his set without conflicts and everything > will be nicely ready for the merge window. Thanks Alexei. Andrew, if you decide to take try_alloc_pages branch into mm-tree, then this series should apply cleanly as it is based on next-20250314 which already have all the try_alloc_pages patches and the conflict resolutions.