From patchwork Wed Mar 1 10:06:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 62835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3544727wrd; Wed, 1 Mar 2023 02:08:27 -0800 (PST) X-Google-Smtp-Source: AK7set+DiKxoSNpCuIkQPmrKvToHo1korYX3ZzIiacGEOJdtwl2hdLn9FyKQgcvXCSdXLU9E/f5n X-Received: by 2002:a17:907:c1a:b0:8b1:749f:b2bc with SMTP id ga26-20020a1709070c1a00b008b1749fb2bcmr7768144ejc.11.1677665307293; Wed, 01 Mar 2023 02:08:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677665307; cv=none; d=google.com; s=arc-20160816; b=iiUjX+NNjXf0QRQJY/UFBFMXrcu0zgVqm/5H8aMnZbxo6+RD0nLFQyXeYCdcyGgdoZ 2WG+LIRuDGxWMUnQMpX/CBgcCdlp4wOUgGIbVb8goj6M2EixPNQpeO885PhVxfB25L96 jSztQGGh5MQ9f77CKUC3V0Yik5odp+aTfKzIceevFC+xFBxEUoYWibHzFTtf+QHBMZe+ VbABUB9sVN4SF1ZE4xmz/xnZBarEK5yUk3FN4SXqpxbTntzebYWYHuPedM4oh9euozGD f2BKE6lI1Y7DKfNV6mdABd55Ifi8RiIQn0eV0WXoX2Fzu0U0eNW1Mmv2kg19lujBMmwz BUSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=5GmjGYwSLflWzBmyhcUsuYm01PVvxmgVFn9fZi1GFMM=; b=INqTX73r1lWTk8EQsElxPypXARK4HVOeQ2tts232srcEW/ISxw+FuGpSOolOnaMumO wnIOJ3VAz3NGUIr5dzZ90+7YmZRliQaOHuDucNimtXY1kRMBQd7I+1vuz6nQ1sOAihNT 1UIuFCvQgCwjbC17zSVT3suzMwT5Ft3RnoRZjzfXPF/G8GkFzXJxEoHZGl9GtYNxCsXB FytfK6d+FwDZM3qyghoysJ32ngYy/Myt+GnumykMskFnHkUcuCGbaPAl13bZ6K7o80k3 Wu1ny5OfHsiPvncUGcgw8r0bAKw4sC4mj32ZCXq1M5wX7+YcNF5zPS9+7FBpP/5NU/pl k0Cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a170906c00100b008c25e1c05desi14798197ejz.392.2023.03.01.02.08.03; Wed, 01 Mar 2023 02:08:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbjCAKGj (ORCPT + 99 others); Wed, 1 Mar 2023 05:06:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229769AbjCAKGh (ORCPT ); Wed, 1 Mar 2023 05:06:37 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3FE83B66A; Wed, 1 Mar 2023 02:06:36 -0800 (PST) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PRVF74H5fz16P0H; Wed, 1 Mar 2023 18:03:55 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 1 Mar 2023 18:06:33 +0800 From: Peng Zhang To: , , , , , , , , , CC: , , ZhangPeng Subject: [PATCH] userfaultfd: move unprivileged_userfaultfd sysctl to its own file Date: Wed, 1 Mar 2023 10:06:27 +0000 Message-ID: <20230301100627.3505739-1-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759159577598914720?= X-GMAIL-MSGID: =?utf-8?q?1759159577598914720?= From: ZhangPeng The sysctl_unprivileged_userfaultfd is part of userfaultfd, move it to its own file. Signed-off-by: ZhangPeng --- fs/userfaultfd.c | 20 +++++++++++++++++++- include/linux/userfaultfd_k.h | 2 -- kernel/sysctl.c | 11 ----------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 44d1ee429eb0..d01f803a6b11 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -32,7 +32,22 @@ #include #include -int sysctl_unprivileged_userfaultfd __read_mostly; +static int sysctl_unprivileged_userfaultfd __read_mostly; + +#ifdef CONFIG_SYSCTL +static struct ctl_table vm_userfaultfd_table[] = { + { + .procname = "unprivileged_userfaultfd", + .data = &sysctl_unprivileged_userfaultfd, + .maxlen = sizeof(sysctl_unprivileged_userfaultfd), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, + { } +}; +#endif static struct kmem_cache *userfaultfd_ctx_cachep __read_mostly; @@ -2178,6 +2193,9 @@ static int __init userfaultfd_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, init_once_userfaultfd_ctx); +#ifdef CONFIG_SYSCTL + register_sysctl_init("vm", vm_userfaultfd_table); +#endif return 0; } __initcall(userfaultfd_init); diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index 3767f18114ef..fff49fec0258 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -36,8 +36,6 @@ #define UFFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK) #define UFFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS) -extern int sysctl_unprivileged_userfaultfd; - extern vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason); /* diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 1c240d2c99bc..c14552a662ae 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2438,17 +2438,6 @@ static struct ctl_table vm_table[] = { .extra1 = (void *)&mmap_rnd_compat_bits_min, .extra2 = (void *)&mmap_rnd_compat_bits_max, }, -#endif -#ifdef CONFIG_USERFAULTFD - { - .procname = "unprivileged_userfaultfd", - .data = &sysctl_unprivileged_userfaultfd, - .maxlen = sizeof(sysctl_unprivileged_userfaultfd), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, #endif { } };