From patchwork Wed Apr 28 22:50:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12230201 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 47E60C43462 for ; Wed, 28 Apr 2021 22:51:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C83FE6143F for ; Wed, 28 Apr 2021 22:51:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C83FE6143F 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 4456F6B0073; Wed, 28 Apr 2021 18:51:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CC736B0074; Wed, 28 Apr 2021 18:51:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26F656B0075; Wed, 28 Apr 2021 18:51:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0094.hostedemail.com [216.40.44.94]) by kanga.kvack.org (Postfix) with ESMTP id 0B8FA6B0073 for ; Wed, 28 Apr 2021 18:51:24 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id C505B3644 for ; Wed, 28 Apr 2021 22:51:23 +0000 (UTC) X-FDA: 78083273646.02.ECE30B4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 5200913A for ; Wed, 28 Apr 2021 22:51:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619650283; 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=aG6Es1lhsdq1W+SfyrFpv9ZTWYnqP0BhVj1uRKdeKnk=; b=gCyzTK+dD/1LNR8sei1HPglFjmQJoNWqEVZtbKDQPPDafyioyvGKZmGkDNYzd32I7K/rRI ZtYkJ1l9WroTF2W14RuVFg7IHM2aOseglFj+NOvwj72RzmJqzOPD1zqCcIuK2dyGj7BdwK STyzUaUK5YXh7/GVz2KuFfw4ywbQDXQ= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-xZTpu5RgOlS42vklXaUZ4g-1; Wed, 28 Apr 2021 18:51:21 -0400 X-MC-Unique: xZTpu5RgOlS42vklXaUZ4g-1 Received: by mail-qv1-f70.google.com with SMTP id l19-20020a0ce5130000b02901b6795e3304so9717472qvm.2 for ; Wed, 28 Apr 2021 15:51:21 -0700 (PDT) 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=aG6Es1lhsdq1W+SfyrFpv9ZTWYnqP0BhVj1uRKdeKnk=; b=ZfZA9uQBwcno0vIrSHP4xtA3XxxdLNYnuCBArjf3Cv2E54V4sNVPHv7vlf1n6e6+cI Ups+1qf0detuqJWbFAtlCOj4nc2lCr5LUF0oiqMkWMRaYOqZ2sSH2C0N59bC70TQ4AB6 MRKDGY15K4AYHcw3qp3Bj3RyCpZbIC0U7CxZ3BaQ2VVMSryG9eKXUS8hOqLH8x26hZJw O2VwOByt2Q71LNk6HF1QGVhlSJBAD1cO/eU7ze8tSs/72ztzeRLuO/rypMNVo2uB8NK+ tgNry7woMCL5TvpB9S39S2O9aDFKxXAiHHtCmNzgAwK0A0Y56WeXJmcSyOjUIuw8eR1u YefA== X-Gm-Message-State: AOAM5308fT2RyTvi2Bsf/uon7kIIo9egmJtQm7IXGXC+fOm3Cdr0Befm HGWvEbRslWMnhFA4ORy2hhl8bNsmkTdJTvNCqlmKZR8FYx1Jppw8UuzM+n+OW+WX5aLE936wEMz QXu2ddHjZedN4NTn3+047InBoE2B3OiIoQwq3oqwtedNUEfJN3Vl/vq9f1vky X-Received: by 2002:a0c:9ae9:: with SMTP id k41mr24204958qvf.40.1619650280409; Wed, 28 Apr 2021 15:51:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzi0KqzO23V+VDmbdXTP1koTP2GA72Z0kaCSBKAzMlcmEcNe5JkFaEp7X/r2ioxQbKVKn1aRQ== X-Received: by 2002:a0c:9ae9:: with SMTP id k41mr24204929qvf.40.1619650280118; Wed, 28 Apr 2021 15:51:20 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-77-184-145-104-227.dsl.bell.ca. [184.145.104.227]) by smtp.gmail.com with ESMTPSA id 191sm897459qkk.31.2021.04.28.15.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 15:51:19 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Mike Kravetz , peterx@redhat.com, Mike Rapoport , Axel Rasmussen , Andrea Arcangeli , Hugh Dickins , "Kirill A . Shutemov" , Andrew Morton , Jerome Glisse Subject: [PATCH 4/6] mm/userfaultfd: Fail uffd-wp registeration if not supported Date: Wed, 28 Apr 2021 18:50:28 -0400 Message-Id: <20210428225030.9708-5-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210428225030.9708-1-peterx@redhat.com> References: <20210428225030.9708-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5200913A X-Stat-Signature: pjjsu89z8fsq14hnrwjukeexrbmhawth Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf29; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=170.10.133.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619650279-342838 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: We should fail uffd-wp registration immediately if the arch does not even have CONFIG_HAVE_ARCH_USERFAULTFD_WP defined. That'll block also relevant ioctls on e.g. UFFDIO_WRITEPROTECT because that'll check against VM_UFFD_WP, which can only be applied with a success registration. Remove the WP feature bit too for those archs when handling UFFDIO_API ioctl. Signed-off-by: Peter Xu --- fs/userfaultfd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 14f92285d04f8..5dd78238cc156 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1304,8 +1304,12 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, vm_flags = 0; if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MISSING) vm_flags |= VM_UFFD_MISSING; - if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP) + if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP) { +#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP + goto out; +#endif vm_flags |= VM_UFFD_WP; + } if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MINOR) { #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR goto out; @@ -1942,6 +1946,9 @@ 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; +#endif +#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP + uffdio_api.features &= ~UFFD_FEATURE_PAGEFAULT_FLAG_WP; #endif uffdio_api.ioctls = UFFD_API_IOCTLS; ret = -EFAULT;