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 6B900C61DA4 for ; Thu, 16 Feb 2023 05:19:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A8256B00AC; Thu, 16 Feb 2023 00:19:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 030D86B00AD; Thu, 16 Feb 2023 00:19:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DECD36B00AE; Thu, 16 Feb 2023 00:19:14 -0500 (EST) 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 C8DF06B00AC for ; Thu, 16 Feb 2023 00:19:14 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A424BA1132 for ; Thu, 16 Feb 2023 05:19:14 +0000 (UTC) X-FDA: 80472001428.18.4A2BDA2 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf30.hostedemail.com (Postfix) with ESMTP id E6C5080018 for ; Thu, 16 Feb 2023 05:19:12 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=aft7yDPM; spf=pass (imf30.hostedemail.com: domain of 3z7ztYwYKCCYUWTGPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3z7ztYwYKCCYUWTGPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--surenb.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=1676524752; 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=REPTBg+i2LhaxaiXpF8lrF3nvI6zBhAH5JQxrJ1l/Gg=; b=PnYhyNS6ZjZTaz8YX7x55rUk4Kknqigg9qaPzMbjRxgPvl327WQQf6d98SmhYkQX8mMb8d nhlA0dZrunjft6lNi6RHQ+BTbRHYuraipW2yKBu/tu9YCi8QgJ1t3YYTAQjexTh32CrTPG ETioiGkZkWYcC9Q/7+g3mB2gnyMc8/c= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=aft7yDPM; spf=pass (imf30.hostedemail.com: domain of 3z7ztYwYKCCYUWTGPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3z7ztYwYKCCYUWTGPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676524752; a=rsa-sha256; cv=none; b=Znp1zxUdaPi6HZYZU8TP39LQTkKi1hNbyqVrY63nMT8xjtGeLChImTd38pQXc6/oHnmGGp kvwpTgY5sdYryJRhy5V9Od3nzZGrHIoAdA8e4pu7ZOzuBJQNG44Xu5pkUO9qGiV8BLNRnK e45tGxoIeJ6mYeyrOjE2YssOvg5VggU= Received: by mail-yb1-f201.google.com with SMTP id q127-20020a25d985000000b009362f0368aeso884010ybg.3 for ; Wed, 15 Feb 2023 21:19:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=REPTBg+i2LhaxaiXpF8lrF3nvI6zBhAH5JQxrJ1l/Gg=; b=aft7yDPM8GMTHB06MFPSYtKh6oWhZ8a8LMFo6PcEI9pnNLntVOlXFNQs/1Yvf52/5v q7Mb9j3IbqGydOQagHUnsSeX/sfiJUssC8Nuv1RApw1dHW5T8YzKas/LnJ1orI0tqnNj 0nSP5pSWAhACQCuzYc7axzYrfhmKcyRBbpYSaW4sNEVU5J76PVU7lF/u3PAFDwnMoS0w 449nI+g12YKzlYuLkXvI0hBRvnRJV+xrScZAqKlTKhgGwG9sA/5/r9CeoVq4yrFt/yH+ v8L5/t9gLYQIZy7UnUIKS96KONHOM4/bkOuXUpcfaqGPz0nskdK5CUeyDODt2k3AI1C9 6jaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=REPTBg+i2LhaxaiXpF8lrF3nvI6zBhAH5JQxrJ1l/Gg=; b=hzIEWkuE+KSZGeW0lyovp+kVpbYuXUY6EWR/+U+e+Kg0a462bLbbw8uJyuH/FeG/HC FsUtFhq/e2IFl+nlvVecvFIpMQP4B+M32uROVo4ggh6lkG37CIoavESyC7VGi6P51L2a EtwVayxbDBzxBFte7H9lR1856Q/JXnukBhUEZwBDa8kfi1HZ45/9Ln7O8v9nO9ZwW1N2 TrC9Ewt5HPCrijoq93R5fvGSp6fp2pYFePcMShlTzSF4EwFGANzbvJarsB3gTsYpgqZm ELXYWbXtPzTvbzKfrQ1B4n+DLB8z+52Vnr0YdKp4RxIZ2TYNCnvB3fBWksRFnBrPpPmL iX2w== X-Gm-Message-State: AO0yUKWtuCUCPwSKXzhTJNCzKFeeK+o8yb15ZA50crJLzNmyioTH1FcD bcBNq1cd9/10YriWjNLeFSCgJUE4CMg= X-Google-Smtp-Source: AK7set+v0FR2W9n0VmO9fC7d0HyR1AW4QGVl+/6/uhiM7Ww0w+Lt/AynlEHt7RfffNYQztU45jTBm0A6vi0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f781:d5ed:1806:6ebb]) (user=surenb job=sendgmr) by 2002:a5b:d49:0:b0:90e:37e9:1e01 with SMTP id f9-20020a5b0d49000000b0090e37e91e01mr1ybr.1.1676524751194; Wed, 15 Feb 2023 21:19:11 -0800 (PST) Date: Wed, 15 Feb 2023 21:17:47 -0800 In-Reply-To: <20230216051750.3125598-1-surenb@google.com> Mime-Version: 1.0 References: <20230216051750.3125598-1-surenb@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog Message-ID: <20230216051750.3125598-33-surenb@google.com> Subject: [PATCH v3 32/35] arm64/mm: try VMA lock-based page fault handling first From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org, mingo@redhat.com, will@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, punit.agrawal@bytedance.com, lstoakes@gmail.com, peterjung1337@gmail.com, rientjes@google.com, chriscli@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, rppt@kernel.org, jannh@google.com, shakeelb@google.com, tatashin@google.com, edumazet@google.com, gthelen@google.com, gurua@google.com, arjunroy@google.com, soheil@google.com, leewalsh@google.com, posk@google.com, michalechner92@googlemail.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Suren Baghdasaryan Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: m6qhuy1i1u7uyzsjqtttwjbicpidwu6t X-Rspamd-Queue-Id: E6C5080018 X-HE-Tag: 1676524752-117143 X-HE-Meta: U2FsdGVkX1/zno6gOWwe+KSWfWLm5fBH4BY1Ghklz6HXZ95hA/pbdjW6R3NER6GZVFipRFxazB+PyLdf1Cs/Er2qbfwGbl7lk4+HJHHklq18jRVe9LldF/uC0guN1Yv1N8+82/PxbKQby8TR/sw/GXwy9n+reY6zRaFLhAbSpiUv6r4yMyegnGObsOX1ndRMFYCsiyTkm4QTL60P57yqASPdf5dalY94TOcoKCIs6/xy3qjPqjMHKgwzdYjEMYpeBJW2P/933Jkuz5e6sr6haR9BOEtdl43gnLzChHFZ+RNmLykakiD5ewSGDQvkOeO5yPmFux1O2uxQafdM2uyEi/H4qmrXAy4UuEiWZUXQwYhYpx3tugbdWzSrVR92z2gaLCFqsr3dEivaZYtHjc3QbzqjLy4XYVHvWkvJjdr4nh89Ebc+y4FtNQvSHyNSCMUnqVd/ariWZEO5bD8cZQFlc/2Vp1eHqYK8YkPXJFjvDhQx4Elp1oK+7aQ04VZkuO2/Lsb7ipLmLIproiQLgzqUpHYTq8lZNrTBUD6gWADCNtr4Ugn5AwDd60aorIsJAYLxKnlcjoEgY5nWJ1T3ow6SnGcn9bWKJRn5by6JflyAJfYGue6vRoWINctcuoU2/drlMBQCcsPhknUMAVAuIh4ztH5ahRer4eOGoao7w6Q5uZ91YEcxOSW7B7VmHlwG8uQWFPniBPGFHIkv3vO9yFCM8+McQdJOkD7nnoJ7KEjnwmXEKWV8nq03HINOR4c8BndKhY8aeolkGzjJCyil4KaNzX2cXonmqbAysfQOaoLWyQZYzLqkE81D4jhJwybtiHn/NJakHti7/pn12Vw2354N1AAGeDVwYelLlbAIyCk98xtcagXnBGRrzFyCpF5HBBN/pjH0yz2r4hho0qwWGYLe3Yb8gVm4GElA8RzpsoF7pY+7hH9d9O66+OsYiw+8p3rD/dtRZEi0GLwppzRmP6x LBx2KZNM dakMvv7dpBS0Egv0I1x6M5mKNNnej+Ex60hf+664Gi8esWZW7JqoY4pYNDaCRRvRABZg6NmyYufNreYzSknzSWwmEytEXshdL7vvfKnc85I8meOwWoDiZhIBK/uIUrFvm41rvZfvaeRTWpGSOesdQhEkLo1rEAjmhlpTe3e6yru6HPXPBFZ0y8PJX8TofZyVTE/u/dQG2t1RySBF0knlWHf27krGhTlv/thsH3B9vSiQaoOzd2LrnEXbIXGwo63BXq+5XnoEZ9Sigur81UbI63xm2OAiMe8CgpHboHdZTnQhmPqHMoHfZfa+ohjzbx8AIJxdexUQA9ZElO3rlVNYtFr7sQaUFf2y+EAwWElLu/l2YuP3hjsOV9zIRfM0oT+knY27usebTbYjnL3X7TzhvXpPkQjlz0bKuR8CJMYLuy1D+6G5ox2givsjP0J8zdWTgk+5/Ij3Cmtk7HF7NRfa0TmN4iqaaLzfYaebMXQDVD90hqFOOThRcfItyfpqNbEpwhChmMX5AIKFLmt8Zw5Yfu2yP4w== 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: Attempt VMA lock-based page fault handling first, and fall back to the existing mmap_lock-based handling if that fails. Signed-off-by: Suren Baghdasaryan --- arch/arm64/Kconfig | 1 + arch/arm64/mm/fault.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c5ccca26a408..9f2c0e352da3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -95,6 +95,7 @@ config ARM64 select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_SUPPORTS_PAGE_TABLE_CHECK + select ARCH_SUPPORTS_PER_VMA_LOCK select ARCH_WANT_COMPAT_IPC_PARSE_VERSION if COMPAT select ARCH_WANT_DEFAULT_BPF_JIT select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index f4cb0f85ccf4..9e0db5c387e3 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -535,6 +535,9 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, unsigned long vm_flags; unsigned int mm_flags = FAULT_FLAG_DEFAULT; unsigned long addr = untagged_addr(far); +#ifdef CONFIG_PER_VMA_LOCK + struct vm_area_struct *vma; +#endif if (kprobe_page_fault(regs, esr)) return 0; @@ -585,6 +588,36 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); +#ifdef CONFIG_PER_VMA_LOCK + if (!(mm_flags & FAULT_FLAG_USER)) + goto lock_mmap; + + vma = lock_vma_under_rcu(mm, addr); + if (!vma) + goto lock_mmap; + + if (!(vma->vm_flags & vm_flags)) { + vma_end_read(vma); + goto lock_mmap; + } + fault = handle_mm_fault(vma, addr & PAGE_MASK, + mm_flags | FAULT_FLAG_VMA_LOCK, regs); + vma_end_read(vma); + + if (!(fault & VM_FAULT_RETRY)) { + count_vm_vma_lock_event(VMA_LOCK_SUCCESS); + goto done; + } + count_vm_vma_lock_event(VMA_LOCK_RETRY); + + /* Quick path to respond to signals */ + if (fault_signal_pending(fault, regs)) { + if (!user_mode(regs)) + goto no_context; + return 0; + } +lock_mmap: +#endif /* CONFIG_PER_VMA_LOCK */ /* * As per x86, we may deadlock here. However, since the kernel only * validly references user space from well defined areas of the code, @@ -628,6 +661,9 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, } mmap_read_unlock(mm); +#ifdef CONFIG_PER_VMA_LOCK +done: +#endif /* * Handle the "normal" (no error) case first. */ -- 2.39.1