From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3104A82866; Thu, 2 Jul 2026 16:44:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010665; cv=none; b=CMIFiJ9G4TiBpLd3EUIt5tg8TPLzwYbGeA9jcyE9blgp4NY65+8ESU6IA+B3qTgvbQ+KKfpj8diq5AaOaQHNnufrRGfd6l+CM2mZa4sOe84xXXHRExTHGiVn7DyNiJwuLbp002Wntr4HKh2CXwHAbl8yAv7EAUu7Rf5+LrPm+BM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010665; c=relaxed/simple; bh=hEPjnRB2vbnraqwb8VIWkC+9MNjFgDPLftCjvztkDbQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ue+y92Um5mkwgiN8S0o4ycS8ZrvRzAUfKQZXawCPHAFQ5nVu/jRDMWBJ0wngqV/Mva5GtUBY9xRCw2gYtQkOWAAqIUKkV4zfgp420gKDEJ39/O7MmPx2lQ0wAPuXlOCuytx2uD5Cb0cANppuXulSR+5xGZ/fGvlfvBVyS8xByY8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iaCUpUyl; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iaCUpUyl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A1831F00A3A; Thu, 2 Jul 2026 16:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783010663; bh=OSB+bhFD1js71tRayNH9Fko0i6Vy9ma5UZvuQsYKkCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iaCUpUylKTJ/+gMBZiZRRZymH8Gl1/UcQbxHJfk5+9+WSL1Ah1+O+VojA9BvaX4he FxCFU4LoSBNJq5TBPvvSi/Lhi8+tse9W7tqBmcqrjznOSfd8sS11af2gQp+cY+hyD/ WJvIc45phuanWFquqFqeOvkFGFL/8JKn47qn77ZE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Georgi Djakov , "Oscar Salvador (SUSE)" , Vishal Verma , Mike Rapoport , Richard Cheng , David Hildenbrand , Georgi Djakov , "Rafael J. Wysocki" , Andrew Morton , Sasha Levin Subject: [PATCH 6.12 194/204] drivers/base/memory: set mem->altmap after successful device registration Date: Thu, 2 Jul 2026 18:20:51 +0200 Message-ID: <20260702155122.724830154@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260702155118.667618796@linuxfoundation.org> References: <20260702155118.667618796@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Georgi Djakov [ Upstream commit a2b8d7827f48ee54a686cb80e4a1d0ff954ec42a ] If __add_memory_block() fails at xa_store() (under memory pressure for example), device_unregister() is called, which eventually triggers memory_block_release() with mem->altmap still set, causing a WARN_ON(mem->altmap). This was triggered by modifying virtio-mem driver. Fix this by delaying the assignment of mem->altmap until after __add_memory_block() has succeeded. Link: https://lore.kernel.org/20260514092657.3057141-1-georgi.djakov@oss.qualcomm.com Fixes: 1a8c64e11043 ("mm/memory_hotplug: embed vmem_altmap details in memory block") Signed-off-by: Georgi Djakov Acked-by: Oscar Salvador (SUSE) Cc: Vishal Verma Cc: Mike Rapoport Cc: Richard Cheng Cc: David Hildenbrand Cc: Georgi Djakov Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/base/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -794,7 +794,6 @@ static int add_memory_block(unsigned lon mem->start_section_nr = block_id * sections_per_block; mem->state = state; mem->nid = NUMA_NO_NODE; - mem->altmap = altmap; INIT_LIST_HEAD(&mem->group_next); #ifndef CONFIG_NUMA @@ -812,6 +811,8 @@ static int add_memory_block(unsigned lon if (ret) return ret; + mem->altmap = altmap; + if (group) { mem->group = group; list_add(&mem->group_next, &group->memory_blocks);