Message ID | 20200220163112.11409-18-peterx@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=kLjY=4I=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB03917F0 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 20 Feb 2020 16:32:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7FCD206F4 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 20 Feb 2020 16:32:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dq2nkdqo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7FCD206F4 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 BE1F86B007B; Thu, 20 Feb 2020 11:31:53 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AA5796B007D; Thu, 20 Feb 2020 11:31:53 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96B186B007E; Thu, 20 Feb 2020 11:31:53 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0044.hostedemail.com [216.40.44.44]) by kanga.kvack.org (Postfix) with ESMTP id 786AB6B007B for <linux-mm@kvack.org>; Thu, 20 Feb 2020 11:31:53 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id EDA658248D51 for <linux-mm@kvack.org>; Thu, 20 Feb 2020 16:31:52 +0000 (UTC) X-FDA: 76511046906.16.trade24_2d77e9c83360c X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,peterx@redhat.com,::linux-kernel@vger.kernel.org:bgeffon@google.com:xemul@virtuozzo.com:mike.kravetz@oracle.com:david@redhat.com:peterx@redhat.com:cracauer@cons.org:aarcange@redhat.com:mgorman@suse.de:bobbypowers@gmail.com:rppt@linux.vnet.ibm.com:kirill@shutemov.name:gokhale2@llnl.gov:hannes@cmpxchg.org:mcfadden8@llnl.gov:dplotnikov@virtuozzo.com:hughd@google.com:dgilbert@redhat.com:jglisse@redhat.com,RULES_HIT:30051:30054,0,RBL:205.139.110.120:@redhat.com:.lbl8.mailshell.net-62.18.0.100 66.10.201.10,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: trade24_2d77e9c83360c X-Filterd-Recvd-Size: 5682 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf35.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Thu, 20 Feb 2020 16:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582216311; 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=fdsi9h+1zQkn0c32yWChqqrI/M8WeLIQlt/jbLwWXSA=; b=dq2nkdqoANA5XeQ0Y9h7SoDCNVc9T6vChO0uNfgnvXI8GCk/iFRmqFVRgW/n3ZlNkQ0YQu 6+pxPZo1rC435gLRwFnUJ8VMXH32c0Zdfj7Or+uhGYxSAwtESBNaPRrsQD6a7NluSiGUNR L9aOkSZKLImZmIxno0yui4YI060CQUw= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-LLTh_VM7PCK426GwJ4KBjQ-1; Thu, 20 Feb 2020 11:31:47 -0500 Received: by mail-qv1-f71.google.com with SMTP id z39so2941097qve.5 for <linux-mm@kvack.org>; Thu, 20 Feb 2020 08:31:47 -0800 (PST) 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=IU1fgxlkB6a/1caEc9OlPp7STKLZ6FpW39zfFVLVvVg=; b=E/AsrPUKJO4GP08+QOfAiPfczarvqIBTJT8Hk8/ByBsG0eo6ZpSKtHL9E1N0r3Bks4 zuBJCHjF1l+KhHWL03N4LTuZ535fmTZhT6lIHfc4XayeyXVtPtaFI35Cg39rLTEp1eEN sSjJS24yNDZHZLyzsW7PKPTSV4qYM57RYaETualRWvDGUT3F7dbfzGdxRmjvbybYXZE3 BFeIByQ2lMctLUgvmAAWo0INFLdo7XUZRUKnk5s1wsKe9JIn/bL4R8t/Hltr0hOsifIh sLzDJR/Z6g+O+C/jSKAIaxUbbklH6Y2M6SZtW4ThYfsBzVAQ1ePGFXLCH4zlI/7aBkmM Yg5g== X-Gm-Message-State: APjAAAUraiodBNL3A2CL+RgdonD9nys5nXCrj5Bq6XbtA8bGvR+MQ3gy pnJzcpvIhEL9gYTyYp+FFWdKqvgbXK+56ngBxLn+MLUjuuuuz3Cn9OKImhd7BjloP3XohhJVevH CAzi7jv/Z4VU= X-Received: by 2002:a05:6214:450:: with SMTP id cc16mr26380442qvb.175.1582216306746; Thu, 20 Feb 2020 08:31:46 -0800 (PST) X-Google-Smtp-Source: APXvYqzMg51Khw0k2HZsVu+5Fdow6BayCSYLtWlERq1D239QTNW+33WWT4KycPEAwP+32tQ5qNarog== X-Received: by 2002:a05:6214:450:: with SMTP id cc16mr26380415qvb.175.1582216306483; Thu, 20 Feb 2020 08:31:46 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id l19sm42366qkl.3.2020.02.20.08.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 08:31:45 -0800 (PST) From: Peter Xu <peterx@redhat.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Brian Geffon <bgeffon@google.com>, Pavel Emelyanov <xemul@virtuozzo.com>, Mike Kravetz <mike.kravetz@oracle.com>, David Hildenbrand <david@redhat.com>, peterx@redhat.com, Martin Cracauer <cracauer@cons.org>, Andrea Arcangeli <aarcange@redhat.com>, Mel Gorman <mgorman@suse.de>, Bobby Powers <bobbypowers@gmail.com>, Mike Rapoport <rppt@linux.vnet.ibm.com>, "Kirill A . Shutemov" <kirill@shutemov.name>, Maya Gokhale <gokhale2@llnl.gov>, Johannes Weiner <hannes@cmpxchg.org>, Marty McFadden <mcfadden8@llnl.gov>, Denis Plotnikov <dplotnikov@virtuozzo.com>, Hugh Dickins <hughd@google.com>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, Jerome Glisse <jglisse@redhat.com> Subject: [PATCH v6 17/19] userfaultfd: wp: declare _UFFDIO_WRITEPROTECT conditionally Date: Thu, 20 Feb 2020 11:31:10 -0500 Message-Id: <20200220163112.11409-18-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220163112.11409-1-peterx@redhat.com> References: <20200220163112.11409-1-peterx@redhat.com> MIME-Version: 1.0 X-MC-Unique: LLTh_VM7PCK426GwJ4KBjQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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: <linux-mm.kvack.org> |
Series |
userfaultfd: write protection support
|
expand
|
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 6e878d23547c..e39fdec8a0b0 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1495,14 +1495,24 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, up_write(&mm->mmap_sem); mmput(mm); if (!ret) { + __u64 ioctls_out; + + ioctls_out = basic_ioctls ? UFFD_API_RANGE_IOCTLS_BASIC : + UFFD_API_RANGE_IOCTLS; + + /* + * Declare the WP ioctl only if the WP mode is + * specified and all checks passed with the range + */ + if (!(uffdio_register.mode & UFFDIO_REGISTER_MODE_WP)) + ioctls_out &= ~((__u64)1 << _UFFDIO_WRITEPROTECT); + /* * Now that we scanned all vmas we can already tell * userland which ioctls methods are guaranteed to * succeed on this range. */ - if (put_user(basic_ioctls ? UFFD_API_RANGE_IOCTLS_BASIC : - UFFD_API_RANGE_IOCTLS, - &user_uffdio_register->ioctls)) + if (put_user(ioctls_out, &user_uffdio_register->ioctls)) ret = -EFAULT; } out: