From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFF36C4332F for ; Sat, 1 Oct 2022 01:47:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232050AbiJABr1 (ORCPT ); Fri, 30 Sep 2022 21:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230291AbiJABrY (ORCPT ); Fri, 30 Sep 2022 21:47:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E8B1153A79; Fri, 30 Sep 2022 18:47:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D471862598; Sat, 1 Oct 2022 01:47:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 327FDC433D7; Sat, 1 Oct 2022 01:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1664588841; bh=5sOXLC0h1AGWuzO2XrIRch5SPLJ4F2CvSDYpKKfdnnI=; h=Date:To:From:Subject:From; b=Q5rfvKaQGkH1IfnfoTVrIqhUPddVMthn7ACqnPk+CyTGpU6ST3zEnxKXwrerrqguL AVsG9806gEqTZhxN6SMu9K+jsD7wga/JI8Y10Zb+6YUv3EcjNgHBAf6+H0USm8wZn+ Lo2v6ZaX4c7X00uTkM/tDZLfx4YP/8U5Iz4OgsdE= Date: Fri, 30 Sep 2022 18:47:20 -0700 To: mm-commits@vger.kernel.org, vbabka@suse.cz, urezki@gmail.com, stable@vger.kernel.org, micron10@gmail.com, mhocko@suse.com, fw@strlen.de, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] mm-fix-bug-splat-with-kvmalloc-gfp_atomic.patch removed from -mm tree Message-Id: <20221001014721.327FDC433D7@smtp.kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The quilt patch titled Subject: mm: fix BUG splat with kvmalloc + GFP_ATOMIC has been removed from the -mm tree. Its filename was mm-fix-bug-splat-with-kvmalloc-gfp_atomic.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Florian Westphal Subject: mm: fix BUG splat with kvmalloc + GFP_ATOMIC Date: Mon, 26 Sep 2022 17:16:50 +0200 Martin Zaharinov reports BUG with 5.19.10 kernel: kernel BUG at mm/vmalloc.c:2437! invalid opcode: 0000 [#1] SMP CPU: 28 PID: 0 Comm: swapper/28 Tainted: G W O 5.19.9 #1 [..] RIP: 0010:__get_vm_area_node+0x120/0x130 __vmalloc_node_range+0x96/0x1e0 kvmalloc_node+0x92/0xb0 bucket_table_alloc.isra.0+0x47/0x140 rhashtable_try_insert+0x3a4/0x440 rhashtable_insert_slow+0x1b/0x30 [..] bucket_table_alloc uses kvzalloc(GPF_ATOMIC). If kmalloc fails, this now falls through to vmalloc and hits code paths that assume GFP_KERNEL. Link: https://lkml.kernel.org/r/20220926151650.15293-1-fw@strlen.de Fixes: a421ef303008 ("mm: allow !GFP_KERNEL allocations for kvmalloc") Signed-off-by: Florian Westphal Suggested-by: Michal Hocko Link: https://lore.kernel.org/linux-mm/Yy3MS2uhSgjF47dy@pc636/T/#t Acked-by: Michal Hocko Reported-by: Martin Zaharinov Cc: Uladzislau Rezki (Sony) Cc: Vlastimil Babka Cc: Signed-off-by: Andrew Morton --- mm/util.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/mm/util.c~mm-fix-bug-splat-with-kvmalloc-gfp_atomic +++ a/mm/util.c @@ -619,6 +619,10 @@ void *kvmalloc_node(size_t size, gfp_t f if (ret || size <= PAGE_SIZE) return ret; + /* non-sleeping allocations are not supported by vmalloc */ + if (!gfpflags_allow_blocking(flags)) + return NULL; + /* Don't even allow crazy sizes */ if (unlikely(size > INT_MAX)) { WARN_ON_ONCE(!(flags & __GFP_NOWARN)); _ Patches currently in -mm which might be from fw@strlen.de are