From mboxrd@z Thu Jan 1 00:00:00 1970 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 27076C19F32 for ; Mon, 3 Mar 2025 01:57:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 833126B007B; Sun, 2 Mar 2025 20:57:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7BC2E6B0083; Sun, 2 Mar 2025 20:57:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 635DB6B0085; Sun, 2 Mar 2025 20:57:24 -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 43E8F6B007B for ; Sun, 2 Mar 2025 20:57:24 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E419412071B for ; Mon, 3 Mar 2025 01:57:23 +0000 (UTC) X-FDA: 83178577566.28.98559A0 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf03.hostedemail.com (Postfix) with ESMTP id E926D20003 for ; Mon, 3 Mar 2025 01:57:20 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf03.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740967042; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=yk7OZyuZiFtz+vpWLUebt1ZHDIp++GmOq2bPwcIC5lI=; b=b6xc1g7RGpwy2dXfMCv+X9rsC16+ur70C4htbjzm/ix6JbSMIoot/iiiS4s0Nt8UNPTVbO lVkkNNOHKI1JiARxt/woyAgZheapK1YZu6YZJxU7c2Zl3dCfzEgF6yKNr66ajdLwopf0LD QjnSOmKa/3+gX63zxf7YZpos+Svh+7s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740967042; a=rsa-sha256; cv=none; b=6deE/odIAkDO5acko+NLtR/rGXg8MOYgJckWg13pn1sUnhf1FmpuRmqCSu5IIbpW1CKCTp myVhow6HaszB9ENWWcNQ98DYU2mI+K8VJZiNNoEP0eEZi48AunWjRqWV63VVcZTtWDtlL2 4LBGL9tGoNjmXwgOAFBGvv/sZLEiTts= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf03.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn X-UUID: d2e0496af7d211efa216b1d71e6e1362-20250303 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM, HR_SJ_PHRASE HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT, HR_TO_NO_NAME IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED, SA_EXISTED SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS CIE_BAD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO, GTI_C_BU AMN_T1, AMN_GOOD, AMN_C_TI, AMN_C_BU, ABX_MISS_RDNS X-CID-UNFAMILIAR: 1 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:c605b5b3-edfd-4127-a2c6-aa105ceb2a29,IP:10, URL:0,TC:0,Content:0,EDM:25,RT:0,SF:8,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:43 X-CID-INFO: VERSION:1.1.45,REQID:c605b5b3-edfd-4127-a2c6-aa105ceb2a29,IP:10,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:8,FILE:0,BULK:0,RULE:Release_HamU,ACTION :release,TS:43 X-CID-META: VersionHash:6493067,CLOUDID:14aa765bd3339adb6d5948ae338d1a50,BulkI D:250303095713XL76UOVB,BulkQuantity:0,Recheck:0,SF:16|19|24|44|66|78|102,T C:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:n il,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_SNR,TF_CID_SPAM_USA X-UUID: d2e0496af7d211efa216b1d71e6e1362-20250303 X-User: liuye@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1208996738; Mon, 03 Mar 2025 09:57:12 +0800 From: Liu Ye To: akpm@linux-foundation.org Cc: urezki@gmail.com, hch@infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Liu Ye Subject: [PATCH] mm/vmalloc: Move free_vm_area(area) from the __vmalloc_area_node function to the __vmalloc_node_range_noprof function Date: Mon, 3 Mar 2025 09:57:02 +0800 Message-Id: <20250303015702.319416-1-liuye@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E926D20003 X-Stat-Signature: bhrt43pwbjoyoewf96cd4pgit6wn6sdp X-HE-Tag: 1740967040-506327 X-HE-Meta: U2FsdGVkX1/YWPbh0eT3WmiJSvOwF9qAtufuyrKmMANtcr1OuuxENhfIPUZq2BUATEC/ymxGXwap0FqRO9CoSK0PPZawIRnnDZ4xII/UDEK4U3Qe56G0s8qrLdC8N8xEI33E3tthmQzuupD1RM4JcQFJMNIF3DSWIMjbVhdSIMmKN8rz5RfzhJIK/NQd+z+1QOEruUOgj31GyCvSNfzN7WduRk+s85djTRFak5gzuwjSyykwlfI4l+sDnqEon/7r/KvIaY07dyqNdIrshQasNfUuJKZEeD2B10/SQrT8MDjWTpGeZX1031sp800eZiq3Qmdi2rFJS7bdHasruVw0NzTjH1Kce9pEEKXRYvqjk2YgNW5F+x9KkzBnHsxvuKgaslV9Di5C0KfpZs8Ndb1Wcd/DPhtt48/olnBcgBfbXqwDEKIBIX+y0lbwNF41IRjbhLq86w86ya461QXoKuqp/LtsvvR8M6GDUKfk6MuJo/B4YrwL3vIXAWLIWo6d/uwHYxp6e1OXn2DaiCyN4p3VpdoorNQWjGiZlv92rOrwqwUL2f1tdGwtReXgxDYgO9UEha78kXIDSk5ZNahbIcjo3Z8t2WuRH3f0gbWhCe7d9dAtljjM+m6j/iJbAnDdqOx9XixHDeXZo0GqRGYRzDkArkbyVW7VqabnNPyEOxo5gL307EEfMRl+TCE8iFmyA5WVEDoMh5KgS8FohgugHI70d8FIEenGDhJXwt/o5/Krp08oF2YDhTx9bz/xsHo8xuHBAXPjJ0gQvWTMAkBLzNgb2v+bGbJODSlhs6aFcuVbd/gyocmLzJhGcW2NHTwytcQ/N39FfxphYEyhqDEWpvCwSj+rEm8h8+aGrr71WiYVXu4yFCxZPWpcVd++9tTp3dlts93WlW8At2DnUf2aMHYYinxLVAiw7vQZSy40iOaLnatRUik0vs1u1esCjxRwh+xjWbruzsNSnwpgQtxDPFN BWpEWW/1 uDaxU0SymtstQT6JGoe9qY13Uv/ri6ELcYaQhPg282bxwjM4NS3CL7Wc1jo2D1i9L1zBEziEcteVTSZU= 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: Moved free_vm_area from the __vmalloc_area_node function to the __vmalloc_node_range_noprof function so that allocation and freeing of the area can be paired in one function for better readability. Signed-off-by: Liu Ye --- mm/vmalloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index a6e7acebe9ad..dc658d4af181 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3651,7 +3651,6 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, warn_alloc(gfp_mask, NULL, "vmalloc error: size %lu, failed to allocated page array size %lu", nr_small_pages * PAGE_SIZE, array_size); - free_vm_area(area); return NULL; } @@ -3844,8 +3843,10 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, /* Allocate physical pages and map them into vmalloc space. */ ret = __vmalloc_area_node(area, gfp_mask, prot, shift, node); - if (!ret) + if (!ret) { + free_vm_area(area); goto fail; + } /* * Mark the pages as accessible, now that they are mapped. -- 2.25.1