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 60C46E77182 for ; Wed, 11 Dec 2024 23:28:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DE276B00A5; Wed, 11 Dec 2024 18:28:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 38DAF6B00A6; Wed, 11 Dec 2024 18:28:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B9B66B00A7; Wed, 11 Dec 2024 18:28:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EAADF6B00A5 for ; Wed, 11 Dec 2024 18:28:25 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9D4191414D4 for ; Wed, 11 Dec 2024 23:28:25 +0000 (UTC) X-FDA: 82884268908.16.32DBD5A Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf04.hostedemail.com (Postfix) with ESMTP id B85F640012 for ; Wed, 11 Dec 2024 23:27:58 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=i8ykNCNA; spf=pass (imf04.hostedemail.com: domain of 3FiBaZwsKCAElbmftitjohihpphmf.dpnmjovy-nnlwbdl.psh@flex--kaleshsingh.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3FiBaZwsKCAElbmftitjohihpphmf.dpnmjovy-nnlwbdl.psh@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=1733959685; 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=aLForDZ3L8G53NDE8CmnbZXOU/eHam8tpqogo1+J+z4=; b=BkZ2suhkzt8CAtaXWPVZau9j+Ri/TQCw9Bp7yjs2quaJ3i2uY6Epn8x3T9ZfOunNuxPgzP lirm+RPNJcpEuJMW2Ew9pbtwkLVDhVP7Doe7FOYJzV7P+y3gYgK6T48LM9vT8emzj9TC3J DqL3u/OzvFxsOV9P7LcZsWtZ44HoBtY= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=i8ykNCNA; spf=pass (imf04.hostedemail.com: domain of 3FiBaZwsKCAElbmftitjohihpphmf.dpnmjovy-nnlwbdl.psh@flex--kaleshsingh.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3FiBaZwsKCAElbmftitjohihpphmf.dpnmjovy-nnlwbdl.psh@flex--kaleshsingh.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733959685; a=rsa-sha256; cv=none; b=mi03dw6MopEcBi6fV1h0ZEDm+popu9uLa9rDzSAEJujgtyfvJWyez6BEXBPDqHJpvfF1EG YMTGEsV/d8wtHZ4dmjt6lAVCICfg14Z2JXxJT1BmqcVly4iMyJkDt6DF4Miwtj6YVJEy0z evAuez2bcTdiN7gI5slHRF8gYTqgea8= Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-728eb2e190cso13284b3a.3 for ; Wed, 11 Dec 2024 15:28:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733959702; x=1734564502; 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=aLForDZ3L8G53NDE8CmnbZXOU/eHam8tpqogo1+J+z4=; b=i8ykNCNAouOUl3HjhYD4RjQzF0Bareh+K8K8AznlofmbXnwtVXqomypWjCzbo85Xad eoWf+R9RFD8RDI5GT+2xBTLGwsxL0cc1mGO2JM7ouXkYtCD4tPbhmQktVkNkhKqLbqQp pBvpxrHrUHHBU/PiuGkqH/g38KcGVzMoq01HYq78tiQCEQ3DGnKMRmjvgVjtFqNnGOWi omdNvcfepSDepfVcGq+Iw2nHuefGJJDkytIq+OqY9Kt274HI5dhqbJh9FThS1dQn1fNt x8I1Z9p7ORtVbKb1DVCnWGxU6ok1AwSgmJAMoT2miYuMKi+fyGueH9R0WMj2yC8Ir+aP grGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733959702; x=1734564502; 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=aLForDZ3L8G53NDE8CmnbZXOU/eHam8tpqogo1+J+z4=; b=E4NbZZgTkOx+IW2e8jxmaZ8YDIpGzpDDl7viKvfrJIREPFaansMlWrVhcXpA2S9Hyb bncN6ll3xlxhz6g+hvKt4+nv+T96x898acy5oGnNZoxTZrT8Dfw38HfXP1C6r6HZbWis ziky35VCuRjZyX/1jKhmHYLlSaIvDhGLZvbJVcQKtaBxi36jq/YhvQOA7E77DEY8Mjle E02V35DRttdIhcHBLDQfcW8UNmvOBlNd8+0oJHXQAYome1XOKfCU/3R/mKeoHHB0NI+n 3hpeHhpVe3nwyYmaKsxts6JrinAsPhjP6fVmLbXpD/hH1x7r1j0ynrq1e2EbZlUkMw76 c6aw== X-Forwarded-Encrypted: i=1; AJvYcCXOdZMZ4hFmOcmNPpU6RLOQg0+PEPxT+hiM0d5Erh81xDDqIcSqwvc1QWgLCZJwTKy0S+p0B8FfVQ==@kvack.org X-Gm-Message-State: AOJu0Yy/vcSsCHvngSKXDmmPzSzjwzO4ANkUhAP1JnmhLlmIfnrI7f7a vB0MZyfV8o2K7VmCSwNwfw1UC+m9+abHMr2/IpxHe9t0CnUiuz+5EIVK+QgkIGQSMkUl4I1ojrR P/qo/fS3BlRrjQQMo09jPSw== X-Google-Smtp-Source: AGHT+IGWTEcN8NSoCgFvsRpfbkF7zue8+P2XAq5n+JVkXUUPL+bOWBEsvAKL/CZzz2D8WnFsu8nT+1urmYWqTc7eRw== X-Received: from pfaw10.prod.google.com ([2002:a05:6a00:ab8a:b0:725:ee5e:6efd]) (user=kaleshsingh job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:92a6:b0:727:3cd0:1145 with SMTP id d2e1a72fcca58-728fa9a8139mr1688780b3a.2.1733959702467; Wed, 11 Dec 2024 15:28:22 -0800 (PST) Date: Wed, 11 Dec 2024 15:27:51 -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-14-kaleshsingh@google.com> Subject: [PATCH mm-unstable v2 13/16] mm: sparc64: 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-Rspamd-Queue-Id: B85F640012 X-Rspamd-Server: rspam12 X-Stat-Signature: 7c4gygbx4jmi97xfe4uitobex5nmbzq4 X-Rspam-User: X-HE-Tag: 1733959678-897006 X-HE-Meta: U2FsdGVkX19CZlitN+2kJjOOn+7tg2Y7QBwkEsqXs62KFY1ZnsROlSYL+LyHj79uVtPNqOjwCfmZ86SUSPFmTRDENZn0duWYizdxXm3O9b+x97DV65PH9aWRegK8ObF98OQ/syNHIZOqQA1djSfPUGzbq/2Tvu8kgyeHPlVkNVVNWXKNObe5yav/RFeeyz5iWekJjDWoW5rUZ/r6dtOu1zeMu4a8clPhjD5PjDq2JaVFaxEo+b76q+k8WmEdVhqZPMQ7mW9gRkHeWDVKl8T/f7b7lKJDscQU3wiODw7jhdZntzioFaya5SJSGWEugNM/CZvg0WH9X5sj7PS/VpAqOmAcyOEPBml4mKkRoz9xq3/1/ArMkySzAr/LGzpIG1ShDlmyFKOpX4GOBzpkwR8qsBz8jTKnvmKOZBvMfsqfYs0MiHd/uCNjCHZAWbcfiqrZ50gkkhQBdUlMR8yzhQ+92FYHv5mqQ/f6WrS8x5H6qBjL10OdL+IGhrfNlAaffqvItfioS7CGsYKHuwXD9Yl7pr9BM2YjIyBKR6c+6giuL/D/B6td8pu5fFJ11JNY3f2b5UZPVlrznuuDMWWN33WnN7ld9xpKMs4S/zTlW06ne/KTJ/0rTLyVac5/q4ne05aFNXyDgnTpoMI0+I6W6EkhS4GrTYGaS07s/wt9r8UkC3ApJwhus/Ojm49Z8ipfpw249aMK/FX5IhxncpIhX9HCmyDy7XUWRDmxitGFh4Ipss3DIe1c2lT/qfYpDWeVkJWLiOJdr/Ykg+f8XGV9AhgMNVsbEBOcxZIdL3Eco9cYibHiQ8xL3x6eFK3IMrTB/Hl5c5qwu2BmSq+lgPZllt2Tn4w0jhpNcAfNsFdgFYh0e/FBccKewDLY6gu/AKBSsHD7o7v4ofmP4yr96/9C4s6OAOl7ooMhmEiKKGrZ3OYV+0m+Z592MLenJITM8bhTfDeZnrZQAzoL5Q6vB97aZL5 /oo9z2lG LC3x6utRIJw2yfRJ8/+FNnWduE5v/4k3UOCLVQIvZg9KG6nuHVNy66fe9MONybdM7Y9sFRfoqx53giiGl6QjBby+gTodtqum2RGjbT6+8qL1FyzP+BwyYHXyckaznQnfSKLE/RyXqBAZ9EBk2MzgxPN0NXd036zDUvhmm7LGCK9B9AhuUirrInf9KmvgZBLSS8U7flmiOMQv9wX7XWsdd1k8S46xGv6yL62oPjoLwt6Bpy6wZS16RL3QhnsnkO6ryDnoY22DUYEZb7rdP7itCXjAq65ZaHEGe1Znn3gU26cr+vDHzhLLDmfN8QKEUyE2wRWK6kRpm8ww9VyS5qCNjvswxfV0kxMFAOzvcGjxF4N1DU/PEmp4Bw/MmIRGyBAG5vMMwv21BSOivQjM1Abt/TC9iXR9kbtfAmJbxLkHc3uSp05J2fOlt5+EEuBk3svyjBlY+d4Yt5mP06f+ry5WWh6wwAIOa6qVX7DwH86DM8CmAF7KXVReWYslXntDHov8JQIXSv5IbFScxNEYmLKmxEGMuCZGAgaXRmdWwhyuqWLe1x5+7+IpNOxFeU5eOKwBe3DpwuzeSPkdDcsOLHYoPr1qn9ZbvXeYxAQdsC5DvRRUQ4swFjIoHzKcJz6ql3FysmI6a X-Bogosity: Ham, tests=bogofilter, spamicity=0.051391, 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 sparc64 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/sparc/include/asm/pgtable_64.h | 1 + arch/sparc/kernel/sys_sparc_64.c | 96 +++++++++++------------------ 2 files changed, 37 insertions(+), 60 deletions(-) diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 2b7f358762c1..f24a4eb2777b 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -1148,6 +1148,7 @@ static inline bool pte_access_permitted(pte_t pte, bool write) */ #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN +#define HAVE_ARCH_MMAP_HINT /* We provide a special get_unmapped_area for framebuffer mmaps to try and use * the largest alignment possible such that larget PTEs can be used. diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index c5a284df7b41..e44d55b30a84 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -98,17 +98,19 @@ static unsigned long get_align_mask(struct file *filp, unsigned long flags) return 0; } -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; - unsigned long task_size = TASK_SIZE; - int do_color_align; - struct vm_unmapped_area_info info = {}; - bool file_hugepage = false; + unsigned long task_size; + bool do_color_align; + bool file_hugepage; - if (filp && is_file_hugepages(filp)) - file_hugepage = true; + task_size = test_thread_flag(TIF_32BIT) ? STACK_TOP32 : TASK_SIZE; + if (unlikely(len > task_size || len >= VA_EXCLUDE_START)) + return -ENOMEM; + + file_hugepage = filp && is_file_hugepages(filp); if (flags & MAP_FIXED) { /* We do not accept a shared mapping if it would violate @@ -120,26 +122,29 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi return addr; } - if (test_thread_flag(TIF_32BIT)) - task_size = STACK_TOP32; - if (unlikely(len > task_size || len >= VA_EXCLUDE_START)) - return -ENOMEM; + do_color_align = (filp || (flags & MAP_SHARED)) && !file_hugepage; - do_color_align = 0; - if ((filp || (flags & MAP_SHARED)) && !file_hugepage) - do_color_align = 1; + if (do_color_align) + addr = COLOR_ALIGN(addr, pgoff); + else + addr = PAGE_ALIGN(addr); - if (addr) { - if (do_color_align) - addr = COLOR_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 = {}; + unsigned long task_size; + bool file_hugepage; + + addr = arch_mmap_hint(filp, addr, len, pgoff, flags); + if (addr) + return addr; + + task_size = test_thread_flag(TIF_32BIT) ? STACK_TOP32 : TASK_SIZE; + file_hugepage = filp && is_file_hugepages(filp); info.length = len; info.low_limit = TASK_UNMAPPED_BASE; @@ -164,49 +169,20 @@ 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 task_size = STACK_TOP32; unsigned long addr = addr0; - int do_color_align; struct vm_unmapped_area_info info = {}; - bool file_hugepage = false; + bool file_hugepage; /* This should only ever run for 32-bit processes. */ BUG_ON(!test_thread_flag(TIF_32BIT)); - if (filp && is_file_hugepages(filp)) - file_hugepage = true; - - if (flags & MAP_FIXED) { - /* We do not accept a shared mapping if it would violate - * cache aliasing constraints. - */ - if (!file_hugepage && (flags & MAP_SHARED) && - ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) - return -EINVAL; - return addr; - } - - if (unlikely(len > task_size)) - return -ENOMEM; - - do_color_align = 0; - if ((filp || (flags & MAP_SHARED)) && !file_hugepage) - do_color_align = 1; - /* requesting a specific address */ - if (addr) { - if (do_color_align) - addr = COLOR_ALIGN(addr, pgoff); - else - addr = PAGE_ALIGN(addr); + addr = arch_mmap_hint(filp, addr, len, pgoff, flags); + if (addr) + return addr; - vma = find_vma(mm, addr); - if (task_size - len >= addr && - (!vma || addr + len <= vm_start_gap(vma))) - return addr; - } + file_hugepage = filp && is_file_hugepages(filp); info.flags = VM_UNMAPPED_AREA_TOPDOWN; info.length = len; -- 2.47.0.338.g60cca15819-goog