From patchwork Sat Mar 9 04:44:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13587491 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 F120CC54798 for ; Sat, 9 Mar 2024 04:46:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C0DF6B007B; Fri, 8 Mar 2024 23:46:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6717F6B007D; Fri, 8 Mar 2024 23:46:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5110D6B007E; Fri, 8 Mar 2024 23:46:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3F3BE6B007B for ; Fri, 8 Mar 2024 23:46:03 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D3DD7C0965 for ; Sat, 9 Mar 2024 04:46:02 +0000 (UTC) X-FDA: 81876263364.14.B3F2F97 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 03B85100005 for ; Sat, 9 Mar 2024 04:46:00 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dSMAFhAy; spf=pass (imf05.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=1709959561; 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: references:dkim-signature; bh=NXgwTRTDLmUTg+sFCItxCas48RXoyPz7QoolUxN5wKg=; b=L9wWQzA8TghVQi9Zmov3lF54fugbDeubc98aFabk2dPMjZNxqo5Mo8ox9QJWB8JQUw1Ng7 p472AkvuRqhDsfTKOmUbvLRsQlOuEZITsA3+911C7cEcetNdjvw9SFqL3ZAV46M+X82zhB MrR1lTvmIyfTPUx/7WtF+k0So9XgwcI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709959561; a=rsa-sha256; cv=none; b=Cd1X354U3CuKlYXzP6bBhgHbfMymPD4fOUHfugvR/uojgg1nrv4OTBQ0ocR8DALbQQDqeq 368Q8fw4UAkVATsROa40ABuKeomSMswh5sUy2paF84RlRCxUaDy9bmX3Z0Ro+6AAvsG/Oc r8X5cuZFBlDaOMEUGrbnRySveFyHa2c= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dSMAFhAy; spf=pass (imf05.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709959560; 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; bh=NXgwTRTDLmUTg+sFCItxCas48RXoyPz7QoolUxN5wKg=; b=dSMAFhAyugFpWDAAj2D8HSXfconUGFTdSUO3xDwT2HBxe2C5nLHLNt5TyMKuxyvF+3OEqu ijJX7C5Vk87b7b31xemswk5hAmAg+9Af65psuz67nszlLwhaM8IVF9mw0JAM05jPvtxdIW Vlb4TLrMPWf8cIkUq+DY/ax9H6nyC+0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-459-z1JE6Ef_OpmUD6YJAvOzbg-1; Fri, 08 Mar 2024 23:45:18 -0500 X-MC-Unique: z1JE6Ef_OpmUD6YJAvOzbg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D319C800262; Sat, 9 Mar 2024 04:45:17 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FEAEC15778; Sat, 9 Mar 2024 04:45:00 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: urezki@gmail.com, akpm@linux-foundation.org, rulin.huang@intel.com, Baoquan He Subject: [PATCH] mm/vmalloc.c: optimize to reduce arguments of alloc_vmap_area() Date: Sat, 9 Mar 2024 12:44:54 +0800 Message-ID: <20240309044454.648888-1-bhe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain X-Rspamd-Queue-Id: 03B85100005 X-Rspam-User: X-Stat-Signature: 6p7e5c4xbi4s81jrm3u6kecxgsptdnii X-Rspamd-Server: rspam03 X-HE-Tag: 1709959560-294907 X-HE-Meta: U2FsdGVkX19zdC+ehqfMkNRowsBEgSSMcAXEAheOjwWyF5wSa0ep3B7muwbLIW7L/NDvZ1i6Y0Eoml1zjJZjzcGJnDXuxH6Ca2z5R1NSIWEql63OK8DQW9FnhZtRstN487x3ntp0FmA1GTtz/kZe7egS9yQJWYAJcUL1AbQqKt1ZNlFSaJEC3ZHwaIg74/guSnosyfYI834GmLoP7PWm7JJXwxavZ4++epefyX965ltDu9aE62meZGl+URhw23lFuOsDEeMS30XPhJ9bXPmDA51fefomIJdxiF0MjCS6Cbm4ZSaLZfxQ1gdRmstdMGjlAUwPQCs3m6vVRSzXkqYqSk5Ag3Px8Bp5OYWiDZvqUWcLGa7e74YQ0m/VI8WRq693IropeCuRflUzoOSJGlPA/LhDnVKcBzwUYQ1RoJJ4H9hvogf3+X6snLQPqJWvi6GRAnV3eqieJP2UweEOO75h1MIADRNc+hhSEPM2WS6SxRqIBIdXgFB2kfjw+wW3gz6GO27/zmh4N/Nr1K6pTP/DyzTdrpFjr0s9IrhHVOFqxVC2UVSX059F0y/KSH/GfcvUPaT+ONzCrN6nVTTO4SgxGJM49SyNSaQyuGQByIskJ6QQyERmiyePZebMTFkXABzruZUgOJifklKmxtO+MEq7rXa4AStJQ1pZPWlB9ldDNg+gRiwuVk4NmclOvaJiNMO8pB7EvEHXTckIDC3rnLQeMQG4lN6Q92IZddwWWzPG6JCmcU4F5yWga2c0kVV3hpnFz7AYaSu0qt10SviyXnQ/LYlPfJrvMFJXCN689XCLIeB1KJ/N+Y4hLyiUsVrmEPHLYCwmhig+uv2aNv6txFziVyJSVBwVneilZaUBlg69AVjKdB0F08kn9QcWVJsCgBJWN9wvoHQv5zgmi/vH6f5SMlEZBBom+6638Fu6UmzUdyqf3FJ+Cn6/V5r9nmk9mhv74d5UR3A+M7WNdYpXsyy MOA190O+ ksre9mu4lt2E16nkxwZF8uq6KoifOuRMl3gTRXjgmFfwHTKgJB7PKulxuHEBBXfa8fN8erlJ/NYy08K+rp6vRRuvGXBeu5BNG1v36CFUPxlj5WTR/G3WekQWo/Medyo7W3jdbQuhbznMbpr0h3VL2QGiIRg9kTm0HYJHAOuOy6AYYcuRcOA+G3xp+JYqrAcrveUAKoGUPLJxx8QGs0Dv4YS3GBWlrbMAjhi3Zo6cTakODfMcJcv+3JPGH8w== 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: List-Subscribe: List-Unsubscribe: If called by __get_vm_area_node(), by open coding the field assignments of 'struct vm_struct *vm', and move the vm->flags and vm->caller assignments into __get_vm_area_node(), the passed in arguments 'flags' and 'caller' can be removed. This alleviates overloaded arguments passed in for alloc_vmap_area(). Signed-off-by: Baoquan He Reviewed-by: Uladzislau Rezki (Sony) --- Note: - This is made on top of Rulin's below v8 patch: [PATCH v8] mm/vmalloc: Eliminated the lock contention from twice to once mm/vmalloc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 0fd8ebaad17b..0c738423976d 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1924,8 +1924,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, unsigned long align, unsigned long vstart, unsigned long vend, int node, gfp_t gfp_mask, - unsigned long va_flags, struct vm_struct *vm, - unsigned long flags, const void *caller) + unsigned long va_flags, struct vm_struct *vm) { struct vmap_node *vn; struct vmap_area *va; @@ -1988,8 +1987,11 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, va->vm = NULL; va->flags = (va_flags | vn_id); - if (vm) - setup_vmalloc_vm(vm, va, flags, caller); + if (vm) { + vm->addr = (void *)va->va_start; + vm->size = va->va_end - va->va_start; + va->vm = vm; + } vn = addr_to_node(va->va_start); @@ -2565,8 +2567,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE, VMALLOC_START, VMALLOC_END, node, gfp_mask, - VMAP_RAM|VMAP_BLOCK, NULL, - 0, NULL); + VMAP_RAM|VMAP_BLOCK, NULL); if (IS_ERR(va)) { kfree(vb); return ERR_CAST(va); @@ -2924,7 +2925,7 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node) va = alloc_vmap_area(size, PAGE_SIZE, VMALLOC_START, VMALLOC_END, node, GFP_KERNEL, VMAP_RAM, - NULL, 0, NULL); + NULL); if (IS_ERR(va)) return NULL; @@ -3063,7 +3064,10 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, if (!(flags & VM_NO_GUARD)) size += PAGE_SIZE; - va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0, area, flags, caller); + area->flags = flags; + area->caller = caller; + + va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0, area); if (IS_ERR(va)) { kfree(area); return NULL;