From patchwork Fri Jan 13 03:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13099674 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 DEF61C54EBE for ; Fri, 13 Jan 2023 03:19:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 791298E0003; Thu, 12 Jan 2023 22:19:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 741658E0001; Thu, 12 Jan 2023 22:19:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 609698E0003; Thu, 12 Jan 2023 22:19:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 52C478E0001 for ; Thu, 12 Jan 2023 22:19:45 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E98D6A01BC for ; Fri, 13 Jan 2023 03:19:44 +0000 (UTC) X-FDA: 80348321088.19.01DAD9E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 0E5F740010 for ; Fri, 13 Jan 2023 03:19:42 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QKGUiuWX; spf=pass (imf12.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673579983; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3O1yb9Uy/5LFjX4NDSyalG0dSblNfhgkG8biJIT1bLI=; b=fS5Jdu4lfHQDxn5E3Mpi1LFaRTPwv6q1yOLhtjeVkNtD1F4/u2p07qjgrDkEGJjntDcnGY ROt4+VGCfeBtagMKhCO6F9vrcp1gtC2MM33qVuxedmHb1kFVbjUH8nK1fiGlyIPVbPmVQ3 CH6nwYVSxNsXeskQOkF4vfGbSaZiopg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QKGUiuWX; spf=pass (imf12.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673579983; a=rsa-sha256; cv=none; b=OKJUwI9nPZWfIwACa229d+xj4D4pGQKJ6QwfOhIV8BN9EINr2Bwi4DacftUXKp7l2glo82 WsQugTiewV/h0qULI319lMa7F1INt/sEiYa674RBadj5oRlSHlRcYo+PfCqj8bGV2nNFJo /xr4I10Mp5VDQW/XRYxaGef6ikTfRWs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673579982; 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=3O1yb9Uy/5LFjX4NDSyalG0dSblNfhgkG8biJIT1bLI=; b=QKGUiuWX6zIuh4HmdUZGEFFKSCGAxE9RcSALcFLstcRIv1yq/kLiC7MrIUvHsd0mYdq0JI SHJtgqYqWu+mohO9W538jQy68rtptoJKxAxG5TVJTy8H+X8/g7ajDu2rutG/lmXfgzATmy 6R+oeGgS8wnyZSgqEQhAlsAWZRx/pXw= 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-227-lItJE2KvPr-qbzHFCNlolw-1; Thu, 12 Jan 2023 22:19:38 -0500 X-MC-Unique: lItJE2KvPr-qbzHFCNlolw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 116623C01DF9; Fri, 13 Jan 2023 03:19:38 +0000 (UTC) Received: from fedora.redhat.com (ovpn-12-229.pek2.redhat.com [10.72.12.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D112B4078903; Fri, 13 Jan 2023 03:19:33 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, urezki@gmail.com, lstoakes@gmail.com, stephen.s.brennan@oracle.com, willy@infradead.org, akpm@linux-foundation.org, hch@infradead.org, Baoquan He Subject: [PATCH v3 1/7] mm/vmalloc.c: add used_map into vmap_block to track space of vmap_block Date: Fri, 13 Jan 2023 11:19:15 +0800 Message-Id: <20230113031921.64716-2-bhe@redhat.com> In-Reply-To: <20230113031921.64716-1-bhe@redhat.com> References: <20230113031921.64716-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0E5F740010 X-Stat-Signature: jorgdyeyafisorh9p5pxi4enpiiado6g X-Rspam-User: X-HE-Tag: 1673579982-416289 X-HE-Meta: U2FsdGVkX1+Yjv/znQmPu4Dv4xG5w4wsPkdBlY4UxUm1jlQyJn8Bss0EPuW+QvpyQ8jGhr0KoISHpglnfX2RJhrvKeFYUzMKzQH+eeB3sjiW+IxSKzsrEy/mpaL5hqLmW8sL3Thkzt+NXbOXaeGfLF+ZBo1GCpTN2bZv0Ic6WqclkCgz/7gTdS9WXT2UyQ+fNCPz5SSmonOdk/+k0dhXxL1U/lSbYyEHHT2Kd8JwNrM73f45bVJVF1FVATLsRX6eN9NI+UgZzGTtpg7tNqNuTWTZXVK/xLF/rgRGZ+hnHrca2MMGkLlGr9KOJUNna7g3XCKqbpb4dQX93EHlscKctRfYwPFWVLfzBC07U5OKdDh5TzUH7CoWnwFXRjHUjBeUjJ/I6/5ZqbxigduAQSGb6065CP1xoGzfsZI+nk2zVQ+AA/MxLDhbKosPqeUf4WfVNoLcWU12ElMjhIaes0TSIXmZBUMza73rGXTBzuw7iqbxfECk2EQD64vCRL5xYRBLAk6C75YzMdm0No8qFymFj34iHt0hseq+mX19IiuWrWiUJ0N05g0Zyw0Rj8qvBqoeQDCVBYQTYdXmt4MeUoTjp9+KxujsvHpjp2m2BCs7+mLYV4EJlF8VZ9wwcziukZ2HlHM6OK9IPFl7NgJDdEqR3BRzObXnFoydx41oZ/NIYQYdIrC4z9TeNPD8kl+6ycIPlF2nc92E/ss0GUJpZaFuoHbFe0RqOmIcawDvnh4H+QzokDf+asotUS//HXMSc6tf7G5x0lMimkNfJSj+VW5w7QNnDl9n+TGue7jvGXk85oLYrLpe6YH1i4sMMUbWcPjOYM4DmmACsv8Va7dUdnoBR5jC7OMr1aJVCyRpUNVyQonmEHZJfSqg2QDhhAaHyDTslh5ivyeXZENhGE/DFco44J5brfxi/Et5Ydl0v2vGbd/SZUY9cVl2K46uJ2HfKmTyF2iKYXyVjm/IsxIw++b n8A== 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: 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: Uladzislau Rezki (Sony) Reviewed-by: Lorenzo Stoakes --- 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);