From patchwork Fri Apr 4 15:43:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Kalyazin X-Patchwork-Id: 14038639 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 CE3F5C36010 for ; Fri, 4 Apr 2025 15:45:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33174280008; Fri, 4 Apr 2025 11:45:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E0D3280001; Fri, 4 Apr 2025 11:45:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A802280008; Fri, 4 Apr 2025 11:45:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id ED3AA280001 for ; Fri, 4 Apr 2025 11:45:13 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C26DE1C7771 for ; Fri, 4 Apr 2025 15:45:14 +0000 (UTC) X-FDA: 83296785348.10.A9C1B5C Received: from smtp-fw-80007.amazon.com (smtp-fw-80007.amazon.com [99.78.197.218]) by imf23.hostedemail.com (Postfix) with ESMTP id A208B14000B for ; Fri, 4 Apr 2025 15:45:12 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=j4vPo7SB; spf=pass (imf23.hostedemail.com: domain of "prvs=182d669d3=kalyazin@amazon.co.uk" designates 99.78.197.218 as permitted sender) smtp.mailfrom="prvs=182d669d3=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743781512; 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=GO+fOmyXj9EkRr/gRISxH91V61Pvwt+WgpsvJXpM3FY=; b=BiO1UBkScidDIuICNOxw9jJwiLK6BYxmEp/kNd+i4cnfrmW7XlEyfRB7jZIWfU9vZDvxI5 13+ehfnVM3FyC9fjaL5yQV4szNgnodHt6n1ztW4p2dvSAtKpaNuzTU5AjY4JTW/qqYFYrw MMP6gbOTFrMQNKPVImE4jFEdW7UwRjc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=j4vPo7SB; spf=pass (imf23.hostedemail.com: domain of "prvs=182d669d3=kalyazin@amazon.co.uk" designates 99.78.197.218 as permitted sender) smtp.mailfrom="prvs=182d669d3=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743781512; a=rsa-sha256; cv=none; b=aYPbiCVrlnMRGIvjFSw9/PauwTPvxJWpFx9gm4hu5xYvkvGrr/eYjAAl5u3BL2l6W//Six GkNw51eqcLKx7Hjf2bofLzxfkh4Is32XLd7SisVde6jDH3sEU+AE/3HxeLgT/NzjEVjIyv zsLlURNJTFW50g/pQGRQppa8MCA6lL8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1743781513; x=1775317513; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GO+fOmyXj9EkRr/gRISxH91V61Pvwt+WgpsvJXpM3FY=; b=j4vPo7SBcQdtKistktRuW0yuk779DtzCEgHu2rqeFUdE2shyTaQS7Prf XMrgG/nj5WcdeHZtSYmmB5Un1oUmfYRi3iyxCT9XwVpZmTGqUK99NoNMj nvX6/hztObcVHtXs3NL+d0zU9PRjpiELZ0LHSlx9ALjkAvXSoDsTWjpsT k=; X-IronPort-AV: E=Sophos;i="6.15,188,1739836800"; d="scan'208";a="393099257" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.210]) by smtp-border-fw-80007.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2025 15:45:08 +0000 Received: from EX19MTAUWB001.ant.amazon.com [10.0.7.35:38032] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.51.140:2525] with esmtp (Farcaster) id fdc68b7e-a4fc-4834-afdf-ba6792da542c; Fri, 4 Apr 2025 15:45:07 +0000 (UTC) X-Farcaster-Flow-ID: fdc68b7e-a4fc-4834-afdf-ba6792da542c Received: from EX19D003UWB002.ant.amazon.com (10.13.138.11) by EX19MTAUWB001.ant.amazon.com (10.250.64.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Fri, 4 Apr 2025 15:45:01 +0000 Received: from EX19MTAUEC001.ant.amazon.com (10.252.135.222) by EX19D003UWB002.ant.amazon.com (10.13.138.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Fri, 4 Apr 2025 15:45:00 +0000 Received: from email-imr-corp-prod-iad-all-1b-3ae3de11.us-east-1.amazon.com (10.43.8.6) by mail-relay.amazon.com (10.252.135.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Fri, 4 Apr 2025 15:45:00 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-iad-all-1b-3ae3de11.us-east-1.amazon.com (Postfix) with ESMTPS id A0B33A0242; Fri, 4 Apr 2025 15:44:58 +0000 (UTC) From: Nikita Kalyazin To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 5/6] mm: userfaultfd: add UFFD_FEATURE_MINOR_GUEST_MEMFD Date: Fri, 4 Apr 2025 15:43:51 +0000 Message-ID: <20250404154352.23078-6-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250404154352.23078-1-kalyazin@amazon.com> References: <20250404154352.23078-1-kalyazin@amazon.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: A208B14000B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: czxtibe8aw6txkqcunihhuhea9ff3pp3 X-HE-Tag: 1743781512-169445 X-HE-Meta: U2FsdGVkX18vRmUZlh0e491X1kunwNMrX3C0/dh3i8NusVctrVGP8Ywe7We7ylGw4tnwOVVRypIirI62SXPoGJIALYfh3qUdAKTr9tV78i31nHaGkfVY7W8xokErBubxP8Q7CjaG4Tik+3ZPYlOxtLoYYZx35ZDRCRsffIHc6jGK1T/u28AbVK0W8RY3D1vXcHZhNORyhIDBZqh4TZ+NVRT659uUveNO5DPdCkwFinCK4DUxjnE+okE19h130B/eTumlYjpmPRT+71BXW5cpKOxbUSxqIQld0g7x1Nmik7L9taRzI87Z8OmWilbFPkGTh+lXCkqwhX+jq/r+0JIq+XqTNIiEXh0rSV5E2dcPw4wa/iQK1i2XoENLpfSD+yxY3zucvimG0eL2NgJgSrtfDjk6++nVsRciEAJxMcjrTo4f8H68SCMuOs2X1vimCk9rqrAbQMgvxfhoYLh0k6IX6WvWikRbXIOEqFwh8QrqhV1wcllG4Ou/KXw9H8sntoLVQIeODKPy9/arwRmNu26i96SBcZXOaLtVxjKcYbFPCl8khzBQ9/w3bINAPTlkqKWHKxnwwNepDKTise/Rym43NcIwqBY+lmwOWYl2Bn1DVkzIL+BtfTGBsptOcxS+NUXPW6OSz/yJCF5jA//VqrvjkxEbEexbT1P6jqQ4pf6HX+Z0UvfQUf5Je27rB9C9YMjt/bOcRvm4Yr2/ps7bnw7it4YRojdXwxSc8YXqbHgwQx1N/N4mAEf2Nc4G4ITdxYI8IEmgumSI2PyBAURWYfUKXvff01VG5fViqqn1mK20ZKBeeO1AMKjtV9MliUKsNpgHttrBu46TuFE2/yyyRg28qox82Ze6J+oLLTBxyt4vOywmDFDdL2U23onHzw+APVr0vLfrtaqZCETZkyDy4QMTBaBqjWufzEWQ87QGwzvRKs8q4btWPg4BT3l0/d484mjk2s1y0zrpGeGy6r5FOMI UsEnRzYZ X/Lx3ZuMsY2YFyxvBuCI29rXAdvGEl2qH5CAHgOk9Nnocyz+bCjnH6yvOoqbmitv+gLK3Wa2ndOKjh11SFJEVTaAowGb+HVq0AI5q3E1VSHHUDQUyAoqbPtptWmF0YquKPW3g9CdXwwfEPdxKlx/mTA3iXGAckFnj9YjtTqPHKyx3yF8A8+U2uM7Q5pL7L6y220YBwV8IDYXyoHHuA07L+6pXaYlVjAnB2VkxVeFpuVHwd16sBLvHAkzEBnVIrxUssCAnfjSNub2pQJsPjo4GuEv0tWOUPKglbH9K7AzkzOsEsKcHt0PvQBp44CSWKn6lEvUxspSa7rh30an4+Plv9r0Ypg05har76erKSZcPGlb611x4+0zYBcxkEU3ZJJdar3nqGt6Gc1bn7JUMqeZpAKDZ5UtOmsZv3clty8LQdFCdftlQmPUAxQxwohKK9CzrrbHEIyG3RnMtFhNA+rGuuJH/DNYHdE+JofQ4NoD4UE7lTMI6P/RX6OX9DCXdv1WNOfzo1OWWz8wb0UiQGp9dLBjkUv21j4sRW4QCuYIiAyX9Zzo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000097, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Signed-off-by: Nikita Kalyazin --- fs/userfaultfd.c | 3 ++- include/uapi/linux/userfaultfd.h | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 97c4d71115d8..32152bfa462a 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1954,7 +1954,8 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx, uffdio_api.features = UFFD_API_FEATURES; #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR uffdio_api.features &= - ~(UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM); + ~(UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM | + UFFD_FEATURE_MINOR_GUEST_MEMFD); #endif #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP uffdio_api.features &= ~UFFD_FEATURE_PAGEFAULT_FLAG_WP; diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index 2841e4ea8f2c..ed688797eba7 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -42,7 +42,8 @@ UFFD_FEATURE_WP_UNPOPULATED | \ UFFD_FEATURE_POISON | \ UFFD_FEATURE_WP_ASYNC | \ - UFFD_FEATURE_MOVE) + UFFD_FEATURE_MOVE | \ + UFFD_FEATURE_MINOR_GUEST_MEMFD) #define UFFD_API_IOCTLS \ ((__u64)1 << _UFFDIO_REGISTER | \ (__u64)1 << _UFFDIO_UNREGISTER | \ @@ -230,6 +231,10 @@ struct uffdio_api { * * UFFD_FEATURE_MOVE indicates that the kernel supports moving an * existing page contents from userspace. + * + * UFFD_FEATURE_MINOR_GUEST_MEMFD indicates the same support as + * UFFD_FEATURE_MINOR_HUGETLBFS, but for guest_memfd-backed pages + * instead. */ #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0) #define UFFD_FEATURE_EVENT_FORK (1<<1) @@ -248,6 +253,7 @@ struct uffdio_api { #define UFFD_FEATURE_POISON (1<<14) #define UFFD_FEATURE_WP_ASYNC (1<<15) #define UFFD_FEATURE_MOVE (1<<16) +#define UFFD_FEATURE_MINOR_GUEST_MEMFD (1<<17) __u64 features; __u64 ioctls;