From patchwork Tue Feb 14 07:57:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Stevens X-Patchwork-Id: 56737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2827307wrn; Mon, 13 Feb 2023 23:58:02 -0800 (PST) X-Google-Smtp-Source: AK7set8skg/CzjpX8qBx8XNTdo8twBbzYTSAvFH1xAVpGB0zUE5GbPqcHeBmLeteiZ34biVtnN19 X-Received: by 2002:a17:90b:1801:b0:233:cbb9:968e with SMTP id lw1-20020a17090b180100b00233cbb9968emr1416249pjb.9.1676361482495; Mon, 13 Feb 2023 23:58:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676361482; cv=none; d=google.com; s=arc-20160816; b=ydIhrjP0Uc0nkzeTD07Wyu9qBNvjfNTl9y1fgniSSJ7yCKPCzHCYxQzeUyGNkGPgTK QNcP7mL0X8301eOc/HC6qvgu4mRiljKM4asUxmZE+MoPFajaVuovy9efqwiWqvpFmKpk pIia4/f6eDYi5bwP16LMFaSCZM1DqnlQx/KW07V6U7egv0ZUbLBCmL+/NGuom6Mxbq8k p5vA60kelenlKrOoU3ErjSatWK4b1NXFj2whKWCScoxfiV9qITJ6YyV8DaAl3liCTR/t Q0THdLYRLuR46C9pBWTQt84FxbuDmxsdfqpMmRk6EpTcwD83ogGap0lEb8dojQFh+/qd nZSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=O7DfH1WNOVf4t8XjgAEqyor0ieXU0nLmep1VXk+2LuQ=; b=cu+AgobODdtkBBUci0ov+9/UUIu4xU1U71noSSa5UwihcCiOG56JVnSA4XAW8uoYhK vpDknW12pyYzw9ZLo1ZZq5stKAK7mkjW8+v04K/UzVP6zdO/yq7Kad3ZvzyifOK/rBcz d9uEVwmSkWZZ7OKEA9CIDSj+/a86Me6eCtLbV6gVTK23b7+GLTazkxxVDc8mEZ96oPhe DoEPhmxN/9pJs+q9mvY72sJMpM+Tu5OY4CMsVVT491WUuqqGxku9a2mQWxv52DT11NcZ qu1dBLdpoKcLetLgViVKGeBHOsv47Gwoq5LL9bBGoHWWHlmnwjfNk1/504WtovBvjOz2 Q2Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JgLu+1vt; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t15-20020a17090a510f00b0023090591d39si9291159pjh.175.2023.02.13.23.57.50; Mon, 13 Feb 2023 23:58:02 -0800 (PST) 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=@chromium.org header.s=google header.b=JgLu+1vt; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231623AbjBNH5i (ORCPT + 99 others); Tue, 14 Feb 2023 02:57:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229833AbjBNH5U (ORCPT ); Tue, 14 Feb 2023 02:57:20 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7EBA618B for ; Mon, 13 Feb 2023 23:57:19 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id o8so13850540pls.11 for ; Mon, 13 Feb 2023 23:57:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=O7DfH1WNOVf4t8XjgAEqyor0ieXU0nLmep1VXk+2LuQ=; b=JgLu+1vtOkmwsCN3mtGKQep0/DC4S+kayR7D5/h/M9mQWoDn55NSl/pxsmy26Q0iv0 mZ+yyHegrQKSXmMrSflFTPdrdXHSB97v+65nUUnKidXISbycELbs6KX+KCL4NrJI8VzH MTDC30KzrUwl6T5WRf01DC/YAQkaz2oSKCCFs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=O7DfH1WNOVf4t8XjgAEqyor0ieXU0nLmep1VXk+2LuQ=; b=RNudJ8vi6EdOiE6Toi8RqR5U5hDoBv4lUwuJhH0PxHY2cC4Vs7i6SSwAVrNla4YiGV RfKY+ZKy1xn3ROPwW6WQmY2L8zhC0CqJg/bpRBvH5cmAj+PYozjBkKNAk7Sld+oBeesM YytgW8vRWWCSXDtdR0ZgDHtR7D4jZ4Y8G+9cBfdXNyWZhc8lm+sUBirEnMM47YMAx6Cu J2Khj9xnTYAb8EdsFDE9X8j/YMfRbY6UORP2y7R/Ec3MgMY2fL6x9I/BT1rrAl10gBSv vpoJ7P9WBRv7HNqWEac21L4qj1kjT2C9t0OV4NKj8+lkMF+++1Eb5AIVbQOhQul9esBt vLgg== X-Gm-Message-State: AO0yUKUdWh1349ui5c3pmj2mJ/4+/+wCv0ERIjHMSt97G0pwpMF1CePs fZ0+1f/pty9Ea61s5XZ60TSkrw== X-Received: by 2002:a17:902:d489:b0:198:e63d:9a4f with SMTP id c9-20020a170902d48900b00198e63d9a4fmr2053058plg.47.1676361439221; Mon, 13 Feb 2023 23:57:19 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:45f7:92a0:f546:300f]) by smtp.gmail.com with UTF8SMTPSA id i6-20020a170902eb4600b0019a7c890c61sm2981446pli.252.2023.02.13.23.57.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Feb 2023 23:57:18 -0800 (PST) From: David Stevens X-Google-Original-From: David Stevens To: linux-mm@kvack.org, Peter Xu , Matthew Wilcox Cc: Andrew Morton , "Kirill A . Shutemov" , Yang Shi , David Hildenbrand , Hugh Dickins , linux-kernel@vger.kernel.org, David Stevens Subject: [PATCH 1/2] mm/khugepaged: set THP as uptodate earlier for shmem Date: Tue, 14 Feb 2023 16:57:09 +0900 Message-Id: <20230214075710.2401855-1-stevensd@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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?1757792417761559883?= X-GMAIL-MSGID: =?utf-8?q?1757792417761559883?= From: David Stevens In collapse_file, mark the THP as up-to-date before inserting it into the page cache. This fixes a race where folio_seek_hole_data would mistake the THP for an fallocated but unwritten page. This race is visible to userspace via data temporarily disappearing from SEEK_DATA/SEEK_HOLE, which can cause data loss for applications that use lseek to efficiently snapshot sparse shmem. Fixes: f3f0e1d2150b ("khugepaged: add support of collapse for tmpfs/shmem pages") Signed-off-by: David Stevens --- mm/khugepaged.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 79be13133322..b648f1053d95 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1779,10 +1779,13 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, hpage->mapping = mapping; /* - * At this point the hpage is locked and not up-to-date. - * It's safe to insert it into the page cache, because nobody would - * be able to map it or use it in another way until we unlock it. + * Mark hpage as up-to-date before inserting it into the page cache to + * prevent it from being mistaken for an fallocated but unwritten page. + * Inserting the unfinished hpage into the page cache is safe because + * it is locked, so nobody can map it or use it in another way until we + * unlock it. */ + SetPageUptodate(hpage); xas_set(&xas, start); for (index = start; index < end; index++) { From patchwork Tue Feb 14 07:57:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Stevens X-Patchwork-Id: 56738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2827423wrn; Mon, 13 Feb 2023 23:58:25 -0800 (PST) X-Google-Smtp-Source: AK7set/LaLcEL6G3g+Y1Yo+a4fW4KmZS7EPk1GTWdMTkcFFF+0xdPTWjRIwH1hunJ7NYieCSEVP9 X-Received: by 2002:a17:90b:1652:b0:234:1a77:93b8 with SMTP id il18-20020a17090b165200b002341a7793b8mr1517688pjb.21.1676361504849; Mon, 13 Feb 2023 23:58:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676361504; cv=none; d=google.com; s=arc-20160816; b=WAhDfNl1nvbNMYgTRtVyUQKNih/Vt3uTMpF4C2cm+ki7dVqf+DnWyPL8cCTSVB3B+c CCu2gQ25H+tji8s6OUeF/ljQJOnPer4F4lmVnIa51tihEOOrLE9bCIHalRdnAhNkCUOL +gPccKZRVHeSbA9cptu+TteeB7dJPs6s+bmoWdUdgyUtY21nNNSRcLqWsqii3bwCKUpg HRd1nndaUDfT4secbVqG2tvrO6JGVO8fD1iYXzeCYKDqEXqXjUeoeBPtNjxZTjAlD9k9 NV+OoN1np+ncIcW6huu2zrc3knJ5G8yfgljAbDcYZYX5wldQFPc298R9E7Tj0/3zpN6U xuuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j0Z3rzguH4ZoJOngNzhmwoM/o5xYQMHZRaqzjDLV+ZY=; b=lNMacamOu56Kp6isCS9ugBmKyAmL1PV3n3Nt4bTCsPlfDnLqvzZ4f8Q2S6ikYNMn/B PPGyRbyqmWxCvg8y3Ov29KAeNt1YtTfAzvCg2rfMAUIvXZSQ1n1TzR+t0/UaxjcA6c5Z oMvsC5D79tsSdt04mxxadZHLFNUCH2r+58hX/Vg0OGff5GHCPr3RO7sBSrUPEmpFFO8a ePhJq/wKY6LStfmTaO5f+hk9WEyHjw+boinh8kj/pmjL8Omoza88U+or4PzStRf7HsdW HC4Y+7uMNDnLZevUmA4Ll2Ojxo2YVRSa9vgDPBZGrip0ZFNMWuDPyv/fsucnVFuSNElH ZyJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=TT5qGbRp; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x9-20020a17090aca0900b00233abe49bd1si11334601pjt.109.2023.02.13.23.58.12; Mon, 13 Feb 2023 23:58:24 -0800 (PST) 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=@chromium.org header.s=google header.b=TT5qGbRp; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231549AbjBNH5m (ORCPT + 99 others); Tue, 14 Feb 2023 02:57:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231409AbjBNH50 (ORCPT ); Tue, 14 Feb 2023 02:57:26 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33315206A5 for ; Mon, 13 Feb 2023 23:57:24 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id 78so9711516pgb.8 for ; Mon, 13 Feb 2023 23:57:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j0Z3rzguH4ZoJOngNzhmwoM/o5xYQMHZRaqzjDLV+ZY=; b=TT5qGbRp+TwoKbeoF8RFdMUbptoh0Tt+uCr8QbFYXP+VDWlmHqE0TWskWe7Gg86ZOl w2szTKW6pZULps5U/lb0RAWobrUA+dl61/EqpGukGnH6udCW7LU+n688a001VOF6WnRG l8Xj5sx1HKNNl4w4OHepXx71PY3MkIN5u7aYE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j0Z3rzguH4ZoJOngNzhmwoM/o5xYQMHZRaqzjDLV+ZY=; b=vP/7ga9KyA26PeDuIZAjHZHBrTIQ1VBzJtFYaFSDQyjBnRYPn4jYJ3kxNUDPcBYXdh E+1rkIoSOn/na1GO7aDJBQRYskQKIPOqi8kcFdoH4a5pmhQyt8UGZ/vDXwmE6WFCWX1z DtrSNt6CEtV7zvqprRJVkc2gRUSuxIt3Xvaa0W5JOcRstnmcdVuU+G/4XJVDBqvflR4W eLt2sKYNXKcma7BBAb+74apgqNoRnkHlZssmM9VQX4gF1+52QkHi16DRD+TOELW4lWhg UIq+5A9UIIu7V7L5OtKSBK0LVUHsfl3B4z3gQmOw1zIcni/VF8l8mz7aqe/2Z4AGqttS +ciA== X-Gm-Message-State: AO0yUKWfSDO7TLAYjlr2oOW989uciYa4E658DbPiqT0TQvJYKfl/ls8U xuyM2eWrwfSpjDyFqyXkfm26hA== X-Received: by 2002:aa7:95a9:0:b0:5a8:bd6e:90fb with SMTP id a9-20020aa795a9000000b005a8bd6e90fbmr1427099pfk.19.1676361443593; Mon, 13 Feb 2023 23:57:23 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:45f7:92a0:f546:300f]) by smtp.gmail.com with UTF8SMTPSA id d19-20020aa78153000000b00593fa670c88sm9134529pfn.57.2023.02.13.23.57.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Feb 2023 23:57:22 -0800 (PST) From: David Stevens X-Google-Original-From: David Stevens To: linux-mm@kvack.org, Peter Xu , Matthew Wilcox Cc: Andrew Morton , "Kirill A . Shutemov" , Yang Shi , David Hildenbrand , Hugh Dickins , linux-kernel@vger.kernel.org, David Stevens Subject: [PATCH 2/2] mm/khugepaged: skip shmem with userfaultfd Date: Tue, 14 Feb 2023 16:57:10 +0900 Message-Id: <20230214075710.2401855-2-stevensd@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230214075710.2401855-1-stevensd@google.com> References: <20230214075710.2401855-1-stevensd@google.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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?1757792441587242707?= X-GMAIL-MSGID: =?utf-8?q?1757792441587242707?= From: David Stevens Make sure that collapse_file respects any userfaultfds registered with MODE_MISSING. If userspace has any such userfaultfds registered, then for any page which it knows to be missing, it may expect a UFFD_EVENT_PAGEFAULT. This means collapse_file needs to take care when collapsing a shmem range would result in replacing an empty page with a THP, so that it doesn't break userfaultfd. Synchronization when checking for userfaultfds in collapse_file is tricky because the mmap locks can't be used to prevent races with the registration of new userfaultfds. Instead, we provide synchronization by ensuring that userspace cannot observe the fact that pages are missing before we check for userfaultfds. Although this allows registration of a userfaultfd to race with collapse_file, it ensures that userspace cannot observe any pages transition from missing to present after such a race. This makes such a race indistinguishable to the collapse occurring immediately before the userfaultfd registration. The first step to provide this synchronization is to stop filling gaps during the loop iterating over the target range, since the page cache lock can be dropped during that loop. The second step is to fill the gaps with XA_RETRY_ENTRY after the page cache lock is acquired the final time, to avoid races with accesses to the page cache that only take the RCU read lock. This fix is targeted at khugepaged, but the change also applies to MADV_COLLAPSE. MADV_COLLAPSE on a range with a userfaultfd will now return EBUSY if there are any missing pages (instead of succeeding on shmem and returning EINVAL on anonymous memory). There is also now a window during MADV_COLLAPSE where a fault on a missing page will cause the syscall to fail with EAGAIN. The fact that intermediate page cache state can no longer be observed before the rollback of a failed collapse is also technically a userspace-visible change (via at least SEEK_DATA and SEEK_END), but it is exceedingly unlikely that anything relies on being able to observe that transient state. Signed-off-by: David Stevens --- mm/khugepaged.c | 66 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b648f1053d95..8c2e2349e883 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -55,6 +55,7 @@ enum scan_result { SCAN_CGROUP_CHARGE_FAIL, SCAN_TRUNCATED, SCAN_PAGE_HAS_PRIVATE, + SCAN_PAGE_FILLED, }; #define CREATE_TRACE_POINTS @@ -1725,8 +1726,8 @@ static int retract_page_tables(struct address_space *mapping, pgoff_t pgoff, * - allocate and lock a new huge page; * - scan page cache replacing old pages with the new one * + swap/gup in pages if necessary; - * + fill in gaps; * + keep old pages around in case rollback is required; + * - finalize updates to the page cache; * - if replacing succeeds: * + copy data over; * + free old pages; @@ -1805,13 +1806,12 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, result = SCAN_TRUNCATED; goto xa_locked; } - xas_set(&xas, index); + xas_set(&xas, index + 1); } if (!shmem_charge(mapping->host, 1)) { result = SCAN_FAIL; goto xa_locked; } - xas_store(&xas, hpage); nr_none++; continue; } @@ -1970,6 +1970,56 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, put_page(page); goto xa_unlocked; } + + if (nr_none) { + struct vm_area_struct *vma; + int nr_none_check = 0; + + xas_unlock_irq(&xas); + i_mmap_lock_read(mapping); + xas_lock_irq(&xas); + + xas_set(&xas, start); + for (index = start; index < end; index++) { + if (!xas_next(&xas)) { + xas_store(&xas, XA_RETRY_ENTRY); + nr_none_check++; + } + } + + if (nr_none != nr_none_check) { + result = SCAN_PAGE_FILLED; + goto immap_locked; + } + + /* + * If userspace observed a missing page in a VMA with an armed + * userfaultfd, then it might expect a UFFD_EVENT_PAGEFAULT for + * that page, so we need to roll back to avoid suppressing such + * an event. Any userfaultfds armed after this point will not be + * able to observe any missing pages due to the previously + * inserted retry entries. + */ + vma_interval_tree_foreach(vma, &mapping->i_mmap, start, start) { + if (userfaultfd_missing(vma)) { + result = SCAN_EXCEED_NONE_PTE; + goto immap_locked; + } + } + +immap_locked: + i_mmap_unlock_read(mapping); + if (result != SCAN_SUCCEED) { + xas_set(&xas, start); + for (index = start; index < end; index++) { + if (xas_next(&xas) == XA_RETRY_ENTRY) + xas_store(&xas, NULL); + } + + goto xa_locked; + } + } + nr = thp_nr_pages(hpage); if (is_shmem) @@ -2068,15 +2118,13 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, } xas_set(&xas, start); - xas_for_each(&xas, page, end - 1) { + end = index; + for (index = start; index < end; index++) { + xas_next(&xas); page = list_first_entry_or_null(&pagelist, struct page, lru); if (!page || xas.xa_index < page->index) { - if (!nr_none) - break; nr_none--; - /* Put holes back where they were */ - xas_store(&xas, NULL); continue; } @@ -2592,11 +2640,13 @@ static int madvise_collapse_errno(enum scan_result r) case SCAN_ALLOC_HUGE_PAGE_FAIL: return -ENOMEM; case SCAN_CGROUP_CHARGE_FAIL: + case SCAN_EXCEED_NONE_PTE: return -EBUSY; /* Resource temporary unavailable - trying again might succeed */ case SCAN_PAGE_LOCK: case SCAN_PAGE_LRU: case SCAN_DEL_PAGE_LRU: + case SCAN_PAGE_FILLED: return -EAGAIN; /* * Other: Trying again likely not to succeed / error intrinsic to