From patchwork Fri Jan 13 03:19:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13099675 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF409C54EBE for ; Fri, 13 Jan 2023 03:19:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E283900002; Thu, 12 Jan 2023 22:19:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 592EF8E0001; Thu, 12 Jan 2023 22:19:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45B86900002; Thu, 12 Jan 2023 22:19:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 377798E0001 for ; Thu, 12 Jan 2023 22:19:52 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 08D9D160142 for ; Fri, 13 Jan 2023 03:19:52 +0000 (UTC) X-FDA: 80348321424.17.4269CA9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 7451E140002 for ; Fri, 13 Jan 2023 03:19:50 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WESP9Wfe; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673579990; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5nHjtQ2Zvqv2ODB40Tn7eL05G6Bgx/5cZC8xEWjBDW8=; b=YzZlYz3rv/mp2mgUBpNsLumtdwx8BVk/uzfcEZfe60VWz8fB2WJFw3PNAW/5o6FDfTKUL1 b9rfeOXjOqwwQi3ujBodGU+nbm//6tCmWWTB3S49+hWI48yeLmJgFcov+Qv+7DFqCI5TdG 8xp7um84SYAGb8B9shQdMtxxLV/Qbc8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WESP9Wfe; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673579990; a=rsa-sha256; cv=none; b=OAGZ3LT1+In1QLPLwGvFsfTA1yq5ziNRzevrMNwzFjQubGqsUgo6SrJWNd8rL7+urLUK+R 6zVUapWdC/WrQxjT+jvoF0N2N6glr0As5tOP6Y6RGDrAoh0LZvZJuGgDpdySt25JfaMSvC 1knXt2xGrTRUAquwGXjAad7yjUSnHUQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673579989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5nHjtQ2Zvqv2ODB40Tn7eL05G6Bgx/5cZC8xEWjBDW8=; b=WESP9WfeTtUhLV1ak0w/bylsympWOjt5hxmnsXVViubgXUjfjuWlrMx1OCs1Q1c8Xbzp7N aXkWKfJ0WPXyb65ay7v3IYO+DaZGsl5m/N4+Ctq96qt1dppYDrNmleHWL0OlyDJOjR799A Z/A4u/Sp31FZ3rwmCdpEOGBfg2UICT4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-446-bmRvW9b1MBWI-Kd6DL_sDw-1; Thu, 12 Jan 2023 22:19:44 -0500 X-MC-Unique: bmRvW9b1MBWI-Kd6DL_sDw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F09EB1C05139; Fri, 13 Jan 2023 03:19:43 +0000 (UTC) Received: from fedora.redhat.com (ovpn-12-229.pek2.redhat.com [10.72.12.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2F044078903; Fri, 13 Jan 2023 03:19:38 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, urezki@gmail.com, lstoakes@gmail.com, stephen.s.brennan@oracle.com, willy@infradead.org, akpm@linux-foundation.org, hch@infradead.org, Baoquan He Subject: [PATCH v3 2/7] mm/vmalloc.c: add flags to mark vm_map_ram area Date: Fri, 13 Jan 2023 11:19:16 +0800 Message-Id: <20230113031921.64716-3-bhe@redhat.com> In-Reply-To: <20230113031921.64716-1-bhe@redhat.com> References: <20230113031921.64716-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspamd-Queue-Id: 7451E140002 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: r6rbdx4yunjo8fn1u3dtbfnnmmfemsox X-HE-Tag: 1673579990-152631 X-HE-Meta: U2FsdGVkX19aYA+Fq6X3GMyrcFoQqbCTCW4urPY/QlpoL4zV/uN27WgjZpyJnCitgpgElaWXjyULcfgC22VoZVVX6bfMEI1eZvOqv0YEH348O/cu5mOsa399v3b9/FYMhy0UK7qIQhAV1jF/7lfHkctg6OU2NvX5NXScLsctGypYMoDMmF+Uk08pUeRsWH7K6dJomeKFye4h7CBXlB7BkQGJSQLIzVk9AT7vpKr6J1C/RtRR+hZwonijmyYNHi5n9snSqnVs+zpdLcZGL4LCwJTHnqHXKJB0Bk2M3GA9AfrN+HChta7naDDQloD4I52PmF7P35Wq7ezNDjxqsZ7gtzwmrBpN4Xbq+9cdWNyHtI3GeLU3qpbZIJ79rrF2bbKidnufluSUVeKwng8RIlNNyWcB7OR74QTHnH/d+5sAt+rdRtSeBUj0kEzczmpEjrN4my7zn4DxRZijrB5iCMtt+kRLQgf+lO5JdEp0xPtA0YOb/P74PBA+xjZ2EbOMHxTRIShfWFSRQSSMt4jt2vXAVb/ZQcoOyoS2wAV0H1UTvqSI5NkuoIJGQ1KnRCa9srmNmL6jjo+jOxn9xrqWuD5R7jQYrBb8Hzbit4gL5ER7+DagVg/oweDsV0dsbsykOLEXcNClO37P1hU/Je1rGs/ZCYywjMv1kL1ufm0mV1L7nMu5yMg66Ltd031XFvwJbb5pY3QeCJRYLnHDqL2pTlD7YGAMXcoj/6UiEyRJJFTFCY9hLTqfqSLD9JvWo9iyZ1PXxyDqsxS+OcDDiYatVMU2zDc+cGo9Og8ckZAFkjytkDhTpCEgZREdj7JzWiuadzegkYoWH1FA2JiJd0c7MrL5LOMyMR2LUS/kxfFseYCMZIZoQMJndPPbxuBAdQbTUEu2Ci6/Hc4p2dbn/CiXniyV7CrL4gXvV0XlbPfbTDl0E/Q6xicZZWHGADDZa2NSBhtJBI6JYaL7jOYCqzlN2a2 sxw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Through vmalloc API, a virtual kernel area is reserved for physical address mapping. And vmap_area is used to track them, while vm_struct is allocated to associate with the vmap_area to store more information and passed out. However, area reserved via vm_map_ram() is an exception. It doesn't have vm_struct to associate with vmap_area. And we can't recognize the vmap_area with '->vm == NULL' as a vm_map_ram() area because the normal freeing path will set va->vm = NULL before unmapping, please see function remove_vm_area(). Meanwhile, there are two kinds of handling for vm_map_ram area. One is the whole vmap_area being reserved and mapped at one time through vm_map_area() interface; the other is the whole vmap_area with VMAP_BLOCK_SIZE size being reserved, while mapped into split regions with smaller size via vb_alloc(). To mark the area reserved through vm_map_ram(), add flags field into struct vmap_area. Bit 0 indicates this is vm_map_ram area created through vm_map_ram() interface, while bit 1 marks out the type of vm_map_ram area which makes use of vmap_block to manage split regions via vb_alloc/free(). This is a preparatoin for later use. Signed-off-by: Baoquan He Reviewed-by: Uladzislau Rezki (Sony) Reviewed-by: Lorenzo Stoakes --- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 096d48aa3437..69250efa03d1 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -76,6 +76,7 @@ struct vmap_area { unsigned long subtree_max_size; /* in "free" tree */ struct vm_struct *vm; /* in "busy" tree */ }; + unsigned long flags; /* mark type of vm_map_ram area */ }; /* archs that select HAVE_ARCH_HUGE_VMAP should override one or more of these */ diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d6ff058ef4d0..ab4825050b5c 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1589,7 +1589,8 @@ preload_this_cpu_lock(spinlock_t *lock, gfp_t gfp_mask, int node) static struct vmap_area *alloc_vmap_area(unsigned long size, unsigned long align, unsigned long vstart, unsigned long vend, - int node, gfp_t gfp_mask) + int node, gfp_t gfp_mask, + unsigned long va_flags) { struct vmap_area *va; unsigned long freed; @@ -1635,6 +1636,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, va->va_start = addr; va->va_end = addr + size; va->vm = NULL; + va->flags = va_flags; spin_lock(&vmap_area_lock); insert_vmap_area(va, &vmap_area_root, &vmap_area_list); @@ -1913,6 +1915,10 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr) #define VMAP_BLOCK_SIZE (VMAP_BBMAP_BITS * PAGE_SIZE) +#define VMAP_RAM 0x1 /* indicates vm_map_ram area*/ +#define VMAP_BLOCK 0x2 /* mark out the vmap_block sub-type*/ +#define VMAP_FLAGS_MASK 0x3 + struct vmap_block_queue { spinlock_t lock; struct list_head free; @@ -1988,7 +1994,8 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE, VMALLOC_START, VMALLOC_END, - node, gfp_mask); + node, gfp_mask, + VMAP_RAM|VMAP_BLOCK); if (IS_ERR(va)) { kfree(vb); return ERR_CAST(va); @@ -2297,7 +2304,8 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node) } else { struct vmap_area *va; va = alloc_vmap_area(size, PAGE_SIZE, - VMALLOC_START, VMALLOC_END, node, GFP_KERNEL); + VMALLOC_START, VMALLOC_END, + node, GFP_KERNEL, VMAP_RAM); if (IS_ERR(va)) return NULL; @@ -2537,7 +2545,7 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, if (!(flags & VM_NO_GUARD)) size += PAGE_SIZE; - va = alloc_vmap_area(size, align, start, end, node, gfp_mask); + va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0); if (IS_ERR(va)) { kfree(area); return NULL;