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 99482C282DC for ; Fri, 5 Apr 2019 23:31:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 672EB2186A for ; Fri, 5 Apr 2019 23:31:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554507062; bh=LyuXoSmzs/DGf/NNwchpIdAMh5bWNTu4dpS9uj5BKIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vzEzSRtf0EKS8x3a0yM4e8etw38csC30fXEx3gKmNKIJwYkpF2AZnd5cAAS7Oxq05 MNfxiB6t0urVb3zkAz6SQJxV41AqIfD7gDE+xCtg4ao5IyMr2T/tqs1Y8BeDZdC1OW vzbGmXSHFY0f5XgxPSH7fuwDByMN/FC8erbmvEdU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726633AbfDEXbB (ORCPT ); Fri, 5 Apr 2019 19:31:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:56628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726458AbfDEXad (ORCPT ); Fri, 5 Apr 2019 19:30:33 -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 E49C4218A6; Fri, 5 Apr 2019 23:30:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554507033; bh=LyuXoSmzs/DGf/NNwchpIdAMh5bWNTu4dpS9uj5BKIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SRB2bhIHh+Qj83sUziA9fCc+g3Vnh20ym6MjFMiY5DRAuJe6DXy7IQ/jB0/nLCntg ahpfdfg5Mps6sCtIVOVW4E2lCN0+NqVKYeO2dM8TT7Yzc3Q77A4knLN+sKdgLqjlEN W4WMoWFhyTAtQRlQDcn1LZqEewHjmjsfw1cX7Lc4= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, jiri@mellanox.com, David Ahern Subject: [PATCH v2 net-next 12/18] bpf: Handle ipv6 gateway in bpf_ipv4_fib_lookup Date: Fri, 5 Apr 2019 16:30:35 -0700 Message-Id: <20190405233041.30775-13-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190405233041.30775-1-dsahern@kernel.org> References: <20190405233041.30775-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Update bpf_ipv4_fib_lookup to handle an ipv6 gateway. Signed-off-by: David Ahern --- net/core/filter.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index abd5b6ce031a..41f633cf4fc1 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4639,15 +4639,26 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, return BPF_FIB_LKUP_RET_UNSUPP_LWT; dev = nhc->nhc_dev; - if (nhc->nhc_gw_family) - params->ipv4_dst = nhc->nhc_gw.ipv4; params->rt_metric = res.fi->fib_priority; /* xdp and cls_bpf programs are run in RCU-bh so * rcu_read_lock_bh is not needed here */ - neigh = __ipv4_neigh_lookup_noref(dev, (__force u32)params->ipv4_dst); + if (likely(nhc->nhc_gw_family != AF_INET6)) { + if (nhc->nhc_gw_family) + params->ipv4_dst = nhc->nhc_gw.ipv4; + + neigh = __ipv4_neigh_lookup_noref(dev, + (__force u32)params->ipv4_dst); + } else { + struct in6_addr *dst = (struct in6_addr *)params->ipv6_dst; + + params->family = AF_INET6; + *dst = nhc->nhc_gw.ipv6; + neigh = __ipv6_neigh_lookup_noref_stub(dev, dst); + } + if (!neigh) return BPF_FIB_LKUP_RET_NO_NEIGH; -- 2.11.0