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 E6692C7EE2E for ; Fri, 9 Jun 2023 18:55:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E7708E0002; Fri, 9 Jun 2023 14:55:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56FBE6B007D; Fri, 9 Jun 2023 14:55:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4372B8E0002; Fri, 9 Jun 2023 14:55:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 304616B007B for ; Fri, 9 Jun 2023 14:55:44 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E48BB402ED for ; Fri, 9 Jun 2023 18:55:43 +0000 (UTC) X-FDA: 80884113366.28.03F7784 Received: from mail-yb1-f169.google.com (mail-yb1-f169.google.com [209.85.219.169]) by imf04.hostedemail.com (Postfix) with ESMTP id 2648640014 for ; Fri, 9 Jun 2023 18:55:41 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=pSBFc37P; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of surenb@google.com designates 209.85.219.169 as permitted sender) smtp.mailfrom=surenb@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686336942; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5fqmIPn7/SY3tNNptZ9MZAjCev2zdIK34rPEJNcoPJs=; b=sULIWEnXupohFsGX+C/66xHDi6Lopfnmlidi3wHzHxGe0Mrpngcx56SXUM1+q6XmSuQRm5 s9gNpn9vtBqHBhDPhYYDgl5f4AwKFLLujBIIHqgHpJj/vMIvFHEWs5ORMwIGSpW0qpX2r2 afPmQzUy4kU9oiyNr4m4WHkenbhQhHE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=pSBFc37P; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of surenb@google.com designates 209.85.219.169 as permitted sender) smtp.mailfrom=surenb@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686336942; a=rsa-sha256; cv=none; b=ECq5l17OoNbnKiiZRTLZfi3747cp5jVoP3mEszYTP6UcXBCRWgVVaMGoEoo6Rp6JDBkhYr JUB9j755l1wD25t7Lr2b5IjrjTFMNvIgynnTWt4akoFD5VROxaCaJk5vSs2NsO9DLl4Bf0 iIoDdaeRx6K9PQxn5jfwExOnzZu30ZY= Received: by mail-yb1-f169.google.com with SMTP id 3f1490d57ef6-bacfcc7d1b2so1991828276.2 for ; Fri, 09 Jun 2023 11:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686336941; x=1688928941; 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=5fqmIPn7/SY3tNNptZ9MZAjCev2zdIK34rPEJNcoPJs=; b=pSBFc37PG5mqrdURgSEq7HdUoo9vHzD7lyKhb1CDn4/n16j/q5B1BJ0y6H1tKBObhc 8RZT+6td4dTyXZuFu6FeMZ97TaHDu8XLCdS6QeHmInzWl42MSOpQwg8HuKz71iJlZ7EF 3RD7Fc/SWTNEw3muGL0Hc5uRGZ8TSzZNWH09gNmkovGMNIFuMTPlALfJDHP4+GPQ0DCp OSXobLw+pHqC9UKqFHSszrNSrZnJi+VsiSpJzxAcZJ/EoYKW+djQsRRa+1IzDpGTvlOS u5PmY3Q9vlvGT5ApN7zfmUYZemIUYZTwaxkVzZpCqU+2W0+E/0bL8TdyHX7NUMepnKSq tq5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686336941; x=1688928941; 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=5fqmIPn7/SY3tNNptZ9MZAjCev2zdIK34rPEJNcoPJs=; b=NoZGSHyh/f+Yy9AJBENTInRLQ94KXhzXQrUUNU2eHG4zpTb0GxLtInJc/hvCvCUIov 2Lig+mnWZdeB+CrVJjEDe11Q1A4TZNKUOp6+jNnBdSuJVitUNneInd5qBYPbMaeP3RVJ Q1O/7PYW/FH5VThZ72B5txIlXQshnVtiUqFL+ZAIUdlB9yI2/IU3UVBacdL/xqI8trR4 3C5/p9WRHTohHXhIHFaxcRci/0CI3SjhJQgabpOHyW4CYl2Zqsz6Z/IDBgdcJaKp98Vx 7NAoZJf5L202s/OcjfbJxaiWkSwUInHTHNvO5YdpUfpzmCndVzoPcdQqeiQAM6P18RvU Wc0A== X-Gm-Message-State: AC+VfDwBbDixW/DP7oe7fBrsk/rVfSfPhbyz4qhmuaMuNMXeak9yGhIB lsmYZfGvSEecWqc3IcIomThK9NFtUAqSVF+16R1NPg== X-Google-Smtp-Source: ACHHUZ5J+yJhDkwtV6pUXStA7V8gQSqeAoQnRlmfDE34ExCN9C+jXf8DNwMSEgyyXAYsVrV5phpv5KN7CFndQfkYX1g= X-Received: by 2002:a25:4609:0:b0:bb3:a85c:759f with SMTP id t9-20020a254609000000b00bb3a85c759fmr1630007yba.0.1686336940940; Fri, 09 Jun 2023 11:55:40 -0700 (PDT) MIME-Version: 1.0 References: <20230609005158.2421285-1-surenb@google.com> <20230609005158.2421285-6-surenb@google.com> In-Reply-To: From: Suren Baghdasaryan Date: Fri, 9 Jun 2023 11:55:29 -0700 Message-ID: Subject: Re: [PATCH v2 5/6] mm: implement folio wait under VMA lock 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, peterx@redhat.com, ying.huang@intel.com, david@redhat.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, pasha.tatashin@soleen.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-Rspamd-Queue-Id: 2648640014 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: u5f61nb5k4tuxc7upkknbxaif4oby8pe X-HE-Tag: 1686336941-233598 X-HE-Meta: U2FsdGVkX187ci+Sk62H4pHWF3Z8g/7Fk7U/Uy7bu/PEN5G8m8sQ/wGCgUo/Z0PCwQhjGXQ6X2icFSXiAP/otUhXwqNUNzvMr5YHFvzCkJ8MzZndAKwrYDxxK4pgTCArmOw1MsBbtoOxj8xUFdEDHKNOWmGi5bxH2KTq3v0Buznxp/DFJkyMfRHWjRr3sLDez6OoGt/jeA7FHKGwfbIh7UEZhEC9Lq8B41DKY8IzgQ3/qlXifw9jEsQr/CzSMNUQTFM/6HQ1BwgoRuVbsbv28+ZDyxbXcXAu7UiEQzt6Gn11YiV+Q3jjGboSxwYNgkwKb6m3RCJIYkw5D4X/lPg5E0DX/3bKm17Bd0ih1Z29N33tfJ1JHFERnpZA7BVAYda68bVdkzTCJ8LbGkjYCBtLNZzq/dLfUcK8VUbEM858NtvO0TQvJCLPPFo02n/65dO4om4nNUBho8qIW1yML+y3lK9N0imPIyZEnSio9vmmx2okbFq7+MxtTtyr9JR/VVyFc1wqXzgfskb/m2VGbmrKWPh0SMpUjKOAg8giJ4m9saJPC8iZ5WLsnKODGojM3cG3l5iqTivZ+uTQz6CzdGmIKqRgZ/0eoGm8USjYJ3Hyt9NZ1S8SL6hppVc7GgW4F+h4ocOKjvcFM3C4zLB0GjRhV2CZale9Vu1RG7ngkKQA+auxLVI1cUlVQVem5XGuE2mElHkCfyMTv1zqYt0a9NzAfsAUk+tSYnYmLMR8Tyfr89TC4XPrbwT+66PJG9TZPmeQ2ANnWW1bgjrjG8kVQzPOEJxOZgynH3k0SUYIMZQYoleVxGvZ6WfX+H/IjIk5JTEW9rzP52bzc8MAus7rgozHmhKmPKq8Gv9xoUHT5I2HdruhNoQaO5SXZrV7GmJWEkszzHzi0kV0Q4J0rlM1h/Qo5Qqd1hx9MWS5oMPIHza2vET+vqOnv8ALUTrPo8jIPtb7CYLNuSgXeibPgzekQyS iCD7B3U9 ZrWRBqELs3TVVPUZqHdeT+fyFXHU4Zi2bevBNfk/26RKk/o0cHORVlaNoQyITRBdj/IvKsPGXj9bOGWvNLKL10OPq0Ev/D9CWhO8krnIjiwUrRA5GvJV8BzKZs8c3vDqriIGaNxkUhSsCya52GIt1gupnYDN7HNDQ3NTjhm+WFJ9jjpnCVJLCIk04mcCjTLOBuwF4v6/0zmNCVOQ6VqMesGDezsKV2ruPiX7jHu4xjzOlMIrfFjjx1M85VI142qiLpBMSKsODQYRAugQgvbOBkJOmeh7ggIbGtmmlrRhbNdRVHQKD7vteXOx8Sg== 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 Fri, Jun 9, 2023 at 11:49=E2=80=AFAM Suren Baghdasaryan wrote: > > On Fri, Jun 9, 2023 at 8:03=E2=80=AFAM Matthew Wilcox wrote: > > > > On Thu, Jun 08, 2023 at 05:51:57PM -0700, Suren Baghdasaryan wrote: > > > static inline bool folio_lock_or_retry(struct folio *folio, > > > - struct mm_struct *mm, unsigned int flags) > > > + struct vm_area_struct *vma, unsigned int flags, > > > + bool *lock_dropped) > > > > I hate these double-return-value functions. > > > > How about this for an API: > > > > vm_fault_t folio_lock_fault(struct folio *folio, struct vm_fault *vmf) > > { > > might_sleep(); > > if (folio_trylock(folio)) > > return 0; > > return __folio_lock_fault(folio, vmf); > > } > > > > Then the users look like ... > > > > > @@ -3580,8 +3581,10 @@ static vm_fault_t remove_device_exclusive_entr= y(struct vm_fault *vmf) > > > if (!folio_try_get(folio)) > > > return 0; > > > > > > - if (!folio_lock_or_retry(folio, vma->vm_mm, vmf->flags)) { > > > + if (!folio_lock_or_retry(folio, vma, vmf->flags, &lock_dropped)= ) { > > > folio_put(folio); > > > + if (lock_dropped && vmf->flags & FAULT_FLAG_VMA_LOCK) > > > + return VM_FAULT_VMA_UNLOCKED | VM_FAULT_RETRY; > > > return VM_FAULT_RETRY; > > > } > > > > ret =3D folio_lock_fault(folio, vmf); > > if (ret) > > return ret; > > > > > @@ -3837,9 +3840,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > > > goto out_release; > > > } > > > > > > - locked =3D folio_lock_or_retry(folio, vma->vm_mm, vmf->flags); > > > - > > > - if (!locked) { > > > + if (!folio_lock_or_retry(folio, vma, vmf->flags, &lock_dropped)= ) { > > > + if (lock_dropped && vmf->flags & FAULT_FLAG_VMA_LOCK) > > > + ret |=3D VM_FAULT_VMA_UNLOCKED; > > > ret |=3D VM_FAULT_RETRY; > > > goto out_release; > > > } > > > > ret |=3D folio_lock_fault(folio, vmf); > > if (ret & VM_FAULT_RETRY) > > goto out_release; > > > > ie instead of trying to reconstruct what __folio_lock_fault() did from > > its outputs, we just let folio_lock_fault() tell us what it did. > > Thanks for taking a look! > Ok, I think what you are suggesting is to have a new set of > folio_lock_fault()/__folio_lock_fault() functions which return > vm_fault_t directly, __folio_lock_fault() will use > __folio_lock_or_retry() internally and will adjust its return value > based on __folio_lock_or_retry()'s return and the lock releasing rules > described in the comments for __folio_lock_or_retry(). Is my > understanding correct? Oh, after rereading I think you are suggesting to replace folio_lock_or_retry()/__folio_lock_or_retry() with folio_lock_fault()/__folio_lock_fault(), not to add them. Is that right?