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 541A6E7717D for ; Wed, 11 Dec 2024 23:28:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1455A6B00A1; Wed, 11 Dec 2024 18:28:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D3466B00A2; Wed, 11 Dec 2024 18:28:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E670B6B00A4; Wed, 11 Dec 2024 18:28:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B6A396B00A1 for ; Wed, 11 Dec 2024 18:28:22 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 43F08A18C8 for ; Wed, 11 Dec 2024 23:28:22 +0000 (UTC) X-FDA: 82884268446.21.72F8789 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf08.hostedemail.com (Postfix) with ESMTP id BC2A8160008 for ; Wed, 11 Dec 2024 23:28:04 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=FBidyf2e; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3EyBaZwsKCPwoepiwlwmrklksskpi.gsqpmry1-qqozego.svk@flex--kaleshsingh.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3EyBaZwsKCPwoepiwlwmrklksskpi.gsqpmry1-qqozego.svk@flex--kaleshsingh.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733959678; a=rsa-sha256; cv=none; b=zJW8O43H3n5kRpeIfq5RX6jcOv0VZvkX0SkN9yDsiW7sL3Cbpl0vC1AM62l0Ln3m8rjnaV HzbymDlnscEfodeWQlNNsMTmFOrPbObpujx4j1Zz1oeFPwPOAF1mdutUD1oTFTS6rLX935 VlS+goaLtNpZs+tpBJ3saxxUBu/YxPY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=FBidyf2e; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3EyBaZwsKCPwoepiwlwmrklksskpi.gsqpmry1-qqozego.svk@flex--kaleshsingh.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3EyBaZwsKCPwoepiwlwmrklksskpi.gsqpmry1-qqozego.svk@flex--kaleshsingh.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733959678; 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=uS3JA6w5wn3oIbxGMB+ie6BxkNausmcv0DhJz9a4fkc=; b=BpRyVtngcyToH5si3bPAreUkxNie+RVmGTnAeRlOiYQixudrsyhGnG3Sye4vvDhe3lGtvQ bxA6a7drcDM2DPEa04uRP695VlD5SXYMhr4unjBywyG/nm6S9NNtByFVgb9LRb7JBpO3Gn UAvyGJ2S7kOQ35quxxVNx7YdKTX9ijA= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2166a1a5cc4so26496055ad.3 for ; Wed, 11 Dec 2024 15:28:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733959699; x=1734564499; 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=uS3JA6w5wn3oIbxGMB+ie6BxkNausmcv0DhJz9a4fkc=; b=FBidyf2eVbCO7X6tW+0L6FsO37rQ22GnnP/8lKducyEqxXTznRHjEXtxmp0DBXcY8c u/xsQxG13aTCqM2pQzKyetropk5h+gx0m0qBZMqp6nwd3OLx+aMyDjCWoV73KMi3YNX/ wL2+4aDnaSIuhPqG+YHwGWyaCA3PZxgBCblHTWx19Onsf9QDVcG/DOMhbnPoYD4IZ+t9 ZlW0jvfLaguc8wDyRuknOQ8J7mfPstM6H1M3kmPrf3UvLL4I/auCOwfUzkAuwonvXxa9 V4IqMbyx8p4/viEcMtB6FNRZSKHz+NQqN6b5rORbG/j7GZ2F3UfOTsH2tF685JaNo5Ne bQ6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733959699; x=1734564499; 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=uS3JA6w5wn3oIbxGMB+ie6BxkNausmcv0DhJz9a4fkc=; b=LbDUsMyrjTr7uONP7HMgqhEkqGckDEIlQZMdK+jGDgUh6ZVCDNjFTkPHzd79ddKq9k c9+NgM/a9rxpDJ+uu0bGqwHBwni03pkGi2wUv5bjVPEHTH/6Qqf6nKAAHpwg5dl8hkrD KaNjuVi3QAeC8Tkv16kjIFFLhA4HHmOsrR32F4p5ZYJ41NxepmbeGeVwlO/PwRFv4Ltn yVl+gfh26fQ9VuQ2ECXMSS8hkfml0MsCfNKbDBiGncCtKVkWXyHWK2Zfo6/wVQRSvoZQ wFAaKEPNPm9MN1+1ReWSU5uJUpaq9eFgK8h7TNjN9+51i9h+R3Z/QlmdFuwperiEP3V+ 4+Ow== X-Forwarded-Encrypted: i=1; AJvYcCXBmagGBziFjXQthyyueDQYgtnpCjMF8R7eBupb2wakfphEul69leVNKTLsD+iEGTzd+YqMGAb0xQ==@kvack.org X-Gm-Message-State: AOJu0Yx88eVPxmyGYxzJZ26N0DofqJCdfKocpTehwFSJ96zA6KZA72K+ 8aOAslaKNbDj8GYJVKN7f+WMNtGV7nSM4LE6AP7cS7w7lj0R2ILGV1C2t/Jqh4JRX5QnJD+N/9/ IXlyKj0HkjFsvPH+3zUy+1g== X-Google-Smtp-Source: AGHT+IH7t7zoi6yI0PaPMLOJjSIpLoHx+Um10nYrD7SAuARxjRKOSw8DIf3dxsqs6hFZHoDsSpm8PlX4hDRCbsA6SQ== X-Received: from pgbcr9.prod.google.com ([2002:a05:6a02:4109:b0:7fd:4e21:2f5a]) (user=kaleshsingh job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d590:b0:216:7ee9:2227 with SMTP id d9443c01a7336-21778505a3cmr82109795ad.36.1733959699175; Wed, 11 Dec 2024 15:28:19 -0800 (PST) Date: Wed, 11 Dec 2024 15:27:49 -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-12-kaleshsingh@google.com> Subject: [PATCH mm-unstable v2 11/16] mm: sh: Introduce arch_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-Stat-Signature: ew8ze1gtk7xhgr3gdik9a3tiwj4nys6f X-Rspam-User: X-Rspamd-Queue-Id: BC2A8160008 X-Rspamd-Server: rspam08 X-HE-Tag: 1733959684-494082 X-HE-Meta: U2FsdGVkX193ZodJWx+bl4jLlmKPaDe4iMwNPb9grENrzobs5iheToCCFF/ibOqNhjW+eq+gcN2Od4TjQwwU22vtOXzDyuEoVFpSL7EkJnLzThmlDui6HdDr8ZCROScoNsbEm5mVbYJNmjtidqC3tjRL5UzOaj5fqPzkC1zb/YKO4qszM6IAEUgftHEVdR2vz9YoAjkDUIrWrOUa7iKMAkfJYwbOQE1wdnqtCAot2YoJKeYTUxHSY+2fmSL9F3HhYloed/xS/JdN7FCigCpgvQ8Ls/4ELKIvJpfH/HE9WNSsJav4UUYhz2F4ruDrh+yQx+oez+FaqaEQ6uwM/9oXaO+upe4xXqq3q2wLm0Zvr9ZAm92r6S1KrXfbSGnErLBywjW2sF6HtTrqqbFw+uhBtzV6YKuPjfFWeku+arWXyBOS4PyAK502Pz2P6YciQ3qani9P6AzPrOJ/a2x7avAB83ZGtKQytLBodEw0kqaveUIliarg2Vltz390En8DO9mw2nC6Mxd7aSiSV3ZGqmyn2tbr3ytpG1KSgrFBGPZXIAndrCuKDOgXt30dGP+uBWD2m4qw+EwtB/S1UDMbjmXG2zB8BbonTXazKQJaPA9pA/4teznR+RV09NAt0vXph8ioEmTRc8ewHSFAViO2Gb9+2GTSI3libwsXh/2LZ67CzvdvVzPUqhzD+I6XNdyT7IvcsljPHXq5BehR46uXt/DJZFEAbocVrHi0s1C5mJZkOwoxjWKDVXuh6isTGzcLoHpUH2JznDgZTd3avCQi3zePIQ4vlUuRcRPdKcWrBd8Dv6WAYSfZ6vNtcWuJPIQ80UWQsiRwFgBt6eSrpdkQQ5GVW7N4vI9YE5s6qcOSe0qe/Qb3x9WgFE/7XgHc2f2763gzhQb7ZmUlPcyc5X0Fftmot18Vb0nhARo6ow82IoXQM499IVA7UEZ0+lPa4s2Be+VjWBftQKUVOg1vkuVC0NY YYUgd9Bq jofaTTXwq+Fljo8f4u87qFl8pkITuQRCP7HQtgAj+kFaePh+rmfk1o7DFIS8FGyujr9VZ341jhFOoTtzH3v7v/LHnBI2YU+HJcnTtuJ4lIG5By8cWa3LL2F7QuHtA2tuM2PcUyfA3QHwHGkEttm1qLIjdLMzGw9ASgOXU2B2//MeMrUvnwy8QrfEThkBKvArBQA9U3FL6ll7lgBwcpLF+0oVebGcxU5+CLuScL8788BTcfVAgKaOvSv0L+RTkGtF0HZCkA04djqFYew1qDICnBbBZvfUAwKgvGbvVYv/sadjZnuHc0b9h41lsHvtXCR//8TP7SgGPZszBhu7IPMPmkXX87ipxfThwno62Bk/XdCPwapabQas2ZmuU2qS/4sSO61K1jtDTYsYjrlQvlQa+T+ihf47VPxafStP3GlZ+P0MQTNNp8ja/a6/fhPMMz1tMaUemQORFeBKWo0e/o0bZYsP69NkXvKFe4PL/OT76jPJxLg/O8c18ZC49G/iy/wYrawGvTDGMVHUuympRqHWfZNkEFP9e3rJcEhFKG5ezUkJhPiUlfwcD+n8fQ9tUEvAE3d//F2uHoG8Wg+Gx2HqYTYg1jtgEVYSJyk0fiWOs/GZLGc8efvHrs9ButthlE7lVdqXw X-Bogosity: Ham, tests=bogofilter, spamicity=0.026047, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Introduce sh arch_mmap_hint() and define HAVE_ARCH_MMAP_HINT. This is a preparatory patch, 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(). arch/sh/include/asm/pgtable.h | 1 + arch/sh/mm/mmap.c | 83 ++++++++++++++--------------------- 2 files changed, 33 insertions(+), 51 deletions(-) diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h index 729f5c6225fb..072dbe038808 100644 --- a/arch/sh/include/asm/pgtable.h +++ b/arch/sh/include/asm/pgtable.h @@ -149,5 +149,6 @@ static inline bool pte_access_permitted(pte_t pte, bool write) /* arch/sh/mm/mmap.c */ #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN +#define HAVE_ARCH_MMAP_HINT #endif /* __ASM_SH_PGTABLE_H */ diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c index c442734d9b0c..ebda962e8c4e 100644 --- a/arch/sh/mm/mmap.c +++ b/arch/sh/mm/mmap.c @@ -51,14 +51,14 @@ static inline unsigned long COLOUR_ALIGN(unsigned long addr, return base + off; } -unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, - unsigned long len, unsigned long pgoff, unsigned long flags, - vm_flags_t vm_flags) +unsigned long arch_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; - int do_colour_align; - struct vm_unmapped_area_info info = {}; + bool do_colour_align; + + if (unlikely(len > TASK_SIZE)) + return -ENOMEM; if (flags & MAP_FIXED) { /* We do not accept a shared mapping if it would violate @@ -70,24 +70,29 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, return addr; } - if (unlikely(len > TASK_SIZE)) - return -ENOMEM; + do_colour_align = filp || (flags & MAP_SHARED); - do_colour_align = 0; - if (filp || (flags & MAP_SHARED)) - do_colour_align = 1; + if (do_colour_align) + addr = COLOUR_ALIGN(addr, pgoff); + else + addr = PAGE_ALIGN(addr); - if (addr) { - if (do_colour_align) - addr = COLOUR_ALIGN(addr, pgoff); - else - addr = PAGE_ALIGN(addr); + return generic_mmap_hint(filp, addr, len, pgoff, flags); +} - vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vm_start_gap(vma))) - return addr; - } + +unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, + unsigned long len, unsigned long pgoff, unsigned long flags, + vm_flags_t vm_flags) +{ + struct vm_unmapped_area_info info = {}; + bool do_colour_align; + + addr = arch_mmap_hint(filp, addr, len, pgoff, flags); + if (addr) + return addr; + + do_colour_align = filp || (flags & MAP_SHARED); info.length = len; info.low_limit = TASK_UNMAPPED_BASE; @@ -102,41 +107,17 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, const unsigned long len, const unsigned long pgoff, const unsigned long flags, vm_flags_t vm_flags) { - struct vm_area_struct *vma; struct mm_struct *mm = current->mm; unsigned long addr = addr0; - int do_colour_align; struct vm_unmapped_area_info info = {}; + bool do_colour_align; - if (flags & MAP_FIXED) { - /* We do not accept a shared mapping if it would violate - * cache aliasing constraints. - */ - if ((flags & MAP_SHARED) && - ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask)) - return -EINVAL; + /* requesting a specific address */ + addr = arch_mmap_hint(filp, addr, len, pgoff, flags); + if (addr) return addr; - } - if (unlikely(len > TASK_SIZE)) - return -ENOMEM; - - do_colour_align = 0; - if (filp || (flags & MAP_SHARED)) - do_colour_align = 1; - - /* requesting a specific address */ - if (addr) { - if (do_colour_align) - addr = COLOUR_ALIGN(addr, pgoff); - else - addr = PAGE_ALIGN(addr); - - vma = find_vma(mm, addr); - if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vm_start_gap(vma))) - return addr; - } + do_colour_align = filp || (flags & MAP_SHARED); info.flags = VM_UNMAPPED_AREA_TOPDOWN; info.length = len; -- 2.47.0.338.g60cca15819-goog