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 B48FBC35FF8 for ; Mon, 17 Mar 2025 20:27:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DFA0280002; Mon, 17 Mar 2025 16:27:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46AF6280001; Mon, 17 Mar 2025 16:27:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30C42280002; Mon, 17 Mar 2025 16:27:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0FBDD280001 for ; Mon, 17 Mar 2025 16:27:13 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 46A3B1206A4 for ; Mon, 17 Mar 2025 20:27:14 +0000 (UTC) X-FDA: 83232177588.30.EEF91D1 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf13.hostedemail.com (Postfix) with ESMTP id 933CC20006 for ; Mon, 17 Mar 2025 20:27:12 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=GiaquPeV; dmarc=none; spf=pass (imf13.hostedemail.com: domain of akpm@linux-foundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742243232; a=rsa-sha256; cv=none; b=XpLvkPOIoLNQp3tvJHbhEIlZ6eZH2cbNvcs0FeAlaWy28+5/Db+115n77gx3wLoCoeCU2R dhGNQmiK+oeTNuGbNiJVnG/hbxfADYd8EFxifOYgahYAHp1y8+P6IOiP626fWXWHUKIkno yo+macieHtiJ1rGdtttx31P1XN2TeMk= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=GiaquPeV; dmarc=none; spf=pass (imf13.hostedemail.com: domain of akpm@linux-foundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742243232; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UDdmaMx4QPxswzcqdseWBlc+bN69Znz6LrM7YTFcc1I=; b=ESDc29Y/mE0EN2/FCrGaktkv7qHSJ2MXL/JY26HYCMDiRGIupBQEByAFbOmfuVPNARAGdj EqxA4QzBbAOW5vwsAmp7/2tc4+u/aekHJZ+ly5Fl0zevfYYztP5swKRoe84i5VrUJOAoMn j1T18U6BQMtBU4VQ6kG0L0TOe7Akmg0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 2A31CA48CA3; Mon, 17 Mar 2025 20:21:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04D81C4CEE3; Mon, 17 Mar 2025 20:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1742243231; bh=4UrGEzkEmzoSkM/fjn7XyKgiHlQMMSLunK8C6/I4oXA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=GiaquPeVeNCWAt6uc6jdvHDZiz93WzrWqIl+q5V4rvijJAYhBulOuBdqIqrxnAZcc 1cUGxm9CDfEufEDL6EK7ZwyrH4HfwIsHk9MR+frqnOONfMEE7SJGcluH3tiK9iMaRz 4IHFHJI7GeXWWbOLBb0V2h/kQ3mR9LPd5uZwJjrY= Date: Mon, 17 Mar 2025 13:27:10 -0700 From: Andrew Morton To: Alexei Starovoitov Cc: Shakeel Butt , 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: <20250317132710.fbcde1c8bb66f91f36e78c89@linux-foundation.org> In-Reply-To: References: <20250315174930.1769599-1-shakeel.butt@linux.dev> <20250315205759.c9f9cdfc2c20467e4106c41a@linux-foundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Stat-Signature: io68fwa7aik9oedkoxeau8f88yp8k5qt X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 933CC20006 X-Rspam-User: X-HE-Tag: 1742243232-526193 X-HE-Meta: U2FsdGVkX1/0zewKIoFyX/y/sBKEPEfm6NSfrsdQnQRiARqeOwmUxDVw/KEkmbY17W4iXicnJuAaSWcwcMsawWqwtp7M+a5fXs1mQWkRvFtKDkjeVALDgd1TWxCvMWsUdxksJYoFd7mL9ATuymeteeoOTptyIrtkR9GbHgTAJs6fftd13nlL54T93vN51NDvGCfgNeChjdtRGCUU5mDVlBnmPZTsmJe5I6FcFbKRgDakseI8EJRmnfkQ/3+OQniwqSJXmPpp9CDHAabdhynJv8OHTZQUFaPPvTfw9fQWOZvbtwpbTDCWxiRm+HkjaTEJ3AhYOvBPwrcaWRz4SE9rz9uvAYZ7btfbHmVkSM1eDk8MiTKdtj1LXzs6TQEPEF4wen7+yFEXenbVo0rck44I6LFOcG/sRQkjfKMD+YcOg3i/H3WogCdJIyNwnxF3zAslmK5miQJOpWv4A/Nm5PzOcVcNEzsz0UtG2z85BteELm1KFF+lKfK+zm+iSBdq2Wt8wuiFpvpRTG5cE1gYtEPw45D4gqJToN1yGyf/ER/42IAa4o9paTH+vjD0BJGvRhASrZiHdzpo2WrAwjTahCXuWhYZSq5qaCMhY/ul2bLo/EK2IoO084HsC4ZZRMGLhJu3w5+S++eiOlOW3wSlTE8Ot2Z+cAfY5/TTNUhtp6I829yvJwwTGABICKV6HkGdLvnH6njhXNonTJW017RwH8DB7kMjaEdJ7LI5iUGGNZrU+7OIwd40D72usSgbbc18V1kZIximso78WdVnkfa7Ug2mj4jFmca9n77jYEubEqHRQabQbhtWpmIwOGJR/4h0etXAEStcOJiujhsHL93mnbpv04POxgvMl6JCEYBXfqn2OJ0hCZRBIRdlMRfDFXUfaAkIChkzqXivKHKCrJCcDe7KFXNorjnSHYM4qbzZXg2akHDzCRdnKtrD6GZDhV2+jyuWm9gBaRwmmf97ykKNd96 lPDykA90 uhAdykfsL06uQU1k1BXrJL6l3mGorGxPGuBLQalOIn7x/kWsDxpacZb1QvakAVaYBKE1ENbwbDmoCvuXkrZh7Wszr27j7hnCUuxrAhafO3lWsDTHHq4HMOI4zn84bb0KZkxW99/nD5hkM1TfiPuIdVxfwDMCapqrzYwS4aD2/A9g6aF41rweqj8m1sCkXV7Y4Zs7gKGtQYcwYVc3ktY2o4WEe2i27lw3NEth/pPAbX25ugwumk7koCaI0MZD4m2UeOPX73Op+GGR9SWeCchCfdy+cN9iO17Hswl7r2uXGns8jEPL02yCxA4aw7Zdh/mVx6Rm3XYleuGN4KNQ3o2+fr9n0XVmvvH7MOYDyoJ8SyCCAmJbBygbgkcZL9cDeAU+Eovmo2yvBOSYgzJBX5Iavarvxw8uOb6oU8nKxKavTyaxS6eQ= 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, 16 Mar 2025 08:59:20 -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. > > I'll defer other bpf side things to after merge window when trees converge. Let's just leave things as they are, please. It's only a cleanup series and merging cleanups after -rc7 is rather dubious even without issues such as these.