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 8CE7EC77B73 for ; Sat, 27 May 2023 19:55:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9B26900003; Sat, 27 May 2023 15:55:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4B65900002; Sat, 27 May 2023 15:55:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1450900003; Sat, 27 May 2023 15:55:48 -0400 (EDT) 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 C3A07900002 for ; Sat, 27 May 2023 15:55:48 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8BAD78028B for ; Sat, 27 May 2023 19:55:48 +0000 (UTC) X-FDA: 80837090376.05.5E903FD Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf10.hostedemail.com (Postfix) with ESMTP id A44CEC0005 for ; Sat, 27 May 2023 19:55:46 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ekEHq7WM; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685217346; a=rsa-sha256; cv=none; b=MlW3yrr4nW7clE5QtpzBm7rvAWTmFN4n+St7qtC5p9ys+JfK28O6p8tSMoc+j/7QiH49cf 4GSaF+ySzzbHBUwyLjySmkIYqO4Hf3RPg5xCIksBQZ53bb1RMvtTc33fu3HTsszJ7Rs7N4 BB5Uswk94OTXpU86HRI1I+YaPxMGmW8= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ekEHq7WM; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685217346; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wldCh2gzutJjtiin9a0KZhvAVvGTa21cDzVwRJ3ttrg=; b=We9xHCtKik2feV9XXhThBPlrgD7W6l1NY90JoCLivdlvFOSudrVmkflsYAoOaQAJ2troZy 4SZSZtGvnuNDi+T2Z/3GZmIGohfbWeJEfkf/e/2SwIcWd4d6NrfF4MiM6MNnnmSnnMCHYr 83nPkouX5HE9pSZ2le1+eZLzRBlbLHY= Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-30a1fdde3d6so1891085f8f.0 for ; Sat, 27 May 2023 12:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685217345; x=1687809345; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=wldCh2gzutJjtiin9a0KZhvAVvGTa21cDzVwRJ3ttrg=; b=ekEHq7WMTOElavxN9f/2NfgvQLD7rp3vsmwWHeWLl9jKx1r2ue7ULOWuM0AnQpenRU VxcxLvKsgWWBD/oMuvZs7ckyC+wgpZrG2wIYJL80+eTrcUdMey5Aoz559rYQtldk0SvM bWl2H3UYA/WK/oaRJ6Cbth8UG0hLTizeEsubQRFwsVA5umV75Qy/mnVWR7iEOr2QeqB9 dArPvkTLsW5kr6FCQVksoMeW4T5rf8MPP4DAxz6eRAaNrTgPjGSyH4WKvwDvFJ6jT/0j sNd1fkg4B5a7sswdOYRNnyurIvroxJJZkZYwkWLlFPz6fE/klAN33hXA/2GB7EDmGxc/ p94Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685217345; x=1687809345; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wldCh2gzutJjtiin9a0KZhvAVvGTa21cDzVwRJ3ttrg=; b=Qba61DiM80jj5AKqpsWz/4v6cri8IwUJL1cpOHoVwAQyv1NIajW2j3oi/glQYhZ1Vl 1qOwHYaXFu3ffH6/fVE4+iBH3GCMVfS/oLdncx79b/4HhI4qq8U28scdGysuE8xtr6ro fVEoMtaqnK2VkFhhf8P6HDQVT9+C2PfODuy5kYdL00RQr1u4zwk9lRgWALZ3GJqu2VZn nMtbMt/eAc1t3wApaY8Hh1SYEhUw04+Duvl3CAmUCjBdOzsLTjjqnfmfP6kzMaOkuSBF eZM/rsBi58gHKbWKIPNtligvfNlSbtXZAI2Vpnh5GH7i9a48HmQYOLBUZNVuG0l+q0/P 9X7A== X-Gm-Message-State: AC+VfDzw2PHkMcNRzSvJ9yENA6P9CnCMJg4+3SuPeH7t5TIJO3oGT2ws JtVUpMiq7RBHjUaU7oGm/K0= X-Google-Smtp-Source: ACHHUZ6cfGOi6HpjKvFV31PjOro2m9xAkZ+MGwsCOfkLDEW1XnShLYkgqg1mb0fpXlnV5E+fSgfMrw== X-Received: by 2002:a5d:4522:0:b0:307:4836:64e4 with SMTP id j2-20020a5d4522000000b00307483664e4mr5765062wra.52.1685217344834; Sat, 27 May 2023 12:55:44 -0700 (PDT) Received: from localhost (host81-154-179-160.range81-154.btcentralplus.com. [81.154.179.160]) by smtp.gmail.com with ESMTPSA id z11-20020adff1cb000000b003093a412310sm8916050wro.92.2023.05.27.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 May 2023 12:55:43 -0700 (PDT) Date: Sat, 27 May 2023 20:55:43 +0100 From: Lorenzo Stoakes To: "Uladzislau Rezki (Sony)" Cc: linux-mm@kvack.org, Andrew Morton , LKML , Baoquan He , Christoph Hellwig , Matthew Wilcox , "Liam R . Howlett" , Dave Chinner , "Paul E . McKenney" , Joel Fernandes , Oleksiy Avramchenko Subject: Re: [PATCH 1/9] mm: vmalloc: Add va_alloc() helper Message-ID: <96a75e2d-3108-4f9d-a90f-ad636f0401f1@lucifer.local> References: <20230522110849.2921-1-urezki@gmail.com> <20230522110849.2921-2-urezki@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230522110849.2921-2-urezki@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A44CEC0005 X-Stat-Signature: bfy789b1w8hhhqkk3qo3jdjx7mw1zzpd X-HE-Tag: 1685217346-376491 X-HE-Meta: U2FsdGVkX19eE40ox7R8oCI90qr6VKx6Gdk6ddqHwcDwVnd7sWujHsz9nr7AEOvbzmUvbvmEVsNp7tmGmSoANVT1HMx4l+FPAt88vCoZjebZJ50enKW/a1JgpkMYNO+NRTRKtHtsuI/sSnl3WbvahZ+gtSoboYmrf0LUSnf1Ky4o5b/6/WnuGrPrCv/OF5LSha94b8r+CSZ9J8cbHZQVTBAylMvAiX8RveWFeHOQBlnhBFOfUCIZqckfSW8yZwjapSIhFkM+ght8FV8BjQHwOTChOEZygtD/8g8IeSp4x7VP0hdEVdDVwuw01JphW/6DYOkPAHqTXnxu5SQl3zOn3WdlfQhiXjdEr1/oVCQYqkjgfMcgCc3B83l+aVpisALQLq3Mv4lL/sbtyAL2XnYbNwswdRI6EHyV2RakHsAJAp7R1Io8mcq4T5rwPooMmK2ECzWElIqPIExcqjcXttDOVx65VMGou45QtqxumYJ0OeqLFseMukH00cfs/buyy7MzMMoTmfDs0ydXMZN5ik2VgJMUjXbXYabiTF8xS29DUVvh6P8pdrRsLMS9nFci5ehqgi5Qs8rY1XAto6AMbEeLsCsjZ125frPM1YWiMuUFkDRlk51juNPHVMxFxF5K4PTkr2RNnXoM7Gz7jq8v6IXAQ7gB17XM9dqFfS4rUclBOV+hXg3MfuvxDA7wjgf1Q6kVQcn6n9RZgcy1Khi3br550bgGuiPqXceSb1WfWFZh5podylxxNt3W2e+7Cajxs2AENmFenRkjMEHGF3tdFiBu1d1cI98M3ben5SHSCEo8te9Lxntj4qTDY5k/knL7Ek2ADj/JDJLR9I3xExo2rN9+OxuOlXxPuEEYN5LsmDJnGQ/ZwzgzRC/yDnMgoOqduNV92ZJDflfVYn5ms0snTg1ADvJ2KzHK+BWtYxhTggzzNsMEPY9rkqNMFl74C6ilbc7nNXL9Gwa0Ua/NoUh1xL+ 5K/kriX6 oMbyiNsg7jYzfazjHkKDWugweVxSaIaapIZ26gZrpAsVYY089cexLb8wrTOeJ9tr0DB8aSlActTtkF8ZK8oHTVk5u/ezy5c031243c/6X1xjcJKCVBxItfUJd8CsUh8iyNZXSJvbzw7SKSSTUYsI2QMROpu0k4XgWmg40Anw2wWXhW4yq9cTguEw+vo1zpwZMBa79vuue2iqqpcR1/1SRhPR9ofy4VHdegfnDd//H1QUqCG6BxpP8nwNJ0dnefMzPi0iQ7HaoATlK+XYQ+rWZojJbFHpL7vYdqkUX4ZdwLHKSwQ8jTG2ct+EkB3gaM4ZwPMEPWRSHqfwFJVG/WpXnDG7DGZLJzyU4sun6sLEHWlDGeUzVZ0CtK2RQ5MvR7iZfzaqGDw/DTSnRSS6lyoi7iA26xnZN3ljXSP+LaJ+fQza5TF/GIWo8aHukD4qPkOlmLmy7gD83LH7nwyVnZrzuHELdFg== 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: On Mon, May 22, 2023 at 01:08:41PM +0200, Uladzislau Rezki (Sony) wrote: > Currently __alloc_vmap_area() function contains an open codded > logic that finds and adjusts a VA based on allocation request. > > Introduce a va_alloc() helper that adjusts found VA only. It > will be used later at least in two places. > > There is no a functional change as a result of this patch. > > Signed-off-by: Uladzislau Rezki (Sony) > --- > mm/vmalloc.c | 41 ++++++++++++++++++++++++++++------------- > 1 file changed, 28 insertions(+), 13 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 31ff782d368b..409285b68a67 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -1482,6 +1482,32 @@ adjust_va_to_fit_type(struct rb_root *root, struct list_head *head, > return 0; > } > > +static unsigned long > +va_alloc(struct vmap_area *va, > + struct rb_root *root, struct list_head *head, > + unsigned long size, unsigned long align, > + unsigned long vstart, unsigned long vend) > +{ > + unsigned long nva_start_addr; > + int ret; > + > + if (va->va_start > vstart) > + nva_start_addr = ALIGN(va->va_start, align); > + else > + nva_start_addr = ALIGN(vstart, align); > + > + /* Check the "vend" restriction. */ > + if (nva_start_addr + size > vend) > + return vend; > + > + /* Update the free vmap_area. */ > + ret = adjust_va_to_fit_type(root, head, va, nva_start_addr, size); > + if (WARN_ON_ONCE(ret)) > + return vend; > + > + return nva_start_addr; > +} > + > /* > * Returns a start address of the newly allocated area, if success. > * Otherwise a vend is returned that indicates failure. > @@ -1494,7 +1520,6 @@ __alloc_vmap_area(struct rb_root *root, struct list_head *head, > bool adjust_search_size = true; > unsigned long nva_start_addr; > struct vmap_area *va; > - int ret; > > /* > * Do not adjust when: > @@ -1512,18 +1537,8 @@ __alloc_vmap_area(struct rb_root *root, struct list_head *head, > if (unlikely(!va)) > return vend; > > - if (va->va_start > vstart) > - nva_start_addr = ALIGN(va->va_start, align); > - else > - nva_start_addr = ALIGN(vstart, align); > - > - /* Check the "vend" restriction. */ > - if (nva_start_addr + size > vend) > - return vend; > - > - /* Update the free vmap_area. */ > - ret = adjust_va_to_fit_type(root, head, va, nva_start_addr, size); > - if (WARN_ON_ONCE(ret)) > + nva_start_addr = va_alloc(va, root, head, size, align, vstart, vend); > + if (nva_start_addr == vend) > return vend; > > #if DEBUG_AUGMENT_LOWEST_MATCH_CHECK > -- > 2.30.2 > LGTM, Reviewed-by: Lorenzo Stoakes