From patchwork Wed Feb 1 09:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13123985 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 29934C05027 for ; Wed, 1 Feb 2023 09:14:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BFABC6B0074; Wed, 1 Feb 2023 04:14:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BA9F86B0075; Wed, 1 Feb 2023 04:14:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A721D6B0078; Wed, 1 Feb 2023 04:14:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9AECA6B0074 for ; Wed, 1 Feb 2023 04:14:05 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6F0071C6112 for ; Wed, 1 Feb 2023 09:14:05 +0000 (UTC) X-FDA: 80418161250.07.3371BC7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id B21EF1C0008 for ; Wed, 1 Feb 2023 09:14:03 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d7hKCbk7; spf=pass (imf20.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675242843; 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=Cc8KcFYSac3hETCaiorDwaJuaLkn+gY3HkrQz3ErLWA=; b=n38MANGMC2/wquQO4pxOuWllp/cekD6Cbe2nhvTD+Bn9HXChBw2I3hporNnLkQuvrvn933 erP50iXIQ5Bff38uH3j0IzTD05BHZ612xgtcyDXTtBsYumpZlDMQ6l6DRJYfdoL/NkxuWy oUr78ltv2W4WYUfEVBa5ocYQ/CukoKI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d7hKCbk7; spf=pass (imf20.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675242843; a=rsa-sha256; cv=none; b=7gI/E+0U2Gov4t+XLLk1DawB/7UGVTlAO754L3D8gJp9ulVoN2b9jJYMNQAjrvW3em4CMQ ixV29ZFNm4xYRuzJqJ60dim8jxy4cqD+OOOV5CVIQroGXQgD55rMJmAYtvyqScZM495q4k StTSTggKqn8qTq9GBMDQZeM7ssx8K4Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675242843; 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=Cc8KcFYSac3hETCaiorDwaJuaLkn+gY3HkrQz3ErLWA=; b=d7hKCbk7DseypUEc8pPAqRTzr7vKqxJ/JPDxrpmrQuix5Qn1bLk119Xjn+/a6H7c/D9plO HOrCJyjTasCxJXXi/nqs6eo55mJQxED3Njree0M5owWiQjPjsb0dGmrNG5xyuhamthrC0l va5FMNEX5WoZRyVFjJkVH3feHKSlO3k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-187-TESVCinaPw-AsPopzx-RcQ-1; Wed, 01 Feb 2023 04:13:57 -0500 X-MC-Unique: TESVCinaPw-AsPopzx-RcQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E30A85CBE0; Wed, 1 Feb 2023 09:13:56 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-89.pek2.redhat.com [10.72.13.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09BC6492C3E; Wed, 1 Feb 2023 09:13:51 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, stephen.s.brennan@oracle.com, urezki@gmail.com, lstoakes@gmail.com, willy@infradead.org, hch@infradead.org, error27@gmail.com, Baoquan He Subject: [PATCH v4 2/7] mm/vmalloc.c: add flags to mark vm_map_ram area Date: Wed, 1 Feb 2023 17:13:34 +0800 Message-Id: <20230201091339.61761-3-bhe@redhat.com> In-Reply-To: <20230201091339.61761-1-bhe@redhat.com> References: <20230201091339.61761-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Stat-Signature: 6kqm1jh4xcereka3dwy318eqk8nkj8xp X-Rspam-User: X-Rspamd-Queue-Id: B21EF1C0008 X-Rspamd-Server: rspam06 X-HE-Tag: 1675242843-651706 X-HE-Meta: U2FsdGVkX1/Y5rGMcF8sBlPYVePN9AlNvPQvroJHETu3nDwkdmI402+emCYYze2sWFH7HvFEBa9ERo9GkHYBcpuEtsalPQleIq6sSc/YDmL2QZfFh1TEa7P4SOFygv7wOqaRQ7tmB31EpZ93ne70EqQnvU2iVF8bqQP2Cvopaf23n+YaMD/1+bJx0KuYuo+P6SlZfkwxNwUiwmDXz0jHCIuvbwd3JIzJL/MBUzy+ta4zlb5ikTGEublbgdyOl5dsrWQPUrffho/qeNYXTl4fyuXlq8pG7inHEKkZoHxR3FronssO7ggSgL4DnYFpH+FbKml47yoQ91UL2kJ5c+hIL1FGNKp6i4CtlkB+STpFBOS9xt49SgS1cpsoM8TU36IscigmClMBVp/GpCoqlbCLthYOmhFus8gb/D44C/RALksPEcvkIs/xOQxy22acEB/Y+AWXSG5vLsrOi5qw8UO93OehmJnGVZoVA7TmaWU3qVVEbt77o6TmPcb+CKoK4j942RIZg0H1fKyyYlMeiH5btgOPhAWFXomw82B4VZ8Sdvxev2WOa1pyHqv2X2WZxCfRqex0YtcdMzzUklnXmHynasaTlHJm5y96OD3jgZcDK+YXWVZlNzvqkjVKaKGYOmozMw8oGnl8XmUdv25jtRZ6K6mhLhez/MeQPSB9mpPzZ4d4cKbfiCdGb/UairzRKO43abqtVBn+2ODk/IkfIgaLhMgTXPIusaECEj44mlbYJoIPfiU43EHNs9qBlOoEkoFVY0vMUavzqJVr3DdpiedeJK98JWE8ekKvyrTmhkKL3266+cAl61JzwXlVySKffVkcwSruFRgnAqAJI69aV5frfMhKjZLW93krArEbkDoWaVG98HgEJwG7UKJpSSBctxovF9jDZgS2SZQJ1F3BmyNQn6nT9Tk5hBXUn7zXIIMwldDVtIK9bzCmWZX41JsIk/G+cNA8bd0TvJW4i5YNuMa UVDOKzOm cBB7rYw0YIP+mfxnZZbKzZS2fbAUlUUwKRbBC+eahPy9Mf1c8dRCECjT1Ja/jj01I/WgwO8kqpfjP/c5GrqIx5hS37kmPsvlpUnxQ6gOUIedy2CZa+G9Ryt/EwQMnpMJzgkU1fSZGvEA7cfwbDdjsf9jNIsG/LrQyOo0iTR8Y9ncOuSUDwX//0z6AEAmnqHV7kBoIqCyYr9E6Yc2c/5jPGEtTfCDaVXGzrYWQw1xZh9twhNG5eBm7mhy7A5B7wDDMCocMkW8aZCOCecQ= 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 preparation for later use. Signed-off-by: Baoquan He Reviewed-by: Lorenzo Stoakes Reviewed-by: Uladzislau Rezki (Sony) --- 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;