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 CF29D13B592 for ; Mon, 19 Aug 2024 09:54:28 +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=1724061268; cv=none; b=eBq3NBZm7uaNgmt8ydf8HrPikSJyyYLiqXa/D1EATcsEOKrDnwQUQaRjsP9tpyMv2ovek269okhIjYvnKciFNMjaVXi1J/Xq1YcsOI1Q5UxMTmRDod+1D2s25LHe2X2ez/YnWbNe/sO+ZkK0Uzky4Y7KrlHZHGs5il1qb4E0pOE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724061268; c=relaxed/simple; bh=OrZNBCmAGRAZ/b22gFwaBAp47weQVLYXYMA9mWT98gw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=t9BlUi0/t62BnRQIZzZHfewGYaZAg2iTnoI9fmjCTSeARESqdcZHJ6+OpfK8qhZuYtOLz7cPxZTys5zF2O+AxuKpITzIVAA+DlRE9QqlmUE2/akskRVS6IT83quqyUca9lulorIuAsNkE7gvW8toDCc1sQ4CaQbPsS1KRefrZHc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vuxrg5WI; 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="Vuxrg5WI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FC47C32782; Mon, 19 Aug 2024 09:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724061268; bh=OrZNBCmAGRAZ/b22gFwaBAp47weQVLYXYMA9mWT98gw=; h=Subject:To:Cc:From:Date:From; b=Vuxrg5WILP/FXFAkLPcBUzgmGv8tj2CnNmv+ZQrUl/MtpV8elbFOQTbhXOzZnovtc Dznfqbf38io1gBzi8tMgDaKIc2t05MI/GAaxHxvUaRAjye9WlewUnicsi+kAW0efse 94yhg+fjEHIMXdZXgQWOCrnFqa+dryaX0M5c5IUg= Subject: FAILED: patch "[PATCH] mm/vmalloc: fix page mapping if vm_area_alloc_pages() with" failed to apply to 6.1-stable tree To: hailong.liu@oppo.com,akpm@linux-foundation.org,baohua@kernel.org,bhe@redhat.com,mhocko@suse.com,stable@vger.kernel.org,urezki@gmail.com,willy@infradead.org,zhengtangquan@oppo.com Cc: From: Date: Mon, 19 Aug 2024 11:54:18 +0200 Message-ID: <2024081918-payday-symphonic-ac65@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 61ebe5a747da649057c37be1c37eb934b4af79ca # git commit -s git send-email --to '' --in-reply-to '2024081918-payday-symphonic-ac65@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 61ebe5a747da ("mm/vmalloc: fix page mapping if vm_area_alloc_pages() with high order fallback to order 0") 88ae5fb755b0 ("mm: vmalloc: enable memory allocation profiling") e9c3cda4d86e ("mm, vmalloc: fix high order __GFP_NOFAIL allocations") 3ba2c3ff98ea ("Merge tag 'modules-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 61ebe5a747da649057c37be1c37eb934b4af79ca Mon Sep 17 00:00:00 2001 From: Hailong Liu Date: Thu, 8 Aug 2024 20:19:56 +0800 Subject: [PATCH] mm/vmalloc: fix page mapping if vm_area_alloc_pages() with high order fallback to order 0 The __vmap_pages_range_noflush() assumes its argument pages** contains pages with the same page shift. However, since commit e9c3cda4d86e ("mm, vmalloc: fix high order __GFP_NOFAIL allocations"), if gfp_flags includes __GFP_NOFAIL with high order in vm_area_alloc_pages() and page allocation failed for high order, the pages** may contain two different page shifts (high order and order-0). This could lead __vmap_pages_range_noflush() to perform incorrect mappings, potentially resulting in memory corruption. Users might encounter this as follows (vmap_allow_huge = true, 2M is for PMD_SIZE): kvmalloc(2M, __GFP_NOFAIL|GFP_X) __vmalloc_node_range_noprof(vm_flags=VM_ALLOW_HUGE_VMAP) vm_area_alloc_pages(order=9) ---> order-9 allocation failed and fallback to order-0 vmap_pages_range() vmap_pages_range_noflush() __vmap_pages_range_noflush(page_shift = 21) ----> wrong mapping happens We can remove the fallback code because if a high-order allocation fails, __vmalloc_node_range_noprof() will retry with order-0. Therefore, it is unnecessary to fallback to order-0 here. Therefore, fix this by removing the fallback code. Link: https://lkml.kernel.org/r/20240808122019.3361-1-hailong.liu@oppo.com Fixes: e9c3cda4d86e ("mm, vmalloc: fix high order __GFP_NOFAIL allocations") Signed-off-by: Hailong Liu Reported-by: Tangquan Zheng Reviewed-by: Baoquan He Reviewed-by: Uladzislau Rezki (Sony) Acked-by: Barry Song Acked-by: Michal Hocko Cc: Matthew Wilcox Cc: Signed-off-by: Andrew Morton diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 6b783baf12a1..af2de36549d6 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3584,15 +3584,8 @@ vm_area_alloc_pages(gfp_t gfp, int nid, page = alloc_pages_noprof(alloc_gfp, order); else page = alloc_pages_node_noprof(nid, alloc_gfp, order); - if (unlikely(!page)) { - if (!nofail) - break; - - /* fall back to the zero order allocations */ - alloc_gfp |= __GFP_NOFAIL; - order = 0; - continue; - } + if (unlikely(!page)) + break; /* * Higher order allocations must be able to be treated as