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 340FFC282D0 for ; Wed, 5 Mar 2025 01:46:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B90A26B0083; Tue, 4 Mar 2025 20:46:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B40936B0085; Tue, 4 Mar 2025 20:46:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A08A06B0088; Tue, 4 Mar 2025 20:46:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8700F6B0083 for ; Tue, 4 Mar 2025 20:46:54 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0B1451C850C for ; Wed, 5 Mar 2025 01:46:54 +0000 (UTC) X-FDA: 83185808748.25.564A995 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf22.hostedemail.com (Postfix) with ESMTP id 13EF4C0005 for ; Wed, 5 Mar 2025 01:46:50 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.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=1741139211; 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; bh=aad+Ohzru6FDN0CESNaSWU/i6jWM45p5SMP+INf4IUg=; b=MJrGFyTfHdT6AwAFyptZLy8pKU6N1KfOU9EBWz1vuzhuHbmyxwpZDD724368/ZNpFsrbZC 7Ll2dvFM2hG8JF2akxUT15+Kdl+LVaSotBT722j6g9PN8BvAmGc9kBb6gEwNQGbrqwxnZ3 l6bX00MdvGwWm6rVrjyM+P9q38Kgn7k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741139211; a=rsa-sha256; cv=none; b=i8goP3wuk2tjVd8Mw8aNxt+TWToYgVeGEMSX1kDk62sS3n7yXPSEmWooeY8U9YYAyiqfUd YcuK/o+JHHTgKLSg3mr4g2z4g7sWAvGO/aZSydVoGTPA+y/QC/CQavYFABFjIeBjPOGB/W /cOhGpZV16Yjz1tL5GRs3mqOQ7l1vvs= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn X-UUID: b1647710f96311efa216b1d71e6e1362-20250305 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:c983ef01-c9d0-4c42-b584-391113908001,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6493067,CLOUDID:ace68c1fb23253b0dbb91357b6d45cfe,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:80|81|82|83|102,TC:nil,Content:0|52,EDM: -3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,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 X-UUID: b1647710f96311efa216b1d71e6e1362-20250305 Received: from node2.com.cn [(10.44.16.197)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA) with ESMTP id 1244931171; Wed, 05 Mar 2025 09:46:44 +0800 Received: from node2.com.cn (localhost [127.0.0.1]) by node2.com.cn (NSMail) with SMTP id 53C30B803CA3; Wed, 5 Mar 2025 09:46:44 +0800 (CST) X-ns-mid: postfix-67C7AD04-213778295 Received: from [172.30.70.73] (unknown [172.30.70.73]) by node2.com.cn (NSMail) with ESMTPA id C8FB3B803CA3; Wed, 5 Mar 2025 01:46:42 +0000 (UTC) Message-ID: <6701d375-8d7c-4e13-b0db-486a48088446@kylinos.cn> Date: Wed, 5 Mar 2025 09:46:42 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/4] mm/vmalloc: Remove unnecessary size ALIGN in __vmalloc_node_range_noprof To: Uladzislau Rezki Cc: akpm@linux-foundation.org, hch@infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250303094410.437985-1-liuye@kylinos.cn> <20250303094410.437985-2-liuye@kylinos.cn> Content-Language: en-US From: liuye In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam02 X-Stat-Signature: hkgkok4md7rrdgc9mo8y11zkawwa894f X-Rspamd-Queue-Id: 13EF4C0005 X-Rspam-User: X-HE-Tag: 1741139210-418330 X-HE-Meta: U2FsdGVkX1/JDlfND2OUrFqATuCKjtNjuCcW0ryLXc5ZizJXy2KSy70L0vPlRKJGRacGQ0NaQeq9rMivzixFulmiDLjz+mFTWmlRh3YQuLLpEKi2KvvcRW30Dh66tvGA+GQPn7MmmQdm2TKhhu9+uahpBTeGKGIeXS+uAWSq9AYRI4XV/E4jUfDJAtl7Hi/jSv0cQNdXaaU33xpiItB22dL/gpqU9tK9i+R2BH3AjVb4w5WYL9Hy8fNSHqEG6MLv2LH6KwpKhjmIhgTp7acQZ2PbuURoCWgRzuRbr+yPBX2XwQQJD7fndWM9lDBigHqaNzKbkKloXlocyBagRELAuXZf+8s5v11wT/baZnIqd9SEOnfVBw4rZurArL6mYK33NScnE/JfWZ87ZgQlnd7wlOlthOPP35JHxa91iLXNM+SX7gLzj/WBB85pJDnJVwsBCVuuSSXi7/ncJy1/65dh5sLiWH725OtcsCav+KFf+SKAyKRitFVdGRk6RoG2n54nq3JSoEbl2IgWn6TS95fL6vpsAjgboZcyLdChquqyY6vnN444MvsJcVr7rkNJUsMU/2d/sO248qepcKj3QRv7/VeGdJ/GtjrJrnxP/7+a3oiE47CyVjFeYzPraqNOdRstnUCEdgXQyhxjx5FRSldoQ1ZnQd35IRxa9tfzEYuz/yqseb06jQz/oJhylA/VQlSCGUTSbIJALhf+ycZFs/o2647qQnkhRC5iR81C0k1o8DeDPoml2ZL+DgMI3XOTK4dqawUXNbZkrXk84Zpuqgn/Vfr1EqqP1o1yJynLTonL6wemPh5/MLy6za6YKCJtdF7boHGK0mAtasMIKCwhpbanIEmQkLF90+Mka4sUP0NJr4mVZ2hwMBbGPzarCRVw0XGPS19GBlzq3rK7qVVl1aqQL6+sYw6kgdWL8PlRJUxRc5MtrAVSMz4JAGcRo9xi0mLC0Z1NqPhi7t3t/SrgyB0 +fPjU6xh aRrzhvkjsDa7bDR6kXiDbOzYWYbmpWW/nifHszb5/FOVdTd03MqkuyRpGM/LF74oRUDGzBHG9F9p4F1WFIsm95MRQsOFtT4uVl/AH67taVCXHSUsZdRyLqKs0BFkfRi9qSOsw3g+3hKa5OPGqFsVn+5XEzatV6ElG17zn5NOnaQSdmpE= 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: =E5=9C=A8 2025/3/4 02:30, Uladzislau Rezki =E5=86=99=E9=81=93: > On Mon, Mar 03, 2025 at 05:44:07PM +0800, Liu Ye wrote: >> The same operation already exists in the function __get_vm_area_node, >> so delete the duplicate operation to simplify the code. >> >> Signed-off-by: Liu Ye >> --- >> mm/vmalloc.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/mm/vmalloc.c b/mm/vmalloc.c >> index dc658d4af181..20d9b9de84b1 100644 >> --- a/mm/vmalloc.c >> +++ b/mm/vmalloc.c >> @@ -3798,7 +3798,6 @@ void *__vmalloc_node_range_noprof(unsigned long = size, unsigned long align, >> shift =3D arch_vmap_pte_supported_shift(size); >> =20 >> align =3D max(real_align, 1UL << shift); >> - size =3D ALIGN(real_size, 1UL << shift); >> } >> =20 >> again: >> --=20 >> 2.25.1 >> > There is a mess with: > > unsigned long real_size =3D size; > unsigned long real_align =3D align; > > "real_size" and "real_align". Those are useless. What is about: Sorry, the order of the patches may be misleading. The correct order is as follows=EF=BC=9A PATCH1.=C2=A0 mm/vmalloc: Size should be used instead of real_size " PATCH2.=C2=A0 mm/vmalloc: Remove unnecessary size ALIGN in __vmalloc_node= _range_noprof=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0 PATCH3.=C2=A0 mm/vmalloc: Remove the real_size variable to simplify the c= ode " PATCH4.=C2=A0 mm/vmalloc: Rename the variable real_align to original_alig= n to prevent misunderstanding If=C2=A0PATCH1 is the correct fix, then consider=C2=A0PATCH2,=C2=A0PATCH3= , and=C2=A0PATCH4. > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 5c88d0e90c20..a381ffee1595 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -3771,8 +3771,6 @@ void *__vmalloc_node_range_noprof(unsigned long s= ize, unsigned long align, > struct vm_struct *area; > void *ret; > kasan_vmalloc_flags_t kasan_flags =3D KASAN_VMALLOC_NONE; > - unsigned long real_size =3D size; > - unsigned long real_align =3D align; > unsigned int shift =3D PAGE_SHIFT; > =20 > if (WARN_ON_ONCE(!size)) > @@ -3781,7 +3779,7 @@ void *__vmalloc_node_range_noprof(unsigned long s= ize, 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; > } > =20 > @@ -3798,19 +3796,18 @@ void *__vmalloc_node_range_noprof(unsigned long= size, unsigned long align, > else > shift =3D arch_vmap_pte_supported_shift(size); > =20 > - align =3D max(real_align, 1UL << shift); > - size =3D ALIGN(real_size, 1UL << shift); > + align =3D max(align, 1UL << shift); > } > =20 > again: > - area =3D __get_vm_area_node(real_size, align, shift, VM_ALLOC | > + area =3D __get_vm_area_node(size, align, shift, VM_ALLOC | > VM_UNINITIALIZED | vm_flags, start, end, node, > gfp_mask, caller); > if (!area) { > bool nofail =3D 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 +3857,7 @@ void *__vmalloc_node_range_noprof(unsigned long s= ize, unsigned long align, > (gfp_mask & __GFP_SKIP_ZERO)) > kasan_flags |=3D KASAN_VMALLOC_INIT; > /* KASAN_VMALLOC_PROT_NORMAL already set if required. */ > - area->addr =3D kasan_unpoison_vmalloc(area->addr, real_size, kasan_fl= ags); > + area->addr =3D kasan_unpoison_vmalloc(area->addr, size, kasan_flags); > =20 > /* > * In this function, newly allocated vm_struct has VM_UNINITIALIZED > @@ -3878,8 +3875,6 @@ void *__vmalloc_node_range_noprof(unsigned long s= ize, unsigned long align, > fail: > if (shift > PAGE_SHIFT) { > shift =3D PAGE_SHIFT; > - align =3D real_align; > - size =3D real_size; > goto again; > } > =20 > ? > > -- > Uladzislau Rezki