From patchwork Sun Dec 4 01:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 29352 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1599959wrr; Sat, 3 Dec 2022 17:32:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6d9u9AYjYyhDdy7ey3QaC3p/mKZTs01clbQ3qpsGm5mb2bCnSxEeW8Dgjs/Ua+oDAUbhv1 X-Received: by 2002:a05:6402:2b8b:b0:468:cae8:f5a6 with SMTP id fj11-20020a0564022b8b00b00468cae8f5a6mr1302206edb.263.1670117560584; Sat, 03 Dec 2022 17:32:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670117560; cv=none; d=google.com; s=arc-20160816; b=Y75HhkISaK+g2w3yGyXDjmhAw97/2WY0RUZ8zoxLKbuELlVFEDSsrcPQ52J043WLMT 9e785XKgBsynqFSsDZQ3f7yN63vKgFh4vWlAscYFMt2JHJ1K+KrgaOLgi2jWP5gUHEqP Q/0C/ncN4x2wLyNNRE9pZcxCqmyNOXImMM3SiMOoKTNJoMsDgFyufYERFTjtcfWAtZyk Y2ZtYwWMk7OLS5pHOA+Y09h6m+hW7/iTHE362A4LClNrakVwcBuicVDIVrSTEEycx3Ag a+2/ZobPhmnbERFKPBFlrvGJqC87XokAOaZ0u4BrUPQhXxcOVIjHZn87V+VAVrA3b4c3 IdUA== 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=cIt3sYb4X2Dic9YdLpVEM6DfWLpP7LlIvSJefb8eTGQ=; b=tOWLe85ibHVSaPEaRIpWK9l30VaAM8LoHXhsWVle9aHa3e2+RJs2hgC3ldfFu1s5tn bfPhBAKmP0WBdcKx6g3g2m66gBbj4KKwDwOULCT1Mtro6lgLnr3YQRX4zKykML/wzC8N iI/h4lwm2MDqlQY5Lx0tcMMBe+OiErZeqZdVI19CuWMA5ulfVKjqtX1DWGjkGxum5wfW 4EsJN3fe4iATkRmQiLRYUC1GjPLyufvhMYyZOXcRAKWd9GRV/POZUaQ9oeC3PdyPrheL XK9TzGa5Aekp1hz03JMF51r7I7ONhiGBLa7fcSq8Rkut9x/1XZ412yqi7W7ku9uurvBM L6Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UTOL9BG9; 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 hc13-20020a170907168d00b007c0e155ead2si1567436ejc.369.2022.12.03.17.32.17; Sat, 03 Dec 2022 17:32:40 -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=UTOL9BG9; 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 S229630AbiLDBcG (ORCPT + 99 others); Sat, 3 Dec 2022 20:32:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbiLDBcE (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.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9F621A224 for ; Sat, 3 Dec 2022 17:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670117469; 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=cIt3sYb4X2Dic9YdLpVEM6DfWLpP7LlIvSJefb8eTGQ=; b=UTOL9BG9GSmuXm4Tr1/mjojYP5+foJFJFer1Jiv2XIfWXuPDcBQIwcxLaqXkEju9eY/aYx CN9RHordyZ7KHRCWPYpfqWLdWTXJCPVInHf5gVEGT9boSAx4z2bYXNRUiitWpWkgP53KkM XJ1yMr4R5ckP4rIe02bosZuDVpWFxKY= 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-658-65_Cm5IjPQWactMzJXkpwQ-1; Sat, 03 Dec 2022 20:31:05 -0500 X-MC-Unique: 65_Cm5IjPQWactMzJXkpwQ-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 2D88C8339C5; Sun, 4 Dec 2022 01:31:05 +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 E741B141511E; Sun, 4 Dec 2022 01:31:00 +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 1/7] mm/vmalloc.c: add used_map into vmap_block to track space of vmap_block Date: Sun, 4 Dec 2022 09:30:40 +0800 Message-Id: <20221204013046.154960-2-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?1751245191342533975?= X-GMAIL-MSGID: =?utf-8?q?1751245191342533975?= In one vmap_block area, there could be three types of regions: region being used which is allocated through vb_alloc(), dirty region which is freed via vb_free() and free region. Among them, only used region has available data. While there's no way to track those used regions currently. Here, add bitmap field used_map into vmap_block, and set/clear it during allocation or freeing regions of vmap_block area. This is a preparatoin for later use. Signed-off-by: Baoquan He --- mm/vmalloc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index ccaa461998f3..5d3fd3e6fe09 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1896,6 +1896,7 @@ struct vmap_block { spinlock_t lock; struct vmap_area *va; unsigned long free, dirty; + DECLARE_BITMAP(used_map, VMAP_BBMAP_BITS); unsigned long dirty_min, dirty_max; /*< dirty range */ struct list_head free_list; struct rcu_head rcu_head; @@ -1972,10 +1973,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) vb->va = va; /* At least something should be left free */ BUG_ON(VMAP_BBMAP_BITS <= (1UL << order)); + bitmap_zero(vb->used_map, VMAP_BBMAP_BITS); vb->free = VMAP_BBMAP_BITS - (1UL << order); vb->dirty = 0; vb->dirty_min = VMAP_BBMAP_BITS; vb->dirty_max = 0; + bitmap_set(vb->used_map, 0, (1UL << order)); INIT_LIST_HEAD(&vb->free_list); vb_idx = addr_to_vb_idx(va->va_start); @@ -2081,6 +2084,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) pages_off = VMAP_BBMAP_BITS - vb->free; vaddr = vmap_block_vaddr(vb->va->va_start, pages_off); vb->free -= 1UL << order; + bitmap_set(vb->used_map, pages_off, (1UL << order)); if (vb->free == 0) { spin_lock(&vbq->lock); list_del_rcu(&vb->free_list); @@ -2114,6 +2118,9 @@ static void vb_free(unsigned long addr, unsigned long size) order = get_order(size); offset = (addr & (VMAP_BLOCK_SIZE - 1)) >> PAGE_SHIFT; vb = xa_load(&vmap_blocks, addr_to_vb_idx(addr)); + spin_lock(&vb->lock); + bitmap_clear(vb->used_map, offset, (1UL << order)); + spin_unlock(&vb->lock); vunmap_range_noflush(addr, addr + size);