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 51A88C71136 for ; Fri, 13 Jun 2025 13:41:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 470C46B0099; Fri, 13 Jun 2025 09:41:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FBED6B009A; Fri, 13 Jun 2025 09:41:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C4EF6B009B; Fri, 13 Jun 2025 09:41:28 -0400 (EDT) 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 F25EF6B0099 for ; Fri, 13 Jun 2025 09:41:27 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AA320BB612 for ; Fri, 13 Jun 2025 13:41:27 +0000 (UTC) X-FDA: 83550489414.12.405A870 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 79F2A100007 for ; Fri, 13 Jun 2025 13:41:25 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LnbEofZD; spf=pass (imf14.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749822085; 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:dkim-signature; bh=v/F+9x18GPW2fMOX0xB9ZVXh7FNtANzBJLNRs0BqoEY=; b=CRRb9olI2EeQjDQT6yHDXZj4409hsibz5hnnauB/YKJyIne9y1jUFvnBJctv2p1Qi22Et1 qM1pnu3kCdeUBrm6dSHckJEb8GOp9+YGsTQ7V2XOaUIemnsnUemXOMWUEKsAs2tPW44x2j 4TsYGoS/rGiLeHWWejLDIzAstqVZN7g= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LnbEofZD; spf=pass (imf14.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749822085; a=rsa-sha256; cv=none; b=TMvN0glEpxYY9WWf54FDZkUJEIhXbjbumfgtL7saBBfo6yjluMwBmb/zsP8gehIO3Mfgzt e56JfZZj2iaQ6pcpvCXq9suDWOeZb/7mQifNAb1wQ25x++QtEst+/lA24ZH2h1qyYOKYiN 6Yv6Qw/yI+fsE8j5J6J3hnis+RJpX/8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749822084; h=from:from: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=v/F+9x18GPW2fMOX0xB9ZVXh7FNtANzBJLNRs0BqoEY=; b=LnbEofZDrTr6Y6pPzvNlc6SfpUqjmttplUVuf8UNyDnLk5eB6sZ6cMsss+o9ZSPXJrDl+a pIiQCQk38USRah+vtTNJr3kThRNkjuWizFX2zgsJf2JuvvCgi3Ewzwp2U28CA2x9RIn/Vk eRis5eQvmPmVBEMWOzaXqfinMMu2FQw= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-5-PvW8u1M7WQGLSel-WvLA-1; Fri, 13 Jun 2025 09:41:21 -0400 X-MC-Unique: 5-PvW8u1M7WQGLSel-WvLA-1 X-Mimecast-MFC-AGG-ID: 5-PvW8u1M7WQGLSel-WvLA_1749822081 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5e2a31f75so696841685a.1 for ; Fri, 13 Jun 2025 06:41:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749822081; x=1750426881; 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=v/F+9x18GPW2fMOX0xB9ZVXh7FNtANzBJLNRs0BqoEY=; b=YDhwop8klvwiIWc2Sd1C5RUa70ahd2DlPiKsd2MkGVunRbGyGH4CWUIkJcS50V6Y1T 9XuSXr/5tWKq3SS649YXzNi2bB+AjKNJzBY3fPwN1QKxpcQCYR6WENwDaFgYYoAEWv09 zjguKYeCX9bjdw4l3R7C6T4p4Xoy4JrnhbBdaQu0vkfwWD9tXnEQZOy61+8rh9S3EGpY d8ICVzfeDWOO6tIVqkM8aH+XVcFHpe0J4tRe6bQG4S9zisqc9/zEO2Kt2gSWkJWkgsY/ Tm28bhZLD7af4XsytBZhBrz6Y/vM/jnnavOBonw/tayr0uUODbPTFLrY9OM8BkQ/m427 /O7g== X-Forwarded-Encrypted: i=1; AJvYcCWlaYwDeBTZlyqjm98XCda3pvtj84Z7tzs1JxDIM0+KjbUTNwV8uwwft7PkH397iBRwKQGvwPiifQ==@kvack.org X-Gm-Message-State: AOJu0YxYG4eHMbZTuBpMAwCcdnb8ZOT80/pOCuNPiab94OsneViABusj k78TnobgTUDKNhdfDM7xwcH1bz6ShjonjJDgEMtqol/P94u2MiNBU++piIKJe8cKOhBTAGWwDLO tDAs1IeMFmV/gWsyUujY2DuXEOy/jco1vol0N9tLjEozC4PVnWV1v X-Gm-Gg: ASbGncv8SOVKD8gn3pCf3FmcuuDu3r14nZhE05AjqKzU6OrOwozqfzjofLWlEDVUOw/ Jq2+W1bl0P8bFyhHg98VL3jBqR03xBrmdyahssa/ieBt5nLyd3gnv/mecVvqIA5yRGrYQAOOEkt NmDEAw3pbNYhtCpNZCwCVsHVJzq+HzezfDkGbPyX8ynYgUEeY4Z5RquSe7RkfHI4IllinRog3g+ wx4a45KscS5LtED48Szm3QrxuWgq5CNAN2330wc9/tAWe9YMTvsp/4CU9OlWCcYWhZhC+SK2c1c 64YSkwqQ3j4= X-Received: by 2002:a05:620a:2628:b0:7d3:ad22:7851 with SMTP id af79cd13be357-7d3bc47c25bmr596010885a.54.1749822081229; Fri, 13 Jun 2025 06:41:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IED+auoBj/loYopQZCrkvQWTc00gLx9IMXiqmfkt7NzTeF6mlRUzM1RQY37rgcn1p4Rs3RbhA== X-Received: by 2002:a05:620a:2628:b0:7d3:ad22:7851 with SMTP id af79cd13be357-7d3bc47c25bmr596008385a.54.1749822080787; Fri, 13 Jun 2025 06:41:20 -0700 (PDT) Received: from x1.com ([85.131.185.92]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d3b8ee3f72sm171519285a.94.2025.06.13.06.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 06:41:19 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, kvm@vger.kernel.org Cc: Andrew Morton , Alex Williamson , Zi Yan , Jason Gunthorpe , Alex Mastro , David Hildenbrand , Nico Pache , peterx@redhat.com, Baolin Wang , Lorenzo Stoakes , "Liam R. Howlett" , Ryan Roberts , Dev Jain , Barry Song Subject: [PATCH 3/5] mm: Rename __thp_get_unmapped_area to mm_get_unmapped_area_aligned Date: Fri, 13 Jun 2025 09:41:09 -0400 Message-ID: <20250613134111.469884-4-peterx@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613134111.469884-1-peterx@redhat.com> References: <20250613134111.469884-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: qrS5cSreDbss3yDOL1rcqNr3VUifx091bsj0YEH3VoI_1749822081 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 79F2A100007 X-Rspamd-Server: rspam07 X-Stat-Signature: icm8s11tckjm4yu7g68day373jctgizc X-Rspam-User: X-HE-Tag: 1749822085-288347 X-HE-Meta: U2FsdGVkX19YXN7Y37o5WDRh+gRokKUQItnVczlPbAV7xgSjoNxAPubl0ud02uinc86XLtpooM6rPKP81FpdJTiJ0LW1g5g5EmqM3Q11GqYHde+tAVal8yWZ450nQBdNjFqC+EeQ8erFYBBOxvDUGthAS9emIcaUVAK8Sow3sExyaiyUl3vsiMiMe3VgMuX9Bm0/3u9tk4r6ffSty21SFwTiWjk2hR6Q8kIrljc2sMukIWBg5jM3/Oxjgay0U8YpHTBQu1IswKZF0GefPPNs6ukR20gETsOFCSQpts59ruOil2EW3lWb3GChSgzJEWkNRC1jMf4DzK4k5LdwzyCz+Y+I7sTDPSZ1fts8SX6Zx8MSZ40BKylfyimUU/+QSg74pgikFVU010InQ5/tjDHOZepH1Ec4ZYB18u98cMYWiSa0JnP+vwnmX8dIIyfxLBlA8xfNXHuEN1WZZNUtkHzn+jeGQ6hIT64jz5VXV9RaFgvUelRNra9hwpxk24WuqHBQUJBqRvRXHyzjltgaP2oQgxeuYtCIMLvKyJgVmfeUnsEUEgaqdeMUBAB+uR7vcQpNzS9W8E0pURcmpwnrrWsZIkNHDA8RJLyonQmnMHvuTLZVptRsxqUpy38t40SnVnODvh2kkTy5ipJmRUCBfo4oESku4LiZjq74ahH+PdkmlGQzOk2kjbHD0N2xhb1pZZubxRGppoDq0b0ruFLhCqaid2TalVXXEF+hVpOhcqq02TJa/hMey0dYE46sfiYClETQYbPg71GSicstCqfXFJDPvCasikX8kp2iQVL4Ic+9szoY5Y2XtNI/hEO+x89lGHVRzNfF8miIf1ctm+1seF8Cx2NhViztGtdi3U0QsMqVokPSz/KG2CriQqLApCzupCyCRZ60JJEie0j4AiRqURtSfbS9W8NuloiEZ/JST4oiSDD95FFa1oJsPY2dkr1awoNQAY1/y0GO4iKF5ibE66P Bg6eTwrY jXZlBHa0Og8EkqAFrvtJ7yRxst+romRbM1judDyHAPnJL1AxjIXPFrp0ju6qdCYi2NZB8HZLH9Hm5474/hKf2Le9WKxKXcKgjmgUDEqAr60D+yBS+Y9Y2zPhvM7PEs91FL0T9QKHfi6Iny9KXRYcdwb/XR4pVjhop+/XjHZEm2x+aO/6F7b4//h15Mal7/eHrubgVJ8VBpLGnR1zjOLoWPNvHtOBnnElnYnvYMOR2/AQdUgOJ2zvLw7nEfDd4V+G3BwJQ5LXiPDxJOvw1Ew0bOa2KqNyH74cey0aXHBqLVFadecn96Z24Zb2FATv7TC2Gtr1nUE1l9N+gT4r5g8WaEct2ePuv72l2J4+rmRkISy70jfKdqdkycdZIYSMTXTougddIQ4lXzqoY4STJpW/U7RGoyASCCE4sSKtKGw5HuUdxcOLI2JIs9FJBf2rbQUUDlcWXwTtokS6U0IDv0ghS1eG95LJcrbE5kje4zZYK2RXp0Er/pBaWGhLeqD74KeNSI4sx86Cc98Z+4twFqmxvMaWyOj+73oq/u2ow4DsVcLwW+GLreLeFlbKtbbtiTkaJo2Z7 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: This function is pretty handy for any type of VMA to provide a size-aligned VMA address when mmap(). Rename the function and export it. About the rename: - Dropping "THP" because it doesn't really have much to do with THP internally. - The suffix "_aligned" imply it is a helper to generate aligned virtual address based on what is specified (which can be not PMD_SIZE). Cc: Zi Yan Cc: Baolin Wang Cc: Lorenzo Stoakes Cc: "Liam R. Howlett" Cc: Ryan Roberts Cc: Dev Jain Cc: Barry Song Signed-off-by: Peter Xu --- include/linux/huge_mm.h | 14 +++++++++++++- mm/huge_memory.c | 6 ++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2f190c90192d..706488d92bb6 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -339,7 +339,10 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags); - +unsigned long mm_get_unmapped_area_aligned(struct file *filp, + unsigned long addr, unsigned long len, + loff_t off, unsigned long flags, unsigned long size, + vm_flags_t vm_flags); bool can_split_folio(struct folio *folio, int caller_pins, int *pextra_pins); int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, unsigned int new_order); @@ -543,6 +546,15 @@ thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, return 0; } +static inline unsigned long +mm_get_unmapped_area_aligned(struct file *filp, + unsigned long addr, unsigned long len, + loff_t off, unsigned long flags, unsigned long size, + vm_flags_t vm_flags) +{ + return 0; +} + static inline bool can_split_folio(struct folio *folio, int caller_pins, int *pextra_pins) { diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 4734de1dc0ae..52f13a70562f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1088,7 +1088,7 @@ static inline bool is_transparent_hugepage(const struct folio *folio) folio_test_large_rmappable(folio); } -static unsigned long __thp_get_unmapped_area(struct file *filp, +unsigned long mm_get_unmapped_area_aligned(struct file *filp, unsigned long addr, unsigned long len, loff_t off, unsigned long flags, unsigned long size, vm_flags_t vm_flags) @@ -1132,6 +1132,7 @@ static unsigned long __thp_get_unmapped_area(struct file *filp, ret += off_sub; return ret; } +EXPORT_SYMBOL_GPL(mm_get_unmapped_area_aligned); unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, @@ -1140,7 +1141,8 @@ unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long add unsigned long ret; loff_t off = (loff_t)pgoff << PAGE_SHIFT; - ret = __thp_get_unmapped_area(filp, addr, len, off, flags, PMD_SIZE, vm_flags); + ret = mm_get_unmapped_area_aligned(filp, addr, len, off, flags, + PMD_SIZE, vm_flags); if (ret) return ret; -- 2.49.0