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 25BDBC54EBE for ; Mon, 16 Jan 2023 11:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229768AbjAPLmt (ORCPT ); Mon, 16 Jan 2023 06:42:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbjAPLml (ORCPT ); Mon, 16 Jan 2023 06:42:41 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3E8C5BAB for ; Mon, 16 Jan 2023 03:42:36 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id a37so3827676ljq.0 for ; Mon, 16 Jan 2023 03:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=oxnwJbvyhUCNV9WuLxXMAau6Uwpc5k8QcgUPDDDfKkQ=; b=f4eI3N22d07e5n69IFfasFunuH/CWivspmvvc51QwBByyUBzFXTeWDguVjZbiqk57A lGHP/behR5zcu4QKuyoiqaGo6upZbo2gx/SU3cF+TfsqwGlOAzRuy1AhWKeHW54xKu2s ZtAcIQ5oeB7+YXlG1OLQAicFGBBQtqV+kWTmdLH8GQoPCNjup344g2MsCIG1wAlHpxLM As+oXDDVL0f2cCGkCSB/ONHSG1YsCc5BW6k5jeu5BYdNMJgvFq3GuZJ8P8YMSsQYm0BT kqMprTHLKQtSkl1OgBmfF92nlpGDfV1VFFGseibtyGNcDKz3GTWocU9YJm/2YXo7pSMC CAfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oxnwJbvyhUCNV9WuLxXMAau6Uwpc5k8QcgUPDDDfKkQ=; b=qQ+tXsHy4Ncho1vW2C1JnVdqRYp36sYqi4TnmS4+SLkY6vgkPMaY4R/A2WPgFQqkd7 oWg5iWGAQKe9Qky1/fOAknRxJ9Qd9lJuombwdXsjvpHrGWm+ysRW7CU4BcX0Z6y+gZzH P2Z3RETt/0C0MNaGyQ+/YRgJJPq6d/dE/YPnGM7w3/WqiBLuIjRgKxNPJLJJ9NW1KbK9 wfnlnPoQWDi1a0hkkwCcOuhnb93yPQbYkoI081sT2RX6xhTm3KhYW16PboujifeBEIki yVsCDnlTwIopD1yZbqDQeLPu43MPPtGQZiE5gP/KY5X19SfWVdVU5V53z7QGJp6zSsi2 KK1w== X-Gm-Message-State: AFqh2krA0m51Vbq+sJNlwNkIhMwxcpBHAwH1O4xMm1yDzywLrFOQsBdp tmCvK97ETMLSlIB/XX3ftqo6JDxRsic= X-Google-Smtp-Source: AMrXdXvZ1H5gBTQzSuvDUPeO44ykOO9UyyNWl4Dwsr2/4VapOqFd8mfrgoJl/w4kcnM74SAgh1/2zg== X-Received: by 2002:a2e:6e0b:0:b0:27f:bcdf:526d with SMTP id j11-20020a2e6e0b000000b0027fbcdf526dmr20578316ljc.31.1673869355054; Mon, 16 Jan 2023 03:42:35 -0800 (PST) Received: from pc636 (host-90-235-24-7.mobileonline.telia.com. [90.235.24.7]) by smtp.gmail.com with ESMTPSA id m10-20020a2e870a000000b0027f43f6e9fdsm3578980lji.33.2023.01.16.03.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 03:42:34 -0800 (PST) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Mon, 16 Jan 2023 12:42:32 +0100 To: Baoquan He Cc: linux-mm@kvack.org, 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 Subject: Re: [PATCH v3 2/7] mm/vmalloc.c: add flags to mark vm_map_ram area Message-ID: References: <20230113031921.64716-1-bhe@redhat.com> <20230113031921.64716-3-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230113031921.64716-3-bhe@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 13, 2023 at 11:19:16AM +0800, Baoquan He wrote: > 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 > --- > 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; > -- > 2.34.1 > Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki