From patchwork Wed Feb 1 09:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 51239 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp171998wrn; Wed, 1 Feb 2023 01:25:38 -0800 (PST) X-Google-Smtp-Source: AK7set+WoZx9izOgogwdvyx1lQ4aWcJqE+pPNYnPZX4g/Vrw4/aWFM/2D9FiWaKkOQwyPWQbYUiJ X-Received: by 2002:a17:903:11c7:b0:196:489a:a79f with SMTP id q7-20020a17090311c700b00196489aa79fmr2555198plh.6.1675243538339; Wed, 01 Feb 2023 01:25:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675243538; cv=none; d=google.com; s=arc-20160816; b=AOexCrABoTfaXw3NjBeZXpXprdwYiRy1ws4TJZjRiW5/G2o7+m0JxSS0tuL/2k+jEN OYDM7rcqOHuFlLO2/VL/9trYeXTNvqDa9Y1X6kxow2SwIGtlp7faPXxU4DOKLX3FmWXu NUSryNZd/aAO/AahNDQCQhN8rIzvSMXDiclkSFFEkqKVo6e3Tk3YM9k7sNDO6bZbO2+L emyJcFcb3fkcaYfYBAk81/tTD7jWPa8FPOaiolR9sA4vLOMDUZi3mRSTZn3nvIuxsWz+ Iw1GT9GC4N7JaGdDkHqdF3ET9Vz1wMIXwWFW7m6M7NNWiK87vfNxclc1w/TdJ4YbTqGo FADQ== 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=ZnCrWWx4pp/03QuBJCB11gBYLXEsVuMTBc/8ULu0oDY=; b=NaWBaJiSaVlTq4OmX988hbIMIAc8s5tdh17rbqfC/PjV6dbOqwHN24bUIUzq1mLqqC pZ8+xVKNIQiC7foeQEFeAzqwZbrHGGekptONBx74PvcLaWZOKQQ29+GFNulFxcDG7nZu jeS+Q+sLCJpmo28svB3LwD1IOobcAuaicBsJSz8dPhJV5+6T7C8TjoowYWwdw3lWxoMD 5PFH5dZSgmSvXpPMxTcZ8OVXiyxZ1y2w4wlYcscB0S6QRk798j/fdlaEk5ReX7AwWoN2 3bsY6eo7Blm+ua6K5WQwbiVuNYGUfZz8QF4mJw4zXRsBmBiCwN3tAcki21ZkizZImw+2 Mo6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WqS6Nw4K; 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 bj5-20020a170902850500b00189f58ecb7asi17830307plb.151.2023.02.01.01.25.05; Wed, 01 Feb 2023 01:25:38 -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=WqS6Nw4K; 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 S231934AbjBAJOm (ORCPT + 99 others); Wed, 1 Feb 2023 04:14:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231923AbjBAJOi (ORCPT ); Wed, 1 Feb 2023 04:14:38 -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 C948ACC34 for ; Wed, 1 Feb 2023 01:13:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675242835; 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=ZnCrWWx4pp/03QuBJCB11gBYLXEsVuMTBc/8ULu0oDY=; b=WqS6Nw4K0iE71IeGFM6Ne6MvKBsGdyGAF+sr/Yil9MoLDsHZKfSCeaagcbdFGZkrIQmlLh N9GPaQVVI/iWNuJPJ19Svsbx5k1ODgMX+L1GMHQYeB593HhP0Qzq14A2t5/8PXmD82DEK/ CqgZUMyCgjP47ed36bhmSMJsFThF0Ag= 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-637-Nc5wLedcPe-Xy7Ol7YXmwg-1; Wed, 01 Feb 2023 04:13:52 -0500 X-MC-Unique: Nc5wLedcPe-Xy7Ol7YXmwg-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 53881855305; Wed, 1 Feb 2023 09:13:51 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-89.pek2.redhat.com [10.72.13.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24BCB492C3E; Wed, 1 Feb 2023 09:13:46 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, stephen.s.brennan@oracle.com, urezki@gmail.com, lstoakes@gmail.com, willy@infradead.org, hch@infradead.org, error27@gmail.com, Baoquan He Subject: [PATCH v4 1/7] mm/vmalloc.c: add used_map into vmap_block to track space of vmap_block Date: Wed, 1 Feb 2023 17:13:33 +0800 Message-Id: <20230201091339.61761-2-bhe@redhat.com> In-Reply-To: <20230201091339.61761-1-bhe@redhat.com> References: <20230201091339.61761-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?1756620168477945942?= X-GMAIL-MSGID: =?utf-8?q?1756620168477945942?= 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 Reviewed-by: Lorenzo Stoakes Reviewed-by: Uladzislau Rezki (Sony) --- mm/vmalloc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 428e0bee5c9c..d6ff058ef4d0 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1922,6 +1922,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; @@ -1998,10 +1999,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); @@ -2111,6 +2114,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); @@ -2144,6 +2148,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);