Message ID | 151120273642.3159.6622419948722697029.stgit@localhost.localdomain |
---|---|
State | Deferred, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RyGtQIbD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygclM3w07z9s7G for <patchwork-incoming@ozlabs.org>; Tue, 21 Nov 2017 05:32:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752547AbdKTSc3 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 20 Nov 2017 13:32:29 -0500 Received: from mail-ve1eur01on0114.outbound.protection.outlook.com ([104.47.1.114]:23028 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752124AbdKTScY (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 20 Nov 2017 13:32:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=c+B7pMdEaQhb0GFrBSrIKI6YbpXglAB6o0YzrxYSAsc=; b=RyGtQIbDSEbT6iGDSdK9Lf8GSN7Of9dwfijd65F1+VhjZV8BHjj7aZRw59/YO3LvN55HKOD79UzRXgYzWGz7kMHxpXxDxMsTQ5X8LCOhvxeaJOvvYWmDroMCHt8dZAG/9mqc0KjCJ2rPo28/Truo0lxL/PpWf5oPwJ+JFMEE0QY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by HE1PR0801MB1338.eurprd08.prod.outlook.com (2603:10a6:3:39::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 18:32:18 +0000 Subject: [PATCH v2 01/31] net: Assign net to net_namespace_list in setup_net() From: Kirill Tkhai <ktkhai@virtuozzo.com> 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: Mon, 20 Nov 2017 21:32:16 +0300 Message-ID: <151120273642.3159.6622419948722697029.stgit@localhost.localdomain> In-Reply-To: <151120175301.3159.9577108443167812854.stgit@localhost.localdomain> References: <151120175301.3159.9577108443167812854.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: HE1PR0902CA0030.eurprd09.prod.outlook.com (2603:10a6:7:15::19) To HE1PR0801MB1338.eurprd08.prod.outlook.com (2603:10a6:3:39::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2be9932-ba93-4c15-c010-08d530450849 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:HE1PR0801MB1338; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 3:bAPumftq//tgbZhDV30x+VUpabEWvFB6j6ifmT3BwIa3Z739IMtyQ2qh1MSsQf1gY/iUWAWJuoxYwoSxZX/qpj2fjJGxpJA44PO3ZZzAGSkR9mh2yhFWW4fjm0xL3/70p8Y/r87b4tycOrqLXBiccnI97KEtimGSToJWS2HY0GOtktZXhOfKac4w/ZEqTWEeVwADj8qJlZdS3Wx8N9pMkHlUrbecuyI0Jx8cajCE8i8ev+V1YhcGe/xX0YZyvPTk; 25:bKQUsPxmWRyv5N4q00//L8xwNkP7s2vcDmeSUENA+pl+JtS03tMGZlgfPQhR3cv9XLpHm8Sm9HyvCCQ8NQ/JJgn9m5zT9aEAmolOurAS1Wh2FUEqH7DBxEjDkrv3lUl2a0mUjT8lp1ws7eo/Uqx4o6jR1l934zT91OgF5mAiHMlWafbkh83dIO4eijOYzVhdfl/mkKTTdExF+n1RJAZBOBtzsSLERS1GFS9gUlFbdytXGofFkxEgVG8/gClfoH002te1twI76tAzlWhvvwPzW8gv0jaUj7r6GHdhSeACPJ80DOUKNJVuVDFbwBMBdMMAu7Fhp9rQwIb2T5nyYs+nPA==; 31:sOXDPOCl79Rwlb+XfZSj7tq07twNhzhqV0u5/QoTc6St+zflEcU8fwlJSMlc6P4x8ZflGP6VL9bi5TD3j5uVV2623lyYnrtB+5q2HBUbuG+gjaXsg017yR9vouBYkWqAZyHR1Xw0G2rakLPVYel6UmHKYzaPB706EWbLoXf57DekwrXuWkt5sQJV2MUWaMw5mdV4ogIpslHFIlXIg0suwo4O6UK+hDn0zkFl9p9CrQw= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1338: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 20:hQdgN/JJG7Dx36vnizOEpAY7FKIKy4tHQFEM+zMFPRWybnyYBSp1fMrpYqTG7uH9KzUqCVwxW8UgimAXH618DECoph454PiumG17c7kR06GCrq+J4YrWDrVfw422hxNVww6GZLWbOxFJv2bjTNzq/8jkFCgC2zWo4ccHZ8hBuYNcYYyst5NJEMsxxKn4ixVZngvjyxV4IEZibTkkM2aFwSaBr3CnzYMGsbKYiUG2Xswk2Fq36KKoVXQDyo/ELd5/0eG9plxxCYv9+pcUttLh60xqcVuS5szjYZn0OjGVeAf4SRumTuPLZZFc5yy76K+I8od03YJI4oQeLqlLUJlBgyLUAKaACihI9HzEDADPxBPy8afaKy+h3oxxKABqIz1b8umqjx9gF09LIOiTD1IvNe9jQFqm3WRW9ll7q6TyGcg=; 4:BYH1s0fnzRdo8XvWDHrhfaxVc1fBnQda88PVqfconuo07cyS5nT5irhhQvi1dVA+RoTNfiFGc5g/3xW0mXzdYUtJi2Sft62GeIvHqkRSu1trFWsUFcfF7KAiASPs0edTnsOHBWICixJ5yuc2Yod7tzvHzOIJqJyGpplNe6UVRGqDwV6KDMawxtov7jAJ7hxJlkriBNhF99DVbf+ziToO9Z2Vxbtu0U9ZnPJsdIFfy5nkeC2xtGw9G4JVfM4+UEnqLauXVVR7G9LyZJ3OLt31Xw== X-Microsoft-Antispam-PRVS: <HE1PR0801MB13389577198808BB26C91487CD220@HE1PR0801MB1338.eurprd08.prod.outlook.com> 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)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231022)(3002001)(100000703101)(100105400095)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR0801MB1338; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR0801MB1338; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6069001)(376002)(346002)(189002)(199003)(7736002)(83506002)(16526018)(55236003)(2950100002)(7416002)(23676003)(58126008)(105586002)(106356001)(305945005)(97736004)(9686003)(230700001)(33646002)(5660300001)(55016002)(478600001)(68736007)(6506006)(53936002)(25786009)(47776003)(50466002)(81156014)(86362001)(66066001)(61506002)(50986999)(6116002)(316002)(54356999)(76176999)(3846002)(8676002)(2906002)(103116003)(81166006)(8936002)(101416001)(39060400002)(189998001)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1338; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BHE1PR0801MB1338=3B23=3AyK?= =?utf-8?q?GycQ95hVvHxaEg5e3Oa0DUoV+iJ52zbPJ945ORPPzNWpYOuojIjSSlC2?= =?utf-8?q?KewFh6XaG49VTAd8v0GW55x7OYfJ6M6qdMMuASdr/NoGdsSFOrYawOjB?= =?utf-8?q?+YzJl1p+fzIXZoClaiEchvpTeHX7D1g9ca05/F8WJiHc1LqBuziknRnp?= =?utf-8?q?8VNV6Bmk7YwQK/TEnZ5BAYgwFnlln2OD+XzNfNiqkhogbGHPik/5e5h0?= =?utf-8?q?npdegJzj3vCVdzo4bSP5uhuSYxbVG+q/qRMYwBZ5VKQsTe6l37+7tWBW?= =?utf-8?q?3juZCA6j+WoF/H6x+lpTQOINnbAAOvqdNw61P7FclOqC4WtLaWL5pCu+?= =?utf-8?q?f5e51SLkyfc4kXZK+wlQoWH65B8UUFN58In/vXtSgt1uZMAzYyDgsIrT?= =?utf-8?q?UmhCaHdfsYDUav+K1Dk68RoaEj32XZzkgtLkjdcBlFoB98G2bpaog3pt?= =?utf-8?q?9K1vsK6S5VQY7efxmE1RExLdAjVmPErbieLpecAG2HiaFY7FKyORUzwE?= =?utf-8?q?l37yZ0iMNpGp1vdox/PykJ+emYxK5CNcRoFlzqbyr2O0xTCOgyte75ai?= =?utf-8?q?VjHgCKDFy/eYFNqVJmpVgU/2uNBE7F4ulXlFgPWBNR2g6bLqSYm8Gxln?= =?utf-8?q?Jk4/mt5rdkaLOV/de4lnJuMTKyjm32V6sxGfzAfVf0CB2WiZr7b+3w/4?= =?utf-8?q?dibcE8VnZ7DuQ1P4An/KxmWqUsGQKPOqHLemtN5hdaAXZHuL2dDEuap9?= =?utf-8?q?wYHdS6BG8p+D7nYA1pT04BmR5zQ4D/VXGBRxWiXE+nonScnqvBY7AZd0?= =?utf-8?q?vftHKT+QryUHIJaXNGHXoRIpwxWhMGOS1MEdkkhMbMgNg0/MnxGTOCU8?= =?utf-8?q?t7q/YFA5Wlt5oNHYFar5IdWrlZGuS8rN2hwkC61GKlhhU0bHI6wV3ksJ?= =?utf-8?q?sAQDv1RDbJBtREdROcHrSWw/gUi4WReDeBErvgnb2JHIdbmFqWMBwqs1?= =?utf-8?q?oSA2ZpannOQAl7FdEy5skOs7hcpK74/4fsbLAL3YsDSoFD92AKCkqksb?= =?utf-8?q?ZrtYv91SpzbCr+aLcGfhVoVfJyI7mg0ewPZCVTprHWUiNzGaFrm/94cm?= =?utf-8?q?SYFEbF6Z4c1Ore/l+iXGFqz96y000PusV+wbsaKRdT45JUjOclSYvLrj?= =?utf-8?q?YDoRCdo3xUscu/9pFzE1uHW29rodplj/XvXsYfgmobbRYiPoUCjA=3D?= =?utf-8?q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 6:/oMZk73464olzOP/oqO1WCEWTu3RjXGLEy0aIeL219uzfiqJ4/mH8blWJNN2l1/rKtbS9BGpS94WwJ1t20EvT2oZ7YvTs1eDKpoFMgrukn9/Py+sd4mC5uC7Xi3C1dTGaQq4+HLUDtk8eAMTFTsWvO4CESMjxNSHS5f2UG6fmPKYznTjySmbTfuGG1oCH0HumPui7tzT2X2ap+qHBBmyZ74q3U1qMRErSVVnVCpQsP6dnW+Z40RaXpEJM55Xk59b4POqT5/yykNH8XgWn67YEt9tgUWGFGbqmpqsAbtwK9yz3b9Jui7e0WblefRbw2qlMnswVtlVqJfGW9eY/HB0iHHYeU0TZr1jFFhbO5NR/PI=; 5:c1gMpOcQ1cKqDZMIPlkXfStzEduYoHX73c+AtBXQjZwsBQk+y7TWrQ0VKo5bkocDkHi3589hk63/9OCXmLiQ6cdgACdHIE6GEwjstJQC2uyXAD9jO4uMcmpAvr5y+2szOrL92fqD6z3Mgv7drQ85hLq/z51isc0JaSsKOkQpPds=; 24:UdgoM0TzP692EFtK5nMSo9NAQHtOSogceMyFH2dgLpnGHF2roSImfsWXjF4vNkpioOYB+UNApHa6NNmGrh10RILMiFR8aTRLFA1ctlzEfiA=; 7:D4MX2nfKujSiFYhLX5sspRNQxgDssMkC/uUV4ExkerCzQMVpw5bougcG9jfso8DibnxoeheHq80NL734JxFGvsT7Yu8Jxx62ZiSLfEHtbPoBbM5nTXu2ZH52AoDKPox///YbGPplejdQiS6N0G/EBCtmVPlvW0X22wMGkK5h/6LobcYCZA6y/3mrSqwzA7E9uNmb3GtH7fPt3Wb+XLugLxFV3fBY9+Y4NF/v+XG7EU1GgXYLVVICjgXxWETqw6av SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 20:KCO2dcGJLdSpUZKwcq0cQmSprY5boeSiBHSR4MgWKVoNJHkuj+ED/CYnKVzPYzmEcPAnn6EsqA0ClptcKmaIPguMICkw/tvPtCCdVj3gfzyWStuv6e0/bP/dNSB9KAxcqbPsUCL5VDi79r4tX2ob8MVJKx7qW/Zv28QHrUst4yc= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 18:32:18.4751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2be9932-ba93-4c15-c010-08d530450849 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1338 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
Replacing net_mutex with rw_semaphore
|
expand
|
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index b797832565d3..7ecf71050ffa 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -296,6 +296,9 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) if (error < 0) goto out_undo; } + rtnl_lock(); + list_add_tail_rcu(&net->list, &net_namespace_list); + rtnl_unlock(); out: return error; @@ -417,11 +420,6 @@ struct net *copy_net_ns(unsigned long flags, net->ucounts = ucounts; rv = setup_net(net, user_ns); - if (rv == 0) { - rtnl_lock(); - list_add_tail_rcu(&net->list, &net_namespace_list); - rtnl_unlock(); - } mutex_unlock(&net_mutex); if (rv < 0) { dec_net_namespaces(ucounts); @@ -847,11 +845,6 @@ static int __init net_ns_init(void) panic("Could not setup the initial network namespace"); init_net_initialized = true; - - rtnl_lock(); - list_add_tail_rcu(&init_net.list, &net_namespace_list); - rtnl_unlock(); - mutex_unlock(&net_mutex); register_pernet_subsys(&net_ns_ops);
This patch merges two repeating pieces of code in one, and they will live in setup_net() now. It acts as cleanup even despite init_net_initialized assignment is reordered with the linking of net now. This variable is need for proc_net_init() called from: start_kernel()->proc_root_init()->proc_net_init(), which can't race with net_ns_init(), called from initcall. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- net/core/net_namespace.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)