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 EC517C77B73 for ; Tue, 2 May 2023 10:35:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68539900003; Tue, 2 May 2023 06:35:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60E9E900002; Tue, 2 May 2023 06:35:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AE98900003; Tue, 2 May 2023 06:35:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3709F900002 for ; Tue, 2 May 2023 06:35:24 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 18FCDA0E38 for ; Tue, 2 May 2023 10:25:33 +0000 (UTC) X-FDA: 80744933304.29.28F8D6E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 8EA2880A5B for ; Tue, 2 May 2023 04:28:22 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=muv5pUtK; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683001728; 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=O0AGEBy8/UbtDxbI77K45QF+88zAyxOINSxMqbd3v3Q=; b=kfSuW7Mr39cDHPvQtMAWQa5Tj+bIA6bX/ITZSjn9N8OUdVUmIPGt60R5IWYynWB7lig12r 5TM4njK3g7ldyqsId5lmkXGN/zZm320F8fXWGSNW/Z29hDS3NmEhXd9WrXPDr3BfiDV0uZ FSnx0nck73IWj23RkijnEGyAngFLD/4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683001728; a=rsa-sha256; cv=none; b=PWU6Gtc2w9k4ha0xvq0rwBhpTnlr0cAo4TVQFtm/E0vYNiYfsm/qbwq8Q5a3xt0K61bmlX lZDsNCmwxmazaE3bAFnNvB3sD9Ih+Z39CsxlWVnmOIAwe2RtkCeWNsLlpze06nkPX6Pa77 7g2K4IkIpEHZgpg7SqdcrW7HFbHsxzk= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=muv5pUtK; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=O0AGEBy8/UbtDxbI77K45QF+88zAyxOINSxMqbd3v3Q=; b=muv5pUtKhqzMQZMM1Vt4U3nEft yYpk6R3B0WBzZcaRO43aZn/kjXUkvlxkQOTWVjOysXdiRsxn3roJ2WCtzj9QNJp5Nf34laQL85Oyj 3w8rneiNLfqwpXWDqsIzgeJ0b/J4vU/QUxxltq1DHwjE9OgmAOc3Um8XF9T2nmd9szQICwUSz8aNe mDKD0s/1AZ6zcHsKUGdCjbX5HqaJw1HkT2pqVEfl5DKiNITQScLyb3W8OIGL5tI/FG5VXJDIXNARo dIriKlYgm9FYMxZpau+G7clzOSevVtSXaYdmVQM0hSH5BS7n02ivaxrLvel0l6UsWyzfhpWgIq1j4 jAj+KuEw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1ptfLe-007tot-7q; Tue, 02 May 2023 02:02:34 +0000 Date: Tue, 2 May 2023 03:02:34 +0100 From: Matthew Wilcox To: Suren Baghdasaryan 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 Subject: Re: [PATCH 1/3] mm: handle swap page faults under VMA lock if page is uncontended Message-ID: References: <20230501175025.36233-1-surenb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230501175025.36233-1-surenb@google.com> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8EA2880A5B X-Stat-Signature: ffo9aewhxy9na3a1su4r6fdff477c941 X-Rspam-User: X-HE-Tag: 1683001702-919904 X-HE-Meta: U2FsdGVkX1/41YBODda1SDQJ3XoXClyx7K7wM6SMpYYUIxz2XPtAXZm/Vf+PPViUteCMcIufeYTUirVBgPLoc3QRT2MUjQlfznVqLNdU9FbZA6qeelTVzlXgmp0IHSjn33lYSrzAFucWnSIOP/txB35vStWNkq0kV282UOcJV44i1drTcS905azcGiuitzO2LmhfOlunk62/XYXVxKVHb6ARPaG1kwJerh4akaYjaeBpjmEYUsXg+QWOCDmdFlpV4+UsUSjKezHnMqj4/UWaiD/GOCVZKhsPklN+yVogfH0ySOIikDRu5eBwTbgPrPT0Y+can93xmcF7DKxJyBDOi1v2i0SzZF8+ePBhBUGpYKsFxmgQG2nwxO7WtBMIRXRryhnYapnnOVJJH2QE1zwmv0pvobzNJbGUj6peuvfCKGK7+K8Fb7GTzS924J6g1GCdZeNc7LegzOy1CIWVcQfRAeTFDCiKos5T7Fj+IwZzUrawEN1DLdvAJBL02hveko7kFfSHspwauP+QnWUkzdcrFSSDuRJL+33MMhzmmqBu+SUUWaYPvb7KaIYb4+POnjE76f2FnqtUq12IeRdYPGKACMnCPxKr6MGtedlPvKzMeok64BtBQ+X4RjP17FD38hn+k8MjTli9acveSrM+Pd4UoUq4iEYTFXeN6d7iMaMgEd7Kii62MZXl4J0D93+FhirLMuQAe950krEqy46Vv6nkjTezYmHH5zhz+zmG44yxGzayS4RP3dkC3bRcLz+THK+AJdzFNi1PsF7fhrv8xV5n/5XE5yP00wJJu+CruFopI+CSI2tZvbmhekkz9f5JYH+cmV/DzcX9eKsVhRpTS0HsLQ== 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 Mon, May 01, 2023 at 10:50:23AM -0700, Suren Baghdasaryan wrote: > +++ 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)) { You're missing the necessary fallback in the (!folio) case. swap_readpage() is synchronous and will sleep.