From patchwork Mon Mar 3 09:44:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ye X-Patchwork-Id: 13998444 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 D7739C282CD for ; Mon, 3 Mar 2025 09:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1859280009; Mon, 3 Mar 2025 04:44:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DC98B280008; Mon, 3 Mar 2025 04:44:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6737280009; Mon, 3 Mar 2025 04:44:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A6BC0280008 for ; Mon, 3 Mar 2025 04:44:30 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5BEB6C022E for ; Mon, 3 Mar 2025 09:44:30 +0000 (UTC) X-FDA: 83179754700.16.2216370 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf05.hostedemail.com (Postfix) with ESMTP id 8FCFA100008 for ; Mon, 3 Mar 2025 09:44:26 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1740995068; 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:in-reply-to:references:references; bh=KhezJuwbDZatLoSSC+34bGME7oqW3izunjlzgVLtnkU=; b=xLmzvSIQJP9M0lMRnkFqHEHagWJc614T+YBb50Mn85jo67YS7nwj0bZyuNs1sbKEqdSltl k6veRJo91xcI3imrkpub281k8WkWwefpKCQLYkbBvpqxJcDEWHwCxHo8uB/P2PAiVrNB0J WRydZvBWvENxgUTyvGfQkWxSHfhnRQQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740995068; a=rsa-sha256; cv=none; b=0JIduw5BTKFIHHGeNUg9Wms6f/E1RVn12SsvXji/UK/u+zpnhrxSMHk+pCiymAm4V27k9q zGNmt2LIP/DRRFgVDxU83IqPiOMIc/m65bNGUIMBXcP1sx7Lx8uPSYhXlDdWE1tfhXRtwT /tLbHjS7sUDiVmHoXEYP4ujv+0OQQ+0= X-UUID: 138b381cf81411efa216b1d71e6e1362-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_DIGIT_LEN, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:5383d249-2c70-42eb-b87c-0d7c4c43adca,IP:10, URL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:20 X-CID-INFO: VERSION:1.1.45,REQID:5383d249-2c70-42eb-b87c-0d7c4c43adca,IP:10,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:20 X-CID-META: VersionHash:6493067,CLOUDID:25d1d2012f27b339e62b923a1ac414a9,BulkI D:250303172846IT4R4S2D,BulkQuantity:2,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:40,QS:nil, BEC:nil,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_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI X-UUID: 138b381cf81411efa216b1d71e6e1362-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 154557428; Mon, 03 Mar 2025 17:44:18 +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 3/4] mm/vmalloc: Remove the real_size variable to simplify the code in __vmalloc_node_range_noprof Date: Mon, 3 Mar 2025 17:44:09 +0800 Message-Id: <20250303094410.437985-4-liuye@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250303094410.437985-1-liuye@kylinos.cn> References: <20250303094410.437985-1-liuye@kylinos.cn> MIME-Version: 1.0 X-Stat-Signature: 5k8f5y86zo9hk9my7ynwgu5kczcsqd4j X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 8FCFA100008 X-Rspam-User: X-HE-Tag: 1740995066-780004 X-HE-Meta: U2FsdGVkX1/8VL3h/TQRdzl85BKUen7ND7uAclYoW5LTPtC5jaJrV3+7On1gsxtbXHjCiCZ9tdbdzCO40okUuGZyV2nI9sHJnFLxHYGfOZK1fz/Og2+BSyWcsz95UhpprSzZaC38Mp+sc32pbiumjb+ejcUEAT6QwakG94WodS6gf7wRWhIdbhVhExN6xgxYiIn/OjW+ZTEjwhorBj/81mbEK58vQhllbBpkwgsDAjZw7sD4oJJ6DhZkBX+WC0ZJ9n3IuziflPv0QRY8k2+j8U1PuytEYvKqemnaa3sOTB74FuEMTXuBqW8Pbq9LHmpGwY1czy6Q0GAlOF5xBP6unhyV/Z93VQ45yC9PuE9Sm70W1vK0ZGzCXxYaO2rhpWRMoRy15ST2Blb300YLWyURvO7fVHEFZzdMkBqU7lHOdwwMdeZ6h4CLoQErn2KhLID4ZNI9NIzuh0q0S8iNn3X1nQy+r7bR73J/DnsAmJ4NyGpWqYRlPSMPrRzDeJJdJOG8XsZt58gMRcIbM2iQLguCsWE+3s9/E2gOluQ2EXyc0gAq4A6VDGKl8upQwgWvOaSAHIZu2Buu8W2HOSktyzBD4582AKEabsl89AmLkWvT21yN9Q9TTsTDm8ds/qgWLdJiOruYQc56sBdre/kQo69dqZT2lasl4XYRT7PGEdwPWmC3fzFsvFab6WjMvcRJwTnyx+6/n3eyoXcqm89omcsWznOrOeORh2vZeEOF/TupjS1jwMOntO0AtwjUxesWJN8bw2Nyu2txzL0Ac5MBGcoA363SBjO/xSLvUWdsdEd3C+Wf6Tky3xlHvequXyML5Cmrj1Dc/lTVegSo8iapu3QCWdAjq2xYJzLZYrx+CbatO8wJvGSx/E9tM2jhdFPcE+pbxLQKtib6cj/MUMMZi+ejZzzu0h2D0OKw1+5sMSve4Es3eCH53I+/nWrvW2zfQeA001YzGcdaCZ54ySwJp/b YS60rF0c PgNehPYRQ2Hl2q4uCDhlKl+t9TH1uQRrf7n48hWe6/qiUNRAIEg4HyspIo0QYrpP/K2TmdAIRiglOfyw= 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: The use of the real_size variable causes code redundancy, so it is removed to simplify the code. Signed-off-by: Liu Ye --- mm/vmalloc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index e311ee33f9ef..b4d2010e5105 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3770,7 +3770,6 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, struct vm_struct *area; void *ret; kasan_vmalloc_flags_t kasan_flags = KASAN_VMALLOC_NONE; - unsigned long real_size = size; unsigned long real_align = align; unsigned int shift = PAGE_SHIFT; @@ -3780,7 +3779,7 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, if ((size >> PAGE_SHIFT) > totalram_pages()) { warn_alloc(gfp_mask, NULL, "vmalloc error: size %lu, exceeds total pages", - real_size); + size); return NULL; } @@ -3808,7 +3807,7 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, bool nofail = gfp_mask & __GFP_NOFAIL; warn_alloc(gfp_mask, NULL, "vmalloc error: size %lu, vm_struct allocation failed%s", - real_size, (nofail) ? ". Retrying." : ""); + size, (nofail) ? ". Retrying." : ""); if (nofail) { schedule_timeout_uninterruptible(1); goto again; @@ -3860,7 +3859,7 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, (gfp_mask & __GFP_SKIP_ZERO)) kasan_flags |= KASAN_VMALLOC_INIT; /* KASAN_VMALLOC_PROT_NORMAL already set if required. */ - area->addr = kasan_unpoison_vmalloc(area->addr, real_size, kasan_flags); + area->addr = kasan_unpoison_vmalloc(area->addr, size, kasan_flags); /* * In this function, newly allocated vm_struct has VM_UNINITIALIZED @@ -3869,9 +3868,8 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, */ clear_vm_uninitialized_flag(area); - size = PAGE_ALIGN(size); if (!(vm_flags & VM_DEFER_KMEMLEAK)) - kmemleak_vmalloc(area, size, gfp_mask); + kmemleak_vmalloc(area, PAGE_ALIGN(size), gfp_mask); return area->addr; @@ -3879,7 +3877,6 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, if (shift > PAGE_SHIFT) { shift = PAGE_SHIFT; align = real_align; - size = real_size; goto again; }