From patchwork Mon May 1 17:50:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 89131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp90159vqo; Mon, 1 May 2023 10:55:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5fj0H2I4MZXDs+ry0HrOhvy2Z8OWOMRzMzxLUw96joR7x/M00Qdu9OL0NgbdHpMPCfV3IN X-Received: by 2002:a05:6a00:a13:b0:63b:646d:9165 with SMTP id p19-20020a056a000a1300b0063b646d9165mr21595050pfh.26.1682963742335; Mon, 01 May 2023 10:55:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682963742; cv=none; d=google.com; s=arc-20160816; b=h166ybFmHqJUFn9kIK483wRivMxz+SOfcNxfMaKv5a1Mnu3nZkBdYyvy/JXbNyoT32 d2O4IrJ9gM5Yo2VEJeFVZC8he/3k2HwnmSe/VYpKPHXnJcClYtNms0ugCuoA9TOXpI6V SbvhQd6ZGwSGGLYsqpa2h+fA7SBn0tD8fhPI/29Z+fUUEGWI4MiCoLIZSqn8c8ttN1nr uYoZPyj0T+6CET3lWrI+Do+BBrdVcmGhux6K7tFOvKK9mUzls7J6QX8godmEruHBKAAe XGO4Dsn3leR+49da2osNpDLhhr+44F0DVlvqkc8+uT2IdCD/WYIEu89VTu5tfctkAogU e26w== 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:mime-version:date :dkim-signature; bh=Vjmy9npoFS1ltTIQSU6SYKXLbdap9UrmwfWM+Y2ixPk=; b=Vy7foVnHyRCw+g9Mv5AUG6T2vqhTr/fbwEuhegihaMzCV+wfmOtnazPAXmXvp5L6tf pW522ij9SRqCrNnaQrWuo7/teW15w4kHAK+VxPgFI/XDNh7zPC9x6qALr7zEZ9XUYLdM NUaN0dtc0KIX0SlAMbg/i3L+8UUZgh7/SSgUsaTTMnS0+T4Z3ZCeftn1KxmgOBPq49uz MpIyK8yxWOD5MlQtvlTHxuLs4guk4WMO0O7h4XT0DFwyrevxYxd1Y3sfHag6JL3NoGTy twYMVEMpYX+RvQFKLjV6hcRWuzijuPwIah4a9FF38Yn/FvBvmpT/ja1tmA3C/fXvB0wM dIsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=dZCcwJnc; 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 a127-20020a621a85000000b0063b78126397si28108054pfa.230.2023.05.01.10.55.29; Mon, 01 May 2023 10:55:42 -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=dZCcwJnc; 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 S229871AbjEARue (ORCPT + 99 others); Mon, 1 May 2023 13:50:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230429AbjEARuc (ORCPT ); Mon, 1 May 2023 13:50:32 -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 04ED910C6 for ; Mon, 1 May 2023 10:50:31 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-559d35837bbso54144037b3.3 for ; Mon, 01 May 2023 10:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682963430; x=1685555430; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=Vjmy9npoFS1ltTIQSU6SYKXLbdap9UrmwfWM+Y2ixPk=; b=dZCcwJncaHug3B8HkBJA8I4rogyge1EVTo4b3P8k7VcTSJVpEkICoBGsnhmO7W+EaQ BIxtz97RUXIfYWYlU1CJsKlwqGVGZ7x+vS+3P/rfb8ANuZUjR7SbifV/F6aSBN5z7ZRt /AMQ4KNfWlhXtFlPUDhe7iDHC11AWgJzvh0HYI/QSVDj28sAvGrMcNoB1jrqM2PiCRxV MKWY+ho9Y/9MhG5dJ5YP+l84eWwLxXehtDV3C+sB45yhtiKFovPsBc0ojtZnWpwnmUO1 OgbB8QClj+k71UJXHVn/U9WcLkhMORsNKUzA9GKVhmcWDmrnB5+OYkqWUJRZdkLT90UK DpmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682963430; x=1685555430; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Vjmy9npoFS1ltTIQSU6SYKXLbdap9UrmwfWM+Y2ixPk=; b=BsilZOOoLlkgaf5L8TRwYqLod7zmE88nRCfmPpYLrDiEB+xbxtKui2Rhvn84eE052T pOe6yBSzTCfniX9Gns3SQgvqqou0xpD8rjxFiBCmG2CMEr6twTt3Lgt0TJPQL+cNe7Xm imTpxXSg1PSGoLZ+djL/MfIMjMQOrlp5lxQxIoSFXKGTw25o9+xWOGaSdpOzxIImMvBZ qsPp8xz93J+798z2ruU7+roaDzl2mwl+fx782e0+4eZKTA44FBI7Og2hESkzv9kJ/lBV Q0jFN3rdZ9HLNQqLhfcVEOxi6Nudz2JVjMRjAkFWJEqmte1OOvT1WvRBh7OWBfmYCGAx 8vkQ== X-Gm-Message-State: AC+VfDy69IhJ9RyvZmrqrmWx6lT4npRUZeUxIWvKNHS4mS3nd+54/ce0 55Gt05d3yaSr3L7D6OdzqsDPvKWzYh0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:6d24:3efd:facc:7ac4]) (user=surenb job=sendgmr) by 2002:a81:9f09:0:b0:559:e830:60f1 with SMTP id s9-20020a819f09000000b00559e83060f1mr4687408ywn.8.1682963430249; Mon, 01 May 2023 10:50:30 -0700 (PDT) Date: Mon, 1 May 2023 10:50:23 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230501175025.36233-1-surenb@google.com> Subject: [PATCH 1/3] mm: handle swap page faults under VMA lock if page is uncontended From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: willy@infradead.org, hannes@cmpxchg.org, mhocko@suse.com, josef@toxicpanda.com, jack@suse.cz, ldufour@linux.ibm.com, laurent.dufour@fr.ibm.com, michel@lespinasse.org, liam.howlett@oracle.com, jglisse@google.com, vbabka@suse.cz, minchan@google.com, dave@stgolabs.net, punit.agrawal@bytedance.com, lstoakes@gmail.com, hdanton@sina.com, apopple@nvidia.com, surenb@google.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com 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?1764715389330672741?= X-GMAIL-MSGID: =?utf-8?q?1764715389330672741?= When page fault is handled under VMA lock protection, all swap page faults are retried with mmap_lock because folio_lock_or_retry implementation has to drop and reacquire mmap_lock if folio could not be immediately locked. Instead of retrying all swapped page faults, retry only when folio locking fails. Drivers implementing ops->migrate_to_ram might still rely on mmap_lock, therefore fall back to mmap_lock in this case. Signed-off-by: Suren Baghdasaryan --- mm/filemap.c | 6 ++++++ mm/memory.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index a34abfe8c654..84f39114d4de 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1706,6 +1706,8 @@ static int __folio_lock_async(struct folio *folio, struct wait_page_queue *wait) * mmap_lock has been released (mmap_read_unlock(), unless flags had both * FAULT_FLAG_ALLOW_RETRY and FAULT_FLAG_RETRY_NOWAIT set, in * which case mmap_lock is still held. + * If flags had FAULT_FLAG_VMA_LOCK set, meaning the operation is performed + * with VMA lock only, the VMA lock is still held. * * If neither ALLOW_RETRY nor KILLABLE are set, will always return true * with the folio locked and the mmap_lock unperturbed. @@ -1713,6 +1715,10 @@ static int __folio_lock_async(struct folio *folio, struct wait_page_queue *wait) bool __folio_lock_or_retry(struct folio *folio, struct mm_struct *mm, unsigned int flags) { + /* Can't do this if not holding mmap_lock */ + if (flags & FAULT_FLAG_VMA_LOCK) + return false; + if (fault_flag_allow_retry_first(flags)) { /* * CAUTION! In this case, mmap_lock is not released diff --git a/mm/memory.c b/mm/memory.c index f69fbc251198..41f45819a923 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3711,11 +3711,6 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (!pte_unmap_same(vmf)) goto out; - if (vmf->flags & FAULT_FLAG_VMA_LOCK) { - ret = VM_FAULT_RETRY; - goto out; - } - entry = pte_to_swp_entry(vmf->orig_pte); if (unlikely(non_swap_entry(entry))) { if (is_migration_entry(entry)) { @@ -3725,6 +3720,15 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) vmf->page = pfn_swap_entry_to_page(entry); ret = remove_device_exclusive_entry(vmf); } else if (is_device_private_entry(entry)) { + if (vmf->flags & FAULT_FLAG_VMA_LOCK) { + /* + * migrate_to_ram is not yet ready to operate + * under VMA lock. + */ + ret |= VM_FAULT_RETRY; + goto out; + } + vmf->page = pfn_swap_entry_to_page(entry); vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl);