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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 37DE1C433DB for ; Tue, 23 Feb 2021 15:22:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA51B601FC for ; Tue, 23 Feb 2021 15:22:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233187AbhBWPV7 (ORCPT ); Tue, 23 Feb 2021 10:21:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59205 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232878AbhBWPVy (ORCPT ); Tue, 23 Feb 2021 10:21:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614093624; 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: in-reply-to:in-reply-to:references:references; bh=jwgWYg1VA5fUePkB2TEpm/nm7aaUWzYkZRWH3OYKmTM=; b=UUGREuOoGKe5cAbw3pmkwSXDtIxxY4QaO1+To2Qnq/cwi81nn0wqcPi8DLj8hpj/xedBew GYFmf1ts9+miFJi+9GXiSLE6pF/Nyz0Sa2BtTBcN3g5qsZWhuuFMuELbVK0gLg43xbtZB3 NFQDK/3YJeDctlKiXBv1oM3nNyT15ms= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-NPNbDS7dM0m16pULB59Z7Q-1; Tue, 23 Feb 2021 10:20:19 -0500 X-MC-Unique: NPNbDS7dM0m16pULB59Z7Q-1 Received: by mail-qt1-f200.google.com with SMTP id k90so10224940qte.4 for ; Tue, 23 Feb 2021 07:20:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jwgWYg1VA5fUePkB2TEpm/nm7aaUWzYkZRWH3OYKmTM=; b=Dq8T/EAVvGWaPtSmnypxrVJ2XahfUAK8KAx+OP0ElvZH1gv3Q6MhtzwZZtDnZBxBAw UF36segabIDc51j9aPHfjyPOC8eq6D9iMgDf/5VZdqYJzmZh/tNbwopaUSmybzquFYPC IJXOfo1KEVMN6nyxQb/mCxIO/krIQtxRTrG0CLyYHc6KBq98fFoTw2GYJ8oTvy3Aj1Me 2EGCtcqYA7ujTzCvK4PQ+lkpTAPXrEcIFHQPjY5VUmQPqFdqnEjGWuFM3SH6G2YzV1ig r7ukPwotNFDbH+R/EJtmUTeVpd/OFiEGo0CJDnW32QTaaApyfMHsCSiD+VBKFuWQyPxD Dmpg== X-Gm-Message-State: AOAM532uxhPeuVOzpUEMr3PiyX0TokGw44ubNBBUf+QNwHE9BVxFdSPg KnoZow4j3d65N+cRrKehHGzejgkKmLHNSTymPHDfRugouVf3lBpXjdvDpOkKmNvhgyBWNGQR2kD wAW3+/6jI/Nbg2PmiYdV22EZ5 X-Received: by 2002:a0c:c248:: with SMTP id w8mr1518145qvh.58.1614093618378; Tue, 23 Feb 2021 07:20:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWcuu23NOnPAZhpzswg6vHbLvB7EZ9s8gIVRn3vVyGv4fb9Pn+5A210Mu4KiqWVED3IWq47A== X-Received: by 2002:a0c:c248:: with SMTP id w8mr1518096qvh.58.1614093618102; Tue, 23 Feb 2021 07:20:18 -0800 (PST) Received: from xz-x1 (bras-vprn-toroon474qw-lp130-25-174-95-95-253.dsl.bell.ca. [174.95.95.253]) by smtp.gmail.com with ESMTPSA id w139sm9203829qka.19.2021.02.23.07.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 07:20:17 -0800 (PST) Date: Tue, 23 Feb 2021 10:20:15 -0500 From: Peter Xu To: Axel Rasmussen Cc: Alexander Viro , Alexey Dobriyan , Andrea Arcangeli , Andrew Morton , Anshuman Khandual , Catalin Marinas , Chinwen Chang , Huang Ying , Ingo Molnar , Jann Horn , Jerome Glisse , Lokesh Gidra , "Matthew Wilcox (Oracle)" , Michael Ellerman , Michal =?utf-8?Q?Koutn=C3=BD?= , Michel Lespinasse , Mike Kravetz , Mike Rapoport , Nicholas Piggin , Shaohua Li , Shawn Anastasio , Steven Rostedt , Steven Price , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Adam Ruprecht , Cannon Matthews , "Dr . David Alan Gilbert" , David Rientjes , Mina Almasry , Oliver Upton Subject: Re: [PATCH v7 1/6] userfaultfd: add minor fault registration mode Message-ID: <20210223152015.GA154711@xz-x1> References: <20210219004824.2899045-1-axelrasmussen@google.com> <20210219004824.2899045-2-axelrasmussen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210219004824.2899045-2-axelrasmussen@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 18, 2021 at 04:48:19PM -0800, Axel Rasmussen wrote: [...] > @@ -1290,14 +1299,20 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, > ret = -EINVAL; > if (!uffdio_register.mode) > goto out; > - if (uffdio_register.mode & ~(UFFDIO_REGISTER_MODE_MISSING| > - UFFDIO_REGISTER_MODE_WP)) > + if (uffdio_register.mode & ~UFFD_API_REGISTER_MODES) > goto out; > vm_flags = 0; > if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MISSING) > vm_flags |= VM_UFFD_MISSING; > if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP) > vm_flags |= VM_UFFD_WP; > + if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MINOR) { > + /* VM_UFFD_MINOR == VM_NONE if this arch doesn't support it. */ How about check CONFIG_HAVE_ARCH_USERFAULTFD_MINOR below directly instead of commenting? > + ret = -EINVAL; Should be able to drop this line too since ret is -EINVAL already? > + if (!VM_UFFD_MINOR) > + goto out; > + vm_flags |= VM_UFFD_MINOR; > + } [...] > diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h > index 67018d367b9f..a743a0f9ebde 100644 > --- a/include/trace/events/mmflags.h > +++ b/include/trace/events/mmflags.h > @@ -137,6 +137,12 @@ IF_HAVE_PG_ARCH_2(PG_arch_2, "arch_2" ) > #define IF_HAVE_VM_SOFTDIRTY(flag,name) > #endif > > +#ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR > +# define IF_HAVE_UFFD_MINOR(flag, name) {flag, name}, > +#else > +# define IF_HAVE_UFFD_MINOR(flag, name) > +#endif > + > #define __def_vmaflag_names \ > {VM_READ, "read" }, \ > {VM_WRITE, "write" }, \ > @@ -148,6 +154,7 @@ IF_HAVE_PG_ARCH_2(PG_arch_2, "arch_2" ) > {VM_MAYSHARE, "mayshare" }, \ > {VM_GROWSDOWN, "growsdown" }, \ > {VM_UFFD_MISSING, "uffd_missing" }, \ > +IF_HAVE_UFFD_MINOR(VM_UFFD_MINOR, "uffd_minor" ) \ > {VM_PFNMAP, "pfnmap" }, \ > {VM_DENYWRITE, "denywrite" }, \ > {VM_UFFD_WP, "uffd_wp" }, \ > @@ -169,7 +176,7 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \ > {VM_MIXEDMAP, "mixedmap" }, \ > {VM_HUGEPAGE, "hugepage" }, \ > {VM_NOHUGEPAGE, "nohugepage" }, \ > - {VM_MERGEABLE, "mergeable" } \ > + {VM_MERGEABLE, "mergeable" } This change seems irrelevant. If you agree with above comments, please feel free to add: Reviewed-by: Peter Xu Thanks, -- Peter Xu