From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk0-f66.google.com ([209.85.213.66]:33432 "EHLO mail-vk0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751958AbeBZDkf (ORCPT ); Sun, 25 Feb 2018 22:40:35 -0500 Received: by mail-vk0-f66.google.com with SMTP id z130so1888921vkd.0 for ; Sun, 25 Feb 2018 19:40:35 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <9f3f444a-01ac-ebb3-b342-c6ba05c6f3bc@cumulusnetworks.com> References: <1519537482-6861-1-git-send-email-roopa@cumulusnetworks.com> <1519537482-6861-6-git-send-email-roopa@cumulusnetworks.com> <9f3f444a-01ac-ebb3-b342-c6ba05c6f3bc@cumulusnetworks.com> From: Roopa Prabhu Date: Sun, 25 Feb 2018 19:40:34 -0800 Message-ID: Subject: Re: [PATCH net-next 5/5] ipv6: route: dissect flow in input path if fib rules need it To: David Ahern Cc: David Miller , netdev@vger.kernel.org, Nikolay Aleksandrov , Ido Schimmel Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org List-ID: On Sun, Feb 25, 2018 at 7:19 PM, David Ahern wrote: > On 2/24/18 10:44 PM, Roopa Prabhu wrote: > >> @@ -1847,12 +1858,27 @@ void ip6_route_input(struct sk_buff *skb) >> .flowi6_mark = skb->mark, >> .flowi6_proto = iph->nexthdr, >> }; >> + struct flow_keys *flkeys = NULL, _flkeys; >> >> tun_info = skb_tunnel_info(skb); >> if (tun_info && !(tun_info->mode & IP_TUNNEL_INFO_TX)) >> fl6.flowi6_tun_key.tun_id = tun_info->key.tun_id; >> + >> +#ifdef CONFIG_IPV6_MULTIPLE_TABLES >> + if (net->ipv6.fib6_rules_require_fldissect) { >> + unsigned int flag = FLOW_DISSECTOR_F_STOP_AT_ENCAP; >> + >> + memset(&_flkeys, 0, sizeof(_flkeys)); >> + skb_flow_dissect_flow_keys(skb, &_flkeys, flag); >> + fl6.fl6_sport = _flkeys.ports.src; >> + fl6.fl6_dport = _flkeys.ports.dst; >> + fl6.flowi6_proto = _flkeys.basic.ip_proto; >> + flkeys = &_flkeys; >> + } >> +#endif > > same here - helper versus inline. > ack