From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Abeni Subject: Re: linux-next: build failure after merge of the net-next tree Date: Fri, 22 Sep 2017 09:10:22 +0200 Message-ID: <1506064222.2574.1.camel@redhat.com> References: <20170922110355.6a631fc5@canb.auug.org.au> <20170921.183759.289331373985144347.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170921.183759.289331373985144347.davem@davemloft.net> Sender: linux-kernel-owner@vger.kernel.org To: David Miller , sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org On Thu, 2017-09-21 at 18:37 -0700, David Miller wrote: > From: Stephen Rothwell > Date: Fri, 22 Sep 2017 11:03:55 +1000 > > > After merging the net-next tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > > > net/ipv4/fib_frontend.c: In function 'fib_validate_source': > > net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes' > > if (net->ipv4.fib_has_custom_local_routes) > > ^ > > net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute': > > net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes' > > net->ipv4.fib_has_custom_local_routes = true; > > ^ > > > > Caused by commit > > > > 6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.") > > Paolo, it seems this struct member should be placed outside of > IP_MULTIPLE_TABLES protection, since users can insert custom > local routes even without that set. > > So I'm installing the following fix for this: > > ==================== > [PATCH] ipv4: Move fib_has_custom_local_routes outside of IP_MULTIPLE_TABLES. > > > net/ipv4/fib_frontend.c: In function 'fib_validate_source': > > net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes' > > if (net->ipv4.fib_has_custom_local_routes) > > ^ > > net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute': > > net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes' > > net->ipv4.fib_has_custom_local_routes = true; > > ^ > > Fixes: 6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.") > Reported-by: Stephen Rothwell > Signed-off-by: David S. Miller > --- > include/net/netns/ipv4.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h > index 20720721da4b..8387f099115e 100644 > --- a/include/net/netns/ipv4.h > +++ b/include/net/netns/ipv4.h > @@ -49,10 +49,10 @@ struct netns_ipv4 { > #ifdef CONFIG_IP_MULTIPLE_TABLES > struct fib_rules_ops *rules_ops; > bool fib_has_custom_rules; > - bool fib_has_custom_local_routes; > struct fib_table __rcu *fib_main; > struct fib_table __rcu *fib_default; > #endif > + bool fib_has_custom_local_routes; > #ifdef CONFIG_IP_ROUTE_CLASSID > int fib_num_tclassid_users; > #endif > -- > 2.13.5 My fault, I should have fuzzed the configuration before posting. Fix looks good, thanks David! Paolo