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; }