From patchwork Sun Dec 4 01:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 29354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1600145wrr; Sat, 3 Dec 2022 17:33:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZLZI/ggfbGq5L4KbePRUL53H6Dm1nRf+Lb8z3XMZ8tOMbajUKxCfuYocLNnOfsvmpWa7G X-Received: by 2002:a63:4a12:0:b0:478:ad4f:c2a with SMTP id x18-20020a634a12000000b00478ad4f0c2amr1204725pga.78.1670117591706; Sat, 03 Dec 2022 17:33:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670117591; cv=none; d=google.com; s=arc-20160816; b=o8LTq3GCDBtvDSWAoNebbm9zrTSrhT102gPsdtluU+4zWlhxReVBtbLAJH4xXkBE9l BkBiAMvi7GJkKv6uEylDeMIZ6KfEur0xkX+q7H2ea4zyxeFOGat0EWMlvTfAwJHsXVxb q4DAqgYoOKUAChMku2Ec71DFKOks0p1b3f1qZjRAh5PEvu5WKlV6FqzgD8lxKEoeE8zY TXTSiKZTv+3ohdgluIo7EAD6eGKUHATMcABB9XiewTWdY1pykTf0/9ULQz+xtJDye+Ug KgiLG9V/WWtYCgJoAU7yk8usktd6Gau/blYYONXefkZuMCXwPViUrsiMMYQGaZ04yxy3 gohw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GBa8NQ42TK+42saZbeYZMf/MqCpjigKPBRnIFzKwi1Y=; b=za/lawrXOznxh70qWufGasKaf+17OewzSdY0vQ0CwUT0KVDQxJ47UoB7it9Y+zJ8VG ++7MfxVNvHjPULeOchK4Kn6dIvB3F3k0VpwjQE1OM4CLQ/QsXy0dOAwhNE/k1qWby3gD FF67dR5n65OQSTbnQzX7gwmDHajow6WxjnFl9+4zQlvPNbttXW4d2NkmjlLzYVdwKB0f LmFfcozcEeBHBkx9+82vCiF5HFfGnQseV+TH3M2Mx7YWtxFjXdGsMNHLmpOzy4uHPBtm KhDGEGWXuXS90erhoPuD2cTztBMoj58fYJ3uRKBqctfR/Gt3DKDWU81PZnfff/YWyTyV inHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CsANdLdu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s13-20020a056a00194d00b0056bb424088csi11766526pfk.212.2022.12.03.17.32.59; Sat, 03 Dec 2022 17:33:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CsANdLdu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbiLDBcP (ORCPT + 99 others); Sat, 3 Dec 2022 20:32:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbiLDBcE (ORCPT ); Sat, 3 Dec 2022 20:32:04 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03F5A1AF2B for ; Sat, 3 Dec 2022 17:31:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670117475; 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=GBa8NQ42TK+42saZbeYZMf/MqCpjigKPBRnIFzKwi1Y=; b=CsANdLdum58D/sgIRMJ9I/aItFnzgtAc+Bxe4sOSfriccsc6+mneeMha0xq9aqlHfoaWEC 5EyBHkZ6hKQC7WATGexM+IreivD6wqUuIeFBALiUl9iuWV+mBJSBTlEy+5GVMDZ1S7kA7b s53zJ5yDDAfPTbFL68Ih1VcNRkhrtq0= 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-313-GbxLfDHfNGWhFqJbzN1yJw-1; Sat, 03 Dec 2022 20:31:10 -0500 X-MC-Unique: GbxLfDHfNGWhFqJbzN1yJw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56926101A56C; Sun, 4 Dec 2022 01:31:10 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-31.pek2.redhat.com [10.72.12.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08040141511E; Sun, 4 Dec 2022 01:31:05 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, stephen.s.brennan@oracle.com, urezki@gmail.com, willy@infradead.org, akpm@linux-foundation.org, hch@infradead.org, Baoquan He Subject: [PATCH v1 2/7] mm/vmalloc.c: add flags to mark vm_map_ram area Date: Sun, 4 Dec 2022 09:30:41 +0800 Message-Id: <20221204013046.154960-3-bhe@redhat.com> In-Reply-To: <20221204013046.154960-1-bhe@redhat.com> References: <20221204013046.154960-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751245223907327180?= X-GMAIL-MSGID: =?utf-8?q?1751245223907327180?= 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 types of vm_map_ram area. One is the whole vmap_area being reserved and mapped at one time; the other is the whole vmap_area with VMAP_BLOCK_SIZE size being reserved, while mapped into split regions with smaller size several times via vb_alloc(). To mark the area reserved through vm_map_ram(), add flags field into struct vmap_area. Bit 0 indicates whether it's a vm_map_ram area, while bit 1 indicates whether it's a vmap_block type of vm_map_ram area. This is a preparatoin for later use. Signed-off-by: Baoquan He Signed-off-by: Baoquan He --- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) 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 5d3fd3e6fe09..d6f376060d83 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1815,6 +1815,7 @@ static void free_vmap_area_noflush(struct vmap_area *va) spin_lock(&vmap_area_lock); unlink_va(va, &vmap_area_root); + va->flags = 0; spin_unlock(&vmap_area_lock); nr_lazy = atomic_long_add_return((va->va_end - va->va_start) >> @@ -1887,6 +1888,10 @@ struct vmap_area *find_vmap_area(unsigned long addr) #define VMAP_BLOCK_SIZE (VMAP_BBMAP_BITS * PAGE_SIZE) +#define VMAP_RAM 0x1 +#define VMAP_BLOCK 0x2 +#define VMAP_FLAGS_MASK 0x3 + struct vmap_block_queue { spinlock_t lock; struct list_head free; @@ -1967,6 +1972,9 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) kfree(vb); return ERR_CAST(va); } + spin_lock(&vmap_area_lock); + va->flags = VMAP_RAM|VMAP_BLOCK; + spin_unlock(&vmap_area_lock); vaddr = vmap_block_vaddr(va->va_start, 0); spin_lock_init(&vb->lock); @@ -2229,8 +2237,12 @@ void vm_unmap_ram(const void *mem, unsigned int count) return; } - va = find_vmap_area(addr); + spin_lock(&vmap_area_lock); + va = __find_vmap_area((unsigned long)addr, &vmap_area_root); BUG_ON(!va); + if (va) + va->flags &= ~VMAP_RAM; + spin_unlock(&vmap_area_lock); debug_check_no_locks_freed((void *)va->va_start, (va->va_end - va->va_start)); free_unmap_vmap_area(va); @@ -2269,6 +2281,10 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node) if (IS_ERR(va)) return NULL; + spin_lock(&vmap_area_lock); + va->flags = VMAP_RAM; + spin_unlock(&vmap_area_lock); + addr = va->va_start; mem = (void *)addr; }