Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0699C56202 for ; Thu, 22 Oct 2020 23:10:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8316D24641 for ; Thu, 22 Oct 2020 23:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603408205; bh=KsFbCdFqwgEQ3htTsS1KOEqNQ+tS4HPjs4GZu+TEUpo=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=RbK19owNjNT9153ZBqn6txONJHVrz8KaqczAtefF3Im9R7da4N0NNILe3X+ktpbwu EZc8C9xnW+CvG+VYSuhFDRW+CDtX4XQ4HJykPxBmzJhI9198VNd/ObCUSvNAEWMW2B 7VFvZvCwkuZYh4/7001X04n3CUi62cE9Z6yKMHwg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S373257AbgJVXKF (ORCPT ); Thu, 22 Oct 2020 19:10:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:50364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S373254AbgJVXKE (ORCPT ); Thu, 22 Oct 2020 19:10:04 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F000A24248; Thu, 22 Oct 2020 23:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603408203; bh=KsFbCdFqwgEQ3htTsS1KOEqNQ+tS4HPjs4GZu+TEUpo=; h=Date:From:To:Subject:From; b=ZV8I/Wptdd9KD0aNdpfELDIrBe0g/rMuUM3fZ8l2EB6VUvobV0L4jaSXba9GVsFKx mAoDzJmWrxmb1iay4T3sPlSrgPgh9ESEs44QbHrJ7hX0hFc9Em9n6j1QFXVQncobbN SmSa7NL1oRHUnkDkR6AU/8cLS4w78bG50SCAKsCY= Date: Thu, 22 Oct 2020 16:10:02 -0700 From: akpm@linux-foundation.org To: boris.ostrovsky@oracle.com, chris@chris-wilson.co.uk, hch@lst.de, jani.nikula@linux.intel.com, jgross@suse.com, joonas.lahtinen@linux.intel.com, matthew.auld@intel.com, minchan@kernel.org, mm-commits@vger.kernel.org, ngupta@vflare.org, peterz@infradead.org, rodrigo.vivi@intel.com, sstabellini@kernel.org, tvrtko.ursulin@intel.com, urezki@gmail.com, willy@infradead.org Subject: [merged] mm-add-a-vm_map_put_pages-flag-for-vmap.patch removed from -mm tree Message-ID: <20201022231002.OR_rsBut-%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: add a VM_MAP_PUT_PAGES flag for vmap has been removed from the -mm tree. Its filename was mm-add-a-vm_map_put_pages-flag-for-vmap.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Christoph Hellwig Subject: mm: add a VM_MAP_PUT_PAGES flag for vmap Add a flag so that vmap takes ownership of the passed in page array. When vfree is called on such an allocation it will put one reference on each page, and free the page array itself. Link: https://lkml.kernel.org/r/20201002122204.1534411-3-hch@lst.de Signed-off-by: Christoph Hellwig Cc: Boris Ostrovsky Cc: Chris Wilson Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Juergen Gross Cc: Matthew Auld Cc: "Matthew Wilcox (Oracle)" Cc: Minchan Kim Cc: Nitin Gupta Cc: Peter Zijlstra Cc: Rodrigo Vivi Cc: Stefano Stabellini Cc: Tvrtko Ursulin Cc: Uladzislau Rezki (Sony) Signed-off-by: Andrew Morton --- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) --- a/include/linux/vmalloc.h~mm-add-a-vm_map_put_pages-flag-for-vmap +++ a/include/linux/vmalloc.h @@ -24,6 +24,7 @@ struct notifier_block; /* in notifier.h #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */ #define VM_NO_GUARD 0x00000040 /* don't add guard page */ #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */ +#define VM_MAP_PUT_PAGES 0x00000100 /* put pages and free array in vfree */ /* * VM_KASAN is used slighly differently depending on CONFIG_KASAN_VMALLOC. --- a/mm/vmalloc.c~mm-add-a-vm_map_put_pages-flag-for-vmap +++ a/mm/vmalloc.c @@ -2377,8 +2377,11 @@ EXPORT_SYMBOL(vunmap); * @flags: vm_area->flags * @prot: page protection for the mapping * - * Maps @count pages from @pages into contiguous kernel virtual - * space. + * Maps @count pages from @pages into contiguous kernel virtual space. + * If @flags contains %VM_MAP_PUT_PAGES the ownership of the pages array itself + * (which must be kmalloc or vmalloc memory) and one reference per pages in it + * are transferred from the caller to vmap(), and will be freed / dropped when + * vfree() is called on the return value. * * Return: the address of the area or %NULL on failure */ @@ -2404,6 +2407,8 @@ void *vmap(struct page **pages, unsigned return NULL; } + if (flags & VM_MAP_PUT_PAGES) + area->pages = pages; return area->addr; } EXPORT_SYMBOL(vmap); _ Patches currently in -mm which might be from hch@lst.de are