From patchwork Tue Aug 6 14:25:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 13754947 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 A536AC49EA1 for ; Tue, 6 Aug 2024 14:27:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A29A6B0085; Tue, 6 Aug 2024 10:27:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1535F6B0089; Tue, 6 Aug 2024 10:27:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01A006B008C; Tue, 6 Aug 2024 10:27:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D53B56B0085 for ; Tue, 6 Aug 2024 10:27:13 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 658CFA5A9B for ; Tue, 6 Aug 2024 14:27:13 +0000 (UTC) X-FDA: 82422047946.20.BC097D5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id B5AC2120031 for ; Tue, 6 Aug 2024 14:27:11 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ALGVJb1M; spf=pass (imf29.hostedemail.com: domain of longman@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722954382; 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=sxdMlZiVCpeBnxBeJX0VnaiMFDVq/jpkKoST9+suM0w=; b=oOJQGAmoxL9jwy/BFvvwTsSjlZAKqHvPWYEOMA6MLROQyAmoyJg21mfekKmdgGPpqHJG1x 5Tx6GtCfXK4S0RSF0SshsGcYTNjuxeQqeOlIBmgC9ZNqLIl02bFPptplv4lgfbN++CG5in h5mmbAONYO+iMLCxNrFGGHsbgfxvvJc= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ALGVJb1M; spf=pass (imf29.hostedemail.com: domain of longman@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722954382; a=rsa-sha256; cv=none; b=nI+QdwYdC/GBw3HyJaaOnzcGe8r3iCvP4k+SQsFRaEjy0bCeu85nasu/9XV7J+rQB22CR0 xtBHNGnZZ/y1XIrDkt2xSMLBUuROXKIhKZy5W+DhRPQwNEo/+rWEXfAHawEvGclUohcx9b YQLD84hY2/8eHIhhnKMKkPyoJgrqCLU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722954430; 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=sxdMlZiVCpeBnxBeJX0VnaiMFDVq/jpkKoST9+suM0w=; b=ALGVJb1MXlWzAp0+wmvRBe3E8Xua9wUs30a49EoUFIemx5Rd9J+T+Eld1ey1V9mOBQV2+1 GgS6xrZjHKJnoHv+Mckp3VlRQn+ZucoH2Nh4WjxBvEgkMw829h8A6gAP7Pylg+weP0tZCM hcAuPXJjf8FTRVgfl8n/IR2QJ9opalo= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-Pk9Zjrk5Oo-QKSrVolVvew-1; Tue, 06 Aug 2024 10:27:06 -0400 X-MC-Unique: Pk9Zjrk5Oo-QKSrVolVvew-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 329BF191E7F6; Tue, 6 Aug 2024 14:27:04 +0000 (UTC) Received: from llong.com (unknown [10.2.16.146]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 41C0B195605A; Tue, 6 Aug 2024 14:26:40 +0000 (UTC) From: Waiman Long To: Andrew Morton , Miaohe Lin , Naoya Horiguchi Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Len Brown , Juri Lelli , Waiman Long Subject: [PATCH] mm/memory-failure: Use raw_spinlock_t in struct memory_failure_cpu Date: Tue, 6 Aug 2024 10:25:35 -0400 Message-ID: <20240806142535.1033323-1-longman@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Stat-Signature: 37ao9pncpougcbyuuf98gzwhicmrdyut X-Rspam-User: X-Rspamd-Queue-Id: B5AC2120031 X-Rspamd-Server: rspam02 X-HE-Tag: 1722954431-333288 X-HE-Meta: U2FsdGVkX1+I692vpC8eYFsaDzui1MIA/YbWqbTQs7n/mdlcx3su8Hu9BOKtjYTcLfCVx2x3FupNpNNoTa2d4fbSdG/fqQnSpxiF3npq93QbZKkU8McBX9Z8YQlJuXvDY5MMNPfKm3jEFLcaZ9U98yvt6KR7tQTkNYmKOGXCZv0P5WJ0eQ5NLBmRRL264wb7rtsyLKDKd29lie/ae9BhPiwnQOXEdhhbiUPE3Nyf43OiDw217QD5aL4f0KmOJgw0mQFe2mrwLVqWjTXng5maYQVCTNHfpdLR5Hy329NezrxEzXtk+UCGEJ1g1vbgPzo0FVk2EIllMUKF/GqwUNwsihmsdw63RJPWPlGfJ5Sd2lKY5dfYx73s3f2hgMhFgDbF+zfMc/E4VkWedQazXvPB4kBllLYOYg5CKvXOr1WUhOT9s3KPMSY/al5XZjxd2x7N3xh0nM3E3rHNVuJyBc1/5P0XXFbuF0l5IPIdbf/2m90VykH5JCrPyAdwcOGWqUS5wDVT7HUWyPfdY52QL/zH6GE1IcVr0NS6JDmzUGkwFp466ydUapu+YGvy8C4gUTKzBA3m3nYeWLhx6AILwETNbDMGysGuTctWL/O/UXLoSjdzThLgycITgWJE6kk6S6FFEV1SGAwB+w/DJz0AQS6EFzx9RfJkVj82DiNl4xagEj9a5Gbo3Y8YoF5HR6nECxO0lplvvCs1ypsJaJVs1cSl/bf7E99AED9erW/HsbGKwKEu6UEYNsSKP+/ZVa+BEQje8U14SSiyamMv1ytt2s5YRtxmW0p/pXcbaWmt4uFCrzDdv9ZTNbLzK2XRnaAirmls8m7/i4iIgF/PNyyGHYtl34B9PgBWTCAV5D1Zv1SvPXqrzi9Iog80s5i5xQlTuX8tKUhiK4+ul+zY22kAnNG+R4BzsFeUsPJxv/M3YVfX2SNVuvTbTxJzGdd0kDHPwfvPlNTgC7AUgvb9mG57x2j rzqmQeou R+jP6FTa0XT23u8wJoo45Kjeky+XyKo6X0sOd+O8rLfXMSvFuzgko9HS6ENlnQL5SfPRiXpLrhszehVfKiAhUB8iINmeX3jQk2iL7Kw6Z5XMezsrYHbDbrYdrAdL5dFmUOKUU6UQlfCg1MRwgvskybhVijhbg91l+0SL9tkHaOILij/NMnwaXF15NdhOztbZNPXngXncSTOHEn8tq/eQIZMNB0hVOwxR4QKTy/KAKw492v0Hdt7A4Dp+pRPWrWbhrvQsRq134q7NyN5t41zi2IO/gPnZONi7Uj4l1OtOPd8btKzrjLbWM2KFJO9lNLry/8/4wn8TZrbCy/2zQvrKGpTCEM8y46kxG2zV3uRaaNVB6vndVKs7I0ExFhBaQLK52F033KQeoat0Uhj+J8Ogu1vVr6hZ5kv9q91Rx 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 memory_failure_cpu structure is a per-cpu structure. Access to its content requires the use of get_cpu_var() to lock in the current CPU and disable preemption. The use of a regular spinlock_t for locking purpose is fine for a non-RT kernel. Since the integration of RT spinlock support into the v5.15 kernel, a spinlock_t in a RT kernel becomes a sleeping lock and taking a sleeping lock in a preemption disabled context is illegal resulting in the following kind of warning. [12135.732244] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 [12135.732248] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 270076, name: kworker/0:0 [12135.732252] preempt_count: 1, expected: 0 [12135.732255] RCU nest depth: 2, expected: 2 : [12135.732420] Hardware name: Dell Inc. PowerEdge R640/0HG0J8, BIOS 2.10.2 02/24/2021 [12135.732423] Workqueue: kacpi_notify acpi_os_execute_deferred [12135.732433] Call Trace: [12135.732436] [12135.732450] dump_stack_lvl+0x57/0x81 [12135.732461] __might_resched.cold+0xf4/0x12f [12135.732479] rt_spin_lock+0x4c/0x100 [12135.732491] memory_failure_queue+0x40/0xe0 [12135.732503] ghes_do_memory_failure+0x53/0x390 [12135.732516] ghes_do_proc.constprop.0+0x229/0x3e0 [12135.732575] ghes_proc+0xf9/0x1a0 [12135.732591] ghes_notify_hed+0x6a/0x150 [12135.732602] notifier_call_chain+0x43/0xb0 [12135.732626] blocking_notifier_call_chain+0x43/0x60 [12135.732637] acpi_ev_notify_dispatch+0x47/0x70 [12135.732648] acpi_os_execute_deferred+0x13/0x20 [12135.732654] process_one_work+0x41f/0x500 [12135.732695] worker_thread+0x192/0x360 [12135.732715] kthread+0x111/0x140 [12135.732733] ret_from_fork+0x29/0x50 [12135.732779] Fix it by using a raw_spinlock_t for locking instead. Fixes: ea8f5fb8a71f ("HWPoison: add memory_failure_queue()") Signed-off-by: Waiman Long --- mm/memory-failure.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 581d3e5c9117..d40377b3edc8 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2417,7 +2417,7 @@ struct memory_failure_entry { struct memory_failure_cpu { DECLARE_KFIFO(fifo, struct memory_failure_entry, MEMORY_FAILURE_FIFO_SIZE); - spinlock_t lock; + raw_spinlock_t lock; struct work_struct work; }; @@ -2449,13 +2449,13 @@ void memory_failure_queue(unsigned long pfn, int flags) }; mf_cpu = &get_cpu_var(memory_failure_cpu); - spin_lock_irqsave(&mf_cpu->lock, proc_flags); + raw_spin_lock_irqsave(&mf_cpu->lock, proc_flags); if (kfifo_put(&mf_cpu->fifo, entry)) schedule_work_on(smp_processor_id(), &mf_cpu->work); else pr_err("buffer overflow when queuing memory failure at %#lx\n", pfn); - spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); + raw_spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); put_cpu_var(memory_failure_cpu); } EXPORT_SYMBOL_GPL(memory_failure_queue); @@ -2469,9 +2469,9 @@ static void memory_failure_work_func(struct work_struct *work) mf_cpu = container_of(work, struct memory_failure_cpu, work); for (;;) { - spin_lock_irqsave(&mf_cpu->lock, proc_flags); + raw_spin_lock_irqsave(&mf_cpu->lock, proc_flags); gotten = kfifo_get(&mf_cpu->fifo, &entry); - spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); + raw_spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); if (!gotten) break; if (entry.flags & MF_SOFT_OFFLINE) @@ -2501,7 +2501,7 @@ static int __init memory_failure_init(void) for_each_possible_cpu(cpu) { mf_cpu = &per_cpu(memory_failure_cpu, cpu); - spin_lock_init(&mf_cpu->lock); + raw_spin_lock_init(&mf_cpu->lock); INIT_KFIFO(mf_cpu->fifo); INIT_WORK(&mf_cpu->work, memory_failure_work_func); }