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 X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0439AC4708B for ; Thu, 27 May 2021 20:23:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7574613CC for ; Thu, 27 May 2021 20:23:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7574613CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 158846B0081; Thu, 27 May 2021 16:23:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 12B2B6B0082; Thu, 27 May 2021 16:23:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E25BD8D0001; Thu, 27 May 2021 16:23:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id A15E66B0081 for ; Thu, 27 May 2021 16:23:31 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 32BF18249980 for ; Thu, 27 May 2021 20:23:31 +0000 (UTC) X-FDA: 78188136222.12.4E8D18E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf12.hostedemail.com (Postfix) with ESMTP id AB13D2BC9 for ; Thu, 27 May 2021 20:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622147010; 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=Mr9CxfY0aflFHSlW/5vIhFmyytmHYg/MM4gViCf8fs4=; b=ULC89pmy+HlQKmDoZQZiEKGbEUpOgdkkfT0vrLnk7cExEGQ3CI2hRvULwxCZGX7VlXm+Vh iSYaBTmLXI7/bexZ7wk/G/dI81yVgZdXHcl8dGOi4/2StROQJZwuDkrYUHTaTizhXiQB56 Nc5tmV6wLJkO9TuqEbENHEUIqj12M5M= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-AbnRgSekNRuCi5khWDSPlQ-1; Thu, 27 May 2021 16:23:28 -0400 X-MC-Unique: AbnRgSekNRuCi5khWDSPlQ-1 Received: by mail-qk1-f199.google.com with SMTP id b203-20020a3767d40000b02903a6207bfef5so1376121qkc.1 for ; Thu, 27 May 2021 13:23:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mr9CxfY0aflFHSlW/5vIhFmyytmHYg/MM4gViCf8fs4=; b=WbVIoNA9UBwD+VXimC9J00Gj6yvCs66u4EU0NkLhgU3ydlToQfMxYId4otPYEYp5YJ 795msfzTBa+jMEVd2u04JqVklRQpWLjw3jimd9LPXeHRx4LuEqc0ZbR2iczHt0R0P56X 36W12xHUjNUeOSZw1aO1l/rP4l9fNqzf4KAvoWkDysSN9e61j7fq8Uoo7wRLN0bJYVr9 lO/J5VPGXhArKwblePu1KLKs3vwm3s56p0/723HFNS0Srnw1Nyt56XzqENE7Mq+/L9la +Y9fF247Fpp1jcN6GmotObQIyttqoT0s22AdoYF8hSubPqnlTN/OzcZXZ8+GVEg6b3GY eSDw== X-Gm-Message-State: AOAM530SfNQ/cwKT3wNzcRJ5QnAWByvJnh6PimYuKzNLYE3OVR/tZEEY PU4K1QwJjapT44dPRq755FgyH2hkGb1jnR1cDPNM6OLrmDJgDcoey0NXDfYWclW4e14NXgdMLB1 W5wHDxRlMl+M= X-Received: by 2002:ac8:4a98:: with SMTP id l24mr352238qtq.378.1622147008355; Thu, 27 May 2021 13:23:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRAIFI/HJUQmPZpJYQ5Br+Zpl1lpkfA2/NL21zRaxxTI5PdiJKqF+10vpJO8ROFiXz1aAxrA== X-Received: by 2002:ac8:4a98:: with SMTP id l24mr352203qtq.378.1622147008104; Thu, 27 May 2021 13:23:28 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id l197sm2069286qke.121.2021.05.27.13.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:23:27 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , peterx@redhat.com, Andrew Morton , Mike Kravetz , Jerome Glisse , Miaohe Lin , Nadav Amit , Hugh Dickins , Matthew Wilcox , Jason Gunthorpe , "Kirill A . Shutemov" , Andrea Arcangeli , Axel Rasmussen Subject: [PATCH v3 21/27] mm/hugetlb: Introduce huge version of special swap pte helpers Date: Thu, 27 May 2021 16:23:24 -0400 Message-Id: <20210527202324.32104-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ULC89pmy; spf=none (imf12.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: AB13D2BC9 X-Stat-Signature: nrh5ggojieftudu8xm6zazfoq6eebxkm X-HE-Tag: 1622146999-226985 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: This is to let hugetlbfs be prepared to also recognize swap special ptes = just like uffd-wp special swap ptes. Reviewed-by: Mike Kravetz Signed-off-by: Peter Xu --- mm/hugetlb.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b101c3af3ab5..c64dfd0a9883 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -133,6 +133,26 @@ static inline bool subpool_is_free(struct hugepage_s= ubpool *spool) return true; } =20 +/* + * These are sister versions of is_swap_pte() and pte_has_swap_entry(). = We + * need standalone ones because huge_pte_none() is handled differently f= rom + * pte_none(). For more information, please refer to comments above + * is_swap_pte() and pte_has_swap_entry(). + * + * Here we directly reuse the pte level of swap special ptes, for exampl= e, the + * pte_swp_uffd_wp_special(). It just stands for a huge page rather tha= n a + * small page for hugetlbfs pages. + */ +static inline bool is_huge_swap_pte(pte_t pte) +{ + return !huge_pte_none(pte) && !pte_present(pte); +} + +static inline bool huge_pte_has_swap_entry(pte_t pte) +{ + return is_huge_swap_pte(pte) && !is_swap_special_pte(pte); +} + static inline void unlock_or_release_subpool(struct hugepage_subpool *sp= ool, unsigned long irq_flags) { @@ -4061,7 +4081,7 @@ bool is_hugetlb_entry_migration(pte_t pte) { swp_entry_t swp; =20 - if (huge_pte_none(pte) || pte_present(pte)) + if (!huge_pte_has_swap_entry(pte)) return false; swp =3D pte_to_swp_entry(pte); if (is_migration_entry(swp)) @@ -4074,7 +4094,7 @@ static bool is_hugetlb_entry_hwpoisoned(pte_t pte) { swp_entry_t swp; =20 - if (huge_pte_none(pte) || pte_present(pte)) + if (!huge_pte_has_swap_entry(pte)) return false; swp =3D pte_to_swp_entry(pte); if (is_hwpoison_entry(swp)) --=20 2.31.1