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: 42901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp57057wrt; Thu, 12 Jan 2023 19:21:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXs6dZAaY47dmeYByXzoDdsYv90uBqLNqWsVrXSysTxH+mFYFvemqEdW0WL7bWzR7YN/Hj9g X-Received: by 2002:a17:906:60d1:b0:84d:feb0:26e3 with SMTP id f17-20020a17090660d100b0084dfeb026e3mr1356454ejk.53.1673580083645; Thu, 12 Jan 2023 19:21:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673580083; cv=none; d=google.com; s=arc-20160816; b=dNwQprj7FUtwlkhZB8heKAkPW6WDpnLtSM/sKopriECXcmuLBvzKn3k0kr4nUwNCJ5 +byKUBeH3OGPIGxdSx7mAeOzuaT1drTCXUMvVbtqGCYB/3EotgGkAmM47vYfgkO0ut1F vVTBAxQ/g1ZY35uFaCHLjFGGnvBdaJi9nX0fuLyctODHA96rSZ2hPhnTcEd85u+KOf6t br9jtiRPuS8tWt9kg28CfmcBUR4yluBFvx93iDNodB2WpPxEDkDH5og77/QdJtrRXzWg 07fG2IpgG1ymI4+A5t3BABxHIq7p2yKdqeNjja1J3Ytxmo7k30vYFmqQOWMDADJaS8dX nZWg== 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=3O1yb9Uy/5LFjX4NDSyalG0dSblNfhgkG8biJIT1bLI=; b=n3gS93BCGmV4WQlZ+vHnI1C1bQM8drqW/4ZCCXczLoGRZcftnQTVWawJyBFX9F5PbP AtkHF5mlmC3w0+fUQzk3oSiwZqbtRp3ALkokgymlc6hVENKh8SKRCO3Tjr+GNfHZVP8V VJ7wx6GCpJOcHWY8+39Gnz18z4pOkq5CTZQFPzuijMqeg/f92gr3c7wOfJisbMWfBfjR +HCj9ejBSAwjiSu0V9BpGC/xrRJwrzecgCLThjOY2r9h16f5LzpCi0jSaWM/kOLfEGT5 M2vvXf34vTQ9E+YKCLtp/RgbIQ3imfzBJOuqa5wat5swp8Bdqny5CoWS8i5sHWolzoD/ ul9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jTtUe8L4; 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 cr16-20020a170906d55000b0084d3bf44987si11225180ejc.551.2023.01.12.19.21.00; Thu, 12 Jan 2023 19:21:23 -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=jTtUe8L4; 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 S229635AbjAMDUf (ORCPT + 99 others); Thu, 12 Jan 2023 22:20:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbjAMDUb (ORCPT ); Thu, 12 Jan 2023 22:20:31 -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 9372C564ED for ; Thu, 12 Jan 2023 19:19:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673579981; 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=jTtUe8L4VePLAJFDxyIwnKlh3TV+1odzNum5/1mMeQkTIoCkaUtMAmP1SXKNA/sevmYI72 /ON3C/l3Rhd8E4kkyYARsEUGnkT+VdgU+A9yxvVraJ+6KWYrzsgPSehsvH+Kv7pfkudLBy JSAe+YchMdly/6XGrrXyc9c6mDZH5aY= 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-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?1754875909515155048?= X-GMAIL-MSGID: =?utf-8?q?1754875909515155048?= 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);