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 3AE41C77B78 for ; Wed, 3 May 2023 01:05:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A46316B0072; Tue, 2 May 2023 21:05:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F6E26B0074; Tue, 2 May 2023 21:05:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E51E6B007B; Tue, 2 May 2023 21:05:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by kanga.kvack.org (Postfix) with ESMTP id 695146B0072 for ; Tue, 2 May 2023 21:05:55 -0400 (EDT) Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-55b7630a736so5434217b3.1 for ; Tue, 02 May 2023 18:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683075955; x=1685667955; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=m4150D4K6PFkw/p8ZQzw3oDIGR67QJcGBtSkoT4wUnc=; b=VT/lpwegPmHfVwQRL263/dFBOGViLcIOmDFEKSDN0JoXp3qHS1srQa34+xoWI2Bo9d YAYLzTw+/PUqOwvAjrk4Ftff8F5kJWlKfFXLm6SaNUq9sMQIEBd9rc7Y5AZ8mLD4/gub P+kVvr9ZVRY31CA33v0UJCQVMLkj77IGdF4r9KJwyIFqNBZisXI+Doy/0kXlk/GNwh8k z+LPUjrG+aqA4j2X7/gCMWy17ZSZ2BwqdcFI/QRv5WL4oWVVT1mr8sG4aD6IKapKQSwu 6mPF3QhOongfrXuWyvUfMuO8ddN1xX1lXjXEaGjKSoOoUaiURn0+HFK99RDAGm9pYQkF x4lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683075955; x=1685667955; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m4150D4K6PFkw/p8ZQzw3oDIGR67QJcGBtSkoT4wUnc=; b=lii0LsLXh1TL/9FORJp86sjx8+GupZnNBsSRV2iiJPx4tCaBFJtn/FRAyj0yZX2Lvp ZfDIPUexkCUYPqEaJ95dD5i6ucovG8Pxfr+6v4cSe/YgOAdCa75CbkS7ZAyiJnapIESt syWSRswxeoZvHl5Veox1CI5t1J0I7fzb9EMSbYPAHST45LHFAs5Re1JsobapndeV6Vwo JpVo/9O8iEMfG7Pl3tgC/NXjwt617H71lA9YvTOGMBHX7aK7HRnJGI3v0OcBi/vGKggu 44RepnOsBqlOjt7Op6BEwmHyz0qlhBmmIIdV4bBuo1i8hZJLBKG2UJMcoUhLiZKYRvaK ynMA== X-Gm-Message-State: AC+VfDyn8YB9GLF7M+2/YcBmYtREXLsTKBbWcXwH4JrbYBALET4AHFbn ptygZfKPqpN56xClMQjZkgLrPbmok1USv5ZXM69YkA== X-Google-Smtp-Source: ACHHUZ7cagiPfB6DVMqItZRu7qL1h7Wan4Y5rk+T4jkv3yUULWQ9G2mryIrQk1F+sybOs2QQQ1mH3gTdh8agGtHShnk= X-Received: by 2002:a81:7507:0:b0:55a:20d5:1e38 with SMTP id q7-20020a817507000000b0055a20d51e38mr10843182ywc.40.1683075954559; Tue, 02 May 2023 18:05:54 -0700 (PDT) MIME-Version: 1.0 References: <20230501175025.36233-1-surenb@google.com> In-Reply-To: From: Suren Baghdasaryan Date: Tue, 2 May 2023 18:05:43 -0700 Message-ID: Subject: Re: [PATCH 1/3] mm: handle swap page faults under VMA lock if page is uncontended To: Matthew Wilcox Cc: akpm@linux-foundation.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, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: On Tue, May 2, 2023 at 4:40=E2=80=AFPM Matthew Wilcox = wrote: > > On Tue, May 02, 2023 at 04:04:59PM -0700, Suren Baghdasaryan wrote: > > On Tue, May 2, 2023 at 3:31=E2=80=AFPM Matthew Wilcox wrote: > > > > > > On Tue, May 02, 2023 at 09:36:03AM -0700, Suren Baghdasaryan wrote: > > > > On Tue, May 2, 2023 at 8:03=E2=80=AFAM Matthew Wilcox wrote: > > > > > > > > > > On Mon, May 01, 2023 at 10:04:56PM -0700, Suren Baghdasaryan wrot= e: > > > > > > On Mon, May 1, 2023 at 8:22=E2=80=AFPM Matthew Wilcox wrote: > > > > > > > > > > > > > > On Mon, May 01, 2023 at 07:30:13PM -0700, Suren Baghdasaryan = wrote: > > > > > > > > On Mon, May 1, 2023 at 7:02=E2=80=AFPM Matthew Wilcox wrote: > > > > > > > > > > > > > > > > > > On Mon, May 01, 2023 at 10:50:23AM -0700, Suren Baghdasar= yan wrote: > > > > > > > > > > +++ b/mm/memory.c > > > > > > > > > > @@ -3711,11 +3711,6 @@ vm_fault_t do_swap_page(struct v= m_fault *vmf) > > > > > > > > > > if (!pte_unmap_same(vmf)) > > > > > > > > > > goto out; > > > > > > > > > > > > > > > > > > > > - if (vmf->flags & FAULT_FLAG_VMA_LOCK) { > > > > > > > > > > - ret =3D VM_FAULT_RETRY; > > > > > > > > > > - goto out; > > > > > > > > > > - } > > > > > > > > > > - > > > > > > > > > > entry =3D pte_to_swp_entry(vmf->orig_pte); > > > > > > > > > > if (unlikely(non_swap_entry(entry))) { > > > > > > > > > > if (is_migration_entry(entry)) { > > > > > > > > > > > > > > > > > > You're missing the necessary fallback in the (!folio) cas= e. > > > > > > > > > swap_readpage() is synchronous and will sleep. > > > > > > > > > > > > > > > > True, but is it unsafe to do that under VMA lock and has to= be done > > > > > > > > under mmap_lock? > > > > > > > > > > > > > > ... you were the one arguing that we didn't want to wait for = I/O with > > > > > > > the VMA lock held? > > > > > > > > > > > > Well, that discussion was about waiting in folio_lock_or_retry(= ) with > > > > > > the lock being held. I argued against it because currently we d= rop > > > > > > mmap_lock lock before waiting, so if we don't drop VMA lock we = would > > > > > > be changing the current behavior which might introduce new > > > > > > regressions. In the case of swap_readpage and swapin_readahead = we > > > > > > already wait with mmap_lock held, so waiting with VMA lock held= does > > > > > > not introduce new problems (unless there is a need to hold mmap= _lock). > > > > > > > > > > > > That said, you are absolutely correct that this situation can b= e > > > > > > improved by dropping the lock in these cases too. I just didn't= want > > > > > > to attack everything at once. I believe after we agree on the a= pproach > > > > > > implemented in https://lore.kernel.org/all/20230501175025.36233= -3-surenb@google.com > > > > > > for dropping the VMA lock before waiting, these cases can be ad= ded > > > > > > easier. Does that make sense? > > > > > > > > > > OK, I looked at this path some more, and I think we're fine. Thi= s > > > > > patch is only called for SWP_SYNCHRONOUS_IO which is only set for > > > > > QUEUE_FLAG_SYNCHRONOUS devices, which are brd, zram and nvdimms > > > > > (both btt and pmem). So the answer is that we don't sleep in thi= s > > > > > path, and there's no need to drop the lock. > > > > > > > > Yes but swapin_readahead does sleep, so I'll have to handle that ca= se > > > > too after this. > > > > > > Sleeping is OK, we do that in pXd_alloc()! Do we block on I/O anywhe= re > > > in swapin_readahead()? It all looks like async I/O to me. > > > > Hmm. I thought that we have synchronous I/O in the following paths: > > swapin_readahead()->swap_cluster_readahead()->swap_readpage() > > swapin_readahead()->swap_vma_readahead()->swap_readpage() > > but just noticed that in both cases swap_readpage() is called with the > > synchronous parameter being false. So you are probably right here... > > Does that mean swapin_readahead() might return a page which does not > > have its content swapped-in yet? > > That's my understanding. In that case it's !uptodate and still locked. > The folio_lock_or_retry() will wait for the read to complete unless > we've told it we'd rather retry. Ok, and we already drop the locks in folio_lock_or_retry() when needed. Sounds like we cover this case with this patchset?