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=-2.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_NEOMUTT 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 6C343C43381 for ; Thu, 28 Mar 2019 01:30:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39A1B206DF for ; Thu, 28 Mar 2019 01:30:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NcClghnK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727820AbfC1Ba4 (ORCPT ); Wed, 27 Mar 2019 21:30:56 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:39929 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726268AbfC1Ba4 (ORCPT ); Wed, 27 Mar 2019 21:30:56 -0400 Received: by mail-pg1-f194.google.com with SMTP id k3so7102498pga.6 for ; Wed, 27 Mar 2019 18:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=f82fsNaGmiL7qkAAS3hR0gCAAVVHknLgosBp3oSrLFg=; b=NcClghnKVgWWCY1ErTcQln668jZL3Wq+LAS0Yi9tz6qhbixtaZwO++Tn6lu8yQLIcF HFg3Be50Hu4OeadRn2NwGzIhgTOgVtTuBAzLSfASoZvXUcy7FtcA8bVdOTWQBl84RymE VmDV7DnlHDpktjSeCUI3gFKdiCRe7JUYNCG4eSKjwU/sillIuXbpYUxLx3NSkJJADhRQ uEEjDAaxn504CZ/1R2r7Iij9Of0Y2X+JS2Mwtgnt5eLt3vKQyNOIOo7BJEIVvDSp04gQ TE+GHHkLBDP2roLuV94gpTKDc73QKW8XmMmv+AeQ5lLbH+EX1hPttVsa96puvyKE0Uau zcZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=f82fsNaGmiL7qkAAS3hR0gCAAVVHknLgosBp3oSrLFg=; b=sBYPpqKi4kiuLNwYsyZe0fJyg5rpQX+IlmJw3UXiPzRyzHa2KUZSE4KmQPoPg6go3D NUZG8qshQimxsG3/bwfcO1b6qlVPxD1a8EN7qYx0A3f0Y+GBIR5PKtLKK+B2NzlKAIx9 zb4/4+ItObjV8pS7PfFNAknXYDMW+sltjnHOPoBgZMU/JL1VxKLGL21qkeEosTsxVm5m RqacwPn6dIbOxUZKey5S7aK8zlqlAsH1Q466r+3bpevVruGwfyVB25m6jQeojNWaAVks Sks4D6aVXRFNdL9allk2nGSvnDZx0pr1s9ZPOcc8rQekJRoOpOKhvb8k9HUZs2V6oXRV 2uEQ== X-Gm-Message-State: APjAAAUduT6go/xkzHKJBboOvMX2vdvB22/bnQEqTM8PLe57oOzcmIxn eA1MP1iz6s+mW8lFrJMXYe8= X-Google-Smtp-Source: APXvYqx8YeA//6LudNpTumQWXN3zE0doY9hP57USZOyZj5XXWy7QitLyRaweKCaSnnFrcvvJzBK+3A== X-Received: by 2002:a63:bd52:: with SMTP id d18mr12969184pgp.52.1553736655766; Wed, 27 Mar 2019 18:30:55 -0700 (PDT) Received: from ast-mbp ([2620:10d:c090:180::27f1]) by smtp.gmail.com with ESMTPSA id d15sm8352253pfo.34.2019.03.27.18.30.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 18:30:55 -0700 (PDT) Date: Wed, 27 Mar 2019 18:30:52 -0700 From: Alexei Starovoitov To: David Ahern Cc: David Ahern , davem@davemloft.net, netdev@vger.kernel.org, idosch@mellanox.com, jiri@mellanox.com, saeedm@mellanox.com Subject: Re: [PATCH v2 net-next 05/13] ipv6: Create init helper for fib6_nh Message-ID: <20190328013051.cukjdmcfdc5gmxnv@ast-mbp> References: <20190327182329.18149-1-dsahern@kernel.org> <20190327182329.18149-6-dsahern@kernel.org> <20190327225210.kbpivej33a72adwq@ast-mbp> <8e0e2afc-c8e7-8728-7b4d-f9c64987d46a@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8e0e2afc-c8e7-8728-7b4d-f9c64987d46a@gmail.com> User-Agent: NeoMutt/20180223 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Mar 27, 2019 at 06:47:23PM -0600, David Ahern wrote: > On 3/27/19 4:52 PM, Alexei Starovoitov wrote: > >> + > >> + /* We cannot add true routes via loopback here, > >> + * they would result in kernel looping; promote them to reject routes > >> + */ > >> + addr_type = ipv6_addr_type(&cfg->fc_dst); > >> + if ((cfg->fc_flags & RTF_REJECT) || > >> + (dev && (dev->flags & IFF_LOOPBACK) && > >> + !(addr_type & IPV6_ADDR_LOOPBACK) && > >> + !(cfg->fc_flags & RTF_LOCAL))) { > >> + /* hold loopback dev/idev if we haven't done so. */ > >> + if (dev != net->loopback_dev) { > >> + if (dev) { > >> + dev_put(dev); > >> + in6_dev_put(idev); > >> + } > >> + dev = net->loopback_dev; > >> + dev_hold(dev); > >> + idev = in6_dev_get(dev); > >> + if (!idev) { > >> + err = -ENODEV; > >> + goto out; > >> + } > >> + } > >> + cfg->fc_flags = RTF_REJECT | RTF_NONEXTHOP; > > > > imo it would be cleaner not to mess with cfg. > > Ideally it should be marked 'const'. > > Existing code sets those flags but on a fib6_info. This is not used for > nexthop objects and is kept here to not duplicate this if branch in the > create_info that uses it. This check affects both which device is used > as well as the flags. What stopping you from doing fib6_nh->nh_flags |= RTF_REJECT | RTF_NONEXTHOP ? cfg should really be const. > > > >> + goto set_dev; > >> + } > >> + > >> + if (cfg->fc_flags & RTF_GATEWAY) { > >> + err = ip6_validate_gw(net, cfg, &dev, &idev, extack); > >> + if (err) > >> + goto out; > >> + > >> + fib6_nh->nh_gw = cfg->fc_gateway; > >> + } > >> + > >> + err = -ENODEV; > >> + if (!dev) > >> + goto out; > >> + > >> + if (idev->cnf.disable_ipv6) { > >> + NL_SET_ERR_MSG(extack, "IPv6 is disabled on nexthop device"); > >> + err = -EACCES; > >> + goto out; > >> + } > >> + > >> + if (!(dev->flags & IFF_UP) && !cfg->fc_ignore_dev_down) { > >> + NL_SET_ERR_MSG(extack, "Nexthop device is not up"); > >> + err = -ENETDOWN; > >> + goto out; > >> + } > >> + > >> + if (!(cfg->fc_flags & (RTF_LOCAL | RTF_ANYCAST)) && > >> + !netif_carrier_ok(dev)) > >> + fib6_nh->nh_flags |= RTNH_F_LINKDOWN; > >> + > >> +set_dev: > >> + fib6_nh->nh_dev = dev; > >> + err = 0; > >> +out: > >> + if (idev) > >> + in6_dev_put(idev); > >> + > >> + if (err) { > >> + lwtstate_put(fib6_nh->nh_lwtstate); > > > > lwtstate_put() is missing in the error path of existing code. > > Is this a bug fix? > > Why there is nothing about this in commit log? > > Existing code has a different cleanup path. > > This is done explicitly here per a request from Ido in v1 that the new > function be symmetric in its cleanup on an error. I saw that comment. What I don't see is where existing code doing that cleanup. Could you please point it out?