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 E1E4EE7717D for ; Wed, 11 Dec 2024 23:28:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D8A26B0088; Wed, 11 Dec 2024 18:28:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 589C26B0089; Wed, 11 Dec 2024 18:28:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 402116B008A; Wed, 11 Dec 2024 18:28:03 -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 2201E6B0088 for ; Wed, 11 Dec 2024 18:28:03 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D823CC1803 for ; Wed, 11 Dec 2024 23:28:02 +0000 (UTC) X-FDA: 82884267900.05.A1E4700 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf04.hostedemail.com (Postfix) with ESMTP id F219140007 for ; Wed, 11 Dec 2024 23:27:35 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wbhOES29; spf=pass (imf04.hostedemail.com: domain of 3_x9aZwsKCOgUKVOcRcSXQRQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--kaleshsingh.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3_x9aZwsKCOgUKVOcRcSXQRQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--kaleshsingh.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733959656; 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=i4sLwXeXnZGwZmaOI+TJwHO8calXr1XpV7HCaSQYyYY=; b=Kx0pb6he/FwsQgOF3pdl02/lljja5rci8VxAbZ27tvOhS8iVOKFJU15DVxfjYm3WVT2NLp IPkiUqxH/j2ZbqUnpMn6gPQ7JC5HwSfgZlF5YGg2AgP0WPtALi6cO62rqrY4gi1MzXpRM6 TTcw8mM2n6nENSjHEArh+a054Nwi2pc= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wbhOES29; spf=pass (imf04.hostedemail.com: domain of 3_x9aZwsKCOgUKVOcRcSXQRQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--kaleshsingh.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3_x9aZwsKCOgUKVOcRcSXQRQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--kaleshsingh.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733959656; a=rsa-sha256; cv=none; b=VuaKGg9IVmz9BsY5S7a0aYWjF38+xa0cOlOCtK4WBD+r1AgR7yFhhS+UWcIv1OY5el8wtc 19sYW7t5mVa8jaEv8L+dz+kQDNUJ0An5kzIELQCDiQsFz5vmM06Eq+zrJcSHqviBbydIk8 TS4hou86SZJ9fAs1fUINAwK+e5tNNrU= Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-7ea8c2b257bso43422a12.1 for ; Wed, 11 Dec 2024 15:28:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733959680; x=1734564480; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=i4sLwXeXnZGwZmaOI+TJwHO8calXr1XpV7HCaSQYyYY=; b=wbhOES29ZHQiV1L3RyoxcTM22ej0C74iX8l2W3NQT/PB0K5v82CQJ+UMCYQnu4TFdE 2yjUMosEqfnM9FxBfHJHWGLz4Wz4A77E+dTIh5aDnlmbXt6UKbDtbL+Ja1oG71w/bSup poZITAsukgqyBDLDJmAn4lXJlf89xAvHl1TP566M8TiwbUKER7iCUTrM75YhI6U9Lk+7 7MTrBgo6J9Bkf2rc15eBflitVeG6Zb7aJiHXIvvY0bxd9BEO/5zrg/OqupEWIZ7U9QUy /N8C8mV5FdMJlDNMYKrbBxMbLFeJJBYqHeetyUlYzu7QuX1r9rJ1c0XjnRIcxB/lvBxg AvKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733959680; x=1734564480; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i4sLwXeXnZGwZmaOI+TJwHO8calXr1XpV7HCaSQYyYY=; b=CxtuOUDgwxsY+B9CB+bKr2QGGIEyWjRHCadzIybWqVsEh0UVhJCOUGPqazkDdM1hxZ 1OK2Q+V0K1/q2lBpdSnO6wlLnMjocfI7nY1zX9gBZUF56bbcH0dK+b6tP46o1ZpC5raa kf4aO9TOLYXgJx2LB299nvPmv0UBZf4NpE7wB1Nb38rrgMEm2tT0W7NDYmE1AghA+Ng4 eo2glh4TrD5wCNU+oblxSliD/k8dByy8ybgZN9EeaGoeRiA7TrMicrxU1lZeGs4FAFKI 1UcUkbYfIjPrBYSxerNGTUcGtw2Kxy/6mZkC8bRykyzQvjkwaOs+aceQyQdYASGT6KVd xpyQ== X-Forwarded-Encrypted: i=1; AJvYcCW9/hREMhkxNJw+ZmjOqNwwDiFz7wF9UvOVQxXsmcZfYZ4ROCdUoTpbdiAJE+az2YCdwTyunxOtkA==@kvack.org X-Gm-Message-State: AOJu0YzlHlPmO2GeBk12/pG84Y4fjXGrm59ndLNKpyccMNz6dLej4kl2 4V7W0oN8pxDh2Ek7T1iDQXi+JaJk8BrwS843sXK7VQSHIn1lxIBLZQc6Kg5UHEIFIaEKKEflySq UZr1N1frPoBbJHNVKvgzs3Q== X-Google-Smtp-Source: AGHT+IFtd/N2pCFnI2u1d5m96JgTZmL7tbAt9a9u3MHy4m9H51vxoRQ9F2QC80/CNULE+uh+FoVAQHYq51Gg3PfRrg== X-Received: from pjf11.prod.google.com ([2002:a17:90b:3f0b:b0:2ea:29de:af10]) (user=kaleshsingh job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2790:b0:2ee:f80c:688d with SMTP id 98e67ed59e1d1-2f12802a503mr6866191a91.25.1733959679820; Wed, 11 Dec 2024 15:27:59 -0800 (PST) Date: Wed, 11 Dec 2024 15:27:39 -0800 In-Reply-To: <20241211232754.1583023-1-kaleshsingh@google.com> Mime-Version: 1.0 References: <20241211232754.1583023-1-kaleshsingh@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241211232754.1583023-2-kaleshsingh@google.com> Subject: [PATCH mm-unstable v2 01/16] mm: Introduce generic_mmap_hint() From: Kalesh Singh To: akpm@linux-foundation.org, vbabka@suse.cz, yang@os.amperecomputing.com, riel@surriel.com, david@redhat.com, minchan@kernel.org, jyescas@google.com Cc: linux@armlinux.org.uk, tsbogend@alpha.franken.de, James.Bottomley@HansenPartnership.com, ysato@users.sourceforge.jp, dalias@libc.org, glaubitz@physik.fu-berlin.de, davem@davemloft.net, andreas@gaisler.com, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, chris@zankel.net, jcmvbkbc@gmail.com, bhelgaas@google.com, jason.andryuk@amd.com, leitao@debian.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, kernel-team@android.com, android-mm@google.com, Kalesh Singh Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: F219140007 X-Rspam-User: X-Stat-Signature: uechdezjrxsj3hrrccuhaetxqh6816aq X-HE-Tag: 1733959655-679012 X-HE-Meta: U2FsdGVkX18wXdfcQNUviKfcqByGJ1RFuuIUXdI+pB3GmKKALz/6gLksTpT7a1jUIvbn6AoPveJy5y4CY4Ygu8hbmSQaA4Tw4N5VG/yUX80g9OtDkYIA+HpTKtnoHn5cKJxatnujshmCXr5Y4l3raUC/3nypSasHlbfdL5z2OFUS/eDQy4G7rE88yrbBf7cRHokZSPTXlBjwT8A1rP/tTs5AWFp7g7wYGSILun2mzbAmc9vG4ArnNPH1AQk44oVZWd0WuZ0HaxJB/cOGqFlSmpM0rQXv+lITkFFGgAYTXoCm9hBzkJ6tnVYwQauUaKnFjrFo75rjVbMc181FlRLgf/RnFaDFG4oMQktGdeMv8IBB+L3ycpEHw+GnsCYp5txDqCz39zYWfCMsm8qW2cZdInRhS31wnw34zMI2mFw5nDkkLE5bvuQ8hKpgPvK/UpAjvNFJzx5Bo6hH6+39e2YiSNizahWLPMo+/LNb/GyvQ3fT262+kNeAV6GCnFM+Gn3ej8X8X/vR3f+mMQlSiLpWOT4FlFHC3nz9mHDarMEKkBh4GDX+LQn7PP5b63mgafJTTEvmYWE7gNt1MofuoQglXve0Kjv0VakMBOLvbfwENo/oOpTmRvY4LgLqgGiA4LKhKb+h2dthyzzLsj8mJxyaf3afc4IoONrCL7OVkIwW/4IYZqh5IMPcMfXpffxmss7DZhEBcTltRMycE00GwVyKgXgIx44sHMtnq0+Qmv9cGu2kUjwWNwCEgKCf3GaYesQJ+mbLhXrmvg3/1XhQepQBnwHKdS+SfPHkXiY9NvQ37B23RWn9cHhbzwfkkkxxffgxXQJJr8itiBS9zfjipdg9VHAZDnrUSge/Wi1Rzn9SgLbOnAZZxMG905Xk2VBtwSr22QlHy6WOib+wdwRuM1NiKQHYBYCUSkbFps8Hx9wCXO+y+EfjHSLhdGdcZpVU4ROazzAi0vDJkJxPZuMCUkT Yl9+n8St vy/dLWxNFx0n2ECmWKwE5nkSDhXnd9CTx2OseNOH1wkw1l1kWPpKfQzf4HXa8X2AC6270O4lK5B9CPEV/bgCShm+ydbZyQMg5Ji5f3eKfjgeZWgaopa3ZIzzAyKdUTWJPaHuxEkt4tX2zLGK6C1beT2wpzPmq8Zy2LhgN7XM5jDAnIJ2X+GUMn3QfbfvhrEGpfaH7+r/mxogGD0QIrpvVinP5UTq5ToSC2EvPH6BT+jE1mvn1iH1C3XU/93ZZmiBSqyHQhhsFAgm6dkODCRHVPg0Je9LZU+5jL/kLUOZVQLt2z+7joGC+8TC3Wy8hJWdyp8NITkjnh/IwGVFIz79hVcu35ToVVb1ehao5iYAHGPGHREhfow0S0Lf6u4vObQSSwspTJFdjvq18/ruNBefI2/sg2gxr1Ne5ZjKNbXhmfEkOVFfIEhQbX1eAycJeQsTmOcuv1rfgQIH8Eccf9HjFXDVoOFTvcW9lv+zWjjl5I/BwncoYrKGOjnQL+dnp2YD19xJwYvCfag1S7MAEje4dSRSk7bYvJIVs8JHXhkaq/Fxx0mNs9PVZAZ6gi4/btjzYdA7oZCqkEIl12FxpMfDjWfL6MF1ga8HzO0r/KxR9THa1TqM6iJpAecW05eS44BoxFtS9+cDuRGFzEo1JpAny3RawA74TEPiDTyxL X-Bogosity: Ham, tests=bogofilter, spamicity=0.157873, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Consolidate the hint searches from both directions (topdown and bottomup) into generic_mmap_hint(). No functional change is introduced. Signed-off-by: Kalesh Singh --- Changes in v2: - MAP_FIXED case is also handled in arch_mmap_hint() since this is just a special case of the hint addr being "enforced", per Yang Shi. - Consolidate error handling in arch_mmap_hint(). include/linux/sched/mm.h | 4 +++ mm/mmap.c | 76 ++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index 928a626725e6..edeec19d1708 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -201,6 +201,10 @@ unsigned long mm_get_unmapped_area_vmflags(struct mm_struct *mm, unsigned long flags, vm_flags_t vm_flags); +unsigned long generic_mmap_hint(struct file *filp, unsigned long addr, + unsigned long len, unsigned long pgoff, + unsigned long flags); + unsigned long generic_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, diff --git a/mm/mmap.c b/mm/mmap.c index df9154b15ef9..382b4eac5406 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -620,6 +620,47 @@ unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info) return addr; } +/* + * Look up unmapped area at the requested hint addr + * + * NOTE: MAP_FIXED is also handled here since it's a special case of + * enforcing the hint address. + * + * Returns: + * ERR_VALUE: If the requested mapping is not valid + * 0: If there isn't a sufficiently large hole at the hint addr. + * addr: If sufficient VA space is available at the hint address; + * or MAP_FIXED was specified. + */ +unsigned long generic_mmap_hint(struct file *filp, unsigned long addr, + unsigned long len, unsigned long pgoff, + unsigned long flags) +{ + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma, *prev; + const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags); + + /* requested length too big for entire address space */ + if (len > mmap_end - mmap_min_addr) + return -ENOMEM; + + if (flags & MAP_FIXED) + return addr; + + if (!addr) + return 0; + + addr = PAGE_ALIGN(addr); + vma = find_vma_prev(mm, addr, &prev); + if (mmap_end - len >= addr && addr >= mmap_min_addr && + (!vma || addr + len <= vm_start_gap(vma)) && + (!prev || addr >= vm_end_gap(prev))) + return addr; + + /* Fallback to VA space search */ + return 0; +} + /* Get an address range which is currently unmapped. * For shmat() with addr=0. * @@ -637,25 +678,13 @@ generic_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long flags, vm_flags_t vm_flags) { struct mm_struct *mm = current->mm; - struct vm_area_struct *vma, *prev; struct vm_unmapped_area_info info = {}; const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags); - if (len > mmap_end - mmap_min_addr) - return -ENOMEM; - - if (flags & MAP_FIXED) + addr = generic_mmap_hint(filp, addr, len, pgoff, flags); + if (addr) return addr; - if (addr) { - addr = PAGE_ALIGN(addr); - vma = find_vma_prev(mm, addr, &prev); - if (mmap_end - len >= addr && addr >= mmap_min_addr && - (!vma || addr + len <= vm_start_gap(vma)) && - (!prev || addr >= vm_end_gap(prev))) - return addr; - } - info.length = len; info.low_limit = mm->mmap_base; info.high_limit = mmap_end; @@ -685,27 +714,14 @@ generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags) { - struct vm_area_struct *vma, *prev; struct mm_struct *mm = current->mm; struct vm_unmapped_area_info info = {}; const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags); - /* requested length too big for entire address space */ - if (len > mmap_end - mmap_min_addr) - return -ENOMEM; - - if (flags & MAP_FIXED) - return addr; - /* requesting a specific address */ - if (addr) { - addr = PAGE_ALIGN(addr); - vma = find_vma_prev(mm, addr, &prev); - if (mmap_end - len >= addr && addr >= mmap_min_addr && - (!vma || addr + len <= vm_start_gap(vma)) && - (!prev || addr >= vm_end_gap(prev))) - return addr; - } + addr = generic_mmap_hint(filp, addr, len, pgoff, flags); + if (addr) + return addr; info.flags = VM_UNMAPPED_AREA_TOPDOWN; info.length = len; -- 2.47.0.338.g60cca15819-goog