From patchwork Thu Mar 29 16:21:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 10315683 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 04FF76037E for ; Thu, 29 Mar 2018 16:21:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E29AD2A2DB for ; Thu, 29 Mar 2018 16:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4E7C2A43A; Thu, 29 Mar 2018 16:21:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CDB42A2DB for ; Thu, 29 Mar 2018 16:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752639AbeC2QVe (ORCPT ); Thu, 29 Mar 2018 12:21:34 -0400 Received: from mail-he1eur01on0111.outbound.protection.outlook.com ([104.47.0.111]:59470 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751714AbeC2QVa (ORCPT ); Thu, 29 Mar 2018 12:21:30 -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=nxUwgyNxUh3tfTpypU3K6PYcwjCHAjqafbaLzZxuVMY=; b=PKQ0pDUMJjo91eNPjHYaaXAOPE35ZKeegWtgPdu82dzdhtpPT8Is8c6InW09V4OFE4ojbCCn82pqDpfgGAy5UV1sTTCAGTA+GYupmXauVnbDl8RjD3FUHCrJCCuPDFCnLJ4LAjJ20pM7XfaxSEZMSD8/5jBWFhJQLAaaYszdcRo= 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.609.10; Thu, 29 Mar 2018 16:21:22 +0000 Subject: [PATCH net-next 5/5] net: Remove rtnl_lock() in nf_ct_iterate_destroy() From: Kirill Tkhai To: dledford@redhat.com, jgg@ziepe.ca, davem@davemloft.net, pablo@netfilter.org, kadlec@blackhole.kfki.hu, fw@strlen.de, pshelar@ovn.org, johannes@sipsolutions.net, paul@paul-moore.com, sds@tycho.nsa.gov, eparis@parisplace.org, jmorris@namei.org, serge@hallyn.com, leon@kernel.org, yuval.shaia@oracle.com, parav@mellanox.com, danielj@mellanox.com, ktkhai@virtuozzo.com, majd@mellanox.com, nicolas.dichtel@6wind.com, vyasevic@redhat.com, paulmck@linux.vnet.ibm.com, vyasevich@gmail.com, gregkh@linuxfoundation.org, daniel@iogearbox.net, jakub.kicinski@netronome.com, ast@kernel.org, brouer@redhat.com, linux@rasmusvillemoes.dk, john.fastabend@gmail.com, dsahern@gmail.com, jiri@mellanox.com, idosch@mellanox.com, vvs@virtuozzo.com, avagin@virtuozzo.com, roman.kapl@sysgo.com, lucien.xin@gmail.com, christian.brauner@ubuntu.com, jbenc@redhat.com, pombredanne@nexb.com, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, dev@openvswitch.org, linux-wireless@vger.kernel.org, selinux@tycho.nsa.gov, linux-security-module@vger.kernel.org Date: Thu, 29 Mar 2018 19:21:20 +0300 Message-ID: <152234048028.19153.843006403471156320.stgit@localhost.localdomain> In-Reply-To: <152234005959.19153.17907173734141707348.stgit@localhost.localdomain> References: <152234005959.19153.17907173734141707348.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0701CA0045.eurprd07.prod.outlook.com (2603:10a6:3:9e::13) To HE1PR0801MB1338.eurprd08.prod.outlook.com (2603:10a6:3:39::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f67dfd1-5cb3-4d40-0c09-08d595911d77 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB1338; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 3:4JnkbppO6wQN6/OsLwTl1WJqgu4TXdavQNRL8HaB3/jt22hse6YVqXYKHnolzHfhvyYE1EnQKiWG6Y93UVKk02xpaedsi24pSOP1sLk2XN3t5ecm1woh/3JMjjsQtR02MZgM13FkS+0a6GDdJPBuI7BGxcHE2SZDMMICJ0oj1n7AuRX5JtucH43o8MbmNme0KXYM5jXW/y+JHRnV3xzcD24R1gnCIXPrbhwq3tSLTKAoOf4bUpw88y2rVI9PUM+1; 25:9Bj65RPuw3fY1LSugZxkZRW8DHQP64GjEiriBE6nMhum8t16fDbJMgCDyR1PeEKc/HxHBkKAtCbCH5oUrx+8M11+aVnHek8qdKheH6drE7wMlrrCrdJaF2hrRHfyGK5BgJPEbfO9e5osOBKjdR0x2tuiJ/4gzP49pEVgNmtcIdxB/iue+AdfFwqUh/IAUcXDIdNwvzVwmCjmjXZFGKZHr/tOs8jNP3/PRrvKbjxdxnLEf7R1v9wVefynnW7jh70HUqXDle1HSQb0B3uAwg2d/stwqd+ZWw+HqLio1H2aOtz9o0OSMLSNxkULUZDFYB05ddPFVlICWuMyN9vyAzhluQ==; 31:gbpUfq2O3PKkkfVU19Rshg+wJPfzVCMsyoBq0BLkf4DfaZQtl4/xQps3pBi4HKBY/ZV1/QC/G1nqKJm002Rpk/WQ+OY1xI1iIY+jN3bps5u9/u1gYkOz07+INorCygOx+vKjCwi++VbK2pJdG+30AznRK1pmQ1mFMkkNZpE/bLbIOtv8PsQuY+Ah30o0VFJhLSj0peJ+4GILz9VdwKjQOowyzV2nWCPMhlRI9ykk+44= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1338: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 20:/l4JVsP13uPPGvr6LHB8FmaEmIYjwwpmlhgN+LTXpTJPv3pzp8zBkUdh4Jf35kLx6OfPO3GZjZ89+7nmfH/njt+IgTGaSkAfRvouFUSUnRjEeBAI6tmZYtIocpIGloSksvm0HxiQOWuF3BYFWvsnInyp4UnHnZ3V7iDd7j9NIgNYFIRDWtr1m0+g69jd843+y1JbWWy5qVXKal9FI2lRlt2/7zzef20BQr5lRIYjoNchUoNmYGtnoM1/LJdhCKLAB5Kkwlm1uyKCfAMqcePAF43BTHL1U4++yuK1LJam6XZm70ZgQ+HCcb5cXhaY1034MOv2dDEGvj7kfw9W6AMjMTziZhg8H7mUGGVrOtel7qLRwAlzmqeXOsSt82W5e776c91lddtgbK42eVLhMXgXj1lyJ/zlFD0NdpR8qaLO3NXTBZdSYXioQ4UAYATrLOG/ndDE8MhQlU58KKXeABxQ+Wa/VKAniguZgwaVZqk4lvu3T6T6Bg2j0ovbJKbKtAmn; 4:OHRHqPLTK2Qain4/4L4DYx9j+2D2MfDGf7xcCeI267aal7Rw5h/OXLQS5G4vHuOm0mEt224o3w771v4I7R0yKbjrbsvbB28dVkGDBDwLUKHHJ2fx9M+BaMnDcigEESDlF4d5YXCJ5ItqOagdPdzNV3ROy6KE7AhsKUIwzKU9mFKyDOnfyasJxlHjxrpncx0HyYqswscPSBUzWP4dMe3aIh3dNrl2BgRKAvcR4A0VFcTNiP7VEjOA0gawI5NZ+qbL/StNZQpOUL8sQjLLr7vdJw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(3002001)(10201501046)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:HE1PR0801MB1338; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1338; X-Forefront-PRVS: 0626C21B10 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(39380400002)(366004)(39850400004)(346002)(396003)(376002)(189003)(199004)(386003)(316002)(6506007)(105586002)(25786009)(61506002)(7696005)(50466002)(7406005)(39060400002)(103116003)(7416002)(305945005)(5660300001)(33896004)(478600001)(8936002)(97736004)(52116002)(76176011)(68736007)(476003)(58126008)(59450400001)(81166006)(446003)(11346002)(81156014)(55016002)(6116002)(7736002)(26005)(55236004)(66066001)(106356001)(53936002)(23676004)(2906002)(186003)(9686003)(8676002)(3846002)(486005)(86362001)(956004)(47776003)(16526019)(2486003)(230700001)(486005)(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?B?MTtIRTFQUjA4MDFNQjEzMzg7MjM6RkxGVDhUaXoxNGJEMkIzeGxNZWsxZ0sz?= =?utf-8?B?ckwrMUxjb2JrejhEeWlyVDgvaVlFZTZJc0JEcFhVaGlOUzRONzlGY0dIelNr?= =?utf-8?B?OUtqV3p0QUdSN2E0RzlueUlSQ3lXSFptb2RVVTZZWFBxSmFNUnlSaTZvVlc4?= =?utf-8?B?ZGtUbnJ1VmZEWVFpSW9pZzZ6eEhodVZQekNVNkdGcCtXTVI2YWF5K3prWXFU?= =?utf-8?B?QXlnRXBYcG1scW9rb0V0WEpkWERrcVE2Znc2NWg0L1dtZGpJNlE0SUk2YzFh?= =?utf-8?B?dEpId3NxRjE0clhFbjBtdW9ndUhxNnRQci93UW94YVFNeHJXaUtTVHhEYzFF?= =?utf-8?B?WnR2aTNwQllBcldrS2tNeURNUTlFeTV0S1lpV04vY3hrdk9nMnpSS0s4SFRD?= =?utf-8?B?Rkx1VUVsVnl5Vjl3VVV3cVoxQTBXSmdnVEJudy9nTmw5YkhucFFoSWdrVjRx?= =?utf-8?B?dnRoWlR6US9KbmhwRkpsbU9BZU5hOVRveUlVei9KOTBnQ2NjdWVUbWlMZFMy?= =?utf-8?B?Q2VNbkYzQTZoS3pTZDRGZ3VXc3BFU2JzSENaODlhZlJkeGs2cExNYVhsZ1lo?= =?utf-8?B?TlY0RS9ucERadzdhVmxKMkNWUEhRajNlVUFPU214OElrNDc1RWZzUHNhSytI?= =?utf-8?B?bU5wNTA3NEM0b1VZVDZOSFBKVlRLTk5nMWxuZ0pjR0xEYXZtcnpIZndQRUFi?= =?utf-8?B?WStpMS9nbWpPNUxXMzdSbk1LQUd4dCtkdkwrYXBlSmx4SVJISklNUXY4cUNy?= =?utf-8?B?K0JZR2xEMTBpK0lQaVl4NGVUWlF5emhBYW04VFJ2algrOVVoRlJINGQ0L0RN?= =?utf-8?B?RG12S3AyV2xBYnNoLzAzRVVWbTJEL3RxRVpjMzJLRk9KU0xGRERJVjlRZnBU?= =?utf-8?B?dS9KVDFRSUo2Rnk4c0tUbDFTMjY5WFJJQ3l0SXJ3UUt2aE05d1JTQVdGRFVM?= =?utf-8?B?Vk5SMHdxOXVkUzFyckFkN2ErRlVGY1Y0YTBzV3NQNGltV3dzbUJlb3p4UUxU?= =?utf-8?B?MWR6eWVGRVBnOHc1SXpNQWlWUzFWUWhRUi9sK0MrNlAzMDNpRlZ4ZWVSa0Ja?= =?utf-8?B?OTRUekhxdjI1Wkp2ZjgrUGI3Z3cxZXcrSzExRXNWRmUyeEJYUXNlWkpNamJY?= =?utf-8?B?WFdiSS9SQWpVT2RzaHlpWGZ5aTZqSFByaHZVTlc0SkRvQmlWNmRwNVllZkRt?= =?utf-8?B?Y1c5Y2liU2xmczQ4NEhwYkVpTks3MmZoU3pOc0xDelJKQ21xQUxGRTFaTllv?= =?utf-8?B?enB0WjdVa0YycjY4ZTRma0syY0Zvc081YjQ5ckNQNHg0OE40S0xPRHp4WW4y?= =?utf-8?B?YTFvNWVJM0h4amJBMnpDcVNnQ01vai9MWEdkdUJvdWxNY1plZ2tmNmd6WGJW?= =?utf-8?B?MFdjbHVuclpKZDZRdWtQVXVtS2xScDdQN1pzMW8rWVJyRnZESWpUUFBBUWVH?= =?utf-8?B?RVcweUdJdTR3V3RaSXEwZmZsZGFRR1dmbXo0YnNleUZodXJBRU9zMTNMY0N3?= =?utf-8?B?NnoreUM3ekI2blllUVJDdVFIMDJELzhpNmZVcS81bmo4YnFNZGNZNEFzYUsv?= =?utf-8?B?eUVYVVpDVzhrZTVIbE5xT3hKUElaek9KU0M1bThnanpsY0I3SE5HcDlqdjk1?= =?utf-8?B?MFBWTHJ3TjkzWHphUmdJNUZuekRDNzlkTTZ1MjkwQ3BIbVlmWFZqZHdFR1Zq?= =?utf-8?B?dGoxMWdJRXZsRjhCS3JiV2ZxYmlSeFl1WjhiQ245L0hyTVU2MGgxT1BmM3A1?= =?utf-8?B?aFlsdDh5M205WURkcHJoVnBHWGIzeUk4eFFrdTRONTNwODJHdG9oTEN6bk9M?= =?utf-8?B?eC94VWppSm5Kc1cxRW5OdjFUSytUVlNkUWRoRjFSK1duSm40dz09?= X-Microsoft-Antispam-Message-Info: sCh7zVjIzHeEOPY0hdIo1g6kZDQq4IteGWGt1GNQVorkxYNLzhBbGW8kbJZ0FJOylEutqrMQ1/HgQ8zFnPvEkGTk074thUmxVHzWpVKlM7XtuUb59ZcBlmgMZlQH/CS//+ys+Cw/NXrMUOssyaQnsrlgNKezLYwdc0oj6bgTbV02R2nWEDW5oS4XfvF/+JV2 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 6:16XK9PVGlAukLM6XUKA1PffFLNmT4EMShEiskMUNyW66WvK/67x4BVrVnOqzJCypqXz7DGEZd1myoONGjwIGOd9GjOi++ChNnkAFg/RM8XWBz/0NKl1kxc+vjpfDsIgRdYfzpW7/QF4m1u4H0UrvOs9oYpnfnPE9xXdg8k1aCfU8oahJuCjTEsBir7vRRUkc3rUf3CEIy6CKTspqw4Mn0WY87kwpBAZNvO4MbtAnpKErEAKVbQSgKcW1EfmPH+/B9jDZu6FjKRVF0EgTiCsFzzFue+JZTvRVMpq/g0E+K++xCcPwmV/TuFcv7x689Th89iZB0N/x7XihpzzHrT7b90yD5x4Kd8xDWKcaToMWYvCz/an2mpHvptbBNtHB4w5c4OSEoiP21vFFpDIMCc0wESwkTyiVf6eKwKlp8oBzo3DfhTfgkmBDZ8Gqo8uC/gg/S5nsohLhRi3EVA8W0+88mQ==; 5:VGuMmSTRd8fFo/d4h+jQViscYmOjTBqrDXDL2thoYor5VTMFKUUEpMkKCJooewg+fhSoReATWJliPHxbPIxDqgWiOOhuN/x5Xugz40aAm/01xZq7P+M1SfzNvxJcoMMo8tljNEeaBh3s6X+kNzBTPUPLZO9xXCA4/NpBQTXEXyc=; 24:vOVYPWPKmtM085LA6UsEtjtBd4uXKuu86aftEnNuSZ1OH25uGuyptJT6COiystU9kifWoO1YLi2XLlZ4d4+kqFpOVoREzBVpuBomzCJw7yI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 7:uXcl2n07zPMhmrwbr/HT9D0jlBKXVjw/rIs1OA8reYBKvegm888qu0+0MDSo7MlEaleAM+x6vLVPwJkkPIUdO6xkvXQFj+TW1slIVSHcH99f2ZyHjd9+BM3Rc0tbtyn9wwHfMcgXEES21etGy8uEI9AJRkUgbd+EUO14rEIV1VV6jNdMTn/zgJxoLBjkDQBq1hpyPIuJowbcQZOEAxyjrsY8f3teFovkbK2L81TArArYa6sQn78rY6LFk50KqiWx; 20:BZUBTw55BzihnIzyEj325vEK6ucLiDoVChkAMr4ksDv9NTgYYtTnfh7xInDs4yBXv7d4WuzapTWh2b7cWvNIjpPH2qw34T1B4VLiu9GhG26bZSsn8mxCu4bvmHHAMPAlbo7dHDfCYHdDG9p7zlthU7csTxGtDz4PeYdWVvw3YIQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2018 16:21:22.5711 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f67dfd1-5cb3-4d40-0c09-08d595911d77 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1338 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP rtnl_lock() doesn't protect net::ct::count, and it's not needed for__nf_ct_unconfirmed_destroy() and for nf_queue_nf_hook_drop(). Signed-off-by: Kirill Tkhai --- net/netfilter/nf_conntrack_core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 370f9b7f051b..41ff04ee2554 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1763,7 +1763,6 @@ nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data), void *data) { struct net *net; - rtnl_lock(); down_read(&net_rwsem); for_each_net(net) { if (atomic_read(&net->ct.count) == 0) @@ -1772,7 +1771,6 @@ nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data), void *data) nf_queue_nf_hook_drop(net); } up_read(&net_rwsem); - rtnl_unlock(); /* Need to wait for netns cleanup worker to finish, if its * running -- it might have deleted a net namespace from