From patchwork Thu Feb 16 05:17:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13142526 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 D9F65C61DA4 for ; Thu, 16 Feb 2023 05:19:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 760316B00AD; Thu, 16 Feb 2023 00:19:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E8226B00AE; Thu, 16 Feb 2023 00:19:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53A696B00AF; Thu, 16 Feb 2023 00:19:18 -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 3DF346B00AD for ; Thu, 16 Feb 2023 00:19:18 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3F458141007 for ; Thu, 16 Feb 2023 05:19:17 +0000 (UTC) X-FDA: 80472001554.07.0CF16D1 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf16.hostedemail.com (Postfix) with ESMTP id 75EE3180013 for ; Thu, 16 Feb 2023 05:19:15 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=KGDJpcNA; spf=pass (imf16.hostedemail.com: domain of 30rztYwYKCCkXZWJSGLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=30rztYwYKCCkXZWJSGLTTLQJ.HTRQNSZc-RRPaFHP.TWL@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=1676524755; 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=UQ3ySmwJxDlPKOGcVlpRpfqxPlYDfL6UGC9Ax4HzzOw=; b=noAZhO6FjQV4bzpqTVqgBzp7lTSf1ioiRi76x59aw7LchIThyAPnnRkJVzsS8O6BHy9QCk UZruMYN7sXll+lFXXk5l3V6GHeqRN7pUp/AgKpgLq4rnb4UXk7zNKSiKdh7KjpAACPZxgf R3RZZ4+CnqqczjTdWZQ/7Alz7K8qr9A= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=KGDJpcNA; spf=pass (imf16.hostedemail.com: domain of 30rztYwYKCCkXZWJSGLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=30rztYwYKCCkXZWJSGLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676524755; a=rsa-sha256; cv=none; b=GfS9uRJKfcpaKT52RTF+t79xfZXna11tUrapbnQh+yxgjWwAAMAl5h0HILklbW3hozK6SH Y7LZnyKdzgqJ5LJzS5XumKdY4qBGQXV98EguG+nOXEXw/YOW/xL558BNxhjKmpHmIDPdwK a+JVuYsoNCbWdCm3Dz7fsqAYICBc6DU= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-527501b56ffso8402517b3.15 for ; Wed, 15 Feb 2023 21:19:15 -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=UQ3ySmwJxDlPKOGcVlpRpfqxPlYDfL6UGC9Ax4HzzOw=; b=KGDJpcNA4oBtC5xQjxkPPkTW0kNBhMrSybgGLHrbBGSwSGEq+rySxMS3rk0dGM+Qo/ JpvUuwvGZIqjAVk+FVRsZ45D9AgvgQzyseylKUSLhPKRWFnmJExh3o/n5uArNAg9pZmc szoMYmExx5uq8bOtsbN9zvU5WJmapQpCTW9YfX5yCKinl4hK2fSO0QEupE6sIVAF6mis 0qvHvTjkF2AHE/zcyOYTuhnORntosRwKL2siaVlbrxc1aSWTq08YWLJWNhdZghaVxqan vIZPE33VZDXNYNH6tC5BE6Aqx0uXP/yBJaWCtfFr0Yvy7z7UrJ4q+Ys5HfXN3+WVCYvy Y1vg== 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=UQ3ySmwJxDlPKOGcVlpRpfqxPlYDfL6UGC9Ax4HzzOw=; b=wnwByVb+m/hwG3fBgoYZpdR9BkTBzuCiWc8RTg5fWzSEh8afSedYzE7N8vc8cNAn2A QTVTvTIlxAv5pmLrGAKrWOwcHQGzcQ+nNRDcXloWdA3x12FOPHzLcyqgr6y7yRMfuaBl UBQdtG+pmA4Ia9hIYWfODrIaNFyIGPlEkr6YEl77GiIsF0ESsproJth6tw3T9GL1W7+b DikLZHpC8H8SsaN/L+vd9EMNs+uSycBaMRCvLWZCIVkm6oiD7V+c921wtVHX2GI4TOMq Ryy4ONpzOyKgOw7E/JzSRC1c/poHNDKLOel222Xd9caddPvcgjCcCEEYk2AaUKYLANVV fagw== X-Gm-Message-State: AO0yUKWJC1pV7QKP++m3l+SYntmd2lOJIaBF7uWiK2h77kIQAWXzLeEs 2NTkIEMTzpWGgTVd49tVa0rzscdgsGs= X-Google-Smtp-Source: AK7set8KqluIZbArnLHWo7hLv5kb+HlUQLsv3CceFcKXduycZudkxodptdsBc1Ay4P83RAwvWnVWegqhxxw= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f781:d5ed:1806:6ebb]) (user=surenb job=sendgmr) by 2002:a05:6902:114f:b0:855:fdcb:4467 with SMTP id p15-20020a056902114f00b00855fdcb4467mr33ybu.0.1676524754468; Wed, 15 Feb 2023 21:19:14 -0800 (PST) Date: Wed, 15 Feb 2023 21:17:48 -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-34-surenb@google.com> Subject: [PATCH v3 33/35] powerc/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 X-Stat-Signature: pe5493mxbuaaxjzyi3doq8w8bn9pworf X-Rspam-User: X-Rspamd-Queue-Id: 75EE3180013 X-Rspamd-Server: rspam06 X-HE-Tag: 1676524755-869857 X-HE-Meta: U2FsdGVkX1+cDR7nJxZQE3Jc1ty9+Ax0vm5CpW3sef09xLMPr9Jzs8A872M+Eof7DsPDkdnuarSKbZNpZ9P6bFvicaYkc0mz5R46+qylJxBR9OgDUtVyxk4HHU1VqYv71ID/D1/n8Nr0Q8UkVRKo3qvnaSSxitClFjkrhO9uONpxwBEcRDNdJqdEHoE2as+xolWwz23JlD+z9uy2qRqN++AdEVf2ve71dxKkReY6A4AQ1rrL8YfnMs3ApEcJrG/nE0zgxQYAJKhxy6FgwaCNdRnWTD9oxSpCAM1jEF5eutlsF9uqVepLkbbIPPe68WjUGqfkEicmnRWFdDnINnchApleISAV4vQrVY8BPp8a7rNr2zLuuM50o+tEj9K7sUmOKfuf5S2jrahVApbWhdTm8tpuH9OwpMq0X6iSiMc2hmKBFLplbLFD/fPLlI0j4ZGK0Hq8aNd9tvBopXoSwUMJAj/BCBOLNpQwFLhduDxq7aQMapki6CZHRIuBTN8X9Bq1HUTWxdk5G5o5cOSO/j2CjcJSl7OawsDYmKhAXD/9p3WlD6wjKO81YHkKNi6N/vZfr5IIxQ5uVe2Z/KWphb0klufZjExJ+PB6i47b4TvIzM0uhOmhG0kmfGEORZZzfkfjqsSOEQERz+wMKlVf2CaRc9m+A7jpTpBAr7joqmWWAxXJjSP2SzgoND729EPrmm/72ncZec+JqXZzdDkxyUyEXebbtf7tsg58iO5yR7O9n/BzaPbW6N/b/WXztUgpvPyqpxCjJvIcCpkefMmb+by3W1IIkfsy74NHf60VD3NBs+jZOLWLG40Z3tFv9R0pYzhUGYwZZJGWuQciawQ3R1w2NQFUtc9e/9nwlxcRvWvsD3jaQb2QhNPvo5ZvIrtSPYrWWZQtrRQQQG9Mi4o1pNH5uf6SbIFYZZGZtoq3U/A1Eel2QPPchovqbOgPpA4DdjFwzeMP6GGCgeaYhOd29AQ eIXLudIq NnAvxGr0OKS6gp3FSxZkORv4dQvMdwfV1UXmGZN8yJgEpRRzgCUzgGlT2abKvOXTWi+XGJzPrirf08+1S3BbahfuYlpBox3PdIdY4NHgsOroF6ztyroYrJU315EsJVOTIeUsZvH7mppFi3/LvauDdDeMNPbJj+ADiQtJ3LVFZxp00AU9g2qqecO619SHxDyWycdjvUEeWfIcTvOXf3UZliBV7Kf60A61zeuyw1aphgj40R7pTPvaaeFEdMmODYEE9eegDZGrQoQQ7A3n+Wm43+Vldum+I3I2rE/B6CA1sfKUaQfWEe2SLVi8s0FWJAdfu8HaDXFIOCTBO//ZDM+MqgBrS98pfWi9U1tBadW/7bPL8v0T66vlsgNVsZuW6IzWcC6ndyWphzSQuJMxwZIbq7tFA5EY1jyhWK1nWSlXduDFSOcuQlfmqCsIfS8weCB0222N66G3TBg1NFk9sbNoLICK8klRO2gFg/4D+HP9zpnwTvqiuNAOPg+g3ExokQfGL9NpOi13cObJ6eaL8l6O0YR8cDbz2NYUYbvBNTwTgJ35DD0Q7InJQDoI2Zx/DsjfMDnTUcN8XMSpvWzF1Ag00Zn7utpNACuoZ7aPpA9zDUFCEng7lTBPcs4iQ4EziyLNUxhtpbhZQIr4qofS/Nd5D644T2A== 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: From: Laurent Dufour Attempt VMA lock-based page fault handling first, and fall back to the existing mmap_lock-based handling if that fails. Copied from "x86/mm: try VMA lock-based page fault handling first" Signed-off-by: Laurent Dufour Signed-off-by: Suren Baghdasaryan --- arch/powerpc/mm/fault.c | 41 ++++++++++++++++++++++++++ arch/powerpc/platforms/powernv/Kconfig | 1 + arch/powerpc/platforms/pseries/Kconfig | 1 + 3 files changed, 43 insertions(+) diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 2bef19cc1b98..c7ae86b04b8a 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -469,6 +469,44 @@ static int ___do_page_fault(struct pt_regs *regs, unsigned long address, if (is_exec) flags |= FAULT_FLAG_INSTRUCTION; +#ifdef CONFIG_PER_VMA_LOCK + if (!(flags & FAULT_FLAG_USER)) + goto lock_mmap; + + vma = lock_vma_under_rcu(mm, address); + if (!vma) + goto lock_mmap; + + if (unlikely(access_pkey_error(is_write, is_exec, + (error_code & DSISR_KEYFAULT), vma))) { + int rc = bad_access_pkey(regs, address, vma); + + vma_end_read(vma); + return rc; + } + + if (unlikely(access_error(is_write, is_exec, vma))) { + int rc = bad_access(regs, address); + + vma_end_read(vma); + return rc; + } + + fault = handle_mm_fault(vma, address, 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); + + if (fault_signal_pending(fault, regs)) + return user_mode(regs) ? 0 : SIGBUS; + +lock_mmap: +#endif /* CONFIG_PER_VMA_LOCK */ + /* When running in the kernel we expect faults to occur only to * addresses in user space. All other faults represent errors in the * kernel and should generate an OOPS. Unfortunately, in the case of an @@ -545,6 +583,9 @@ static int ___do_page_fault(struct pt_regs *regs, unsigned long address, mmap_read_unlock(current->mm); +#ifdef CONFIG_PER_VMA_LOCK +done: +#endif if (unlikely(fault & VM_FAULT_ERROR)) return mm_fault_error(regs, address, fault); diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig index ae248a161b43..70a46acc70d6 100644 --- a/arch/powerpc/platforms/powernv/Kconfig +++ b/arch/powerpc/platforms/powernv/Kconfig @@ -16,6 +16,7 @@ config PPC_POWERNV select PPC_DOORBELL select MMU_NOTIFIER select FORCE_SMP + select ARCH_SUPPORTS_PER_VMA_LOCK default y config OPAL_PRD diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index a3b4d99567cb..e036a04ff1ca 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -21,6 +21,7 @@ config PPC_PSERIES select HOTPLUG_CPU select FORCE_SMP select SWIOTLB + select ARCH_SUPPORTS_PER_VMA_LOCK default y config PARAVIRT