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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCA82C433FE for ; Fri, 21 Oct 2022 16:37:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48CA98E0021; Fri, 21 Oct 2022 12:37:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43F258E0001; Fri, 21 Oct 2022 12:37:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BA988E0021; Fri, 21 Oct 2022 12:37:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EAB368E0001 for ; Fri, 21 Oct 2022 12:37:48 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A20BC160457 for ; Fri, 21 Oct 2022 16:37:48 +0000 (UTC) X-FDA: 80045513016.12.EB1CDAA Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf16.hostedemail.com (Postfix) with ESMTP id 0645C180031 for ; Fri, 21 Oct 2022 16:37:47 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-36ab1ae386bso3392147b3.16 for ; Fri, 21 Oct 2022 09:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+C7/ATuUriMIrUw34NjzRIATqKexU0rnzCYq9OSaiU4=; b=jJGO9Z7ZWa3ry6jjj7ApkjoGMgyzlebjLJ9uIX3/IGcrm79tNXbnUjUmPWEAbUWcEd 55DuEMpVP9519fDyAuDBtSlqfbKbDKkyB8ijR8pErjYk3LLzCP/D/GV/wZwetPTE7Ojr wpMDqo/jZbCPsmNcIrkWDF+SByqBvmoi+4RjlGJDBYF3ZdmqeeL+CbWAQiFjQNnor9LY 8qVv18b9TvK+Uf6pPv8vBqeHpFR9pTHLq1xNH9bPPuK8OH77Q8JvguOlKR7a9IFK3m+x IXO0PqqgFybb/i1Kn8jmukXUloBrvY5XjEr+pUxja4P0YbG1JGN8wCpY7Bj9c2UzEM8m BOcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=+C7/ATuUriMIrUw34NjzRIATqKexU0rnzCYq9OSaiU4=; b=sU5cxV0B1OgwKCv9kib4MpGTzO5VdlIz7532JE3DrUxYMKz44ToT5VO3sprVYaCUSe z/zdi/k2qxQ4BimPlFC4k0BOhn99cZNGc/oBdVZ3TdDQU0F67lrREaE4LpbK5pt7OwV9 pSMuKVfVxskf6TIwRyHPe/fYvbtvf4pw99gN8UuU+baQviWjl8Rpxb4UwPRyR4iWrOqJ qLeFZEMxZYmmOL2TBpPCdRAPfJI9sZVTJeng0Y7LdK+ieDMxv+Kd8Co81rJIRQ0QdHrj KqrksCzAV947RfOsy5Rs7t8TWnIUR/CbPKdzCv6DcUbuLUusr4zLInZAfxYyAvk438Xz YANg== X-Gm-Message-State: ACrzQf0LpeUbhj9TKmKFJmHIzxmmmYgBsxwtj/AOXR2Tuq+t+J6yWVRz I3cdsI4gjWsjuf3yGbD2xhUL20XUOIPP35qm X-Google-Smtp-Source: AMsMyM5P4lx4WIyqBLDAe0Bc4rPZ7u/BTYY9AuZts942sFnS05sAkglQc+I6YcdbaB2xek0CE+P143XsmtscbOX3 X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:b851:0:b0:6ca:2b0b:d334 with SMTP id b17-20020a25b851000000b006ca2b0bd334mr9202954ybm.104.1666370267430; Fri, 21 Oct 2022 09:37:47 -0700 (PDT) Date: Fri, 21 Oct 2022 16:36:49 +0000 In-Reply-To: <20221021163703.3218176-1-jthoughton@google.com> Mime-Version: 1.0 References: <20221021163703.3218176-1-jthoughton@google.com> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog Message-ID: <20221021163703.3218176-34-jthoughton@google.com> Subject: [RFC PATCH v2 33/47] userfaultfd: add UFFD_FEATURE_MINOR_HUGETLBFS_HGM From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666370268; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+C7/ATuUriMIrUw34NjzRIATqKexU0rnzCYq9OSaiU4=; b=tG3qjGbaPYOQJvU4LHqB/es0p/bbJwntYmiIdCFzyrLRQKp93EJkiB/ObIVnAlZuOK6H3h PmbIj/DcudZzeboE7TzOtzm1fuZMy5GtijTHGG5oR3K+nQ5DuDE4l7maYGGB9c0ecv7rc6 pkBQ/54M9tDwTQo+q6WwCGULfNZ4CuM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jJGO9Z7Z; spf=pass (imf16.hostedemail.com: domain of 328pSYwoKCNwHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=328pSYwoKCNwHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666370268; a=rsa-sha256; cv=none; b=hNylix9+HFREalwDT1maZRAwrzX/pOd8yGvo/u1W6uF6yU7NzXzAOnRuvw+dtIKTJ/VxOX ygJ99tcMmPX3KHrN+dTDRP7R+xp1SbpmmbcGj7z/nucpPWGhB+4RfBJWJNeQ0sa+vO+0OL Irpw8CAZZh0WMDq/wN9/RgNgcqIDErQ= X-Stat-Signature: 8j9h1mnu9tzim97o1j3wdgukeftib6gt X-Rspam-User: Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jJGO9Z7Z; spf=pass (imf16.hostedemail.com: domain of 328pSYwoKCNwHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=328pSYwoKCNwHRFMSEFRMLEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0645C180031 X-HE-Tag: 1666370267-939585 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: Userspace must provide this new feature when it calls UFFDIO_API to enable HGM. Userspace can check if the feature exists in uffdio_api.features, and if it does not exist, the kernel does not support and therefore did not enable HGM. Signed-off-by: James Houghton --- fs/userfaultfd.c | 12 +++++++++++- include/linux/userfaultfd_k.h | 7 +++++++ include/uapi/linux/userfaultfd.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 07c81ab3fd4d..3a3e9ef74dab 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -226,6 +226,11 @@ static inline struct uffd_msg userfault_msg(unsigned long address, return msg; } +bool uffd_ctx_has_hgm(struct vm_userfaultfd_ctx *ctx) +{ + return ctx->ctx->features & UFFD_FEATURE_MINOR_HUGETLBFS_HGM; +} + #ifdef CONFIG_HUGETLB_PAGE /* * Same functionality as userfaultfd_must_wait below with modifications for @@ -1954,10 +1959,15 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx, goto err_out; /* report all available features and ioctls to userland */ uffdio_api.features = UFFD_API_FEATURES; + #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR uffdio_api.features &= ~(UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM); -#endif +#ifndef CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING + uffdio_api.features &= ~UFFD_FEATURE_MINOR_HUGETLBFS_HGM; +#endif /* CONFIG_HUGETLB_HIGH_GRANULARITY_MAPPING */ +#endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ + #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP uffdio_api.features &= ~UFFD_FEATURE_PAGEFAULT_FLAG_WP; #endif diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index f07e6998bb68..d8fa37f308f7 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -162,6 +162,8 @@ static inline bool vma_can_userfault(struct vm_area_struct *vma, vma_is_shmem(vma); } +extern bool uffd_ctx_has_hgm(struct vm_userfaultfd_ctx *); + extern int dup_userfaultfd(struct vm_area_struct *, struct list_head *); extern void dup_userfaultfd_complete(struct list_head *); @@ -228,6 +230,11 @@ static inline bool userfaultfd_armed(struct vm_area_struct *vma) return false; } +static inline bool uffd_ctx_has_hgm(struct vm_userfaultfd_ctx *ctx) +{ + return false; +} + static inline int dup_userfaultfd(struct vm_area_struct *vma, struct list_head *l) { diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index 005e5e306266..ae8080003560 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -36,6 +36,7 @@ UFFD_FEATURE_SIGBUS | \ UFFD_FEATURE_THREAD_ID | \ UFFD_FEATURE_MINOR_HUGETLBFS | \ + UFFD_FEATURE_MINOR_HUGETLBFS_HGM | \ UFFD_FEATURE_MINOR_SHMEM | \ UFFD_FEATURE_EXACT_ADDRESS | \ UFFD_FEATURE_WP_HUGETLBFS_SHMEM) @@ -217,6 +218,7 @@ struct uffdio_api { #define UFFD_FEATURE_MINOR_SHMEM (1<<10) #define UFFD_FEATURE_EXACT_ADDRESS (1<<11) #define UFFD_FEATURE_WP_HUGETLBFS_SHMEM (1<<12) +#define UFFD_FEATURE_MINOR_HUGETLBFS_HGM (1<<13) __u64 features; __u64 ioctls; -- 2.38.0.135.g90850a2211-goog