From patchwork Fri Mar 14 06:15:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 14016309 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 6A4A7C35FF1 for ; Fri, 14 Mar 2025 06:15:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B956528000C; Fri, 14 Mar 2025 02:15:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B21E328000A; Fri, 14 Mar 2025 02:15:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F98828000C; Fri, 14 Mar 2025 02:15:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 690EE28000A for ; Fri, 14 Mar 2025 02:15:52 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3F501C0AE4 for ; Fri, 14 Mar 2025 06:15:53 +0000 (UTC) X-FDA: 83219145786.17.48812E6 Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) by imf06.hostedemail.com (Postfix) with ESMTP id 8DAD5180010 for ; Fri, 14 Mar 2025 06:15:51 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="vhAfmg//"; spf=pass (imf06.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.179 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=1741932951; 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:in-reply-to:references:references:dkim-signature; bh=5fE+tfATBs+u3OomjlvcpPVaZLFEEe7to/tRcynNlOg=; b=pNPPCJG57WiXRDP7rv3UNlgXM6F9xnS60TpquQjVk+WmyErcOeUdOK1imkzYcXV94JgkqH HRzGaKgh+tWfVMv33DoDN3qPOtCVtnC+DnnXLGYYj7bCyjXzB+qd+ZglyNxJq+MfIzq5mD khyEAwZV71fvmLzQVmiyZoEsV0BkPb4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="vhAfmg//"; spf=pass (imf06.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.179 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741932951; a=rsa-sha256; cv=none; b=59zhI60OIAKm2A56OB+siCQo8JqiTAWippzebpoAKQRe2Z322mhX+yN59xrXsfJqaWFxIn UPNNCO7y7Vs8xFNL/F/VfXsmC9uP2bLIBeYiKJwCkTelaFlsBNxXnrQSsC2THy3hkirsK8 z/AmaepqBhEZw1SAMNYhnrXgOr+pwOs= 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=1741932950; 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=5fE+tfATBs+u3OomjlvcpPVaZLFEEe7to/tRcynNlOg=; b=vhAfmg//mk5ht4EXslf1UpxrBhoU+6iHYa0Fdob5JRoSmvL+p5JjLl+AsS2rCYbTMyvkEM Uk2TH3CtPmlMCFALAhBM+VV80oT4jcCeobDv8g/awWwP8Xvz3ivJmp4jmuhu6Wr1xd0gwF /Ajsj8Phh2rDKYPW9ZJL0S9rCQRj/i0= From: Shakeel Butt To: Andrew Morton Cc: 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: [RFC PATCH 08/10] memcg: assert in_task for couple of local_lock holders Date: Thu, 13 Mar 2025 23:15:09 -0700 Message-ID: <20250314061511.1308152-9-shakeel.butt@linux.dev> In-Reply-To: <20250314061511.1308152-1-shakeel.butt@linux.dev> References: <20250314061511.1308152-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 8nc681756w3mbi6fcuaf6o4ipyo9zws9 X-Rspamd-Queue-Id: 8DAD5180010 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741932951-151742 X-HE-Meta: U2FsdGVkX19ph2xzOL1PJKK6FwO06E9k3/59/lLUSqxPx6i9K3tyKm5LNEAiEozLp0e5lcOWvWyT+K71U1MpWTyILWVzZPFMUOO0pMNGHVf3MkLzdjU65VqdONq9/uzfcNPiDjS3xjECnsSezDeFqCVOQnKUViVzMl9MU430sBG6Ky+a27oMq7TfAiyjth6UF0tyhRZoQ4NZiQRgIqNzn6UGW2Upqx1vpDA/gHsscFrtIxjk/2CimGWd4xmA5Op11u9GagCTvRmUMSlxFwxOMPtw8AEaHsXk+SnSXemcAQ2kdlYeQYu76GJpPmJpAjy7iX+MFLQ+Ic4qG/yPQyB3oWnLANFA/trcrRJElR9Ye/Hsr9pOleZ84wOU+/0WaV7xUDg+ilxUxKpkndgCmApamY/1D23d2hJ/KFW0FngWYY27B0d02/lQhloG0ExUrpg7NIi3t2AuOIGSsO5geTeqoGkV0Hx9JzNLSJG8FMf/DMHFVXpzPbwlYuRsZfLoybvXITP6BtdPhSBQ0YFKys/8Qr3b9jHDpe/FLfMlJghgUX3SmjS+/nCdC7k/mALW5mI+hRmqUgn9YM8ByhrBN1bUEIqkOcBdaYLizB/paxzskL9HexbMzYsM2A9B/POdVcNkIRNM2RwMGm32WVSWb+amDrfQClgib1W3fSZTFXSTxPbhd9QQlas5GngRo01voTyKCLiqvPHB3R09ZBt2ofkSVnjuLw+78RmRv6vL1C0SWMkK3ndyltu5B79ExDeAF4VD/O5GukdMbW8Un6Ki32fnsmH4UNBZjL3Fa+cxsdwlh8nChF0UG++m4YUuUBcpj882m7725iyRs0iMcEdH2Dha7nQMNaWMYqqBoge7TSkgc8aQ5VIwEBR9qCDSl5u4Rx+Q5B0/x7e0qAwPPO6YaxHgDPRyh9tmMFU+/0JbR8RhDcg3KWKhaUNewy8L1hAT3H3deANaJH7pxbxMBc4z+4Q BOHtu+lR zNvApcOKCWwaZF0cg+rxvrTljsMRN+se0cMv0yudEtVgvYitgjZT3ZG+EwyEWpXPY4xgpGY5fYP9j2xCoNj8Qc7+aUj/K6ypTp9GrlrGSnJylcRd/z3CIlWTw0Ez9/4tdYuI3H4iztTA4KciQbohA5rAYlUY8+duzhaFwjQe589nAGj39XmKOv2BhllU/PlolPK9t88V/fF3cdpwPjEGvSC/TDS9C8w1CdcA5 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 drain_local_stock() and memcg_hotplug_cpu_dead() only run in task context, so there is no need to localtry_trylock_irqsave() the local stock_lock in those functions. The plan is to convert all stock_lock users which can be called in multiple context to use localtry_trylock_irqsave() and subsequently switch to non-irq disabling interface. So, for functions which are never called in non-task context, this patch adds the asserts. Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index dfe9c2eb7816..c803d2f5e322 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1857,6 +1857,8 @@ static void drain_local_stock(struct work_struct *dummy) struct memcg_stock_pcp *stock; unsigned long flags; + lockdep_assert_once(in_task()); + /* * The only protection from cpu hotplug (memcg_hotplug_cpu_dead) vs. * drain_stock races is that we always operate on local CPU stock @@ -1953,6 +1955,8 @@ static int memcg_hotplug_cpu_dead(unsigned int cpu) struct memcg_stock_pcp *stock; unsigned long flags; + lockdep_assert_once(in_task()); + stock = &per_cpu(memcg_stock, cpu); /* drain_obj_stock requires stock_lock */