From patchwork Thu Sep 20 09:11:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 972261 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) 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="E3B1QPhI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42G9vy1LpZz9sBv for ; Thu, 20 Sep 2018 19:11:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728635AbeITOyH (ORCPT ); Thu, 20 Sep 2018 10:54:07 -0400 Received: from mail-eopbgr30112.outbound.protection.outlook.com ([40.107.3.112]:56384 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726903AbeITOyH (ORCPT ); Thu, 20 Sep 2018 10:54:07 -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:X-MS-Exchange-SenderADCheck; bh=81xHb0coJvJ4WwLevIvKOhDZ753K0vmHwEg1dO8bT38=; b=E3B1QPhI6jQ2slRR+uUSus7gUsogjd4xPYAGA4lfGNa14yLOZcGJGWqaLaUO77qy7+/PH90+z26FHFyk2N0uFY7HRbRWHk9vYLgiMP5j7G5J4/0xYOlG3mGqCSwPxbrBhI4bAh/4N3oLETM3HXu1ZWwSdaN8dTJoi5AgzgUFH1s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Received: from localhost.localdomain (185.231.240.5) by HE1PR0801MB2026.eurprd08.prod.outlook.com (2603:10a6:3:50::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Thu, 20 Sep 2018 09:11:33 +0000 Subject: [PATCH 1/3] net: Remove inet_exit_net() From: Kirill Tkhai To: davem@davemloft.net, xiyou.wangcong@gmail.com, yoshfuji@linux-ipv6.org, ktkhai@virtuozzo.com, avagin@virtuozzo.com, edumazet@google.com, ebiederm@xmission.com, netdev@vger.kernel.org Date: Thu, 20 Sep 2018 12:11:31 +0300 Message-ID: <153743468053.21312.12479798720931338461.stgit@localhost.localdomain> In-Reply-To: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> References: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [185.231.240.5] X-ClientProxiedBy: HE1PR0301CA0024.eurprd03.prod.outlook.com (2603:10a6:3:76::34) To HE1PR0801MB2026.eurprd08.prod.outlook.com (2603:10a6:3:50::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 66d4f2cc-ce32-417b-05af-08d61ed90ffb X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB2026; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 3:UJZGYFrqnxbB5Np3Rkq9gqMWyga0gNKEMgEWXWijerSc/T36zkr1TcK0tpVsOixTAc5K5WkOxmaYps1cU+QDeEo75WOx0PGoSAE7Wt5Q6F6sJLUH8Jz4Sk9QMnYlxIelcCky44Lu0AXOMBjTfDhOVolL3Lypx0Y0CYlAq2wthES1p6aGubRJT3AtAnngXzNKlmrgN7X7FxwWj1FyoOcyJ7UZfF0Vjs/Sv8ObsEUR7c3OA1Jdzsib9oEsxCe/qjyT; 25:h7YLIk1KTiCJvm/hDXSLBYmKPUCl7ccBa/hrgdgb1X53WiUDwyjFuD1I1393SPeOVS4TM1IpTG3cmL6xI3SkSzB+QHKD8+zhFWkHHmCZOa6WVs4jFRN3sLyX2IAkgdKRzdscU+x9ZhuIWwQOoaslZSYV+MJUyRbSbaAhRNyLCm4AoZUh9IF+SHOWSHrV/qadSCo2JCKmWfWbuXmD4ZR+rTo8SS8hpVf2pRR7YKl68aZSMKb+eyZsQW268MUEFvnaQ/sedenrV6wo0FKuGRIGlRsrd8fTehVEXHNz3PJsWC5jrAGAni0dlRWu3pBiY/s2lHswWcdpr5l60xcZQGbq3g==; 31:NIWGhCJkqmIgBtzEVe+adwWEIjhUl4m64i9Ol/4rkQpPN/WC9Z2wyrFVml5mKW+/JmXHZeTq4WOW/ZnNe4RP1QA1mhodlQDlS5r8httgGBAup/vK9wuK/9dmkzQY5dhcPFsAU+rRgHovtVM2T3McozfCCgdTvsMYRSoFv1ZtNvtxicFsAHI3fDDbasYwgz9h9ex7AKWvBCSjIVTrnz6nPFtExv7cvUNj6BiNFdpZZeY= X-MS-TrafficTypeDiagnostic: HE1PR0801MB2026: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 20:wEKXsQ3KMw2/0Wj8Id+EVStVeQWPmfjDMZ9x6b4l/4b/EZZVNu1j3/CnMxJAO5mx2+WDqlvm6+9ecUtTMVzFc9FeVlRQ3c6efvlgm8J0Rmk6oq1Sk/JXzVmWY5xClRoKrEEQcLFlEFhjGGq7PqRebnRacRniheq1blS1Es04KEXm7gyLuqe20anttlrfyjNCfqf1UxwTJq80divxmF9x2zo1z4KJ+yRRUQmKQA2nvNdP3T0eCikuDAnZ6S8EF1ezTxRBUNBwD6sUdpjZ20R0K44gg94Ay1XiKImLAUSX/0sS6S+Bmr0aGfG7sQVcQ277DjbdBwkXg2IlCsf3R6BZ+z7qLx22QEd3Is01wSKlZQQu+/iFvIJGfSPQW+easaMeOhWLWmMrnkRmOlG1FpvZ5RbzHvnx/TovEMcdsl63JHhtw224BH8kkUOpK3NShROEEyU/l2hfiQuvhkLJOsFeymnd52dV7R9WWOn/VCyIso0yI2KMfr9YBqZ1nbLwmARZ; 4:z/AANMJ5YP63oZKXQlrChZMt2M5BJuYRIM6hChcSpo8X15mAoXxDNvLlHNyMGpII66FHYUgCVPailG6Pz5rl79mER9nGackB3ft8NwW+9y0aja3p88OyFhSobjd3bPE+QHkCDHmd5YldOQ4jgNINBDcCUJ8oXhEvHZyrY4Nv2xeaswQzVVeLqlM5nZwcnqOl2NOcCIeJo0LZgrC5XpZLmLYy923i463xqsihTqrZpsTiuxYoDB8akUT7CcjfQ7RoXK6AJnl9DXrWq73CDxWn2g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:HE1PR0801MB2026; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB2026; X-Forefront-PRVS: 0801F2E62B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(6069001)(346002)(376002)(39850400004)(136003)(366004)(396003)(189003)(199004)(16526019)(7696005)(86362001)(575784001)(33896004)(6506007)(53936002)(76176011)(305945005)(66066001)(61506002)(386003)(47776003)(55016002)(230700001)(9686003)(68736007)(5660300001)(316002)(50466002)(8676002)(446003)(58126008)(476003)(6116002)(3846002)(81156014)(7736002)(26005)(11346002)(81166006)(8936002)(2486003)(97736004)(23676004)(52116002)(106356001)(105586002)(486006)(25786009)(2906002)(478600001)(39060400002)(103116003)(956004)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB2026; 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) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BHE1PR0801MB2026=3B23=3AS5?= =?utf-8?q?e8m/40h5jYnVV1Syq0sEmDhSKsuCscsVWTZqZZl2NS+6i7ZNdiYZg8Km?= =?utf-8?q?nWnfGDVaaS0EQRlTRFMhd9f/LlU6RkI2HQTbRF49fJ03BZt3P8o2UH1I?= =?utf-8?q?kWQdc6jw3KjjLN92o9J1BBelCT5xIHkG6tj1VSDXRgmCChgjqG2/h25k?= =?utf-8?q?fyAIQyV8qv2jVQqyewclOTBDblee8yTp/qlqvG84Nr8sw5AGURq6AHa0?= =?utf-8?q?Wqf4ApUOvRDl+xhltgjn+ds/+u7oLA/zCrVpOciAosejNnd8NHXL1aKH?= =?utf-8?q?hqQ/1MXeszxjuISNRrwoICTxi8q07pHBi3nsoqHNHbM0AuXH+RLdO5SP?= =?utf-8?q?WEObd/bq0kOToJ7hpxJqZHsWtEY+42eYWPqughddO0xcVJsNe8OCZSCy?= =?utf-8?q?TCUrN/4ksmSOuUfsqx2DC4Ag8q+MALv/ybMWzCS9FvWkVJrFVtCFIY6r?= =?utf-8?q?x8xxNKHKBDHZH2KmQMSs9qr4lVQHp1dDwPBvFsnKCQho40gRZhgBTVde?= =?utf-8?q?em14oa8KHJV4VaIN9S2DoTDEXQvsFO52Rc3dJJEr0hjWWe7kBwMO2y/S?= =?utf-8?q?MK1P7MDxj7xgw1ra4F+fJBGTM/eCCNzTMEAZ00jQtUgJJrZGQgWZ26dN?= =?utf-8?q?g8XnF+eOznWhl0/Jc7P4zAcn3okfq4QEzxF7ftSXIHAKnT2hiOV3lFUW?= =?utf-8?q?07dQoBCOLFblcrg2uTGvET97NnbWwKgZButNSithCj6LaxWiXZ42yBNs?= =?utf-8?q?LAX1B2xwAOYHwggBJA5IZJVRcdRqlh7DA9oHO5zii/bOyrl8IslOtJaM?= =?utf-8?q?i1YMIJyOksp7rTOoUsC6m1egNApuA5MDE6mXChcjgeXmKJhhPWZB8f7K?= =?utf-8?q?8ma/67GDgVPQnbO7SKgJ2jt1B9vL+hxe4EDrma26Jt4lN+rlggei8Rkp?= =?utf-8?q?Hkz1syZ6sybSDsFCzjtVcXPMVUcpZ8fOWJW1K9GO56aKzix74cH2Aq5Q?= =?utf-8?q?56XEXy+KZMVHziECYAHSpf6R9gRs/kYiciUndKWZ0nCUDPqvgN3w6WsP?= =?utf-8?q?SlDkrnG9qZ+rrePS5pVsZP8EoM6c8CBxNlXbCQpKbM1/kdT/UMCmxWcP?= =?utf-8?q?AHz2ZXXCoAZp5em/oANDVoRStvTBqKBzYP8Rmk5CwVaygs66SGaiw0ak?= =?utf-8?q?/R7GTcVl9/TzoL1kwJ+/Qt7c+rInZtKQrtkDnqHgD/lprkikDJ63Rw7i?= =?utf-8?q?SNYkBrhtplQmnLPx+PWzjpbv1J/yyFzKpiJ0sKVqEZJbIIrGLPKUwBW3?= =?utf-8?q?+S3ASVSIAr/XYmDE9ZE/F394X8dvAwdyyGDMFfqvEwKyEnmii/gOnbA3?= =?utf-8?q?U5JRmahp6sGOpnrXZdUvsR0sKGfJ62/x4=3D?= X-Microsoft-Antispam-Message-Info: 9zhAD71QQZ7drMI8NDMURgnmUu2QLBDt2/LvDd2VKpkVE4QLbtAznHlxcmqaES/JFSJRCKhAYHiZco7DnKo3nJSydZntAW8Iv16w7KjGnJJzJIpCUT+/xQVpBSXSr8ClElqge7NpjhBJsWD9fnb4gKd8UANsM+WzXt/EqbQw1CjRjHGJ7hDn5fDBlV9LBARZePHyN3b3vE7hgSStlh3ETYwyJ2wcuqqlWBg8xhAmrUK8crzf8NtWU/i8mbzoezOHx8xtSlQfL7wkFkxI4lplt2t/VEozlguPJXPcaRYl/ga1+O+fYwo89Rz+8D23A00rnX0xD6bxBWe0/19pLM3v4Sk6l2Hb+GESmP5gddK5gho= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 6:WCo6naTrsLCgnDQQrK8wsve0VsnzE1TNBw7BrN5CZ/CHaTHnWMl2JYSOgTz+HqTreBgABVljO2AAPyhhAUgL8M1VMKfcoeD9tzlHOi/TnzGvvmVqcIhvDJ8ptY6w406kHo9shU7qvyycStUA2H7Iydc9Jah1f6ZrI0j+kmmIKxji08PJbvOqABnrWdY5qhT0/EquF5CwPSzAywtk+OlxYu5aPbWkMykHFXlnqXlUQYM5pgJmBvevuXr56PuUDoP0n34RtQCq5hm4DFPn246sr8NaqIRjUcQEHVLRapa9j9wPtFpZXthDwt5yndlfWrXInVAWFomTxJkKkJ5PjgmOx8lmemUfzKwOM51F1G2QNeBVqF8be/A38t8i2LsOzwxsM6ZQsVYxyjvQ3IrHmF4BM4aIjOatFCcAUI9SRTpDW63AhqDMq/KIBoKsG1EVOGiARcdUnuttEZjFkacnMkbMAg==; 5:WycmBqNJjfPPalDflTTxwMlS5Rw4GDXeohxTo+HT2tYgFwJG9x+IXhXfhJPfPRbpahuTl4aGwqK8hqw9R8Vpyzjt2Sb6QusR1vbs+TiiU1tKv485ysTitzt/cYEkBf08DslkaHsWGQESykI6udM3ewpBF1QhYs3bMd3fNxbpABw=; 7:1PFanahIbZMHE9D5uhF4Yr5YZ0MSj7R3p3xcOj8rzqZpScCVlUqPNZTRiIgOlQ2eJgnbT1jAl2+yvOUfGsK9mZJcxiHu99fiIPxeHF9faGOpa5vLXtViGPT/u3kw3FaOpK+OiAim2kj7AZjYXLGPIstulVtgqQqMqC5moCtGtZnpf2aiE20EoUOsbngxG8b5QgthZAGAv8obm9KhddCm8zgV4PhT4TSwrbqDK0hlE2SfnZquux2SPa8FyxyhsS71 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 20:nkSb3vgJjc79MgfWBniVs2ukSEM8Se/WF/MUQGyTeKyKjarDDo2M2RqVi6ArPSMN+KF15it1/EYEINH/KV2PNr2wQZ7je4SNT0fX3RudBu7TTVLkXKr23xByvJ7Vx+m2qhCOl8JNOkCFRYsls2fPvex39vPmt/Ec0/p4b/wMrK8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2018 09:11:33.9435 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66d4f2cc-ce32-417b-05af-08d61ed90ffb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB2026 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This function does nothing, and since ops_exit_list() checks for NULL ->exit method, we do not need stub here. Signed-off-by: Kirill Tkhai --- net/ipv4/af_inet.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 1fbe2f815474..f4ecbe0aaf1a 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1821,13 +1821,8 @@ static __net_init int inet_init_net(struct net *net) return 0; } -static __net_exit void inet_exit_net(struct net *net) -{ -} - static __net_initdata struct pernet_operations af_inet_ops = { .init = inet_init_net, - .exit = inet_exit_net, }; static int __init init_inet_pernet_ops(void) From patchwork Thu Sep 20 09:12:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 972263 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) 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="QXIFgk9i"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42G9wW0bq5z9sBv for ; Thu, 20 Sep 2018 19:12:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731562AbeITOyh (ORCPT ); Thu, 20 Sep 2018 10:54:37 -0400 Received: from mail-ve1eur01on0098.outbound.protection.outlook.com ([104.47.1.98]:31328 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726788AbeITOyh (ORCPT ); Thu, 20 Sep 2018 10:54:37 -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:X-MS-Exchange-SenderADCheck; bh=0bTkcnxl8+5gckzWUJunNETbsImEAEdlxM7LIKxZ978=; b=QXIFgk9i09TyEyw8+Zz9oq0VXMTgOppywEVE3im+qdH47xMISAbpOpK44zNNUfoxMyZnbItTrONyEDAExMnYH/Rf1kAmy0sdlESA523WB0j85+2+CLWMuc9C7FNzuRVUkQHmQVxvQn1rUWwlHsOffeOkSn/rea+9Lhgp/V4cZ5Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Received: from localhost.localdomain (185.231.240.5) by HE1PR0801MB2026.eurprd08.prod.outlook.com (2603:10a6:3:50::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Thu, 20 Sep 2018 09:12:03 +0000 Subject: [PATCH 2/3] net: Register af_inet_ops earlier From: Kirill Tkhai To: davem@davemloft.net, xiyou.wangcong@gmail.com, yoshfuji@linux-ipv6.org, ktkhai@virtuozzo.com, avagin@virtuozzo.com, edumazet@google.com, ebiederm@xmission.com, netdev@vger.kernel.org Date: Thu, 20 Sep 2018 12:12:01 +0300 Message-ID: <153743469969.21312.2316847616468846087.stgit@localhost.localdomain> In-Reply-To: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> References: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [185.231.240.5] X-ClientProxiedBy: HE1PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:7:29::14) To HE1PR0801MB2026.eurprd08.prod.outlook.com (2603:10a6:3:50::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cee22b3f-4b5a-4cc6-8f26-08d61ed921ab X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB2026; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 3:+N1ULqQ2CX3KFTnAdfOtwuGJ8drwQaCyeJHUwBT32dmkUcwI46xBj35or4rFHg6r2y3oXODxuE/cAHo0H6cjR9K2kOvGBjv6bICoanChCpA8ZAm/ne2Kb/eecc1pFzPXTg1nmHIgIxJ3cIApCoSQr7hQXVfa43MXxVR/EsDLIThl1ONODGj0ORq8ZO7UIrqubETasqeoSwg3NhEOkx0lYvYKRLOByUUCWlD3t/jwgTvUxuK25eY0xiMDv521RPjX; 25:+/nMX5ApdIR/HhV9YUOFxMD/4gUXVdv4CMJcdNS8zWzjGz7X+fbrXawuQ6C2fxiTGhxkgrLp2NdkZhuAwYNnvkriGEHfIuLvNcYFZgaoKxNLFyef+pVao3fnwbzGyZKu2n5Jx3MXk0XFJkixgWmoZujkHfxg4rZgjgqmbyF7laVCAs9iCYNzJu7VBPrQ4W3eaYzxgle7VKcjiftuXsOyuIaxJ95QCmbEjA1NLT5U9APCMUUeomzpX03VeeXnOPd4KpTQR06In3lor+XieNemEwcrpsnSRLnrRXjZMIRZxK/n4h/Uxdmf5bdqn3iEwmlefs+zBqMgaLNCbYfyxvtP2w==; 31:DMu5ssxC+oVmKbMPhBcjcoLi70nfuYswfOFVudJkinBNVwJtoJJl6c82PtqTijpycYE7RFqYGh4JgpmjZgtfbgWUQ5LcYG1sqqK6I73vbeK5lLT99QF8g1FGUXOoPpcX+6dUbyy4YQKo3oeQid8+zTAKCtch2CenHC5IZpWnVvlWAV2WOIoLf90bE4WZoYI8V4qFtWMFSucyWAlcYJgfE/rxkWYD8Grwe6eFW9rqNh0= X-MS-TrafficTypeDiagnostic: HE1PR0801MB2026: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 20:p8idPiOUCTZFuYMnBKSXSkpOuj+VRWZIYIV2Bt3rn+kvdLftSYmf+Vo4mmieHSZCCeduwxZrpCevkVffVzEfmjkyu9QEgVcotN6OXKBXsMUv3VDMC9kbAXT7bMutKkFY+Y8t0wS55HSD2vmbZ6KFVanOSjGAGICSuqVJVjSiHlunYR+0Wru+d5JrTw0ujTpx19jXNnA8g6uhMwNFDstUijyJ2llBs9fq3Cjj6J5ndDsgm2v65gYq9AOzLrAskNHsYAubrPO//0hpLUa3W89r+v0KZUC+b36e817j+Aq2oa29ebYbi/Heq/JMKyneULeXEwyeOtbOsnYfZTyV9Ur7boBv8DYCLtb77JNpAAZml30DLsLAmsTqw1rISSPiuweVI6UsI0aUXnRJu9U62h8tvnwXNSJVzw5E0Y9brfigomPyGrFfEEid8Ps7x+Vz4qR/igs7c8lSod8oLCRBAsI4D986fbcE4t5Lmg3TgiNO5BPmrmXbjZdXm1ufw/+WOOeD; 4:MuPdfoDqvsWxEreB3LHEPNpnoLgfoNMjofKfCmsiiByGPFlM059He1MoWxg08OlQg+SGYRzLQv7/a7IPePVDNXmS7mIXPJHi+fy0Ju+unyKxeTps+NV28X3NPhQHWxeQLKVr2dJ8YHDdahDewhacCRWTtJCjAgcOhKgBrAW5/5Qc1QjoA77RGV+BaF3SPkAJ+EeYMXMuobrrCpqa4cxt0dWTBBZB2tYpf7BJtxlozWz4HhV6GcE/XbK8HS6C1rIcSyZsgCyu2N6Qptts8IXiTw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:HE1PR0801MB2026; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB2026; X-Forefront-PRVS: 0801F2E62B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(6069001)(346002)(376002)(39850400004)(136003)(366004)(396003)(189003)(199004)(16526019)(7696005)(86362001)(575784001)(33896004)(6506007)(53936002)(76176011)(305945005)(66066001)(61506002)(386003)(47776003)(55016002)(230700001)(9686003)(68736007)(5660300001)(316002)(50466002)(8676002)(446003)(58126008)(476003)(6116002)(3846002)(81156014)(7736002)(26005)(11346002)(81166006)(8936002)(2486003)(97736004)(23676004)(52116002)(106356001)(105586002)(486006)(25786009)(2906002)(478600001)(39060400002)(103116003)(956004)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB2026; 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) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BHE1PR0801MB2026=3B23=3AJv?= =?utf-8?q?IDuXro7+0nRs2AQC4znEO590UYXc08Zke9ZRWRJL6NDbQwT4U/9XcfhW?= =?utf-8?q?XPJJy5itbUamLGJ1MjJcZQhY4fA5RELjXgPxsL/d0nIaCAdfXmnVhw8Z?= =?utf-8?q?rMta+jjA89zbpFgF9TrYGuw7u9leMpDQJ3HCz81FRVkD6jaJLZGfOsJ/?= =?utf-8?q?Cuz9PnmsQBe0NYvroCFzWeNp7Dl2enAyc9fiK4+P8/cvIuZC84xcYvL1?= =?utf-8?q?gv/xF3tDdbgtrtNeTUXkxfKmUqczP1rJcJ2ZsiK2mj+RtKwtaU86jp1B?= =?utf-8?q?ZRyh6RcSzpzdYov8Cd3CunXMyqp+bxDeGBVSUyC2InuQivYMY60rMxbF?= =?utf-8?q?2t78ycL5VyOCluJTAgIgbzK7x1oNhtJwpBSUHUmGR0PNOCd3JRU4HblY?= =?utf-8?q?Xvz6dM3h3jLZFF9N9iQmehtYxf7gQzvbFG8gs5JO6/pg6iryNzVPXxzS?= =?utf-8?q?EK/QkDZpoHGXpYsWK3th4YiEyQxyI+LVGIFvUVMfUAYcZvvjNuQ9HOMG?= =?utf-8?q?EWUyw5Di98kOy6eNq92zSZ3JAJD8lXYCwGoO4NUOIYgvUQM8l82FN6kQ?= =?utf-8?q?8jS0JzzZHyfuCQHIL2BLEmsthrISzaBfj8pxHuUgJJV1fQLmyvOolKxw?= =?utf-8?q?kuFoJeRzJ7GHZ2D3XLU/NdTZr8wZsH8SD6Q8nA+aE4XPY2oGMnW8Etfy?= =?utf-8?q?spYGxVsiyG8BB0EUyIsoL1N99H5BhTBeaX/DEyfqr6W7iRyCII8e4V3O?= =?utf-8?q?g2aA85ugj8j2p1JHz1wyzK06vrP/ptO44SXmzIoRd9xLlf+reOf+DwQl?= =?utf-8?q?4NvjO+UyOyYHMtGPRzrnQZQL95a8RPeUPL3k8SeseS4jsKKy+spj0Fx4?= =?utf-8?q?DD3wavMjIzfxRSmx1aOpIP4wXoYfr+b+vNM6rwrjAmU1hClnrBBoPyVW?= =?utf-8?q?s3fEtDucGfsG4LW+keMafw9x+4SDHh+5Ky2+XEn4Kgmx3NKk4BNsGzCb?= =?utf-8?q?xy16UejG4RRDqD/iaVGeeqLQvr8AMI4F1a75Nqs2VpEQwj0Y7nDziL/o?= =?utf-8?q?3WTQWxXa4PqnsxCHUD2UZb0EMeeCVkS/8xl38G7NecDs9oXlKndc6xYs?= =?utf-8?q?mE9Qm444TJmlgPxqzMy6JbkHCgJBc4+eDU1hySq3Sr5YPyPBlmr74m6O?= =?utf-8?q?ooMDxPS55w6TV6JjF7SO/+jU6MxnyzyXP33g2cnEkFPpZ+vAO6gIUs7t?= =?utf-8?q?uzkJeDmQDjGMVsdzYRtAb6PI5mUSuY/m2dD47UIxgY988k9mEX/RYndP?= =?utf-8?q?RICiOTJww0O+mOSKzce0XSjHVCR3UZwr/p0AU+C6x2nrvlHJvksI/3j+?= =?utf-8?q?i17HpNMdKe1wREpZ3KKPIG7TSskqW5yNE=3D?= X-Microsoft-Antispam-Message-Info: xqDiOu0/u2CFMIeHX0iXG4H6vF3NVG8RauqX1G6rELW+U5G4F1/sxt0bWmbXQXwzsexo/0y5h2ukcYwfL32AxMQrQTSE2CrVHrgxObLOgEdP5QyTOUmuDFg1Ta10finAlQzdy/Js3BHTGlEFkr0++m5GjlJGoXlW3lFo4TK0rdf96rR8Gka92tK452cn6NAoB02iCnYw66LWA9fpUi0X4XsJSeqnL5AzqUgjAU2dYvFFyyktKullB1wuUVt2ya31zIZBDbaivdy35hoKHQC1GqEOHSW1ASWDh5aSYEYzudrmvYU8zwxU0crSa77vahGE4kw0e8ATcFF2wJynsMsXRWLSXam886ftuPl/etMCeJw= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 6:UbzrqLg79BgV9HDLK8VJ1vC00GIo38p0FwzhK/p86flhi9Vi9xEiDJC2YCgYriC/SjiG7wHhlnmUB5/YcxIUHGNlRGMVNOhfKh1Wm/OnVCEIOH8CJfWBh5kStNtRIzLIthiLGK+q/5GPbtgsoRpXXJyaGlespGPyg3IuvCva3KAROQwAO6qRK39AGq+1LxprPyWzhfjYvC/ZuEoSC4b2i2M+M245RwESpbdHPrGwqzpfXuvkYfPQByGKpSroRZdDTFXkssnGcJnRJxQLyMc7STaPPhArG2IxQs3MB+OIpLLANUO3cHm2bjHllTUZlmPYTsWhMWNbZlED7wrjC3rLEQRogSDb6Kc7vYvEFwOpIk/dPhsBs6PxpLAyD8yWTArXNVa3FraYdU5ITplW3D932RN/fAt0VjOIZjsOZtiW2xFYeOh6G88ZcM81JijnKyr5+tMT78I7ujPLzE8cMs0i0g==; 5:PxDOETf1icwLQBiLuPP8HzaBuupGQxK9pBI6gjYA2vOSmR3XelLxgCjZ+V9zM5p5ty4CDFpjVLDrTLPYUsVH0K9hSHjCzzLzJ2WCo7k1CxWh5EIoxSbsc1RUM8xblSSIwC2rdiUki6SpRhNQkuH2fbXZ6+uJBqO2IjJeN3Jaulk=; 7:fKqGv8wJsanN5O4aYZB08Xb4+7iPwsYxjnq572nkjlZGJLNDncrIwYXkLfzgdfoBQZHcPh1DksZq7dXvhuiCBA91p6NjhzTMZkgP3upi4LL/hWhoGXnb+Za4Wy5RcN7E4G9mlLpbrRDDLmNnBftDrMAW3sL5iHuLsFcFY5xU86rlJRDzaUIimIDk0ufxGl//2+qr19FIMZo/IUnPZR5AuTCXerG5XgAbm0Q51vxidExDfx3OH/34Z8MI5TX1DLjn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB2026; 20:xgQWmwT3K1JBtWvEjB3SxQlThWIjhJIHpPxE4MLMa3KfI6tx9SL65vnPb3MFJftL4wxrV5j9ttwLObOJwtR5rEikoC7MgleX3+5RzdOmzAh/GRHk2HtDPCyhJDT6Xi1awWSBldtB+jDRrdmv4X2uTtLYXXzFr0ZLSoGCrqq+CKE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2018 09:12:03.6237 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cee22b3f-4b5a-4cc6-8f26-08d61ed921ab X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB2026 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This function just initializes locks and defaults. Let register it before other pernet operation, since some of them potentially may relay on that. Signed-off-by: Kirill Tkhai Nacked-by: Cong Wang --- net/ipv4/af_inet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index f4ecbe0aaf1a..bbd3a072ffea 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1938,6 +1938,9 @@ static int __init inet_init(void) for (q = inetsw_array; q < &inetsw_array[INETSW_ARRAY_LEN]; ++q) inet_register_protosw(q); + if (init_inet_pernet_ops()) + pr_crit("%s: Cannot init ipv4 inet pernet ops\n", __func__); + /* * Set the ARP module up */ @@ -1975,9 +1978,6 @@ static int __init inet_init(void) if (ip_mr_init()) pr_crit("%s: Cannot init ipv4 mroute\n", __func__); #endif - - if (init_inet_pernet_ops()) - pr_crit("%s: Cannot init ipv4 inet pernet ops\n", __func__); /* * Initialise per-cpu ipv4 mibs */ From patchwork Thu Sep 20 09:12:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 972264 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) 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="HbP6F/WW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42G9wm38ftz9sBv for ; Thu, 20 Sep 2018 19:12:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731654AbeITOyv (ORCPT ); Thu, 20 Sep 2018 10:54:51 -0400 Received: from mail-eopbgr10092.outbound.protection.outlook.com ([40.107.1.92]:47232 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726788AbeITOyv (ORCPT ); Thu, 20 Sep 2018 10:54:51 -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:X-MS-Exchange-SenderADCheck; bh=J1GmP18DI3F5ak06ocI4W9nb9coRr5h6z8X1FPbM/VY=; b=HbP6F/WWpga6JVE1Qr9/AM5u24qMVWtRkVVizrrK0VJEc59foslrt9vjog3yCTP/vUhAoaK2z+R5+v2f5lRuMEu1diyEyYqDprc5Wh/EGTjRWlvGVD9XkQRmMY3iK5l/G4b5bz9wlaKh3YTnev1g1dHgUn3BnQlS6duY5Y0gN60= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Received: from localhost.localdomain (185.231.240.5) by VI1PR0801MB2029.eurprd08.prod.outlook.com (2603:10a6:800:8b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.17; Thu, 20 Sep 2018 09:12:16 +0000 Subject: [PATCH 3/3] ipv4: initialize ra_mutex in inet_init_net() From: Kirill Tkhai To: davem@davemloft.net, xiyou.wangcong@gmail.com, yoshfuji@linux-ipv6.org, ktkhai@virtuozzo.com, avagin@virtuozzo.com, edumazet@google.com, ebiederm@xmission.com, netdev@vger.kernel.org Date: Thu, 20 Sep 2018 12:12:13 +0300 Message-ID: <153743472937.21312.592412049853708197.stgit@localhost.localdomain> In-Reply-To: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> References: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [185.231.240.5] X-ClientProxiedBy: AM4PR0101CA0069.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::37) To VI1PR0801MB2029.eurprd08.prod.outlook.com (2603:10a6:800:8b::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd60e89d-7f9f-44fb-45dc-08d61ed929b8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR0801MB2029; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB2029; 3:9wsXoaZv5F6YSpRa/0eOoDOJuNTAUKM2yITUru/Vgfkh1fHpEB3dKcJ+1XvOmpyjAsgp7lCKYC//2WNXhG9FYtre+7SvnM0+43Mbvi3bjkdIoEye9CXmBC4T76YFkrp6DCxvRpESqcTYCxOYO7/dFg3sMAuI89gZJqYy2o/z56rSvJYIrGJhpksQ/zsyAUTku/NEYmi2e/Vku1rmNX/eM9yZdCSoLFNYq0e+5ciaYfm196SncKqwdl5Na/vL7KR0; 25:84e1AfE3sUXH6Nhq97rcqfQ47V3UDt6AWbT5a6Gm4F4AnK0QQ8Khtrguncg84XgkKu9r8bCL02hjbiU92rl89rJ3hMF7JVHIMr7+nxftrmOXHLPGM1TXxVOoMK4ItCNFWvB43NWEP7L/gbkM4EIw3LAu3pmxMjsob6vUPxToDze0281PxFZoS+yDbQHG/DstlBthmdRDKGz/rdQbaLHpIbH97KBsGrGxBqLHJTdRahLjPlaVtprkGbsiHTnTHziDR5Xzw6dMGn8MleGpVdKdgn+fSdQ/nwbJuMS2r4+G83yh7t0fCEmGWJj5Ceahtywne+yA5P7dwc8R3E7e1wqzHA==; 31:GRwwqNtZMGymj4lrEESP2CQJxK9QJrVy1TprtjjFGU5c8pxPg4WcUMJ0UH0BU+Tyu+8HWc6nPN+fC0flYe5fjZfGuTVj+h7gjRg9jgvFyW2VyUYRi7h2ZQdZDHnLS1vvaGHNC2yIK505QO5/M+JHEyroIVs3iMusofXO5mV+OLZZldzQgbX3apSb2S9aEBWrXzM97jD0jamFIscmGC0MIcV3unjDAYJc6XYjRh/Z/Xg= X-MS-TrafficTypeDiagnostic: VI1PR0801MB2029: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB2029; 20:6BfY1h0pjfE7Z7NfwERumZvtKv7YQZdx6Z9Su3GGumYgZ8LCnme4wQciIIRvotqti6vLnoCWk71A5bkdf0m3YxSodAIlW3Mcw0J6/oUbxYMIAOOqvMFDJM7JMQhazA8Ka/M7hEgbFGcqJMj7sU2UvUOWRU72R5gUM3WhaNYZ683z0I4/mZdq1UZ0uiAdGFlFK7HEFRVcM4fNxj8zBFsJaFNuSggN9EU4BtNwbsS2aUiuXsFG34WUiQKIQeml8hS7l66ydOQ8YUKR8Kuxr/GB/O0cCLxAqP07DDjoEkbDIdl4Ci4fjAXkE1sVKQgcokkqwsWjl1ykBa+/Hl1ELUBKw0t8y4OgYPjNSWaUHXzh2Gx36i9NF0HZy2lOfyDyF6h6yoOFxJi4ykh0g/Pd3ViT2TlcnpZA8m8NrD6QqiNaN/hjFmIwISxjNmb/7ANeP4Zef5v8QZhML2VXhzWU5V7IhuYbyjfKx/cUzAe9RMTLiFIuzgNJAKJuFl0/oPKeptdk; 4:o+OA9UepwXL8Z/gkEFlmkziPupcaXkqgIBtB7BndQ3Nlzhrnokt2bb4QxjxOxskPyTeFG3POOfDMqL4a6XxbVRDLURX8Rb75ZZPHK31wClRtmI0aYkbCLnQdBYAD3/tm4wwPtBj3opKUMQE2b6cxoVole8d6tPtYoqlnvhmydeANXVlsHIgkHOIW+PXBJdkfVOZOR93qbw715ioOJnrYFvESj+iLjHtiehXOJKY5V9EYRiqGYTY9Yh/DpQ2EyB88LKFLU+pn7YU0N2u6lykjyfq05EXFif5seLNJEGLsKEiYpLw+cZRlZKRwFwicqe6snA6kKl5XGXCHBkAFIX+fgZPdmCS6dWuMK41LU9fZhKXbG4H0TsTUm9a3RONj0elM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(788757137089)(17755550239193); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051); SRVR:VI1PR0801MB2029; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB2029; X-Forefront-PRVS: 0801F2E62B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(396003)(136003)(39850400004)(346002)(376002)(199004)(189003)(6666003)(5660300001)(68736007)(58126008)(14444005)(3846002)(230700001)(6116002)(97736004)(105586002)(86362001)(106356001)(61506002)(478600001)(53936002)(25786009)(7736002)(39060400002)(7696005)(103116003)(76176011)(33896004)(9686003)(81156014)(81166006)(52116002)(23676004)(2486003)(55016002)(386003)(6506007)(50466002)(8676002)(26005)(8936002)(16526019)(2906002)(305945005)(956004)(486006)(11346002)(446003)(476003)(47776003)(316002)(66066001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB2029; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BVI1PR0801MB2029=3B23=3AsT?= =?utf-8?q?kGWkXuduvB5nj3giqsvFtZ7vCOkAKCGOGhvuStAUi/HoAsP1jVh9bu6E?= =?utf-8?q?bQscVAXA9f74VAF33mhQP1x39xagEkihqsRX/CW99KGQwzZjB682Y1Vw?= =?utf-8?q?AvErbf4d3nn2pBBy/+5zEN+bAWb4RkEk1x8ZdKFG8/XjuBcLoZRpsjfa?= =?utf-8?q?PIuGrCwb90vxfzqnH74FccIom6kusnGJF3xr+jOX7xdY+cyp8fk6jO/H?= =?utf-8?q?SE8QVpYqYUN75Txns0VTmae0daItvxqd/kA2WvTN53RNb+ruW0n6q0aa?= =?utf-8?q?eMyTRGt8hvFZF2rdk9vhKUx3WC3MSdidpkJyZVVe1NbO798spMlcpuYN?= =?utf-8?q?q4CH4hxyqz5UCU2bY2DSqyc1XYbtqt0Aga4FRwJFsh6LBDvDNDGO8bOU?= =?utf-8?q?jaMeINgTAXe0A86zqzmGF6hLa7yQWOA/hLWHIVKIRDStyKNHdAjyrV3H?= =?utf-8?q?IYyjC9heOCRcgf82AFpmH53k6chaAHdkRPPXLi/M57b165yet3uDQzjI?= =?utf-8?q?qgVy29Vo9mR+bLlDhzN1UC4TyZtUHNov9z8Mk8w2cmTdkIMijiJ9mH8b?= =?utf-8?q?iHGyucyzN83qD/c3MUyPmBmVNkcmUEOt4IvzkAzam404Gsn2ai2154pB?= =?utf-8?q?KqjSYhEGjjwjKL62H6EiIOSS0KGDZZ51W/tjT60HCaRJEvLKleOYqFQm?= =?utf-8?q?/rnrPFx+/0lxARMeZbq4Jb1+gBr4jfZyB3Y56cOpTuRPsXQ/i8Prw48v?= =?utf-8?q?6obwj92owCwbAFeF9hNpHVLnkQdBfHv+h9OPZmJxWirPB3xhhNvK+IS7?= =?utf-8?q?dyKBWAUySae2/6WED2423aJsL2mw3dpI93zjHtdhsyODh8+I6677n8+/?= =?utf-8?q?MN8AB6ZOmCQe1wgNQq/DTTzT48aKgqL+83Q6hk33BklePDxxnhBZoMLv?= =?utf-8?q?F4nnZ7Lozk3xEgj/vuxHzm6VYt0KfuIcIXV4Rey7lDbXtY6GHa5VCDHw?= =?utf-8?q?AAn1t0urOU5oXRggdtP5BLaOhLE1EZKZ9ZVB8tuhgukIKODjL1ZQvNbd?= =?utf-8?q?fDdROH9bJ4Eon85UUAv2SwGmapPmEyWdlmXUnk6mH/aVCIcU5ixXdCTt?= =?utf-8?q?R+PCErCLY+q3vKrGrDBjwGqQeJsqxXAH2TFZl+oDg4yg3o2bkrEnfh1N?= =?utf-8?q?7ycWhabuc3bkirfCRwngW8q4IwhGqBkvNSUBzB6nty/JddZLwB7X1H0O?= =?utf-8?q?pDmf9/QRwP1kU7tBayn6LLIT3d3xYbC2FJZkn7WHgRXqP80mvFJPwwZH?= =?utf-8?b?NklGZz09?= X-Microsoft-Antispam-Message-Info: 47Z4mABPtviHvT41pyiJHSWSJllTfvMzUkdF1X+fuondFlsh8RckJrwwQITFDrjcGd0IKKazKxOTCAHVI6ln27pMHre0YkNpXnQtj8Cv1qSvFqO594B2JJQ6j/K+4mjw4mS2yaSqMVbBnHaPi7ynQ8t6TmQokpd/JkOJ/IVjp6RQZX6r+cktELd9nOHfZ+oaKUoGFUmOJqvcqr7/p4B0i/R+FQJEEZFeA6uoEovOALWIdlnTO8ZAmcERMt9trpfiEG+oJcteJSMtHmjl03PK4eIHBI7Wd2w6Ugb8CRkGeuEWUdxt8GfnmBZ1iN5RE+b+TFpmeLUIWqllSOvqyq92VEmyFv5k++Ob6yjp6CiB3n0= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB2029; 6:xgPWDBIGHZhKboxyU2J8Pux+Yq+L5xYZQgbZTUymkCNTVQ1ywtntdkMZGkHmqEdkvzzOPy6oX3KRxwsOu1BIEzYgvHxyO5m9lu060TsQecSQus2fIp2p5UdgMkIyjFUEw38zEs6d0JD6xxiE3EB+a7l3N5iFyKYcOgXnG+odKX68dafynSFpU6aZadl/kO3aUEZrNCjsCG0u7L51mx/7/7m+7iAP/GNutqK60665I+X49X6lhNm0xsJ1xVMV8Ylu00ynn/YY3JLqUzKms186V3HKZXCh4iD2HJTb+ozr2T94nyIj9f1tc6A0MKZcV2cTkLPJJEtmwZovhmSHtERrNYHibiFkvPcXvVmtsFzL65lhosYKl5TfTE1fngarL2o5Xbz4wva4QBuGgmYJsB6kZMOtnMqexgx5bqUU12jOd1++l5uWu1KHOQ8l6ICaDjAeUwSwoMe+iFi1uS6/qh4VcA==; 5:LwiME9N7n1wVL+IKk1shbo4X6hZH8b/Wg0IPto5OlWj0yj/w/oBrm0uadDH6nDTJvBldu/BzlFbjyd8oGEqkLsdZuqiicGvaWewDSvyoT1Hx6qfUvBziCt86Bxxcx20cP2OIaxmyrg9Wq5YvofCOjjxy5tdUD7SPugrNj9QSDv4=; 7:9RjpN8rLF7H7TXCFdue/En1InNKiPRolTdb64kXzpE8Ibbfm0wc6PsZAVFDTJlGimtt3yyV6ASpoa4uS4lABMEUg03CyRTYRFkGQnrJmQxlhqR28WMDpm4y5/VHWI2l4G5LaEP4nkMB/Tq/A4KhkDrbnsnqc9WrQAbQz7NGIPMabhTmrBbPKivn4KO62bRRYxxRzLadgMnDfZ/85c2aw/RqEWFT+PHQSFOnHv5v9FUnVLtq7jS1UKzI4rPpQ98VT SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB2029; 20:O9MGh2tscrn1PWRGPpysAK5mJeUGM+ZLwzc/uOCLa55PM1t+3ZkY4uMyujJm5HVw61JvV3JgpD/53snqjVwE+M3wLf2T5ks4o68ijFgG0f8WyDS/rJ01unDqPL9xJFvs9/8FGQa+/uyNRRtoD4fs5bX3QovhURKmfLPxBPU9BgQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2018 09:12:16.9347 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dd60e89d-7f9f-44fb-45dc-08d61ed929b8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB2029 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang ra_mutex is a IPv4 specific mutex, it is inside struct netns_ipv4, but its initialization is in the generic netns code, setup_net(). Move it to IPv4 specific net init code, inet_init_net(). Fixes: d9ff3049739e ("net: Replace ip_ra_lock with per-net mutex") Signed-off-by: Cong Wang Acked-by: Kirill Tkhai Nacked-by: Cong Wang --- net/core/net_namespace.c | 1 - net/ipv4/af_inet.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 670c84b1bfc2..b272ccfcbf63 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -308,7 +308,6 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) net->user_ns = user_ns; idr_init(&net->netns_ids); spin_lock_init(&net->nsid_lock); - mutex_init(&net->ipv4.ra_mutex); list_for_each_entry(ops, &pernet_list, list) { error = ops_init(ops, net); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index bbd3a072ffea..d4623144e237 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1818,6 +1818,8 @@ static __net_init int inet_init_net(struct net *net) net->ipv4.sysctl_igmp_llm_reports = 1; net->ipv4.sysctl_igmp_qrv = 2; + mutex_init(&net->ipv4.ra_mutex); + return 0; }