From patchwork Thu Jul 6 01:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 116469 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2245198vqx; Wed, 5 Jul 2023 18:26:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFF2tLnAMTh50Cp3RjhtDcKBsfc3hmxeaYjP77Lui+TTJVk58Ns6Kz4a/ztNKn1xeIBb+2W X-Received: by 2002:a05:6870:d626:b0:18e:af01:ad93 with SMTP id a38-20020a056870d62600b0018eaf01ad93mr1034020oaq.58.1688606776727; Wed, 05 Jul 2023 18:26:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688606776; cv=none; d=google.com; s=arc-20160816; b=Sa+cXlfBqpyK7xxJyn0cS4Gg5hf4gJIYTA7jrEhO1ty2+zX8mET40k9DPACrBCNk18 31bJNpCqS8Mc0YenJp+x06+zuZ4FmxmbwW7iDyczdeK6LEcJf4Gq2LJaxIZJu5RV1aYO IpJuvN9l5f+SlZgyn2fdtuhGrFsfR4Yph7X6lpAQSvDqyTrVvdbMBL73Zh0btoJiuHe0 1Ej5zhg4lfs5qMlZOFcWWxg57kCrecANCKNAL4jwUtAPcO1H6eiNXsm0SJlKhmkcP1ez KNbT9qw48qHq9YJbnManhfMgBFBSv306+RSn/VWPZl3zbGq+2jV91rdKnRaraIOQ5Ifc yw9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date:dkim-signature; bh=dRyQ8wft+e4cwUe/4GM3Z/J/mXzz/SW74opGciLdsgA=; fh=nzhkncz5xabQzrhgEb1MkFMbxxZbZAo75xFv/cDVpUE=; b=ud0DFM/iya40k0+rbVA95r+9TCNd8rcP1wo+ta5jVlkjEZyfRs0zb3ecS9go9oDhAj Qwmx1os6vI9EGCkF9GeF6meUQmoWYuRB6OShRACamCKb02jQS2ClIokEbHTScP7ByIWA gzeSpPkY1y/lS5ISnVLHGNpMeJYCAHvYGERGBeZw03AALGHIP9CbdocIgVmBk6aqtN1v b3L3jxSHXiChNv+g5i2zqtn2TLVeNBERBXuom8mTdbmlEyBvuTo2kMX8j6CdMQ5eVPEo X8NHRLwB6qvQu5swqxpr7pVXk0LRUKojjusq2RrDnL0FmO1Qiz0unE3isD30n+6DlDH1 vu2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=xMFTe33U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a11-20020a17090ad80b00b0026306b94ee0si475796pjv.135.2023.07.05.18.25.59; Wed, 05 Jul 2023 18:26:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=xMFTe33U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232319AbjGFBOK (ORCPT + 99 others); Wed, 5 Jul 2023 21:14:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232282AbjGFBOI (ORCPT ); Wed, 5 Jul 2023 21:14:08 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 698961997 for ; Wed, 5 Jul 2023 18:14:07 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5704991ea05so2923157b3.1 for ; Wed, 05 Jul 2023 18:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688606046; x=1691198046; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=dRyQ8wft+e4cwUe/4GM3Z/J/mXzz/SW74opGciLdsgA=; b=xMFTe33UghKj4/G8jSkl+aAMntxmpgQyUTj2jgLHCbBzVb7QaFsV3Qt5UoTcoYiY4e ynbz5c/7AAWVN4OWYl8Rutu8qVUj0BgMtJxbdqQQF9Jgj2E43IhnOz6jnjLRWn+jh8qZ j2jKUrzEpotfW6PkRYlwOxlBa05JaVxygK91qgISwSCJF2DgNiZZyxbTnZqSsVrACtS3 T0QKYCFZrPolcFgqdTex7G8qQAvSlc5QZU3T0X5EJgWJI+yUFCfWtKZGTVyoMQiosrU8 5V6sSW20QSvTmgMgA2i9rYZyRIgVoD6GV9SZ9bs/ZCOyIFX0hAk3ZF/G1pbDqovqnTVD 8e/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688606046; x=1691198046; h=content-transfer-encoding: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=dRyQ8wft+e4cwUe/4GM3Z/J/mXzz/SW74opGciLdsgA=; b=TnISV8B4MumyACqDVc5niW197acyrjstvV7BBfqNkfjZ0MUsiLXC250b7hc6H/lVRF oQlFpLWAgFaq+INE+bdqaQHALTqPSO6qnl+ZWq1nDbbqrjEMW8sQuqjToMt2nsO7LrWc ZrHW/h73rmP/YhKHEswwmg1z4aDWin8zBA6ANH6mLAIHofKJYdbXu2d4NOal6ojXnlwa 1P/pThGzua7OCVlAapWcswFMDCWrfc0cK6J5CZD2Sdej/zVXUyw11bW8wki1+aLwC8Sn ELBfVk/g2JOpH9MbCI247AqEjIETt+r+EhxuiroJGbgDyqjC+iitg3foC4vN+A8GytGk t5oA== X-Gm-Message-State: ABy/qLZASiJVZZrzDur6WrKsEFuTT6qWvpVZsXPnpSHSiMLK0AozYPWw T8OhDIZ/DaDTJCsopOZq8hyRiDzE22s= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:946c:be30:90d9:9093]) (user=surenb job=sendgmr) by 2002:a81:e409:0:b0:56d:5d2:1bb1 with SMTP id r9-20020a81e409000000b0056d05d21bb1mr5654ywl.2.1688606046365; Wed, 05 Jul 2023 18:14:06 -0700 (PDT) Date: Wed, 5 Jul 2023 18:13:59 -0700 In-Reply-To: <20230706011400.2949242-1-surenb@google.com> Mime-Version: 1.0 References: <20230706011400.2949242-1-surenb@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230706011400.2949242-2-surenb@google.com> Subject: [PATCH v4 1/2] fork: lock VMAs of the parent process when forking From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: jirislaby@kernel.org, jacobly.alt@gmail.com, holger@applied-asynchrony.com, hdegoede@redhat.com, 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, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Suren Baghdasaryan X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770632539292403664?= X-GMAIL-MSGID: =?utf-8?q?1770632539292403664?= When forking a child process, parent write-protects an anonymous page and COW-shares it with the child being forked using copy_present_pte(). Parent's TLB is flushed right before we drop the parent's mmap_lock in dup_mmap(). If we get a write-fault before that TLB flush in the parent, and we end up replacing that anonymous page in the parent process in do_wp_page() (because, COW-shared with the child), this might lead to some stale writable TLB entries targeting the wrong (old) page. Similar issue happened in the past with userfaultfd (see flush_tlb_page() call inside do_wp_page()). Lock VMAs of the parent process when forking a child, which prevents concurrent page faults during fork operation and avoids this issue. This fix can potentially regress some fork-heavy workloads. Kernel build time did not show noticeable regression on a 56-core machine while a stress test mapping 10000 VMAs and forking 5000 times in a tight loop shows ~7% regression. If such fork time regression is unacceptable, disabling CONFIG_PER_VMA_LOCK should restore its performance. Further optimizations are possible if this regression proves to be problematic. Suggested-by: David Hildenbrand Reported-by: Jiri Slaby Closes: https://lore.kernel.org/all/dbdef34c-3a07-5951-e1ae-e9c6e3cdf51b@kernel.org/ Reported-by: Holger Hoffstätte Closes: https://lore.kernel.org/all/b198d649-f4bf-b971-31d0-e8433ec2a34c@applied-asynchrony.com/ Reported-by: Jacob Young Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217624 Fixes: 0bff0aaea03e ("x86/mm: try VMA lock-based page fault handling first") Cc: stable@vger.kernel.org Signed-off-by: Suren Baghdasaryan Reviewed-by: Liam R. Howlett Acked-by: David Hildenbrand --- kernel/fork.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c index b85814e614a5..2ba918f83bde 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -658,6 +658,12 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, retval = -EINTR; goto fail_uprobe_end; } +#ifdef CONFIG_PER_VMA_LOCK + /* Disallow any page faults before calling flush_cache_dup_mm */ + for_each_vma(old_vmi, mpnt) + vma_start_write(mpnt); + vma_iter_set(&old_vmi, 0); +#endif flush_cache_dup_mm(oldmm); uprobe_dup_mmap(oldmm, mm); /* From patchwork Thu Jul 6 01:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 116470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2249153vqx; Wed, 5 Jul 2023 18:37:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlEEuUWXdBX1Ajk+gMTuG8YKJGIf2sRotolpam/n7rLnumvfSXak7N1K0UcQFgQ13f2b031t X-Received: by 2002:aa7:88c6:0:b0:662:5146:c761 with SMTP id k6-20020aa788c6000000b006625146c761mr642693pff.17.1688607476649; Wed, 05 Jul 2023 18:37:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688607476; cv=none; d=google.com; s=arc-20160816; b=E5YcyNeW3iOp38oNnRAPBBihSAgqaOz/oZM1mJDug7wUx5DaJucfmnqYaoGjU9rV/B nJFZV0/qu+dSASccUhn/P9x2NhR2rUtf9/a4YS65WkgDwRBwItQZ2wvEl7HJ5IU1cWiY JXWYF6agG9abuZUTanOlRPVdrvSZSnXaHMvjJrpwef3pCNdnUGibGrsijTMBeJDY5bkT Scrx0Vdvrn7UYsFXDQuL68Jjv9XFKhxrhm6mw+DG1rnvILCy3C08geDzeOuGkQTHtbxX P5qpdO18Jbjcbqr1cRBRMQiTvkZNAtSWKE+leM0WvnD4J7iW4PdQlcFdoyWLBe5ix2VN lwUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=BMMaNFIuSTODACKQNg6XDNNsjL1Pfx6pMDgwoYH4Ut0=; fh=nzhkncz5xabQzrhgEb1MkFMbxxZbZAo75xFv/cDVpUE=; b=B4uqW7X7YJgijdtopV5eCibmWcbHnMo+q6Q5Sz2TuoyrAUs3DhF2+hL+qrybDtU/1K 0Tr08FBJI8IXKON2c+dHiY0MbrLJUI1H/F5fSOGjRP9xs0PuIXCSAMioWM0eqWAgTyiR 3ZI3bUPNdkHmlRCLRsomFjiVTAfHXPi/kV6vDJhYuBdXmcQNTwe54D11ZjuiRXEOvDER 2KfMqq09k0Z9jiEt6wSb29kNWh11BQQGqVTi8lrBZZdrgJHbRvioHcmVdZ4MCPFx4YD1 2VWk+oa7LfMYylYceRnWZMVsrEl6FIOjszN/Yfbz8UaG67QJgKJXKlNZkPwzr8U4VXGY sTrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Yn5aRyUW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w127-20020a627b85000000b0067e34495f2dsi390048pfc.143.2023.07.05.18.37.44; Wed, 05 Jul 2023 18:37:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Yn5aRyUW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232458AbjGFBON (ORCPT + 99 others); Wed, 5 Jul 2023 21:14:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232282AbjGFBOL (ORCPT ); Wed, 5 Jul 2023 21:14:11 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACA7219AD for ; Wed, 5 Jul 2023 18:14:09 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-bb0d11a56abso104585276.2 for ; Wed, 05 Jul 2023 18:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688606049; x=1691198049; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BMMaNFIuSTODACKQNg6XDNNsjL1Pfx6pMDgwoYH4Ut0=; b=Yn5aRyUWACvrhkw4W9c/RrQ1vZVkQ3aETLIOHYDXUyaoQSnxwBiG3WfF5wRFwIFEvw weJQdiFsuoHFg7+9Knuii4aazDz880sQWUsYnqjniz/RcD+lsmIUy0RtMfI3EZOdknvG lfux25ysmzhfKTDzbuUftCdRHhS3/CZtHh7uU502n9ZsPETUnBcunocCrRCWmY4NthQM NYWKscTrHCCVV2l9q6DYpMlOWBsc7125yZXvQvDPOkzqa2jEVxhh++SxzCEucUU7Sj9Y PqugueozRZVh1tS8qAnhcSciZ/GC8dmxTaNU5U27m8aw8+rjObbB60wx6Je9TqxLz6zX mKCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688606049; x=1691198049; 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=BMMaNFIuSTODACKQNg6XDNNsjL1Pfx6pMDgwoYH4Ut0=; b=gNTKDQRLYtT59SsSRj64wrCj7CcrLwfU/UCrBJ2k1+U7gDfP108Ue/sUa++jGjNiQT sXK7ZiBpvA8F41LSwxayYpymwC6pCAdrhPNw0Gm2FR2GAYFaxqKCDVOuRx6R1+FoRj6L LBRA0KKVRldVWpiS0sRE2XWuDrzv+eK+gbyyfXdkhZghk2gvFGw4nMlbgggWGuy5n8Vj uZxXPygKqnDglvyPWiuL6+O61l8NBLnzgyoSC/txVS6WbzaeF/T5m9xgBIPqUUs4pEwb +ZfLfxsY2n9sTNR2J7tVeJBQkzBpAfeHAVgjUpBpondUzwdGjy+ZjlcSMQUTpvmJshag vB1w== X-Gm-Message-State: ABy/qLY0hYMSeqI1aJGaKO7qUST7eAFCAkN0O5qMf32amw8IodaghgVH cODpwOJWQWRlps20ccRqM/Gi1GURPnc= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:946c:be30:90d9:9093]) (user=surenb job=sendgmr) by 2002:a25:c6:0:b0:c4d:c7cb:5a4e with SMTP id 189-20020a2500c6000000b00c4dc7cb5a4emr2822yba.3.1688606048773; Wed, 05 Jul 2023 18:14:08 -0700 (PDT) Date: Wed, 5 Jul 2023 18:14:00 -0700 In-Reply-To: <20230706011400.2949242-1-surenb@google.com> Mime-Version: 1.0 References: <20230706011400.2949242-1-surenb@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230706011400.2949242-3-surenb@google.com> Subject: [PATCH v4 2/2] mm: disable CONFIG_PER_VMA_LOCK until its fixed From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: jirislaby@kernel.org, jacobly.alt@gmail.com, holger@applied-asynchrony.com, hdegoede@redhat.com, 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, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Suren Baghdasaryan X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770633273214797477?= X-GMAIL-MSGID: =?utf-8?q?1770633273214797477?= A memory corruption was reported in [1] with bisection pointing to the patch [2] enabling per-VMA locks for x86. Disable per-VMA locks config to prevent this issue until the fix is confirmed. This is expected to be a temporary measure. [1] https://bugzilla.kernel.org/show_bug.cgi?id=217624 [2] https://lore.kernel.org/all/20230227173632.3292573-30-surenb@google.com Reported-by: Jiri Slaby Closes: https://lore.kernel.org/all/dbdef34c-3a07-5951-e1ae-e9c6e3cdf51b@kernel.org/ Reported-by: Jacob Young Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217624 Fixes: 0bff0aaea03e ("x86/mm: try VMA lock-based page fault handling first") Cc: stable@vger.kernel.org Signed-off-by: Suren Baghdasaryan --- mm/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/Kconfig b/mm/Kconfig index 09130434e30d..0abc6c71dd89 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1224,8 +1224,9 @@ config ARCH_SUPPORTS_PER_VMA_LOCK def_bool n config PER_VMA_LOCK - def_bool y + bool "Enable per-vma locking during page fault handling." depends on ARCH_SUPPORTS_PER_VMA_LOCK && MMU && SMP + depends on BROKEN help Allow per-vma locking during page fault handling.