Message ID | 152242790790.18864.14327439737191768578.stgit@localhost.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="YdDcpFr6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40CS446g1Qz9sX8 for <patchwork-incoming-netdev@ozlabs.org>; Sat, 31 Mar 2018 03:38:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbeC3Qim (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Fri, 30 Mar 2018 12:38:42 -0400 Received: from mail-he1eur01on0115.outbound.protection.outlook.com ([104.47.0.115]:30183 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751932AbeC3Qil (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 30 Mar 2018 12:38:41 -0400 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=TK5svAeNEmxfWP14AA1pnKF0zHR2aqDGIB8VqiJdDRY=; b=YdDcpFr68DMzMDH4xBqUwkdpnuWkNVBK6yu5DOBIoUCbQie0b1HYi8xqpNf/HXbPlK3vPz+SwYMjE97fCuNSXiPAw+NGHtI5s4UXHvO3L2kxz1qEyuM5H1odybkL6lqoaB7OJwcseICAXTEI8gkqhztxjYERjiuOBNikDKnhOTw= Received: from localhost.localdomain (195.214.232.6) by DB6PR0801MB1334.eurprd08.prod.outlook.com (2603:10a6:4:a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Fri, 30 Mar 2018 16:38:31 +0000 Subject: [PATCH RESEND net-next 1/2] net: Remove net_rwsem from {, un}register_netdevice_notifier() From: Kirill Tkhai <ktkhai@virtuozzo.com> To: davem@davemloft.net, zhangshengju@cmss.chinamobile.com, ktkhai@virtuozzo.com, jakub.kicinski@netronome.com, dsahern@gmail.com, mschiffer@universe-factory.net, daniel@iogearbox.net, netdev@vger.kernel.org Date: Fri, 30 Mar 2018 19:38:27 +0300 Message-ID: <152242790790.18864.14327439737191768578.stgit@localhost.localdomain> In-Reply-To: <152242784495.18864.4373352355749698367.stgit@localhost.localdomain> References: <152242784495.18864.4373352355749698367.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 DB6PR0801MB1334.eurprd08.prod.outlook.com (2603:10a6:4:a::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3214828f-eb43-4e63-22d0-08d5965cacbd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0801MB1334; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1334; 3:LXvfecTcJn1GlODEwQNssOho0EAJo/5O50+Iwzb6lB/KnOL4DvLqOOe2YxzYUkeVS+1Ry5+cl8VEufem1DRfw9XZ8SPbI3JGHacPxU7FgXJPO3Wow1yGf7DzyUWT+pe0hKWaZ8hvrcZht1o9d4wYso2wlsOxt7gj7erOMuPakewuCDXa2OqznYBzULH2LszUe59ESj/IrRffJUlj6aF0zM9pArSpNKcHYKGYbBh26pEHQuLqmvj9TwIY55kfPQET; 25:YuwtYvd3dqgjc/VZ0o8ekjHubWPxsB+4perLFl9ylsgIrs6ng4vWVTW7EPIbuiCS12hQ3S10RCG3EM1rTsEesQ17YZcktVZx9MR2IuSqkYQz5Mcp0RTu7LkwkewPlr6zi8VT4ruwoyWbBV6qNc4BTT4GHCM/ist6XkABgQl94+QANJQB6ywiV3d/8apleA8P1/J+r4smzV8Ge7ijOEmCizsz0P/XZkXW3ExPQSX3vRkZABj86rTjd+2EFTuR01tbQ8sTzvN2tjW/EXZQLJksfqBbb5s1GadAo05FS7ppYt6zLDTQnZjNVQX6WnG+7tKCxFxE5Mbqr7QMqntWTNP1aQ==; 31:b9KSLvKdvWAxqK4omrwGaz/gSP1j18JZ9g2B8YklOdTQTBOVvtfkXIxdc79np+sD+mO5gkOs/3rNnVaT1+uVZOcBYnLE6mGTl9SnUhD9+wxB+ZQ3Js8yxVLLpmcWpFgBV2K0jaIqY9fuaJCxWGklRa/X90hLfDqq27AtpUjh5dDvwXm6w6yc8pBkcl35SG5V0+9nU3Ij6dLlxSW/2Bmip9BAxwJgTYzDWI2zEDQJwcM= X-MS-TrafficTypeDiagnostic: DB6PR0801MB1334: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1334; 20:DZOGSmdn1eXV8tLSzAc1d1wZOd/aZkZJFtlIQROlMWdBc6PHTyIkog16weavCC5XKj6ROGp3HdGhg7D87ZXh1Udx9/b1QSNVgpLS7HHBGKSaGP7xSddRig1UgVKZZ95H2HPVEF4AnRb1JjADqAJBBTfEtGVw8YmbFD5wuc6K/yIBDaRcUGxIeVKHaJBABnBcsMW6zbPYEJYjmDK+i6bh8573UOpoOn2HmkHjSV1pmsSR8xB6y/6/M0WoJaWq7aSgiS3LBaXLM0DOWOuMN/ZqfXsTX311jdempmREZrTkJnPe1fRPVUSOFSTZA/3T7/nSN8JgsPk2jsZx6j2EEupDPeIkiiu1znqauTt+xwVyNbAoU5+0WYevKZHjidB8pLoRK+H4jATbRrmj6SjQ5WAOya12AyWy4kgq/f4tq2LJrU6rqzQXhIbyQO+tE+3cSiZuAvIJtuK+5m15P1OfVvhQEenyiZLhFGYvi6Qze3NXyJPlA05mT79lBRdFqC2hoacD; 4:YzfxyYPwqGOU+BsI7vJuzH2vgfpRi4Aqr1sPSyPK003Qlx72uGLwAu+OS3e+mlsMxqM2Nj0mhWTp2wc0e8NwT50HkZaYOwXsxSYCXBgnAUONNBX8Pxoev3n6YXce1aaydgoAsb5VOLFAvIVSYyahy4ecpcEzUoq1NBEdpBu2zcQTpmNiZIpDiyZOgVxXkPVDjvJszkVp0/l1O3NDdJETTDi1z32onbGcEfS7ueAJUcbcmsxbatXY+fDknP4R31Uu40UEGB+foJS6tlbojM+ZtQ== X-Microsoft-Antispam-PRVS: <DB6PR0801MB1334382A997F3750A92793E6CDA10@DB6PR0801MB1334.eurprd08.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DB6PR0801MB1334; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1334; X-Forefront-PRVS: 06274D1C43 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(376002)(39380400002)(396003)(39840400004)(346002)(189003)(199004)(8936002)(11346002)(476003)(8676002)(486005)(575784001)(486005)(86362001)(39060400002)(956004)(25786009)(446003)(6346003)(81166006)(81156014)(9686003)(3846002)(55016002)(6116002)(23676004)(52116002)(7696005)(230700001)(33896004)(68736007)(76176011)(2486003)(61506002)(6506007)(386003)(106356001)(97736004)(6666003)(105586002)(66066001)(7736002)(47776003)(16526019)(103116003)(55236004)(26005)(2906002)(53936002)(305945005)(5660300001)(58126008)(316002)(478600001)(50466002)(186003)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB1334; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDB6PR0801MB1334=3B23=3Ajr?= =?utf-8?q?AUyO2rOSRndWX8klunpX9nb3giiB1Ld3oMRSIHz8wKQBKXqIv/9BlrjS?= =?utf-8?q?WfAgpooFrLJarsq7uvGUDXLbX+fpeuqcje30qdHUBG3CTqjUr4m7HPx8?= =?utf-8?q?SuRSlMB2KQ0yj9vaeNPOMxFAPg6L5st6d7SbjKsn9sTnjxtk+lSBl1nb?= =?utf-8?q?RAJ+jqmuGKUaNZDl8k7VxCAUBDTlYAFViOBlorcdOsaLnkmELer5Vrgo?= =?utf-8?q?RTsMqjlDEMkrlnU4L9BDHzsJBhV/uU4tCqQuTu5ukFZZwrUypH5jJRsa?= =?utf-8?q?xKXa0r5J0Ni1kRw6c6z3OhqvvpO8YEf5uhvAjw498NCKSujnJ2/UXYuN?= =?utf-8?q?Ah57vAa+1Um8j6PNmydvdXhXTM/f5ipMlhPDifKW5maU8yFNz2HmuXad?= =?utf-8?q?GY/10NC77QFFAcnmB6ZpsOgMaePSd+Kn7TFXMq0/YX1Ty17ygM+dZ1Dc?= =?utf-8?q?xCEApN1d97ITAVXU+xuaUi19FDXW94sBZ+tyAj1cCT5176WAZhU+MhWy?= =?utf-8?q?fT0T65LmtkFih51FXbyFNWVEwZgiChYYCrItqQXveAwFTaUjd4RMzBu5?= =?utf-8?q?XseKvN3AfhF3J30JHqkjFRWtksy/wqiglhZT0eAnqkJPFiRD6P3y2Ffh?= =?utf-8?q?DkHVFVrhDNelFyhD0KYE4GCgq5EcLb0MvdW04iu9fgFk92/A6cCO59rX?= =?utf-8?q?lKl3u8xsUlTPWo0UlAFkUbyRE5s2VKN0f1whJlrEFXosZRueQ5wBX6rP?= =?utf-8?q?Emx3nfRK3xL15VYRuhMKrveAAPnJVzFgXAMQ7tVW71GCIdfe7vf6wT4Y?= =?utf-8?q?5qkPbG+Q5qQJ1UXPRCC8zkKlMH8zbThDuE7Dk04ZfZtZ2v4SRsX+E8/U?= =?utf-8?q?ubLtXjQud9HrTaSpjrh1FAIbJWhph/OJY4QxMVNq2brm59hAdIXGxmfv?= =?utf-8?q?7KLdbSSKoN9Io+iIh/Hfi4zo49lBtl0YIB2ySBe5sFqhgWafL1JFp9ea?= =?utf-8?q?a1aS5kGTw6Wc40WwTVl8ZOT2/+XQsk0SCzJjIbkgKSvsy7qaL8KgRucT?= =?utf-8?q?S0ynIiNDifCbJGGw6ID9LSCUReq3+vdW5SZeNwYJTBCIyyE3h1/fnEnL?= =?utf-8?q?iTJ0OsEQ7Her3kpUZ3nNnYKnewZs+Hv2x8nx6LLjI/hiLWutg7Y2WyDz?= =?utf-8?q?oQ2qtDo75i0YEx8cuHkBkulo6K/jxvuSi65Mb7P3UzM4gIG0pZzgki78?= =?utf-8?q?mCC6Zd4zPWgNds6lIob9xR/HATGmm5JXA5narrU+bjIQgiZP4QC4b+my?= =?utf-8?q?ZNBSo4A2oZqT4Ll0gImxe7M5E+2QEMsR05RzoEcHvkPVH+UHuHDLd41c?= =?utf-8?q?lS2GVxOM8Zo9uBCXIXpsJc8/YfgpZ7HCFn8/Q2vJXVjh0pJUkOiYNa?= X-Microsoft-Antispam-Message-Info: iQ3gm0tOpMiN6zluIEN//csVsO8wuZEXxMequtF3nT8SODW87NG/nVRVQ9NopXBBqalX+3HvCof0CAVVhtRVBU/sBtNAMwxC/gGcP8VETx7ibJQ92sl7xznYW1l7lgUrpC+uJbarCvYDtjiIOcsyptcq9grZPiDGcA8jQjcqXXHB5QAcINwEJl1PGEAgcNHu X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1334; 6:+GWYXyK0AlkGMRMJQ8JQhDDbpcijheOSFYpK04AocdEZgEFAIiJN0p/1FP6cArWfmMZb9KWcmybV+3des+g9U46lh8adFXNrv58yDivPpdpXd5h21R89BspuvSwVwSPVOCKkhBbKRstbBf5Ag8jY0451l6XYtVqm5gFJONNt5sWEpwRn6uvnrTYftaOg6BLnXITeO3al96+hMBThJ9nSGS8nSy3erUdbkzMjxe5aJVlHL+/3XKEO37CE+qrUIS/6glhDiXed5FxPK1Jb3MzxnWZSdHZZkVD47H5GCRQrXJOeKTmkpxHd3FZ2OvNhSPNDrO8T0Pecya5jzgOrVnEExO6Q0eoi3EPb7xGKYTaH0QCfHqXSRg9hCmNciORR/wpH+4ccSS9TRH9hK6zZ8tblaEm+Hf+PIIfqeH+ygZucH9eRKEicNShJMkF0KCQY717dMszLINJnRwOkV9x5zqOkyA==; 5:vKH6pwmizJnJ4O2ClOfzvqXIre2am8IuDzOj8yREBiNPX9wgxzMdpX7O9fGzUzqIMFhEQS8U7WdithOow034mJ22dda5MWupTdi/b/e+dv6j2+COczYD7S0ghgWnJkSLXlSmr8B2HrNzcMWIfcLB1FU2nmCc+5BeXGai8XwTlx8=; 24:qafkVEO8D9UyqwnKkMBGZfbAxS9WZqIaNrF2J8vG79RVIcmZmKaNxiHpgjNDa5Spz1jO/u05a0IfdyeK+e6pBel6D+RuUzKVsier/GtlwEM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1334; 7:CZH103o5XxatuLwgvGh0pK+fhx8bdTzhtGDIMZva2a0QcRG+5uVhqpEYh1FIYRRQrW2b9A/+1FezXT3gE5sA2IQJVuiwKsm6W11S9tUSaA/7D7GKDNmWpTgXB2NozOCYySAnFyIP5Rbo732hWJ38QcwifFhnQjpD9uziawUDP3gWNsNu5WlhTamBmjTxoIrVVyTucsF6st6oB6hJl4qUFLBZHAO26BTyffVIhQ/l3GpfAw2FRdE+SduD+QTBDu9N; 20:fcnGFRMMP8D3od+ZoCIEWdgYaTUMvvA8LU18dl49UX/em5YxDPxgHX4OuogItzsdkI79uo288geYNdUWIZv8vxKTmt9OZLIc7luq0Nk8HNzrvm2X2jt+Q0bVI7Y1q/+H14BPLRd5zp3iJjkGqGvrdqmrSrfoKxKgFLp4iwkQLzE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2018 16:38:31.4526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3214828f-eb43-4e63-22d0-08d5965cacbd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1334 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
net_rwsem fixes
|
expand
|
diff --git a/net/core/dev.c b/net/core/dev.c index 07da7add4845..8edb58829124 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1633,7 +1633,6 @@ int register_netdevice_notifier(struct notifier_block *nb) goto unlock; if (dev_boot_phase) goto unlock; - down_read(&net_rwsem); for_each_net(net) { for_each_netdev(net, dev) { err = call_netdevice_notifier(nb, NETDEV_REGISTER, dev); @@ -1647,7 +1646,6 @@ int register_netdevice_notifier(struct notifier_block *nb) call_netdevice_notifier(nb, NETDEV_UP, dev); } } - up_read(&net_rwsem); unlock: rtnl_unlock(); @@ -1671,7 +1669,6 @@ int register_netdevice_notifier(struct notifier_block *nb) } outroll: - up_read(&net_rwsem); raw_notifier_chain_unregister(&netdev_chain, nb); goto unlock; } @@ -1704,7 +1701,6 @@ int unregister_netdevice_notifier(struct notifier_block *nb) if (err) goto unlock; - down_read(&net_rwsem); for_each_net(net) { for_each_netdev(net, dev) { if (dev->flags & IFF_UP) { @@ -1715,7 +1711,6 @@ int unregister_netdevice_notifier(struct notifier_block *nb) call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev); } } - up_read(&net_rwsem); unlock: rtnl_unlock(); up_write(&pernet_ops_rwsem);
These functions take net_rwsem, while wireless_nlevent_flush() also takes it. But down_read() can't be taken recursive, because of rw_semaphore design, which prevents it to be occupied by only readers forever. Since we take pernet_ops_rwsem in {,un}register_netdevice_notifier(), net list can't change, so these down_read()/up_read() can be removed. Fixes: f0b07bb151b0 "net: Introduce net_rwsem to protect net_namespace_list" Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- net/core/dev.c | 5 ----- 1 file changed, 5 deletions(-)