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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 781ADC433F5 for ; Tue, 12 Apr 2022 14:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245448AbiDLOWA (ORCPT ); Tue, 12 Apr 2022 10:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229922AbiDLOV7 (ORCPT ); Tue, 12 Apr 2022 10:21:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C495A4CD63; Tue, 12 Apr 2022 07:19:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 54230B81B79; Tue, 12 Apr 2022 14:19:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD641C385A5; Tue, 12 Apr 2022 14:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649773179; bh=1VUTZxonrCDkfPHXmdBH8Zj1TmEucW75R7ve0axxL0k=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=of4K9vJZ+LeNJbW6AbXYt+DWGKQsDW2i5QxkJhqVNXkQcgeq2rfs8qAFJ/jUa9Dmf Kp0M5377b9xO7kL+BNh7mUEnpNMMl+KjXXkVoDXvkEqcJ4Y7vjDdSgaYGtBuiZzBVE l68rZx0CyCBtW77IHI0Kk6xa2rXQn0K4yFtDkh+m5//bopSL9J0QbD7R+r4Qk4tQr9 B/gXEcYld+1o08ke+sFGiRAG6l7gSoqInN0lpnXqQd8EfN0tQAUIIY1n4W4xeQOYL2 VpV/CO6QeXNSRM+wLcWHgnm02Uv1Kx/McNJRuCMj2JstOlSOVPcVGKFaCSwr0LqF71 O7+P2T3bptneQ== Message-ID: Date: Tue, 12 Apr 2022 08:19:37 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH nf] netfilter: Update ip6_route_me_harder to consider L3 domain Content-Language: en-US To: Martin Willi , Pablo Neira Ayuso , Florian Westphal Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org References: <20220412074639.1963131-1-martin@strongswan.org> From: David Ahern In-Reply-To: <20220412074639.1963131-1-martin@strongswan.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On 4/12/22 1:46 AM, Martin Willi wrote: > @@ -39,6 +38,13 @@ int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff > }; > int err; > > + if (sk && sk->sk_bound_dev_if) > + fl6.flowi6_oif = sk->sk_bound_dev_if; > + else if (strict) > + fl6.flowi6_oif = dev->ifindex; > + else > + fl6.flowi6_oif = l3mdev_master_ifindex(dev); For top of tree, this is now fl6.flowi6_l3mdev and dev is only needed here so make this: fl6.flowi6_l3mdev = l3mdev_master_ifindex(skb_dst(skb)->dev); > + > fib6_rules_early_flow_dissect(net, skb, &fl6, &flkeys); > dst = ip6_route_output(net, sk, &fl6); > err = dst->error;