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 C7F94C4332F for ; Fri, 25 Mar 2022 01:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357390AbiCYBd4 (ORCPT ); Thu, 24 Mar 2022 21:33:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357453AbiCYBdM (ORCPT ); Thu, 24 Mar 2022 21:33:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63A1ABF506 for ; Thu, 24 Mar 2022 18:31:15 -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 ams.source.kernel.org (Postfix) with ESMTPS id 14A22B82729 for ; Fri, 25 Mar 2022 01:31:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAC14C340EC; Fri, 25 Mar 2022 01:31:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1648171872; bh=GSNoDFz0J5zLyoVVUb5DBuYDtuUQiXWPeY2vwDVNfrY=; h=Date:To:From:Subject:From; b=1SqMUiK7KmKuKbUEixKYGk5i1mDLv8EkPOdGyhqctTSN5TuYJ7D10p+pdRwzHLJCd 3U1uaOzRHa5BPgV1ks2wZBcpfKDLMk3C+2JmXS8WzFMsBmEFU02EGlgbxvPUaspIaM kwZy1cI4uBzdRqv7LdNFUp90F0YwurbAF4hqfN7U= Date: Thu, 24 Mar 2022 18:31:12 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, vvs@virtuozzo.com, uladzislau.rezki@sony.com, oleksiy.avramchenko@sonymobile.com, npiggin@gmail.com, hch@lst.de, urezki@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged] mm-vmalloc-eliminate-an-extra-orig_gfp_mask.patch removed from -mm tree Message-Id: <20220325013112.BAC14C340EC@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/vmalloc: eliminate an extra orig_gfp_mask has been removed from the -mm tree. Its filename was mm-vmalloc-eliminate-an-extra-orig_gfp_mask.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: "Uladzislau Rezki (Sony)" Subject: mm/vmalloc: eliminate an extra orig_gfp_mask That extra variable has been introduced just for keeping an original passed gfp_mask because it is updated with __GFP_NOWARN on entry, thus error handling messages were broken. Instead we can keep an original gfp_mask without modifying it and add an extra __GFP_NOWARN flag together with gfp_mask as a parameter to the vm_area_alloc_pages() function. It will make it less confused. Link: https://lkml.kernel.org/r/20220119143540.601149-3-urezki@gmail.com Signed-off-by: Uladzislau Rezki (Sony) Cc: Vasily Averin Cc: Christoph Hellwig Cc: Matthew Wilcox Cc: Nicholas Piggin Cc: Oleksiy Avramchenko Cc: Uladzislau Rezki Signed-off-by: Andrew Morton --- mm/vmalloc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-eliminate-an-extra-orig_gfp_mask +++ a/mm/vmalloc.c @@ -2946,7 +2946,6 @@ static void *__vmalloc_area_node(struct int node) { const gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO; - const gfp_t orig_gfp_mask = gfp_mask; bool nofail = gfp_mask & __GFP_NOFAIL; unsigned long addr = (unsigned long)area->addr; unsigned long size = get_vm_area_size(area); @@ -2970,7 +2969,7 @@ static void *__vmalloc_area_node(struct } if (!area->pages) { - warn_alloc(orig_gfp_mask, NULL, + warn_alloc(gfp_mask, NULL, "vmalloc error: size %lu, failed to allocated page array size %lu", nr_small_pages * PAGE_SIZE, array_size); free_vm_area(area); @@ -2980,8 +2979,8 @@ static void *__vmalloc_area_node(struct set_vm_area_page_order(area, page_shift - PAGE_SHIFT); page_order = vm_area_page_order(area); - area->nr_pages = vm_area_alloc_pages(gfp_mask, node, - page_order, nr_small_pages, area->pages); + area->nr_pages = vm_area_alloc_pages(gfp_mask | __GFP_NOWARN, + node, page_order, nr_small_pages, area->pages); atomic_long_add(area->nr_pages, &nr_vmalloc_pages); if (gfp_mask & __GFP_ACCOUNT) { @@ -2997,7 +2996,7 @@ static void *__vmalloc_area_node(struct * allocation request, free them via __vfree() if any. */ if (area->nr_pages != nr_small_pages) { - warn_alloc(orig_gfp_mask, NULL, + warn_alloc(gfp_mask, NULL, "vmalloc error: size %lu, page order %u, failed to allocate pages", area->nr_pages * PAGE_SIZE, page_order); goto fail; @@ -3025,7 +3024,7 @@ static void *__vmalloc_area_node(struct memalloc_noio_restore(flags); if (ret < 0) { - warn_alloc(orig_gfp_mask, NULL, + warn_alloc(gfp_mask, NULL, "vmalloc error: size %lu, failed to map pages", area->nr_pages * PAGE_SIZE); goto fail; _ Patches currently in -mm which might be from urezki@gmail.com are