From nobody Fri Dec 19 04:01:20 2025 Received: from mail-io1-f73.google.com (mail-io1-f73.google.com [209.85.166.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 417A8204F77 for ; Mon, 24 Mar 2025 06:53:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742799215; cv=none; b=CeqSn6T9Q+A6EoKGqYEJX6dRSMxIpcYqqr2rjtP43Wo9zvOh+VVaOFdd5HHkBpeaezwFqsvFwmJHMtw/KxEZtx7Xh92sgaqsMRrsyX99qkKyDqgsWuCva8E2ihqvp//dXhCHmVT/4KKrYLmWBfNV1+rRgfLSZu+gMl8llsvZCZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742799215; c=relaxed/simple; bh=nrkJk9DKEGt/dov8Gi4x/jNgwqImygJxo/xULmqLdas=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OXg2CkNraroguGsDzdYehqGAPlFTB8JV+gxZKRryBwbGMyNzWiF7o2+xzqEcGm/j1SuCCYaink9Jg8KkxqvnmJinSb7x3Ku9zrYAfDDhGDdBnOJdumOmi3YH7ZFwwGxm4OHly7pXvun65EMYS1StmUZXmeC8XOHfxXiLtKrsjek= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=AvNOsxdM; arc=none smtp.client-ip=209.85.166.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="AvNOsxdM" Received: by mail-io1-f73.google.com with SMTP id ca18e2360f4ac-85dad58e80fso849650939f.3 for ; Sun, 23 Mar 2025 23:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742799212; x=1743404012; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xl8IF5RHpUU1Lg7cJxOKLVwxFTCbPq38iLJ6S8yYG08=; b=AvNOsxdM5EMdfxvwysARbn1btARGyZcSAvnc7mVNMFh52iKQukt0ePXdvMsIi8Wx3C iiKsBEzRD0hNvs4SJJDtTSvhixpXGTDRweKZBkz77H83mxy6/35WssYCJFsDhC0BVKac lMi3ZyDgwvKwnFyL+V3ieH02EZK+2A/nEPGo+z1UsP8pxu5zQKxw2CnURY+e+C1WjyOw MLYIbJdd8fHf60PhCOq4gLy6IOm7YOTYl9L3WYazlZtQEOo4eTaV/1FL9Yjd+wS/yzOc UGGk4Iw9sLGDNcpqa90VfdS4dz09UPAogTrOCP7dO+P3F5wnSd1eMP8wmvjwW7bLhbWA wVDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742799212; x=1743404012; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xl8IF5RHpUU1Lg7cJxOKLVwxFTCbPq38iLJ6S8yYG08=; b=qS0gr3goJsnui2lC1kXRzoQvJkP/cz8AFchdGOGKP8pGGIZikZLPSRhhX2P1iq5Ghg /9PZtTesLc0a5N0GGexnaZEvWsYNroofpfX9sqOLlp93Rb1FnHuzIlVGaL0bQilVYYjS yU2L166ZeQQIsrn5ntcKRfI2K12/RRe3Q1+x2/w2lHLhf7BuhYqZc/7lfjimuSdBHq+E ApfY9Eb6XxtZjwqv6h28uBICLhKVu8MSMIUlJylh4IgQNU0eJOUCaQOys2a8AR+7LhQv Ol6a3V+Wa4BWzN2U8mVO6tEJ4pKlV3wUmHxAuveWpcTn6vsAu+ZYas3lXgue1oTnSsl5 17NQ== X-Gm-Message-State: AOJu0Yw/c8S5vdEpU4He5TyC4ybugFhe+LkknlBJl4kJe13crMwJRihL 225SwA4u4PA+ZqUKDJ3kY8FnACsG7PBhg0U7WHAPk12Rhj3sCC9wnlKxDt8aQ4kZwmnP00Tipu2 N/A== X-Google-Smtp-Source: AGHT+IGLukfQgJAXKk11u4fnuWxiAd2otr8HGeGoAqGpKKKT8IRHd3Jidw+Bw0GLHnKZol10jN2Ijr7hn10= X-Received: from iosu9.prod.google.com ([2002:a05:6602:29a9:b0:85b:606c:d446]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6602:418f:b0:85b:3f06:1fd4 with SMTP id ca18e2360f4ac-85e2cb5960dmr918008339f.9.1742799212314; Sun, 23 Mar 2025 23:53:32 -0700 (PDT) Date: Mon, 24 Mar 2025 06:53:26 +0000 In-Reply-To: <20250324065328.107678-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250324065328.107678-1-avagin@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250324065328.107678-2-avagin@google.com> Subject: [PATCH 1/3] fs/proc: extend the PAGEMAP_SCAN ioctl to report guard regions From: Andrei Vagin To: Lorenzo Stoakes , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, David Hildenbrand , Shuah Khan , Jonathan Corbet , criu@lists.linux.dev, Andrei Vagin Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andrei Vagin Introduce the PAGE_IS_GUARD flag in the PAGEMAP_SCAN ioctl to expose information about guard regions. This allows userspace tools, such as CRIU, to detect and handle guard regions. Acked-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Signed-off-by: Andrei Vagin --- Documentation/admin-guide/mm/pagemap.rst | 1 + fs/proc/task_mmu.c | 17 ++++++++++------- include/uapi/linux/fs.h | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Documentation/admin-guide/mm/pagemap.rst b/Documentation/admin= -guide/mm/pagemap.rst index a297e824f990..1f49762190eb 100644 --- a/Documentation/admin-guide/mm/pagemap.rst +++ b/Documentation/admin-guide/mm/pagemap.rst @@ -234,6 +234,7 @@ Following flags about pages are currently supported: - ``PAGE_IS_PFNZERO`` - Page has zero PFN - ``PAGE_IS_HUGE`` - Page is PMD-mapped THP or Hugetlb backed - ``PAGE_IS_SOFT_DIRTY`` - Page is soft-dirty +- ``PAGE_IS_GUARD`` - Page is a part of a guard region =20 The ``struct pm_scan_arg`` is used as the argument of the IOCTL. =20 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index c17615e21a5d..cc35d8990c54 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -2067,7 +2067,8 @@ static int pagemap_release(struct inode *inode, struc= t file *file) #define PM_SCAN_CATEGORIES (PAGE_IS_WPALLOWED | PAGE_IS_WRITTEN | \ PAGE_IS_FILE | PAGE_IS_PRESENT | \ PAGE_IS_SWAPPED | PAGE_IS_PFNZERO | \ - PAGE_IS_HUGE | PAGE_IS_SOFT_DIRTY) + PAGE_IS_HUGE | PAGE_IS_SOFT_DIRTY | \ + PAGE_IS_GUARD) #define PM_SCAN_FLAGS (PM_SCAN_WP_MATCHING | PM_SCAN_CHECK_WPASYNC) =20 struct pagemap_scan_private { @@ -2108,12 +2109,14 @@ static unsigned long pagemap_page_category(struct p= agemap_scan_private *p, if (!pte_swp_uffd_wp_any(pte)) categories |=3D PAGE_IS_WRITTEN; =20 - if (p->masks_of_interest & PAGE_IS_FILE) { - swp =3D pte_to_swp_entry(pte); - if (is_pfn_swap_entry(swp) && - !folio_test_anon(pfn_swap_entry_folio(swp))) - categories |=3D PAGE_IS_FILE; - } + swp =3D pte_to_swp_entry(pte); + if (is_guard_swp_entry(swp)) + categories |=3D PAGE_IS_GUARD; + else if ((p->masks_of_interest & PAGE_IS_FILE) && + is_pfn_swap_entry(swp) && + !folio_test_anon(pfn_swap_entry_folio(swp))) + categories |=3D PAGE_IS_FILE; + if (pte_swp_soft_dirty(pte)) categories |=3D PAGE_IS_SOFT_DIRTY; } diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 2bbe00cf1248..8aa66c5f69b7 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -363,6 +363,7 @@ typedef int __bitwise __kernel_rwf_t; #define PAGE_IS_PFNZERO (1 << 5) #define PAGE_IS_HUGE (1 << 6) #define PAGE_IS_SOFT_DIRTY (1 << 7) +#define PAGE_IS_GUARD (1 << 8) =20 /* * struct page_region - Page region with flags --=20 2.49.0.395.g12beb8f557-goog From nobody Fri Dec 19 04:01:20 2025 Received: from mail-oi1-f202.google.com (mail-oi1-f202.google.com [209.85.167.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67F812054F6 for ; Mon, 24 Mar 2025 06:53:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742799217; cv=none; b=Ct1RuC6CjkFRNEhjMGva4oilSzn6i6rz30NKdcunbF25TCu4bKzoznqS8i4ZLhXKXdvaNcq24zD43XkoJbt8YkRWwPcUe52cCYOdt91Y4TcRvCDXUVOF5YZ3vF2Lgx3yO6RxGh1uD51TN2RWF98ACLs3dtabRjki5jK6cqIl1bM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742799217; c=relaxed/simple; bh=6Iry22bjOWQ1AjPaz9MRQqCkIqRJczbOa9UlGPD4ElM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lTXhBl+EMVzhB9szHCCYuUzTmA/7HK8HODPSeHivXvM+aRYhyJEr1LKp4t2IadA7xWp40Oat6O7b4OcgfqvQgGH7J08y3rIcBWlw6lkRikV/jXcYBK82N/Ja7ufnecovNA8iLBw/OZjMJbck55BDH0HfA16wb7im0J9sBLY4uVU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LpvXYy0x; arc=none smtp.client-ip=209.85.167.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LpvXYy0x" Received: by mail-oi1-f202.google.com with SMTP id 5614622812f47-3f7ade514c8so1072301b6e.0 for ; Sun, 23 Mar 2025 23:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742799213; x=1743404013; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mHKQPGagMOpPzVXkQrg+YdchEGJ0YJ8P2M6qhZ6IcLg=; b=LpvXYy0x1/rlGCWEvwQJRccgpccdpNxLYJJa0AaN/K5VWbmXhypizwu7ZTMHZJzIDn nG6NcLodvxmOlHTwSPQVkQm7/rVW4WbUobSjFghcd8HqpqO5ie5Lb9vgSrXjypHJraOT decivjcIWv8u1Vx1MI6S6v3kmQjJX1PljRuDOo/JHS09yCphHhc/p1QgMvdEqztIi1Hd 4hO1fA5tr4HZZU7QzY4XwCxWraJWyjlva/VOLH68fllrXWWS7Wd9h1LV3KRl1AS5ZSNF uRWa8SPWW4IV1STsWfSp0KnNPFaDM+3IZiTlWYPBrMDqARTUaiSJG4LFUa5H6WdGPoWx 0FZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742799213; x=1743404013; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mHKQPGagMOpPzVXkQrg+YdchEGJ0YJ8P2M6qhZ6IcLg=; b=g/Bp1QkQvNqjC62vKfoWtgnTTG/IRxYBrP9YDBTPLYJDR1aF6TfdEDUvBlBV0l0xsK IGNJ+q5a0XIpdIK/wW+u3k0mAjdMEYYlrfnGuO59Pm8pFszw+EBZNKgIZD8SYDQA/J8B +i2UKIE/ZOjU9Ch9ZWAwPlJkbK2TQi+dBGNa+jYwdSFE9T2JXyvElGPmAhdPU85Mh9lS lpMKZX1TBWhztwREgKqqiiuBwUZGNAjsrB0PD4gB3bzZW32zvkSCBepv83x7q294/7Fi N2hPVljjH3X4AG9VFIg9OYgQwemBAV4Zx0Vx/yh2ihAo53exhRpROvQx5FXZSlAk/DiK uHlw== X-Gm-Message-State: AOJu0YzZQFkyR2Q+lhE2HE2klGLokTK8F5ulGXbfjyx5UVgHKsxFEYKV RA1A4ab6xSo6nmJX2BmzZThPeydOknjG8PpT9Af/wLL5y/k3JaQNgRghta08y+dTcZckrLF07eB bnQ== X-Google-Smtp-Source: AGHT+IHdUZdDUihniNDxIj7Y5cXrzFf0YBkU/hlZx14R7lVEo/UwEmOdH9bM8gXluf4n8aUSHGMsn5H0BYM= X-Received: from oabry11.prod.google.com ([2002:a05:6871:208b:b0:2ae:bdb:eb0]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6830:2813:b0:72b:919a:fa96 with SMTP id 46e09a7af769-72c0ae465f1mr8859493a34.5.1742799213422; Sun, 23 Mar 2025 23:53:33 -0700 (PDT) Date: Mon, 24 Mar 2025 06:53:27 +0000 In-Reply-To: <20250324065328.107678-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250324065328.107678-1-avagin@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250324065328.107678-3-avagin@google.com> Subject: [PATCH 2/3] tools headers UAPI: Sync linux/fs.h with the kernel sources From: Andrei Vagin To: Lorenzo Stoakes , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, David Hildenbrand , Shuah Khan , Jonathan Corbet , criu@lists.linux.dev, Andrei Vagin Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andrei Vagin Required for a new PAGEMAP_SCAN test to verify guard region reporting. Signed-off-by: Andrei Vagin Reviewed-by: Lorenzo Stoakes --- tools/include/uapi/linux/fs.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/fs.h b/tools/include/uapi/linux/fs.h index 8a27bc5c7a7f..24ddf7bc4f25 100644 --- a/tools/include/uapi/linux/fs.h +++ b/tools/include/uapi/linux/fs.h @@ -40,6 +40,15 @@ #define BLOCK_SIZE_BITS 10 #define BLOCK_SIZE (1<; Mon, 24 Mar 2025 06:53:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742799218; cv=none; b=i1cBaCrwjikGBNmuCgtK90+S2ijiiOzQWVzIZ0Eh5ZferJRtjOao7Ld6+ZhILUX05WKi1Yq6aySMa4C1TFCrvtgeiTzPMTva4q89AgQWYhJMx0rpyCRqskgRJO4pMcvsDyP88kT+y/Ol26+R0b/UPAaUq/29TjIQkqHr0GdP5Ho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742799218; c=relaxed/simple; bh=a/655ARJD96yOrrJq8qv2chSeO2igeF+EpgPoB34Lko=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AWezqAqbUUDLWVavow+1F2W6JQ9koCtOqIF2WSDX4KIDO8L/7uKOlbPQdhAnZ6BweUQFMS94LJT25rgssL0zgKIBX7cQGYzG2jPQr951iXikxQynzWXiKXa3N4qak2JHXcWMHnyfSJmJGgO3mnsqN5jnRYqWcYfP9/jBgk6EQzU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=BN51GcXY; arc=none smtp.client-ip=209.85.166.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BN51GcXY" Received: by mail-io1-f74.google.com with SMTP id ca18e2360f4ac-85dad46e9ddso338942339f.0 for ; Sun, 23 Mar 2025 23:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742799214; x=1743404014; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ffy3DLCEfKN3in8d5zlc7vx3iwgfrqHuCXTxXTm84ts=; b=BN51GcXYon69e0DC3wmCG7WMntjOUTb3SBB+Gr7psZ5Oic05Ub9A9VnlMIxiQg4OVo sSY0y99d38pDT6F/BgOq0k0Udql1nVxT5qHpxlHlaQp2NsOtgK8L3JaEcF7TTszUaDt6 yP99+3LZjCg9G4p1e96aAxYOLxcuqz69LRCD1x8uvrmPZyzkz7Zw0G40PTfaZ0V1QxFi uXYyjgnQKtrP5OFOuXEtXczjFPIa70OcCf5nCarrYczJulzXcQyMmdknixeTutMEWAob F8GOkto/ckriWp8A2xVKwRUZD+8BqJfqK4K+gU7GuIsWDJwy+ealOAWjyEtaIZYeB8sI V6xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742799214; x=1743404014; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ffy3DLCEfKN3in8d5zlc7vx3iwgfrqHuCXTxXTm84ts=; b=IIxQQ0S/jmiJpAU+tMlI1qAWXXwONFn0xFUrJ+0c/P2lDDvAabeigRimVLCyb2M2BY SjoLd3yHPSVV5Lf2G/8p1Sw7gyndbBRBT6h7FP/yveQZpOAKLk2CAyfv7gFCVnD3f15H 9P0SpQBKEjBhi5NNRokky/h03vm5SOAC97VHV/kSiix1Ey+3JmxHcdcGU3VZz028mfma hfM8PBjr9dnxh9CApGBV1zqf4rhXtlqObNT3UVrSDhY9jTGBGQG7Xr7rK8FE93ePi/I8 VoFirDEckaQdFcQ6b/psLOMXdO2BdKDONM69EUHiZBZTsGy5VTiDMacspDZAVqBjIYRA Di3A== X-Gm-Message-State: AOJu0YztRSurbtgi/74aisXNPND9iEXcRT0ohFA9bzBvnJ3TgXwTR65e PNHV0i/1Tgq32hiGRlMCFiytrF1swuRcuUppyUgOGiFCvViLM/28xNS7xhwctmRs2KcIulv/gD9 VUg== X-Google-Smtp-Source: AGHT+IFwtFlPb7SBpjbVuF+q5bn8QiiRzWt4tMIZGVuP7apCHzJYW7HGlUxBgl+wR+Dv2VtTkkVMvH9ZZQw= X-Received: from iobbw19.prod.google.com ([2002:a05:6602:3993:b0:85b:40c7:ce65]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a6b:7b07:0:b0:85b:5511:e47f with SMTP id ca18e2360f4ac-85e1ef9251emr1427245839f.3.1742799214336; Sun, 23 Mar 2025 23:53:34 -0700 (PDT) Date: Mon, 24 Mar 2025 06:53:28 +0000 In-Reply-To: <20250324065328.107678-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250324065328.107678-1-avagin@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250324065328.107678-4-avagin@google.com> Subject: [PATCH 3/3] selftests/mm: add PAGEMAP_SCAN guard region test From: Andrei Vagin To: Lorenzo Stoakes , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, David Hildenbrand , Shuah Khan , Jonathan Corbet , criu@lists.linux.dev, Andrei Vagin Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andrei Vagin Add a selftest to verify the PAGEMAP_SCAN ioctl correctly reports guard regions using the newly introduced PAGE_IS_GUARD flag. Signed-off-by: Andrei Vagin Reviewed-by: Lorenzo Stoakes --- tools/testing/selftests/mm/guard-regions.c | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tools/testing/selftests/mm/guard-regions.c b/tools/testing/sel= ftests/mm/guard-regions.c index 0c7183e8b661..c99f3da8bfb7 100644 --- a/tools/testing/selftests/mm/guard-regions.c +++ b/tools/testing/selftests/mm/guard-regions.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -2079,4 +2080,60 @@ TEST_F(guard_regions, pagemap) ASSERT_EQ(munmap(ptr, 10 * page_size), 0); } =20 +/* + * Assert that PAGEMAP_SCAN correctly reports guard region ranges. + */ +TEST_F(guard_regions, pagemap_scan) +{ + const unsigned long page_size =3D self->page_size; + struct page_region pm_regs[10]; + struct pm_scan_arg pm_scan_args =3D { + .size =3D sizeof(struct pm_scan_arg), + .category_anyof_mask =3D PAGE_IS_GUARD, + .return_mask =3D PAGE_IS_GUARD, + .vec =3D (long)&pm_regs, + .vec_len =3D ARRAY_SIZE(pm_regs), + }; + int proc_fd, i; + char *ptr; + + proc_fd =3D open("/proc/self/pagemap", O_RDONLY); + ASSERT_NE(proc_fd, -1); + + ptr =3D mmap_(self, variant, NULL, 10 * page_size, + PROT_READ | PROT_WRITE, 0, 0); + ASSERT_NE(ptr, MAP_FAILED); + + pm_scan_args.start =3D (long)ptr; + pm_scan_args.end =3D (long)ptr + 10 * page_size; + ASSERT_EQ(ioctl(proc_fd, PAGEMAP_SCAN, &pm_scan_args), 0); + ASSERT_EQ(pm_scan_args.walk_end, (long)ptr + 10 * page_size); + + /* Install a guard region in every other page. */ + for (i =3D 0; i < 10; i +=3D 2) { + char *ptr_p =3D &ptr[i * page_size]; + + ASSERT_EQ(syscall(__NR_madvise, ptr_p, page_size, MADV_GUARD_INSTALL), 0= ); + } + + /* + * Assert ioctl() returns the count of located regions, where each + * region spans every other page within the range of 10 pages. + */ + ASSERT_EQ(ioctl(proc_fd, PAGEMAP_SCAN, &pm_scan_args), 5); + ASSERT_EQ(pm_scan_args.walk_end, (long)ptr + 10 * page_size); + + /* Re-read from pagemap, and assert guard regions are detected. */ + for (i =3D 0; i < 5; i++) { + long ptr_p =3D (long)&ptr[2 * i * page_size]; + + ASSERT_EQ(pm_regs[i].start, ptr_p); + ASSERT_EQ(pm_regs[i].end, ptr_p + page_size); + ASSERT_EQ(pm_regs[i].categories, PAGE_IS_GUARD); + } + + ASSERT_EQ(close(proc_fd), 0); + ASSERT_EQ(munmap(ptr, 10 * page_size), 0); +} + TEST_HARNESS_MAIN --=20 2.49.0.395.g12beb8f557-goog