From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161331AbdKQS3p (ORCPT ); Fri, 17 Nov 2017 13:29:45 -0500 Received: from mail-ve1eur01on0119.outbound.protection.outlook.com ([104.47.1.119]:4000 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161225AbdKQS3V (ORCPT ); Fri, 17 Nov 2017 13:29:21 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Subject: [PATCH RFC 12/25] net: Move nf_log_net_ops to pernet_sys list From: Kirill Tkhai To: davem@davemloft.net, vyasevic@redhat.com, kstewart@linuxfoundation.org, pombredanne@nexb.com, vyasevich@gmail.com, mark.rutland@arm.com, gregkh@linuxfoundation.org, adobriyan@gmail.com, fw@strlen.de, nicolas.dichtel@6wind.com, xiyou.wangcong@gmail.com, roman.kapl@sysgo.com, paul@paul-moore.com, dsahern@gmail.com, daniel@iogearbox.net, lucien.xin@gmail.com, mschiffer@universe-factory.net, rshearma@brocade.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, ktkhai@virtuozzo.com, ebiederm@xmission.com, avagin@virtuozzo.com, gorcunov@virtuozzo.com, eric.dumazet@gmail.com, stephen@networkplumber.org, ktkhai@virtuozzo.com Date: Fri, 17 Nov 2017 21:29:14 +0300 Message-ID: <151094335412.20009.9359079084529899696.stgit@localhost.localdomain> In-Reply-To: <151094119999.20009.6955267140148739392.stgit@localhost.localdomain> References: <151094119999.20009.6955267140148739392.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0401CA0064.eurprd04.prod.outlook.com (2603:10a6:3:19::32) To VI1PR0801MB1343.eurprd08.prod.outlook.com (2603:10a6:800:3b::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: df7f839d-d10d-4593-8618-08d52de91cf9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:VI1PR0801MB1343; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1343;3:Zvz4uYlqgf6ais5IB7yW4RCf0a2GEYEcv3a4uv5r4c3TOXcghuUmwEbkPG8b45TrRhR0wmNSA1oiirnHGC3jtSK4w69tVkbmLV+4hs2VrPsH0dB7H4aR2IxWQzOQ5E1V63+AUAFj/aeQ2VFh5H9K9hHkt5TI8OWGc4a45ZxtjIlpBHq+dACo4okIrsB/XDCbWBVhNCAyDq7/eAhjLOt90+/xe+FnaC3wH0RtT8BqjQ01y6kmh41Hpy3uD5PjFbgh;25:bY0+9VHvGMuvgZtKA0S6K8vxnD14P+P3nL7kvgREyuhSpL/OC/LxG6ahrKzO0W2wOlZ2ba52cVJ/fdC0ZTQHw+7IsmuUFuc1OrzBFqbXGUMZQL0Z7Omjif5LDrffkH1DA8cMCLEdwpCJy8PZJnZyn0WgiIYfWUTCoz/HYcRm8jQ3K30B8EhdEwRPgXxb9orqSWY8TNOFkY9Lsb3YM3H3IWg/aHdvKml/SyEBFSz9L79KBRSLtK7okyNMP2+xKZHbMN7473QjjEjZ+JU3Arj+QZGLnq5y04Yah02L5K1jLWgZPbNV47uVsM77BvP0hFK88ostMzOCTiBLfqT9z5b+Yg==;31:EDVmdf4urh9Yrqrw4KMiKY6VBsezmXISn4oGA0NufR2838b5++2Gn48zDGSKDcsVXoZRE+jg9ib1MeETVSwv9bW6i2k35nUh9pUwGhgwVPQumT5gYq5ZL5t8Wu9kstm2RcAouHhimJ++sMoo81ZxcKfRR2ij7PmGQwdB3F7hfqv2jBEXYWEM9MPe/ivTdReoDXJfJLKmXDAps+Loxi4OyDXMfKLgYarOYvBiRy2Ilpc= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1343: X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1343;20:rX063Ev88l7d7HxEozCazAFWWH6qhvWUAeUHaJ/K7HVGDQIbldZeIQjALymHbTYxSND2K7IWKY31BdsJFhkLFui83Gk/uBJXgimPtVOH05InMWl/XGqItnsqgZLGyTN7l02FDCChyUvyJWFb+eyv0Vd4v9ixBPflTI5vml8lDcHjAG0xFDshFj6gjlgoJiyMFoWJQIGg7yCz60MzJ8wcD/+qzhaXyJ5Nq74dJeeKShbtDnj2tTdeLHmRXqAuPSqYnF0Tbvmkl1eEC9fMHX5wxyO2U8TxaeNh2WHuxxnipH/pgEO9oQm072Nvv0Vqd+5/ff8wRi/VWy2NYbniWqEAuV1Zaj1wS3iNUCw2nEMYABNrVFUnaWMgNnkCCnbuzchWFgUKAz+M7JugZ0rtslszxp5PRgpnBhNPI2kkyvX3kBQ=;4:lQcZwkY/qFJDh+iz/PRXLN0XgEj9o5T/kWxMVolEPc7ba5GSKmzeFHGSrXi/WBIl2eRA6L90gy7mFkKHe3y+wP5qyIWZCtBza/e6xNJk1wQi4FF+S2v0jPqI0BJBIGVN9QiC6qsTV3ob2BaQ4XTGBVlS9Hi5M6DV9eUpCf7kShZ2wCy5wU9CuyJP2zE6PgmFL6Hk2DT9lbSPvDbhfF8zVWDw5oISnU0jiLsSdImF1x0OZL+WOkKMKvbuszGa6WIvaB49iUZaJ/G2fYbWNSHa9Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(10201501046)(3231022)(93006095)(93001095)(6041248)(20161123555025)(20161123564025)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:VI1PR0801MB1343;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:VI1PR0801MB1343; X-Forefront-PRVS: 049486C505 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(6069001)(376002)(346002)(199003)(189002)(76176999)(54356999)(55016002)(81166006)(8676002)(39060400002)(9686003)(101416001)(81156014)(53936002)(305945005)(5660300001)(189998001)(50466002)(68736007)(7736002)(50986999)(33646002)(8936002)(6506006)(6116002)(105586002)(106356001)(316002)(61506002)(66066001)(47776003)(16526018)(83506002)(2950100002)(58126008)(230700001)(3846002)(97736004)(7416002)(86362001)(478600001)(23676003)(2906002)(25786009)(103116003)(55236003)(921003)(1121003)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0801MB1343;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA4MDFNQjEzNDM7MjM6NTM5YW5Ha1B2ek9rTkZPdzdabTB2a0tH?= =?utf-8?B?anFidmNoYm5tcFVURTFSNDBhUmMzczVYdVNReXR1dG9INHJmNlhUWURjOFhW?= =?utf-8?B?dE1IWnVmSjQ5cGJtdFZiTkJzd3JkWTdYaEd6SzhBRytnaEs1SHg1WVl3NVlJ?= =?utf-8?B?a2p3Rmw4Sm41OXVzVFd1cXJtL2xmSmJlQmFIWXZsTFRQZVJ2NURlbVRXelN3?= =?utf-8?B?ekczTFliOHd4TDdRM0JDNG5BMmZyYVNXWk1jUFNGZlNoazQxTS9aSmY1b3Rt?= =?utf-8?B?L3Q4c29tei9oOFRDS2lvT3pVcjhzcnQyTDBKYTQ3VnJFWWpualZ1NXU1dXMv?= =?utf-8?B?T0NYcDlrUGlFTFlZdFJHeU1HSWpDalJKamdnQ3hmWEJ2MHFsUjF5bXFEQUMx?= =?utf-8?B?WEdJWTIxcmo3VG9jRjgzY2lBM3h1TFBuWTNCeHhhcjg2ZzJyUUJGbWpDMDls?= =?utf-8?B?NTU5d3MrNmN4OGhZSTlFM09KR1JuR0tjNFp6ZjFJdHdtQTVRU0E0N2oxQ1JK?= =?utf-8?B?SmRNUCs0UUdQTERwQTJra2p3QTFjWngySkdtT0FlMU96NjlGdHRLb3N1TzEx?= =?utf-8?B?amJ2dGNRS1cxNUI4TXh6NzNFOUpsNmlsUUVJVGRnRXUxU1RjVkF1OWZHYTdS?= =?utf-8?B?Yi9yVFVXRHFiWmJ2SnI3ZC95K1V1M3Y4bVBCR1JmclhnQytTL0ZNU09CS0ox?= =?utf-8?B?TU9rWWRJczJMUmp1R1BxOEszWCtrOVM3ZXJKbytZNHVBdW40Q3I4UHcyUDh4?= =?utf-8?B?a0hNbGZoQUlHNDJoUG1iMk5keEVSbnZHN2RjQ05vOHpnZDk1UlA5YUl5L0U3?= =?utf-8?B?bEtOQWRZMTFWbjE1dkpPc2lDQmVGajh1cnRHWllMMDhCV0lINmN4Qkg3SE5M?= =?utf-8?B?L0ZXd0pxdGlqYVJLQ1JNSWYwVXRlVm12TXlTYUwwQzBYc1V4N2EwTk1PMHVV?= =?utf-8?B?OGFJRi95UzhDWHhJTzc1ejlOY1FKRGJHYmJqRVQ5NUhMbmluWHdtaCtJZ1Bn?= =?utf-8?B?RDRORkJmbzJJc09kN05CbnE5YW10VDY0Yzg0VEdrSkcyNU90UCtTUGhSRXlQ?= =?utf-8?B?U0R3cmF3akxvcm44TmtIWE1UTTh0Ui9LNmtDeWRyVEdBRWR6Wm9MckxyRkox?= =?utf-8?B?ZkhrT0RVVVVRazk5ZEFoYVl2aklFcWZSTWFjbVRDK2I0bTJvRzA0RmY4a2FP?= =?utf-8?B?YmFPamhFc2pId1dhcEZYWkF5dmFmWXd1UGpNY3JxOFZhYlRWV0FzdVhSRitK?= =?utf-8?B?MWlUNmo0dEZpWDZNWEtiWW50T3VSVWl5c2JiZXVXK3JoaDhTbXBYak9TNExQ?= =?utf-8?B?TGYrOWVMSnVSNmZ0TzdMOXBPYW1SMFlmdUgzVTdvVmwxMDZ4RXFYNHhGRDBo?= =?utf-8?B?S1llSnA2MjJJVzJQaTQwdDM4bUkxWHllWnJjOStjUGQwK0FiSUoxM21RYXVp?= =?utf-8?B?ZHZqM1VNRVRiTktUQitYcGZMbWVJTlJTQVFGVkFqL1czdWxKTCtnRVkySExH?= =?utf-8?B?M2NZRHQvOUh0cFM2ODl4eURIRnJxQ21qS1ZxeTN5ODZtQktlRXF6L084QkJY?= =?utf-8?B?citMaCtVd20yNUFCbUlMemFoMW4vYlM1YUM1TXlOWnppeWowL21ueXNlODVC?= =?utf-8?Q?Q=3D?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1343;6:XHxILSHUwvWmbm50rDmU67jKPNoF3b6x+EQ7a8ZwTeo41M2k7Mdx9V/z5DtbGcJHRyZu1yZ1XQNl0V23msyq5EIj6sODUNHiXgbiLDLz6DnqT9Zj3gC7hzv7zq1MQzyGh46mldJBn/zgHk55zONay1vg0cuPGkpwmpBkZb3D/KppzT8liLFX3p9thCfuD0gzd/SXKdXtprzC/Ddnm17Ap0SxdIcgSQcaapyFm8XgDIQwrRwr/lo2O6Va9nJ/SkqwJiEChh7id/2QvDEkAlFxqPzVbBsA7xTaXBaBzm9sJ1DoQ+wO2W9vsSXK/shjhdivwfqwPWnn5LcX7rw+F0tkmJpawiCb9efUtTr7cTxcyY4=;5:Fi6TnBYO6CbueDNYmPTeC3TduIwMcdGO7h+iDjdp3+h7bMAhoLS03n3XxJM/mB3sl8ljW4IGB/gyxs+cXXOjgt15DVrgws1SDOKfk0pQnEIhuLjid21n3lJzQ4NffV62zBVo/UvMSo8WxpgJs5cY7paoXk3px0nY+hhFIcWnaLE=;24:z6GI5WKX/hcAfzLnpKqKpDpnXuj0YrLG2bOmSzxKo1sjSNZdtsxmBexTiOFmM5c9T5TlEcMGacYS1u41Q4WB080uoDllFK6CUCoUB13KQuE=;7:QzMjheNqlFqI+oLoYSarZAwNqfQR5Wc04gA56W/zgXh2VDN5trys4wZVluxRn9ADx0/NtloUOiRZiGygHORGCNlZ/vrjVWfRGGW3pEAiXyTOmaKSOn/ivnHPqGgfbWRUFgHLMi1aGmrLHJRqJO28apL0vBDC+eJTe/xNxtQC0iTOoY7gIZGZksCuJTeBnmgJ9J/F6w2WSDCFme4+CSzbSNWQkHxUa6tPy1j/zLhOcqXR4CG9g/zjSEYUNE0FphPz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1343;20:rA1mDXofjdE1SqzLkwdtH2vNY828rfM1LgtmkVyODc1ZNxABUUbkzakb/QsH/ttr9ZCmO4J/QdeNKb50AHPSkVAMn5ltV21ZjafKbbCJPeeb0Awr4voCE5QWH+plAincLUDRgLbGBKM7TQcLM0fp+OVcSNbekVtGeySdSjay7zY= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2017 18:29:16.0943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: df7f839d-d10d-4593-8618-08d52de91cf9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1343 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nf_log_net_ops are registered the same initcall as netfilter_net_ops, so they has to be moved right after netfilter_net_ops. The ops would have had a problem in parallel execution with others, if init_net had been possible to released. But it's not, and the rest is safe for that. There is memory allocation, which nobody else interested in, and sysctl registration. So, we move it to pernet_sys list. Signed-off-by: Kirill Tkhai --- net/netfilter/nf_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 8bb152a7cca4..08868afad813 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -582,5 +582,5 @@ static struct pernet_operations nf_log_net_ops = { int __init netfilter_log_init(void) { - return register_pernet_subsys(&nf_log_net_ops); + return register_pernet_sys(&nf_log_net_ops); }