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 5DFB52F363C for ; Mon, 24 Nov 2025 21:38:37 +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=1764020318; cv=none; b=uzaPh3+YHsrfkl9C54cDznsb83+2yHfWTOIQd18ZXh8yG79/CKSic6aeMRj/1cOe4IE9tQolHpXPkV/FGcPrH/Nzu9n8fTMC3hDVJ/TVtyBkayR6fSBp1whwSDJIIx3rPHVTtH5C4vNV8T/y7wzb+/txV+CMwxeMF6QRHFpOX28= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764020318; c=relaxed/simple; bh=rYPQX8lXktpNJk0uPnWQGOEVqDsG7ixSyjEycw6QjPY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=omiDOaguRY84V3vYPXpe9jLP0p/JOKjzoo+AOf08NoXTnlQUE5u0CSmiXrMbTlorXfEcRfTeoC4Er94N6NX7KwNrdSjBEGK3euq9pKH9V7AmxnCtiXL/vKQ/R+UNtWGKc/awiSl0Z0qfnsIZZo/vm9SEpOM7ZikuhquLZVMagzE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pL6qOh/l; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pL6qOh/l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26440C4CEF1; Mon, 24 Nov 2025 21:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764020317; bh=rYPQX8lXktpNJk0uPnWQGOEVqDsG7ixSyjEycw6QjPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pL6qOh/lVur0i5czdBn2FL1bPlb/HSYu7rn0rIVu1Q9/2B7+CbN1QhFnJ+WcQmfPe mMHXSvryY0sEclMpHPuyYx0Ivi3MGneBXCmaXOj/ll3nRgJUAnv66T/c3vW+WcSVN2 Hck7W56Tit4/S+eTx3GTnBCvCGyP/Z82t3+vuQn9wCdvjOUZEkqFsR0Z7hZHkLo8EG 0P4VJWrbjW30BRkZHuTmeev0ZHlEsxcNogAJOk4EkmWFrg+6HlvOXZdqbKjOy2uxxO os3GCXktE29uAFf/axCEv4eNyjSSeooqEyd9GwqwChsresjapvK6bG9FT3uLq8bKYC kR6uQovdiHSLA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Fabio M. De Francesco" , Ira Weiny , Andrew Morton , Sasha Levin Subject: [PATCH 5.10.y 1/2] mm/mempool: replace kmap_atomic() with kmap_local_page() Date: Mon, 24 Nov 2025 16:38:33 -0500 Message-ID: <20251124213835.42484-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025112437-sandpaper-almighty-8e37@gregkh> References: <2025112437-sandpaper-almighty-8e37@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- mm/mempool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/mempool.c b/mm/mempool.c index f473cdddaff0f..2cc43b04c1ecc 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -63,10 +63,10 @@ static void check_element(mempool_t *pool, void *element) } 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); } } @@ -86,10 +86,10 @@ static void poison_element(mempool_t *pool, void *element) } 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 */ -- 2.51.0