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 A2ED7C4167B for ; Fri, 9 Dec 2022 17:01:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C01E8E0006; Fri, 9 Dec 2022 12:01:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 123E08E0001; Fri, 9 Dec 2022 12:01:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCC1C8E0006; Fri, 9 Dec 2022 12:01:18 -0500 (EST) 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 CA9418E0001 for ; Fri, 9 Dec 2022 12:01:18 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9B34AC134C for ; Fri, 9 Dec 2022 17:01:18 +0000 (UTC) X-FDA: 80223383436.08.2AC7C99 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 80E51180023 for ; Fri, 9 Dec 2022 17:01:16 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Gnw1KY0q; spf=pass (imf24.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670605276; a=rsa-sha256; cv=none; b=SiFyy+lVOs/jIq0jlfy2oIbcu42OmgeU+8mKyoWUm4UH0Q/YbktqiGk0CHRX9UBr3yaIe4 tE2X33K7cpVDEEgOCMeDL0NobcusJkFJdu9hFJY7OVjB3bIGCxvbBAKqozL0gSVHrPFWyk FbUNxGGQUE8x2B6Af49hGBUecMrrx0Q= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Gnw1KY0q; spf=pass (imf24.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670605276; 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=3uAZCG3P+mUZeKCIXPYURgU7pcsgAcHbWcWGaDTy3vU=; b=wFXLeoP5L2gQdMHU1TeAIWEViHi7qEZUKPmJ+8UGK4UI3iPWT1F6DUFTYz9HMMs0Gll3uO /akXZiGLxBcoCsTdvWuYNi/2V+j0JI5pW2sz6B4bSKSKrb0V/t2bn6frGmEeTFyDzrSWCg /m+wxp6c7adOi8DOkcVAshlXWSD7xys= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670605275; h=from:from: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; bh=3uAZCG3P+mUZeKCIXPYURgU7pcsgAcHbWcWGaDTy3vU=; b=Gnw1KY0qHlDDKClbv/O3LN1p22lSYAMYiVrGBWI+MiL+YkZ7tXC9QkuOvpdBauRymcQopi ZGi2+8MmOIxwTLmqBzv6bm14oi8HYtBHSfjrXlZ5c4XEsx9hs05fk9IAOeC2odNiIusvP4 1UEbl7+QbcBLccEmHYE3OjB/UBLTD10= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-628-gTAgb96SNBKfmit4TiMbJg-1; Fri, 09 Dec 2022 12:01:14 -0500 X-MC-Unique: gTAgb96SNBKfmit4TiMbJg-1 Received: by mail-oi1-f198.google.com with SMTP id l15-20020a54450f000000b0035e4dc7f325so2245149oil.20 for ; Fri, 09 Dec 2022 09:01:14 -0800 (PST) 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=3uAZCG3P+mUZeKCIXPYURgU7pcsgAcHbWcWGaDTy3vU=; b=RXCFD1XVaUWdqXe9CDHEiJfohXQD/REYPsvCXDOISIiyfVR/i34BA22BjwIE97SJ4/ 2VNRNgKvPw/8nwuDUzrHT/TY2ovGuqlXnT2WQAXhTC2n4wONql/m0N3LnfBmNaIisV53 KNSHrhTpfSlak0NAFqMaJ4L9cWytkLpBilHGhij3V/4MRPQY948bdsJlUWTxw5tg1fy8 V/Fxma/k1Ryv4O8YyKtd8z6/SJZNCm6Urly6XS5Anu3FxSDPeM1SUOJPKNZKmjjTYZj8 Tw3gtQokH2LoDAdyPRpWndMOZBSqF5OjVX9ySwZC0DxCmY5Zk6zdvQLwBrwMIbmHP0y/ u2lw== X-Gm-Message-State: ANoB5pmPB7r7gA766Axk6bWVlr0Fc55V0gYUs7tTEz6hgh9x/EeaDDkO geOtr17LbhqphqU7DFo3wE8oDF6QZG+TcSuo+Su0BM8R784ixa5QDq5rmZa3RBetElzUa0UZrHl NPhZHg1v1UZPTyR3mINd6F/Hst1i623sulSw+xZgIJq9ZEkN+DazqFT77rhw5 X-Received: by 2002:a54:438d:0:b0:35e:1ca6:ff6d with SMTP id u13-20020a54438d000000b0035e1ca6ff6dmr2673244oiv.5.1670605273276; Fri, 09 Dec 2022 09:01:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf4i+e1KtxZvFOzCGHgXB6sOxKF23L/F2cv/jo46p0ozGa2WnFiSOSP68F7KBtkljhg4CQrInw== X-Received: by 2002:a54:438d:0:b0:35e:1ca6:ff6d with SMTP id u13-20020a54438d000000b0035e1ca6ff6dmr2673199oiv.5.1670605272841; Fri, 09 Dec 2022 09:01:12 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id q7-20020a05620a0d8700b006cf38fd659asm178907qkl.103.2022.12.09.09.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 09:01:12 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , Miaohe Lin , David Hildenbrand , Nadav Amit , peterx@redhat.com, Andrea Arcangeli , Jann Horn , John Hubbard , Mike Kravetz , James Houghton , Rik van Riel , Muchun Song Subject: [PATCH v3 2/9] mm/hugetlb: Don't wait for migration entry during follow page Date: Fri, 9 Dec 2022 12:00:53 -0500 Message-Id: <20221209170100.973970-3-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221209170100.973970-1-peterx@redhat.com> References: <20221209170100.973970-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 80E51180023 X-Rspamd-Server: rspam01 X-Stat-Signature: 6nnywd33sh8eubzxaui7a6io49wte59x X-HE-Tag: 1670605276-846114 X-HE-Meta: U2FsdGVkX1891BiMp7+3f5VqXJ/9NRqiMSNAtzrOYgTvJRvkwQBP3yIYChjU5bdl6XVeWebYDoRAIk/mFn5LefqqSvhcHwKGBZbJax0aIwhH2s8OSxL13rgGNYGfP/xh+UglhfYMBeOXKYGwcWb7Bu8Ggg58lZpxx1wDB1wWOU1lJjvXQJvSSsfNn2YdEgsBBuVfhN1v8J6PnXiFBCiEihEJxeiPrvhvYleKi9HCIYSOlxLCSUSdz5lAKnJJu1PLr5Ve+US3J6QNXJJQhDTXNK0KoUZbylG8/UE1QM8kATe78avDXYw5DITuyOeFII3WJ1Y9Vq6a+YLXtOXKutF9BWk4QHSgA/IvDdQaURB79D8icIjNtr0F9C59yo5iuHKAiYiVBPZB+0/rm0E/4reHrzPnmqFGbo0yCGOH+nFhxdX+BU9X4MhoJlqRuhH5ZBLIP2j0xFKLzbZtzj0PNfJxCFgkv/w5MAYxmgX+/hYZCXZ+55ek4P6umzAICWQJMheqiD//OU3Xp6e1/SkSg8GWcKETgI7T7D1Bjdv+AGSn+z2NkUsDwBwk1vyxIATYVZEZCqrVEsymV3wftwYJ2Or0s3V4D+4lZQcP4P91vFmC6EtYG3lQRz6kpzkFGRRPj13FNfUfw4V66nZZNnJKJ3xmFEe6Um1Cd51InUVhdirCDXXVdK9L5oflwPyAIg8haqewsDpmWyxHq6YsFBOIJEwz9Lh0EM7AZgxOnZ+VtIRRXLdjUMbiPVttlLRu1/+YxoExQMcfhFbT4kk6av08zslMbVaHpQX3W/1hWvJe/ntiierfjSNzQpO7onUkRzjDfIX1HmkcYOuBbnjWpcHivvwQxERLJOEUDGmJWvR48nW9k/+KH1h3Cp+pnsH7oWaw2dwbXhkRJDWHnbwuKmtVOIeMM+o3hkQnYAlU9SgvH7JcYlPxnZGSldTdyJWC4bvUjuWOZuP4aLyGfgjF8eIjmcP VIcK6HCj 16V3Zd1oGtaesGmJKtOpZagCmlo/EQsbzBJBgbagUN+hCAPjox7iwN/70nOaLC24/EkWF9iVlvggfaWNbsTLvWfCxeV+ZRq9FP08oetD7YPphr7wKyk/66gJt20fweJNhcBOZ3S81nLJFqejZWAzhh80nWGmXdJK6sFT7F74leoYejYf2mzZRXPZrcRDap7UXkBiWQyaD0Ib9m163fG8DYXUc7ztM5VJ93wSe 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: That's what the code does with !hugetlb pages, so we should logically do the same for hugetlb, so migration entry will also be treated as no page. This is probably also the last piece in follow_page code that may sleep, the last one should be removed in cf994dd8af27 ("mm/gup: remove FOLL_MIGRATION", 2022-11-16). Reviewed-by: Mike Kravetz Reviewed-by: David Hildenbrand Reviewed-by: John Hubbard Signed-off-by: Peter Xu --- mm/hugetlb.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1088f2f41c88..c8a6673fe5b4 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6232,7 +6232,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, if (WARN_ON_ONCE(flags & FOLL_PIN)) return NULL; -retry: pte = huge_pte_offset(mm, haddr, huge_page_size(h)); if (!pte) return NULL; @@ -6255,16 +6254,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, page = NULL; goto out; } - } else { - if (is_hugetlb_entry_migration(entry)) { - spin_unlock(ptl); - __migration_entry_wait_huge(pte, ptl); - goto retry; - } - /* - * hwpoisoned entry is treated as no_page_table in - * follow_page_mask(). - */ } out: spin_unlock(ptl); -- 2.37.3