From patchwork Sat Dec 17 01:54:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 34157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1304023wrn; Fri, 16 Dec 2022 17:56:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf4eN1bbUew6XIDytm+lD6lrT+7gSU640FR9ygA9Vk0keokESFF+gNqKS8LReJjNvLyJG/WF X-Received: by 2002:a17:902:8349:b0:189:bc50:b93b with SMTP id z9-20020a170902834900b00189bc50b93bmr32854221pln.3.1671242172628; Fri, 16 Dec 2022 17:56:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671242172; cv=none; d=google.com; s=arc-20160816; b=CKjhFB6oYXlpRUC1ixigfS5+UX/yvYNtmGMnsbR+xT6FaU6HHBh50zvTPMQC+99INT auyAnPsR2det+eUW88pN9CuZtaCdNaHNi7tq1SnXXQHyOzafqu+MuWB3Wddf/+Vf+ZAR oqTvib97fAQQ6Wxuh8YKlnM/6lHn7zvdFn+l+f/UjCxwx7z04aYHC+GIOPhIxtGVmWsX RAXWswt++TY5sLBGgEkAsBPiY23Aeqw0a1q6qOqNiGbRuDq3z4kHVxIE1yXdphFhVLAl 2V2V8WQxFjhyIZa0FkDCTTycYPilLonmrvP1k2yn83GxHezNtSy6ne5+sw8YkTLZl4gt Otsg== 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=NgVcq//J60uoHj9L6DZ+mag+Y4ssHTWzvhqMZ7GCeJP8kQ5/Z9B6ftunGRi6phDVFD uGJ0KJzbOUrE/EIHwMCL8QWa0RbsuVLVaYXO4/t9nX7Wpb3jzUyitzxM6ZCQj8AAIoz6 PzmBwOwfbvVChJnK3gBpV2/PMXCHRdtS5KXzemG48KvrPMOi5XqcslMqAazlLNUJY6h0 yocgtWyuyZWTGgxAX+gjNSo3sFDxGAe18QzbNK3avKehU6HO5wfOEFyMT63h2Lw1/iQc hZHOcwICTwBZThfhJRTDnnevvAMwq4MFwq7/LI4GOT4yJcbV+kWeSAPPYphiXERfvrpM KxjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cjFutFfm; 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 s1-20020a170902a50100b00186db024863si3795827plq.612.2022.12.16.17.55.59; Fri, 16 Dec 2022 17:56:12 -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=cjFutFfm; 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 S229678AbiLQBzi (ORCPT + 99 others); Fri, 16 Dec 2022 20:55:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbiLQBzg (ORCPT ); Fri, 16 Dec 2022 20:55:36 -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 BFB074A07B for ; Fri, 16 Dec 2022 17:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671242091; 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=cjFutFfmh57b77UPRy5aEef1yjx119Jt316NDS0MU/UYCJCRVv4e6RiUMKoF63aNsuaUwJ TJXraBbzGTiS2ylPSXztb4gyCUVzNxGd7gAphEq4P7854vIlM+Q2LUYNRye7rVUoM3MH2Y nzAM+N3Eiev1lRR/MEXoacvrWQeHnn0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-497-eldor5REOyyUyGect5JAew-1; Fri, 16 Dec 2022 20:54:48 -0500 X-MC-Unique: eldor5REOyyUyGect5JAew-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 27A3338041E4; Sat, 17 Dec 2022 01:54:48 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-34.pek2.redhat.com [10.72.12.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25B5F400F5E; Sat, 17 Dec 2022 01:54:43 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, urezki@gmail.com, stephen.s.brennan@oracle.com, willy@infradead.org, akpm@linux-foundation.org, hch@infradead.org, Baoquan He Subject: [PATCH v2 1/7] mm/vmalloc.c: add used_map into vmap_block to track space of vmap_block Date: Sat, 17 Dec 2022 09:54:29 +0800 Message-Id: <20221217015435.73889-2-bhe@redhat.com> In-Reply-To: <20221217015435.73889-1-bhe@redhat.com> References: <20221217015435.73889-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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?1752424432636031753?= X-GMAIL-MSGID: =?utf-8?q?1752424432636031753?= 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);