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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 E0846C43219 for ; Sat, 27 Apr 2019 01:56:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1CB8206BA for ; Sat, 27 Apr 2019 01:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556330165; bh=5wkxzf/pcvLpE72/kDBxAAgzGEPqSj6lQkfU0m6uFhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zjDFWPr0aDe/mECkIKdgyFbcVAygqASEpMIveawhLtSk1u/LcMURYH0rMhmKOPWWx ltTGbEbQJCItF2E25Imd9GAQ44dDLygxWMbu0XQetkYO5LSMJjyCc4pWmA9mGBTtQP Pd3ZRc0PT2Vd7WCcTq20mzzDz7pD32MlhHDfwhxI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728075AbfD0B4D (ORCPT ); Fri, 26 Apr 2019 21:56:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:56164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727877AbfD0B4C (ORCPT ); Fri, 26 Apr 2019 21:56:02 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1B68B206E0; Sat, 27 Apr 2019 01:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556330162; bh=5wkxzf/pcvLpE72/kDBxAAgzGEPqSj6lQkfU0m6uFhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XfNy5TBCNbExo0uOQzjqwBr+dN0IM0H/sZvds/NrK3TJnxs1rGRBBbD1lCC+scevz F63AM1VBIsQh/ueLXC4vsi3F9kc+kNo5o6TD6uhsePCdBuEmk+rY/liFOwdYZ7N97l 4pEkZ60ZQ2CLSd4XMiUKpE2f5Y1MiRFH6W0chl7I= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, David Ahern Subject: [PATCH net-next 2/7] ipv4: Pass fib_nh_common to rt_cache_route Date: Fri, 26 Apr 2019 18:56:52 -0700 Message-Id: <20190427015657.24655-3-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190427015657.24655-1-dsahern@kernel.org> References: <20190427015657.24655-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Now that the cached routes are in fib_nh_common, pass it to rt_cache_route and simplify its callers. For rt_set_nexthop, the tclassid becomes the last user of fib_nh so move it under an IS_ENABLED check. Signed-off-by: David Ahern --- net/ipv4/route.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 15776e98dfa3..bf76830ac1e5 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1470,9 +1470,8 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe, return ret; } -static bool rt_cache_route(struct fib_nh *nh, struct rtable *rt) +static bool rt_cache_route(struct fib_nh_common *nhc, struct rtable *rt) { - struct fib_nh_common *nhc = &nh->nh_common; struct rtable *orig, *prev, **p; bool ret = true; @@ -1576,7 +1575,6 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr, if (fi) { struct fib_nh_common *nhc = FIB_RES_NHC(*res); - struct fib_nh *nh; if (nhc->nhc_gw_family && nhc->nhc_scope == RT_SCOPE_LINK) { rt->rt_gw_family = nhc->nhc_gw_family; @@ -1589,15 +1587,18 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr, ip_dst_init_metrics(&rt->dst, fi->fib_metrics); - nh = container_of(nhc, struct fib_nh, nh_common); -#ifdef CONFIG_IP_ROUTE_CLASSID - rt->dst.tclassid = nh->nh_tclassid; -#endif - rt->dst.lwtstate = lwtstate_get(nh->fib_nh_lws); + if (IS_ENABLED(CONFIG_IP_ROUTE_CLASSID)) { + struct fib_nh *nh; + + nh = container_of(nhc, struct fib_nh, nh_common); + rt->dst.tclassid = nh->nh_tclassid; + } + + rt->dst.lwtstate = lwtstate_get(nhc->nhc_lwtstate); if (unlikely(fnhe)) cached = rt_bind_exception(rt, fnhe, daddr, do_cache); else if (do_cache) - cached = rt_cache_route(nh, rt); + cached = rt_cache_route(nhc, rt); if (unlikely(!cached)) { /* Routes we intend to cache in nexthop exception or * FIB nexthop have the DST_NOCACHE bit clear. @@ -2139,7 +2140,6 @@ out: return err; if (do_cache) { struct fib_nh_common *nhc = FIB_RES_NHC(*res); - struct fib_nh *nh; rth->dst.lwtstate = lwtstate_get(nhc->nhc_lwtstate); if (lwtunnel_input_redirect(rth->dst.lwtstate)) { @@ -2148,8 +2148,7 @@ out: return err; rth->dst.input = lwtunnel_input; } - nh = container_of(nhc, struct fib_nh, nh_common); - if (unlikely(!rt_cache_route(nh, rth))) + if (unlikely(!rt_cache_route(nhc, rth))) rt_add_uncached_list(rth); } skb_dst_set(skb, &rth->dst); -- 2.11.0