From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00600C43381 for ; Wed, 27 Mar 2019 08:38:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7BA4206B8 for ; Wed, 27 Mar 2019 08:38:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="XUNDXZmR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726392AbfC0Ii6 (ORCPT ); Wed, 27 Mar 2019 04:38:58 -0400 Received: from mail-eopbgr10056.outbound.protection.outlook.com ([40.107.1.56]:53895 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725786AbfC0Ii6 (ORCPT ); Wed, 27 Mar 2019 04:38:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NvJS6SixKxZNta8PL2vLq+dlPCjtdRKt/+HTG7xknhY=; b=XUNDXZmRo6FSNXKu718pv4F1GlZ5uh9rrvFxhf1vUkKXQPdFS+ON3IBIf0iH13DFzqDFHLdnoqZK3VKzmPozgmi6MPA4qM+pMthX0sDmQZRkeY+KU52l2VPv77uc09rsOCDqLgHHVMw2IXWcQ7RcScroIdnS6O+lRvtHEKjf0nk= Received: from AM0PR05MB6100.eurprd05.prod.outlook.com (20.178.119.209) by AM0PR05MB4513.eurprd05.prod.outlook.com (52.133.58.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Wed, 27 Mar 2019 08:38:53 +0000 Received: from AM0PR05MB6100.eurprd05.prod.outlook.com ([fe80::85ee:723:721e:51f9]) by AM0PR05MB6100.eurprd05.prod.outlook.com ([fe80::85ee:723:721e:51f9%4]) with mapi id 15.20.1730.019; Wed, 27 Mar 2019 08:38:53 +0000 From: Ido Schimmel To: David Ahern CC: "davem@davemloft.net" , "netdev@vger.kernel.org" , Jiri Pirko , Saeed Mahameed , David Ahern Subject: Re: [PATCH net-next 06/13] ipv6: Create cleanup helper for fib6_nh Thread-Topic: [PATCH net-next 06/13] ipv6: Create cleanup helper for fib6_nh Thread-Index: AQHU5E1aqk3uCHcckUaJ271LVfBQ/qYfKGeA Date: Wed, 27 Mar 2019 08:38:53 +0000 Message-ID: <20190327083851.GA15127@splinter> References: <20190327032942.20473-1-dsahern@kernel.org> <20190327032942.20473-7-dsahern@kernel.org> In-Reply-To: <20190327032942.20473-7-dsahern@kernel.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0701CA0071.eurprd07.prod.outlook.com (2603:10a6:203:2::33) To AM0PR05MB6100.eurprd05.prod.outlook.com (2603:10a6:208:12e::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8433ea05-213c-4e18-82a7-08d6b28fa468 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:AM0PR05MB4513; x-ms-traffictypediagnostic: AM0PR05MB4513: x-microsoft-antispam-prvs: x-forefront-prvs: 0989A7979C x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(7916004)(136003)(396003)(39850400004)(346002)(376002)(366004)(199004)(189003)(33716001)(71200400001)(52116002)(14454004)(2906002)(71190400001)(54906003)(68736007)(5660300002)(1076003)(26005)(8676002)(186003)(14444005)(33656002)(66066001)(76176011)(102836004)(9686003)(81166006)(81156014)(6506007)(386003)(4744005)(86362001)(8936002)(478600001)(25786009)(3846002)(6116002)(105586002)(316002)(7736002)(6246003)(97736004)(11346002)(53936002)(446003)(6512007)(486006)(305945005)(6486002)(99286004)(6436002)(106356001)(476003)(6916009)(4326008)(256004)(229853002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR05MB4513;H:AM0PR05MB6100.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZgGI6zTr1WqSdazTsb1J3BDgrnhl3rAKTntZC6Z9lvR0/FRFzqfAJy7cvKZZFqNHMWkVHWlSbJ4mOOm5otQGvbbK/RYYT9izqwzfFfux7gmFlGfLC4kyduZAft4aKX1/C3zX1mLlb3tOKFJhZLyfmpL8oCDJbD444ZqXGz2DczXSfTCXcl9m3yk50HAnby6G+ZarXPoUknLM9Nk6AgrtR+fVwhMG4Du14V2ZPrKWwrZwayX4dD7+ArQeOLuMzbVBGPbbapnMDpP+bob0Rb+bP9xIOAs5fOqqvKLPNGH4r6J71fTiUKT4mD3MxOvs0KktGXCe51hTNOjElnEeXKECy55l0+XfI8PJBudBA63LBHbAnQ6sfMUWuOHcQlhCKuywhdmLFFlqTJ7jNs68m9b7UjF5zeeT8X3tyQ5Wi3CbaXU= Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8433ea05-213c-4e18-82a7-08d6b28fa468 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Mar 2019 08:38:53.1526 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4513 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Mar 26, 2019 at 08:29:35PM -0700, David Ahern wrote: > diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c > index 6613d8dbb0e5..db886085369b 100644 > --- a/net/ipv6/ip6_fib.c > +++ b/net/ipv6/ip6_fib.c > @@ -199,10 +199,7 @@ void fib6_info_destroy_rcu(struct rcu_head *head) > free_percpu(f6i->rt6i_pcpu); > } > =20 > - lwtstate_put(f6i->fib6_nh.nh_lwtstate); > - > - if (f6i->fib6_nh.nh_dev) > - dev_put(f6i->fib6_nh.nh_dev); > + fib6_nh_release(&f6i->fib6_nh); > =20 > ip_fib_metrics_put(f6i->fib6_metrics); > =20 > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index 269ad7b9cdbb..4923a5f88e9b 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -3012,6 +3012,14 @@ int fib6_nh_init(struct net *net, struct fib6_nh *= fib6_nh, > return err; > } > =20 > +void fib6_nh_release(struct fib6_nh *fib6_nh) > +{ > + if (fib6_nh->nh_dev) > + dev_put(fib6_nh->nh_dev); > + > + lwtstate_put(fib6_nh->nh_lwtstate); Why did you flip the order? lwtstate_put() dev_put() is symmetric with fib6_nh_init() > +}