Message ID | 151120274466.3159.14692557383591295224.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="A4SS/puX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygd0j1pZFz9rxj for <patchwork-incoming@ozlabs.org>; Tue, 21 Nov 2017 05:44:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752563AbdKTSci (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 20 Nov 2017 13:32:38 -0500 Received: from mail-db5eur01on0131.outbound.protection.outlook.com ([104.47.2.131]:34233 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752182AbdKTScd (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 20 Nov 2017 13:32:33 -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=LR00eIkNMCvElFbHd5udnkdEjeyXE58GUJOWwO30KsY=; b=A4SS/puXzImNYgGG3cFOxadxE4Hewz+F3vjMRAPyLpgsKp2ksCU7PmJm32iLbEzwH4NqbxB188kMsjo6i25AgAYQGgMaTaxpIFtlmYiK8EVHZO5sG+8H5KvNyMA3Lvjde3vRK3hL0n3E/P+skidQAA1+1eYg/qfjG0mMQ+YIhxM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by VI1PR0801MB1341.eurprd08.prod.outlook.com (2603:10a6:800:3a::27) 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:27 +0000 Subject: [PATCH v2 02/31] net: Cleanup copy_net_ns() 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:24 +0300 Message-ID: <151120274466.3159.14692557383591295224.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: HE1PR0501CA0008.eurprd05.prod.outlook.com (2603:10a6:3:1a::18) To VI1PR0801MB1341.eurprd08.prod.outlook.com (2603:10a6:800:3a::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60391644-a1e1-4a6d-9fd3-08d530450e20 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:VI1PR0801MB1341; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1341; 3:Nn/s8UZmtKqlrgo8iJmqb2jRJeBFIFpesxmXCHpBK/PjtJPQDeY3AuxTVIcEcdVtMSc24TjcfkpIhMIb3ELs3+CKgT6X78IEhBXBTOEXGR6Oo1fhI92tkhZ0QH5NQPR3Qh1/QztOycrjg4f9mJbvBwllGXZ286/8BOoUoR0jCTEp9UY4evi/Fl6hDd3n+dqWErXoQh1k5u5y/TkY5PpxflJgCMamaVpj1W1esbJqnallZwNGU7Nvdbxv5Gb+EvJw; 25:yBQ4Zo+S8Aea1igPQf118U8hCUT+OuUrZDjsz7cLAgY4x+8jOPe+TbAwKntpl569zfEXQTXwbKHpYoT4io6DBf0z8OAeb4bhfZHh6hw3McXOKP9vTBuc3BNYUszECG/TxyfTu0iirbtdk/hWLakdF7zPdj8QJ09EyTlgmRA+TK7toomXhA3pizenS/LjM00KN8GsidKfomyGJtEUZ1ZIjM9E4oEWIHl+rUdrszl54a2oDeIVkHdWCxptIsi/D0cRReYcnX1JmobGwzjN/72blCrYTJivk0y21f48Z+opTDuppq/P/OSvIAgMVke+Ug3qH5tz1XxUR41qOJgGlUylTA==; 31:exIN9VDFdsegSPhCu5kDNpqOhNo5UwPOGrMM31sCoEgZ4dT9HbbHVcWY80ahYx0tjHO2e2kornhH2Uc79WOr466Jl5jMiVP+o/IE+lN3RLVaYD6gPm8h9i2iRkJSuxOM9NKr7yZ2GcuFkHESsPto2ZAzDhx4JsXPM2CSag9wn+TyzmnwNr3j/m/YLNLk9WftVxhKH7PlhK7+NdXHRdvA1Z7ZoynN3DRbDg/kwUpll6w= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1341: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1341; 20:JoZDR1UmvkiXUPR0crmiSa683lccyl/35dt2dOiBJ8ncRwK+j5O5PHI68JI38UDIoYQsGsFBatb9QqZgIS1G3i0yQKf7KxTY242AWNEOYdqY+VngMgXlidw4FJJzi6/gDtie2V6gcP22p4BY5gRT5NaEMHZaBn+1Ump0lC5Eqy3IH7XrfXo1nYcschGovMOV6tmG7S4T79KSEe1zqDxOG2YvT1Qc9QGXUdwwo5BmVCBqDjZUvonXu+D06dVDGYWPOXefbbqHZZK5jLKw456O6dM/bP/mm7Ju6+toe5nJBkdNaw9CGKPEejuT+safHAcSzotYnws8CEvXmTrB/y4GtdezigoSpI+j7WN06/V1jWla9ROoCvSvOzXEMJeN4DPGKqz+6Xj0A0Pykb1zqL6NdarpvQZjO5Hef6V/LkgjM74=; 4:GYoDvnOcqTJWMRZ5HH/OBnFgkfwxSDf27/rVKk5K118JgZZhKrkMB5956DL94SV6CszfawIfUeYn/Iu4BmHBzSEG+0nbAAc/TRKmJfy8FWBU1Fi2TSUuja0++1G2FAJ7cIO35+7ezTr1s8iLGMzTMumiaINayRvL9jS0nsaKNXTxbPo8WAIcf8on89BGFGe1G9nFjugTcukUkicntHKRIH25K1B2hBroZvXIVC4JX6ACfsd7jdElMm7dx1doXVGJp0TL49itnvUf5ECbUk+LZQ== X-Microsoft-Antispam-PRVS: <VI1PR0801MB1341A386E44E05FC0AA2CF38CD220@VI1PR0801MB1341.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)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(3231022)(93006095)(93001095)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0801MB1341; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0801MB1341; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6069001)(346002)(376002)(199003)(189002)(58126008)(55016002)(9686003)(316002)(81166006)(83506002)(23676003)(53936002)(81156014)(61506002)(2950100002)(55236003)(6666003)(478600001)(25786009)(97736004)(2906002)(39060400002)(5660300001)(50986999)(33646002)(230700001)(7416002)(54356999)(76176999)(6506006)(68736007)(8936002)(103116003)(50466002)(16526018)(86362001)(101416001)(66066001)(106356001)(105586002)(47776003)(189998001)(3846002)(305945005)(6116002)(7736002)(8676002)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1341; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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=3BVI1PR0801MB1341=3B23=3AUi?= =?utf-8?q?S47V/5Rt4VKoCZG4tsWQWto98aVsk7WQeHUmVC2i1wQb4NVPa9YRnaUR?= =?utf-8?q?n/5i063wz6xTjfNFAKrCfCabmvdsX8RMg0gLMaViBcIXHji4LJg+OkN9?= =?utf-8?q?gBQrVcmlG/2ap0s/pCa6Ay09ci01JKtfIik6I0mTgFw7hS1Yo8qpJWaU?= =?utf-8?q?O3ioxwpRlotSK/RV/Voyf8D+4fVgb4HGByBE1BniFTopi8ALpORSnNNW?= =?utf-8?q?ZR14jigDoSg6TVONEgE9dZMrBM+eW6Iw8L11yqekxks5zeTOlv9n9LOx?= =?utf-8?q?a3b391T55GOxKF8xd7+dAvTtaqYR9VnTJQXSmCO5bWvU8khkqZH6JYKa?= =?utf-8?q?O/oqZbsS254pJ0Ceb+0j916aPe1gODT5rZEnZv62LutFnWwhA3PL6SV1?= =?utf-8?q?CXYUq6Un7yofzi+0HizWFmpjB04YvsnnWo05b0IcZazf6FQQPnWshiM1?= =?utf-8?q?jL2VLjKo20gvOpWTiV9XFXqlY5SQfsIec7gy7ohGpvMlitYQWoKfRT24?= =?utf-8?q?73nbWhjJRuYVbrO8QV3Dn0VKD0kwqUyXrSNcoltpuT5CiHbVu1J7YQTa?= =?utf-8?q?MZpp0Tgr8cEgdaVOmz4asqTmpXobECNEF9kuknEfIGF6ij+n4o0Xdasr?= =?utf-8?q?u8HmRb1pHQVdxNlfgAx8D6RKBU89q43/6bVGC+0GajDng5nMu4m8DkdV?= =?utf-8?q?aXJ3SGlDb1G6nHeENJGG3yw1p8AHep1c6VtbWMz+LE5zYXrNQ0dopBYc?= =?utf-8?q?L2r26i4Djwzs6ikZKkm+MMCEYpLZNMrOQ69DhC3Mt1w3W6nqMU43dYtq?= =?utf-8?q?b1+D0sQHaYhwgoa8uK+NyMmOOv3Wa6Y5IA1jphEIgzwYJx211tWwaUTV?= =?utf-8?q?ZVJl7F9WV3u+QKEtjiWKGO5NzX+caNTraA2dblBgN/dfaCA/UqyaQNa/?= =?utf-8?q?TVvXrQR7ktuR5ZMB70CnuInutoXt/DQxLWPJ/MBnOlE0a/LquDkKKivF?= =?utf-8?q?W21eJmHD4TFyApEsUfKWyUY3DqBdK9aJ4vHbfRfo3OBQf06cLZnGTMiw?= =?utf-8?q?O4D0xzj20xFIpYLjZ0rkPrvobS9wvL2EUWx2sPpeIcD7nm1oIjGNtl2k?= =?utf-8?q?MEFgss72S/vVhUATWclwWCy0ubU/JYSsihFy8IuyGcSeG70bGmadCQxy?= =?utf-8?q?m6gZUNQAbU8ROh69Bs2aToeAwD48yqYlaluawYSdWI1WzLjZ2xhBh4GU?= =?utf-8?q?aBnKwE7PPdiIpfi/Q=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1341; 6:3KiM0k0GcxameiR9qmfjVoFOSIK4a+Rp//doYGQmdwfdHNiVG7X3gRJck5SDOT0OLmYmzgpEJZx7TX+XQJ790rjCtuc0EAAP3//p+jiGL3YMPx6oPBt+y4FddB6Y4JucX1yCqaPExkaOi783eKDf/n11z7wAxw2WDtzzt/h2t1XDXmkrCpMBrTLf4WIxZWSaE/Q1X9zhSXoN8lTIomtYJV1MBBo5wR7gsFG7xMBc/QT9KU/5IYZDGYigU1uMrn5YLs+JdD9VshbfaWJSBmN9ImVO2hMpPtLmTnulQ7VF5P6u3isZcC4JV3BDljJ0fAr+Vaue/1fw/q4hxIZ7av9RxzSDeds0k+7qn0vx/sIEbYY=; 5:9VoSu3UnCGl6ehq7e9JHhSsBYV3vB8uiSzN0gN8SaCoDkeKFMNemUiXK5JqzIzYdQhjMXA4HXrmgNdHzjIxsjgkuhIu28W5j5fpSEbkyPyzswFcw2Tfb2QTQrlxqY4X/o1BgePUXT5n3NVIyN/rLHpazr40s0HmSCb2sF/K9IBM=; 24:C/tnnuazB0tyyrX/6rHIhzKheUXANW4dJ8m359BUs9a507N3LkUBDHXHgIpdkWWjuM4wZIqPOtZjkja54RCi9ol9zxfIeqeOcnq3bq2LGlY=; 7:B/DqtpMAK68CfezlmLdKIJVQhOmRaAVeXvG8D8xq1NM9ZahFA5yp6G1k6+I07x4zx6XVG7Rfln/Ku3ABc9iRIl74VlsS5qljTlkGkiA8KMWDoenCDLUCnvc1FA7f1+RRnmYQHvTRhkfBiE7lhqVfeQngCBACuWi/LjdxKdmsDrdjX7gfxulCfQpHL7Ur23L/2R20ovKEF5Ld26BMDYO6zJtGiTXReuVEdxAxCHyEKKdX75Y23EAEVHcGDwWr+GzT SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1341; 20:46NYLyG+ItqfTxMl58Q8H7IapuJ70JYEoeMsU4wVGNY1oNVcGcARrPjYeJfxFm3emCnkD/el7fpWIj0hEMvcNI7zrutlqdJ9eZvIaIwrrJSPQRi43Tila4G+r1ivuGnSBPQFOFJ5Ain5OWyjggQVoyVysomCvWE2DvEPPKexK6c= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 18:32:27.2250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60391644-a1e1-4a6d-9fd3-08d530450e20 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1341 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 7ecf71050ffa..2e512965bf42 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -404,27 +404,25 @@ struct net *copy_net_ns(unsigned long flags, net = net_alloc(); if (!net) { - dec_net_namespaces(ucounts); - return ERR_PTR(-ENOMEM); + rv = -ENOMEM; + goto dec_ucounts; } - + refcount_set(&net->passive, 1); + net->ucounts = ucounts; get_user_ns(user_ns); rv = mutex_lock_killable(&net_mutex); - if (rv < 0) { - net_free(net); - dec_net_namespaces(ucounts); - put_user_ns(user_ns); - return ERR_PTR(rv); - } + if (rv < 0) + goto put_userns; - net->ucounts = ucounts; rv = setup_net(net, user_ns); mutex_unlock(&net_mutex); if (rv < 0) { - dec_net_namespaces(ucounts); +put_userns: put_user_ns(user_ns); net_drop_ns(net); +dec_ucounts: + dec_net_namespaces(ucounts); return ERR_PTR(rv); } return net;
Line up destructors actions in the revers order to constructors. Next patches will add more actions, and this will be comfortable, if there is the such order. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- net/core/net_namespace.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)