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 5BDDCC433C1 for ; Tue, 23 Mar 2021 00:50:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 071376196C for ; Tue, 23 Mar 2021 00:50:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 071376196C 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 50BF66B0137; Mon, 22 Mar 2021 20:49:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46CC26B013A; Mon, 22 Mar 2021 20:49:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 248C26B013B; Mon, 22 Mar 2021 20:49:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0206.hostedemail.com [216.40.44.206]) by kanga.kvack.org (Postfix) with ESMTP id 040236B0137 for ; Mon, 22 Mar 2021 20:49:50 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C24398249980 for ; Tue, 23 Mar 2021 00:49:50 +0000 (UTC) X-FDA: 77949306540.38.4E2D7CC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf18.hostedemail.com (Postfix) with ESMTP id AF21B2000248 for ; Tue, 23 Mar 2021 00:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616460589; 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=KeJZGTpGOrohXVCCKtDdkXfVwkpCkyHGurO1opmnjl4=; b=c3TVOvflmh94hA4f7BjDKcRktSk/W6PNsQ5TyX/LzS7ZOMichkE9BcGxdT2mlfZLxwvHGm nbgpNW9HDL1+0bHaxgb3kNewfWPNs79yzwchGZk98GPli7Dpy05jJSZ+m7u8xzGyV5zxpr efja3aoNSLuvQdodpqQDTB7s7hMzemg= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-4IksJrd6MA2eD79yk_jJ6g-1; Mon, 22 Mar 2021 20:49:48 -0400 X-MC-Unique: 4IksJrd6MA2eD79yk_jJ6g-1 Received: by mail-qk1-f198.google.com with SMTP id y9so804529qki.14 for ; Mon, 22 Mar 2021 17:49:48 -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=KeJZGTpGOrohXVCCKtDdkXfVwkpCkyHGurO1opmnjl4=; b=hAvNCgMj1Lc0OW9hx+/fkyIfZxe5qxcWPuENTHkPGEO10I7eCRko5heyDC2T0BIcGq NWX2jei2e6XRO1XwK8R7cytMgCxwfL9hiJsObM77Hzl3fyUcWL9WjXWZ9SZN3GOS2YXi upfgSK5EssHRra7F6gS8Ro/9TM1uOSvolEZPpey8ukDhGTT2gFj9SdDEmQURKCcPDXMy DvZ7+DEm+fOHhDT8zTnYnjvdBsfvO6iq9QhckVs8ohmfqSTaiSoxLGcZ2FCRSs6SHTzS o9xb/91QE21X/R+vEmo8bi5C9VU+L8skC6ZT6cCkDQ8ECTUHsLe4UrgYMMPzWVMLT2Rc VmoQ== X-Gm-Message-State: AOAM532gvNV1NZVIFA5LbP5rdUONmwmMsQ6AjiaQi37i6PG34ZkNBGZ/ vijeVyeHYGcpWvkRIK0RFbY7VNjvtlCMBR8KdisrxpD944RcbbH/b8J01UXhBSuBboQq1Xt8G7d tLgZltO12xI4= X-Received: by 2002:a37:e16:: with SMTP id 22mr2917205qko.145.1616460586504; Mon, 22 Mar 2021 17:49:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxy6w3/RokxBsgJvQlCDPweOOic+hnNCwhRCQU36ubzi7Ex7In6XJ0GzrQwMBBQ4/ZcsoaITQ== X-Received: by 2002:a37:e16:: with SMTP id 22mr2917181qko.145.1616460586282; Mon, 22 Mar 2021 17:49:46 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-82-174-91-135-175.dsl.bell.ca. [174.91.135.175]) by smtp.gmail.com with ESMTPSA id n6sm5031793qtx.22.2021.03.22.17.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 17:49:45 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: "Kirill A . Shutemov" , Jerome Glisse , Mike Kravetz , Matthew Wilcox , Andrew Morton , Axel Rasmussen , Hugh Dickins , peterx@redhat.com, Nadav Amit , Andrea Arcangeli , Mike Rapoport Subject: [PATCH 18/23] mm/hugetlb: Introduce huge version of special swap pte helpers Date: Mon, 22 Mar 2021 20:49:07 -0400 Message-Id: <20210323004912.35132-19-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323004912.35132-1-peterx@redhat.com> References: <20210323004912.35132-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-Stat-Signature: cyts8soao96suenp9oa8rc3rr4hc96n1 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: AF21B2000248 Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf18; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616460589-438542 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. Signed-off-by: Peter Xu --- mm/hugetlb.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index fd3e87517e10..64e424b03774 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -93,6 +93,25 @@ 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) { spin_unlock(&spool->lock); @@ -3726,7 +3745,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)) @@ -3739,7 +3758,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