From patchwork Mon May 22 11:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 13250141 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 5674DC7EE2A for ; Mon, 22 May 2023 11:08:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AFC4D900002; Mon, 22 May 2023 07:08:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A846F280002; Mon, 22 May 2023 07:08:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94BBB900005; Mon, 22 May 2023 07:08:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 80D1C900002 for ; Mon, 22 May 2023 07:08:56 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 51BA3C0CE1 for ; Mon, 22 May 2023 11:08:56 +0000 (UTC) X-FDA: 80817618672.22.EBEE8BA Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by imf10.hostedemail.com (Postfix) with ESMTP id 7916AC0005 for ; Mon, 22 May 2023 11:08:54 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VBUTLfKb; spf=pass (imf10.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684753734; 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:dkim-signature; bh=C3POfPMkD0T4i+gkKz2qkPU4t7/WZTiyT2qCdNLU280=; b=nnc4hHn2hMtKRnYo326LVq4K94Vkz/1BthJjeEu2HiURQ0tl6euAlbKzMeneLbBeh3zo0W iFLE0OCffLJx1uXmytLH6EpLFDoYumNyqoVXSxnJXZHSxg9rVy7ZmAWXAic7vRplL+BL0j iCPCilrtuS8q08I5wt9/XMRtFMAOrX0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VBUTLfKb; spf=pass (imf10.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684753734; a=rsa-sha256; cv=none; b=LLTp69JZoaU46EriGQJ5SDOhTXGM6R5SQgm2ivGYzx/3qVKP2OrHB0kZlku1f48UI9zldt bNducsJQp/GxFXSBVfnCp6qTlY79GXlBSTsxAk+1duylr9paBDbaYf8/EtJeWI9FPiWPVQ DIMrcsz+Hc6B7XJe/bKUEEpwYVBMAzs= Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-96fbc74fbf1so278333966b.1 for ; Mon, 22 May 2023 04:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684753733; x=1687345733; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C3POfPMkD0T4i+gkKz2qkPU4t7/WZTiyT2qCdNLU280=; b=VBUTLfKbApHu6QZhrVrOCB3BjALZb8HbF0H20xKFhc6s2ddiN7suwTGMU0bL+g+sYn RmbQ1cww5mUZenVFKfKM0obeU2G6DDRfd8SBMnH9fmFpOyakPo9ae6ksAd2XakoCBv0E 7Ov6b3cng1MnPemi03HJHLAXu9L7D+fD1mqdF1IW9NYQd6lcGKgDypewZcwaRLFcrhmr yjR9yAKjvtwtrmWZi3nCGabZYIW/EQNSzPSvJbp0e3+m5rd5yon1lw8lX3KGm/ik7TPO pykNacp5zTZge80vp2rYbryAhbquVFUZS46oKag6NjrQQcMLsIE3M8wIwP5IFy1Gt0Ul IcQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684753733; x=1687345733; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C3POfPMkD0T4i+gkKz2qkPU4t7/WZTiyT2qCdNLU280=; b=GK7GQM7h9CJIz1XxDttujFQAwMcl6BYtBO3rLt8OPEEw6H12AFoztoDqtWY/I7XpgM +OiMuCGVj6wKgv0xLAUF54k86971iE6DeNHErlK/+SGIEfBk/J+vUaQ8Z3/B0tCA7Ey/ fFRDsH0j4KVeBnBPn2pqIo5qZ2QZBjBaTcN863UXoJ+wqzjax90KtiMU1US7/xUFAK8m vAQoRsKbEZwDAMe33L39T5qMXyYvX+0HQ1R4UkLbva+/I007bolZs1FHFc9zxcq7SQGf MKBepcQyIHX2cdxeRcd/ul2WNxZ5JvBrxH+SGAiQvllAya6RYXk1OxtqgTfrGsRqeZ0F Qnng== X-Gm-Message-State: AC+VfDzVqsNPND9YjkT1O+iITYfHHVWJdUxcaJuAHmYqVgf3i7j9eBTt H428pzZpN9t+ZOqtB8IU796BvBbUIxagJQ== X-Google-Smtp-Source: ACHHUZ7sSj0PR0+CyXEW2CQQzfPJq5rycOMctGBSYZ5gIV+Lpig9VckuJmCX23ieD4b+A7HcD+ROww== X-Received: by 2002:a17:907:1c8b:b0:94e:48ac:9a51 with SMTP id nb11-20020a1709071c8b00b0094e48ac9a51mr11815922ejc.4.1684753732807; Mon, 22 May 2023 04:08:52 -0700 (PDT) Received: from pc638.lan ([155.137.26.201]) by smtp.gmail.com with ESMTPSA id lx19-20020a170906af1300b0094f07545d40sm2949453ejb.220.2023.05.22.04.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 04:08:52 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: linux-mm@kvack.org, Andrew Morton Cc: LKML , Baoquan He , Lorenzo Stoakes , Christoph Hellwig , Matthew Wilcox , "Liam R . Howlett" , Dave Chinner , "Paul E . McKenney" , Joel Fernandes , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH 1/9] mm: vmalloc: Add va_alloc() helper Date: Mon, 22 May 2023 13:08:41 +0200 Message-Id: <20230522110849.2921-2-urezki@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522110849.2921-1-urezki@gmail.com> References: <20230522110849.2921-1-urezki@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7916AC0005 X-Rspam-User: X-Stat-Signature: di77r4qi4rx7yshunker3x6k5jayb3b9 X-Rspamd-Server: rspam01 X-HE-Tag: 1684753734-998636 X-HE-Meta: U2FsdGVkX1+oOL38R0pfIFfAhtJkEljFW9G8YxZ5UsZ2Gl6TM+SC0A0VQTaFXnDuxP4R1iIpJyGnoXtyMXQu9P7GaVo0GVRazwvhJE/za4GGraKVgCEovXjscF+xW39BshY/HpPQlJv2maCq38CrTSeCqc+GpVVMdGNGXxYMQHbeejNzd57d1qycWWbglYvgsaQFTtvkmNkBVbzAuaBs/8hxuE0DBUA/vvKkcS+DLZ9vnoqsXreGTKGBvUeMBPVMF1fKiD/x9zaIClkZXlxTvg9fe4Lm9aEiAbHho3HS4lTG40ahwpPWQBYLmQaTvfWVpFiIPnx6c4XDIG3mVntZzd6rV02Y5uh69f++KuRrbeUaSmWAlaWd2h7K/jlCXyTMJl6XeRGTpoUOsJhXOGBHphkYe1MXW0WVLdGpeRAhKnh9no3M1Yi2nMzpfCXU2KKJsqLC/I39U1Sj3ZwclvxOWY5xtG43wn9PxRAfobS2YQ0/+Y9P8MZpWfrc/mOwIpCq/wr8jpvQB6t8EuCqJLYw1C7OzJ+BCQ5BlmPYOUjD1/cd05mdlpVO7LSSwrx56xnq5PJkICMbfh7DyZel55UCClYEaylgqcASsbqqVYyNTCvrbl+Q52FSAExGMMvvF1KpTtYl5o/PUo7e+32tE7R9VI1S4XXbeT0s+xH/P9H2zKESzKakMFYON0bABq+C4vNAUHcqQ/t7UBfGMBE0+7o+ZSlZFiClBfZSuC+shR9wWE9oNW1x2zmLMK6lak+hbuoJVnPTr1rmexQME31XKH2NylXOwxrg5UAUvSS/XFJOX/AmJ6TfESsb9qWr2WKfz2atdRV5p1M4UsJdrbyawHD5WS9zzS0uRPrbN+zeC/sieXgv+mbcUxBSLSRxNEk5UrtDH1yIp3kRlfqvVIsjVThxmFIEJMExEFnq2XAJUsx1jwZ7HwNsHMCBbAMp49SUCSWQDKDaB3+aiKxKmdHvzf8 Ph+IJd/v dKbIhdCIjNqzAWbfEgYgM3YEN+hXMuz4pBPNanZ2hQ4rvLRgldKNhgmpeNdrZMAAWvYP7HTAvL6A59G/MeqFVEeYXm62Tsw5c3g1qvLJhrhqkIPHeYU3XwToJlghc2G3Bs/kKuEr5mrYWVAQjH3KZEcqH6tdIawASOXaPVyvF7Ibpn0JfXgpAkr7h5vipvnetT+3W0FPkJI8kyN+3hZE7rs27Zv+N0whQNELAxjGweBLnSjByXmyRZo/r/Tyy+zIqhzKS+uMgAqwvGhYj2b4/Mhd3ti6kq1SwMPUiNztj5efhUjb3KuAOjGY9BCipd3iqGeaH7iIOa2d/oWsMWRJrXX4H+zGRwI2cucZOT+H/XBEJuH3fI4gwIdoMZiRvpt4P0Ekxq1lahGPJ2yhlN+lsqcrhuLmZMI48pEjZjn3au9q9voJQHo/Ntyx7o2Gtjm7S1B4XRLZ4iM4q0yAPdxxssrSNRlBAWM7h6FWtBi2pKzu1irE= 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: 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) Reviewed-by: Christoph Hellwig Reviewed-by: Lorenzo Stoakes --- 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