From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F03B035FF46; Wed, 3 Dec 2025 16:43:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764780186; cv=none; b=rMOkTYiRVMQTX3xJDz91n6gem8liS7ka+mDpIgpzzTFnQgYIEoxWAw89xD28QXiEYTMz+w2IQd95YsqG3hHGJoSGkBSX20HBRIxEqK80p1oEzeE4FgWYVY0wFQtpmkpNrg3QbjL0hfSHE4h5ojvxoPTOtQDWS5VdKfNdAR7E5tM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764780186; c=relaxed/simple; bh=kyumMvkf/cf5Q5OC2uTdZR3ctX675GhI2M7lhmMeX9U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sbi1SvRv/QmjvLh1j5oqcXJpXROu7whyTUQ5Bk2CdbrlJ+v2KOScN/XDEt/1MGoriG3eW6lDQFRmIaCffCB0sf0Bp2SSnBR709u7vQWkzwKeinxCOISoDekz3p62hOz2gDUeD1AMpCB+THHISf+5hZxNkNV18ix9QcXeFmBX0EA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=A3oy+t1c; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="A3oy+t1c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63AD9C4CEF5; Wed, 3 Dec 2025 16:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764780185; bh=kyumMvkf/cf5Q5OC2uTdZR3ctX675GhI2M7lhmMeX9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A3oy+t1cbVVcshvuLHDSzJuwWVp5LCyYNv7MtsmPhtVjjIpq0JDNImSskmzDIVFkl j4RTfcQvrjjXt036VEYV9s5GHcnLlgi7zWlabdx0miLg8U/KnfHw4N8AHj79f4VMfd nR1KyzFghOhZFfyWmqIfprYuiaaQo5zqzCY99f6M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Fabio M. De Francesco" , Ira Weiny , Andrew Morton , Sasha Levin Subject: [PATCH 6.1 481/568] mm/mempool: replace kmap_atomic() with kmap_local_page() Date: Wed, 3 Dec 2025 16:28:03 +0100 Message-ID: <20251203152458.316304834@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Fabio M. De Francesco" [ Upstream commit f2bcc99a5e901a13b754648d1dbab60f4adf9375 ] kmap_atomic() has been deprecated in favor of kmap_local_page(). Therefore, replace kmap_atomic() with kmap_local_page(). kmap_atomic() is implemented like a kmap_local_page() which also disables page-faults and preemption (the latter only in !PREEMPT_RT kernels). The kernel virtual addresses returned by these two API are only valid in the context of the callers (i.e., they cannot be handed to other threads). With kmap_local_page() the mappings are per thread and CPU local like in kmap_atomic(); however, they can handle page-faults and can be called from any context (including interrupts). The tasks that call kmap_local_page() can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and are still valid. The code blocks between the mappings and un-mappings don't rely on the above-mentioned side effects of kmap_atomic(), so that mere replacements of the old API with the new one is all that they require (i.e., there is no need to explicitly call pagefault_disable() and/or preempt_disable()). Link: https://lkml.kernel.org/r/20231120142640.7077-1-fabio.maria.de.francesco@linux.intel.com Signed-off-by: Fabio M. De Francesco Cc: Ira Weiny Signed-off-by: Andrew Morton Stable-dep-of: ec33b59542d9 ("mm/mempool: fix poisoning order>0 pages with HIGHMEM") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- mm/mempool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/mm/mempool.c +++ b/mm/mempool.c @@ -62,10 +62,10 @@ static void check_element(mempool_t *poo } else if (pool->free == mempool_free_pages) { /* Mempools backed by page allocator */ int order = (int)(long)pool->pool_data; - void *addr = kmap_atomic((struct page *)element); + void *addr = kmap_local_page((struct page *)element); __check_element(pool, addr, 1UL << (PAGE_SHIFT + order)); - kunmap_atomic(addr); + kunmap_local(addr); } } @@ -85,10 +85,10 @@ static void poison_element(mempool_t *po } else if (pool->alloc == mempool_alloc_pages) { /* Mempools backed by page allocator */ int order = (int)(long)pool->pool_data; - void *addr = kmap_atomic((struct page *)element); + void *addr = kmap_local_page((struct page *)element); __poison_element(addr, 1UL << (PAGE_SHIFT + order)); - kunmap_atomic(addr); + kunmap_local(addr); } } #else /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */