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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52155C54EBE for ; Mon, 16 Jan 2023 12:23:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D02056B0072; Mon, 16 Jan 2023 07:23:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CBAC96B0073; Mon, 16 Jan 2023 07:23:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B79026B0074; Mon, 16 Jan 2023 07:23:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A6E656B0072 for ; Mon, 16 Jan 2023 07:23:09 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6C36C140904 for ; Mon, 16 Jan 2023 12:23:09 +0000 (UTC) X-FDA: 80360576898.04.302F45B Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by imf24.hostedemail.com (Postfix) with ESMTP id B90AA180013 for ; Mon, 16 Jan 2023 12:23:07 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JHarUTNJ; spf=pass (imf24.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673871787; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZzVbLgeUpcjwkukSky12/coeX/uL5XuAwdrAE7qmZlI=; b=ise7YaoOzUGuzek1b5M8sbwgN8W5rp9ExRXOW49+k4o821mcmE3+7Yed20veug91AL3Yoq y07mWM2DE5BbCgF1y1IiJ5ZVFLmR/FqlX+NkXps7gvo63vq/XQF2IpGPrOb7p2gLWJvIvW LKVz4zgge7Eud8A6FbzpvpiQzDiMZa8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JHarUTNJ; spf=pass (imf24.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673871787; a=rsa-sha256; cv=none; b=TSPE0YOlTWbIB8BsKL2+nhFHJSNLPzulDDJEUglbhLWS9LI+f8Z6wBu71qc3tcSUvigVU0 SrXokhWPrciDsMcogsatBeAxXzGkYVjmeLdUzyfrDJi/BSlJ/3lXfYRWOQe28DEWcR0yB8 ajPYkU22LV8J0KYwmbEpYR49f9aFEFo= Received: by mail-wm1-f45.google.com with SMTP id l8so2737202wms.3 for ; Mon, 16 Jan 2023 04:23:07 -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:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ZzVbLgeUpcjwkukSky12/coeX/uL5XuAwdrAE7qmZlI=; b=JHarUTNJDlQ3rXhXR7YfKt2bN91AsVR7viB76eiTNokKADDPvI6axpXlvWmGNfWs/D hi3Iy829cKym9ysHJHdyKN2u6a4lpNxeB+1BDS+ecMjS6mahD8XgToq3rZNQXO33bHoo Od3s8T/nWXdF8zRU+KF2P/WC1ExZw15C+wOFz/UHT1HwMc84Duv1qIisK8blfWEqHVp3 zCJX/Gb80z8A4Yh+q6o682w+cbydUbhGBRnaZuEb8TgGZAzNmm8NXMWvE7+I4qKg0lwM aJBx9zAinr5Usiw+jjmgSqBGtT30xDD57inqeoa6+PD7lask22KHBVPT1M5ruyYWLgDO ftNQ== 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:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZzVbLgeUpcjwkukSky12/coeX/uL5XuAwdrAE7qmZlI=; b=aN1SUFElyI+F4n5j4M7VQjUn3U9w4l6G0cX/zFuAuzIEPA9azD+0SkPUTkKYY2VwG+ ynVUdq0rGnDnAQc3maAvofyOw3u4Oyu9y1e0J2itZSwDJ51OSAKJyKfWO1s+P3fhHkT6 JVT1tndoOvve31ZSGC/NLzMtO4Nj99hyTgMCRwKHRn1suzqv5kC2dLHrv0gQTcH399vB gJt8dyTKsQSRZAiHEDFncdKZKhfw/bv8IJAyYldxwFjjI6+yNXo20UOPhGuRy2TIlznQ aCFSrV3PDyaNL9fYd3FKEdN/dNeldRKhK+O227R46mfmAJ2/tFuCOpnwzwu6Qq44AFkP yjlg== X-Gm-Message-State: AFqh2ko3LpTtvbENMo78gsSLf8FWnHDcDbBcuRMvfcctIYMwEtlK92vA TfMcW3xCQwEoPs3A7aePxgU= X-Google-Smtp-Source: AMrXdXuazm1a6oi2az1b1VRuoyTd7u0YQdTZqoESLmnMfGqtgyTdQnkLRySiWBaVqtgkfWCORQmgHw== X-Received: by 2002:a05:600c:540c:b0:3d9:922b:b148 with SMTP id he12-20020a05600c540c00b003d9922bb148mr57932980wmb.27.1673871786402; Mon, 16 Jan 2023 04:23:06 -0800 (PST) Received: from localhost (host86-164-169-89.range86-164.btcentralplus.com. [86.164.169.89]) by smtp.gmail.com with ESMTPSA id p5-20020a1c5445000000b003b4fe03c881sm12799096wmi.48.2023.01.16.04.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:23:05 -0800 (PST) Date: Mon, 16 Jan 2023 12:23:04 +0000 From: Lorenzo Stoakes To: Baoquan He Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, urezki@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> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B90AA180013 X-Stat-Signature: 36jui6wkr859hm5u6mmhkx5o9deqgf8d X-Rspam-User: X-HE-Tag: 1673871787-972377 X-HE-Meta: U2FsdGVkX19+i09ptGTHKP15stcynBDte9jVOqceD+KbXqMATqenQd/yUfJsZfakjtmXLGA55lVxWnP7bmjfUPix3x2a3LbauiPVYHo96Nh2xMyffoMOaKjpWRqoULvA/JscemQKfXNX1OHPfFlR6oxu94YwnGWnSV1SQcWOMa8QbAOjZq2MKLP0PQBufohZ1KccaeUyCgJsEuievc7/9OdKd+AU0OHRMX/ZIT2SGmampm4zXLnRtYuQYoo782RVwGgYOYWxayIjIt9hrzH6PA2Ltb6CF/cHk8QVeeg77E99zjtcrXdK/Wolpf262XnorAFTl5I+bpv9Otcj2GW/fchu7IqTUQPRbRDuDqky2XX/5yxp0Fqj1qLPehwipjasY6/EhLpaT2Ftwi3VfOZyVApfqclOR1S1CLKD4+Oakspu7P6pjjLWLKELk5da5evwebdVG7P41romxmxJldOt7uC+kAzr0YSTy9OGrZjK2M6kRiAnBDyZFh6mKdAdgo4KKgAJV5LUvO4DGhO/DyTW4Mz4jwIhn92OVoXhFZsQhTN5ru+Y4Vw/CHIXkujNsBxjxC6erostsUHaS1LDaYlk3eBiXCcaJQSWDlhJwGwNcKLdVrBYqVAyw/WmwZEBnrs7X1RNe6J4FPnWFAUKahsA/CVM0CkwKIMeWuwz1nZJnVzZ0NEhJnEDPCmsjSLgm1hq5uYqi0WByikab4s/SOXfo0z+xoSJ04tbrybXvWwr/+Czdt6EuGMs9p5F0kKqUTpMsvt9UZxkFdcpONd8qEknIsOxdUU0wgMoGYIdHsFKgD1FfvUy+hgubmmbLOY28oX4IAmmaSiYFtmO2swb6Xkc8Y4037vMKoxQamiHwaaXxxQsw8WAy5YRrKy6/ByaFn28jDBmKSMwBTCNXDyLRk8jGNKhfBnxKXDiUWPKKJVtZP8pSmr6Rj4kW6h9y5ST7w5r2gY55DeY9HR6+G1v321 +ACPdPiA qGqOP629+QDCxF9A9KFT6FihIK3LQsGymxr3bxMkBAvYK1/VBU/RKM9d8zqZ3aWU8m+ATdVisD7kHKBIZQ/dqEaGYWR/I5fC8goytL4ds88bhnyejM8ltw88IhYoQBe6PLF1sAbyuBT560Rk= 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: 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. > Small typo here :) > 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 > Other than that typo, Reviewed-by: Lorenzo Stoakes