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.6 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,SPF_PASS,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 DD174C433B4 for ; Tue, 27 Apr 2021 16:14:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 840CA61151 for ; Tue, 27 Apr 2021 16:14:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 840CA61151 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 3F24B6B0096; Tue, 27 Apr 2021 12:13:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CAD86B0098; Tue, 27 Apr 2021 12:13:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1CD5E6B0099; Tue, 27 Apr 2021 12:13:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id ECF606B0096 for ; Tue, 27 Apr 2021 12:13:57 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A27825DC9 for ; Tue, 27 Apr 2021 16:13:57 +0000 (UTC) X-FDA: 78078643314.06.F95FBC5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 87BB36000123 for ; Tue, 27 Apr 2021 16:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619540036; 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=Of2/jNcSu5bZyfPgDma9r/3WOH0gTfsq0jzNO09tuew=; b=DlOIkCKkOsCLheyOx/CN6SmMHAUEAiSNADAYF31PXS28pWZ3zVwvRSvu6+I6he6DWbnt9x YWTpXumnTf0xULqWbaiSfBq1vprHEuP6bHteJhR0eT4dpS9J55JulHiNixWRCmJibPbmQW tpxLOuO95iL2viBrkjvtghV3J5uJRH8= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-596-sMBRYV0XPOS7QqHHr6rvJQ-1; Tue, 27 Apr 2021 12:13:55 -0400 X-MC-Unique: sMBRYV0XPOS7QqHHr6rvJQ-1 Received: by mail-qt1-f199.google.com with SMTP id i7-20020ac84f470000b02901b944d49e13so15807300qtw.7 for ; Tue, 27 Apr 2021 09:13:55 -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=Of2/jNcSu5bZyfPgDma9r/3WOH0gTfsq0jzNO09tuew=; b=mtdR5Vg7qPr82nsXq+7yTs+yzJf6QHyeCw0FN84drTOpqHB0ummASESNG1vdQk2xgY iuxv3PewdvDHxvN1XT2KeQVZvhTKDbxCaRvA8SQRFzEQhS3JY/LEstb8cQkmFVfO9ZoU 7nsql6bzLExXeMnf6/dyn1MMb7wF+hmuBqS/33m/q58jhzO9eDnuf4GREQKX1kHwXLHl LtSrZlGXcqijz+LnpygM8YquNXhllbgBPc6sszzGo6JIEK588umLKY2ej3CM9QAI7sJA ebpxVWayRgBh7x39FDU9PIukvG+GYYRat3LyWW4G75rtr5duFLWlSy2QodwrtTk8BNmq y9ew== X-Gm-Message-State: AOAM530o6W1F7oLVlWApq9pSfCeduV+A2l5KxnMjyE6p2CW1LUOPb2Bk fEzwfyhZnAygDDjwnSsjbH0tZeZ6hFRJWkFBJGqeJEcR5THioJMqU197F7QdxQVmnKK8Azo7tdW 8lrYItBYILVeKmDVbUTPV+v3I+6+Kizds2erab/Nah7i/n4fzHEoqefmnXBkV X-Received: by 2002:ac8:7e8a:: with SMTP id w10mr21740812qtj.126.1619540034198; Tue, 27 Apr 2021 09:13:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNseODxdO93YFWKSY+Dyt7Y8fBZc5YflnrNJdlFTqOIRJxaq9cLRBHJ2XKxA4N01e/IDcnqQ== X-Received: by 2002:ac8:7e8a:: with SMTP id w10mr21740763qtj.126.1619540033840; Tue, 27 Apr 2021 09:13:53 -0700 (PDT) Received: from xz-x1.redhat.com (bras-base-toroon474qw-grc-77-184-145-104-227.dsl.bell.ca. [184.145.104.227]) by smtp.gmail.com with ESMTPSA id v66sm3103621qkd.113.2021.04.27.09.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 09:13:53 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Nadav Amit , Miaohe Lin , Mike Rapoport , Andrea Arcangeli , Hugh Dickins , peterx@redhat.com, Jerome Glisse , Mike Kravetz , Jason Gunthorpe , Matthew Wilcox , Andrew Morton , Axel Rasmussen , "Kirill A . Shutemov" Subject: [PATCH v2 19/24] mm/hugetlb: Introduce huge version of special swap pte helpers Date: Tue, 27 Apr 2021 12:13:12 -0400 Message-Id: <20210427161317.50682-20-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210427161317.50682-1-peterx@redhat.com> References: <20210427161317.50682-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 87BB36000123 X-Stat-Signature: oj4y5omyhby869acynwbshjqioyedrep Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf25; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=170.10.133.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619540032-704319 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 3cad5d7726614..071a8429ea190 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -93,6 +93,26 @@ static inline bool subpool_is_free(struct hugepage_sub= pool *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) { @@ -3885,7 +3905,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)) @@ -3898,7 +3918,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.26.2