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 1C961C10F0E for ; Tue, 16 Apr 2019 00:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC52B20830 for ; Tue, 16 Apr 2019 00:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555376186; bh=CGEYGCPHPBImd9g2WF+oEkK6ljc3M3P5dkFfsxNvTFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FgjP7rLIdHwKXtmYL7Tr7EGtHsHC+89oO3QKgGVSk8EGtqIhM5zBPtjFbN6QZtSsR ihgIglayGUcp4qR8/E+H9DRZaqF7xClnqlb4AXfnCJqERv4U5o0cckwbIAKSlYHXGL xkEgpPATPuPaElMo6NGyx5+9ts583Vyus5Pxg6W0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727012AbfDPA4Z (ORCPT ); Mon, 15 Apr 2019 20:56:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:41890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728305AbfDPA4V (ORCPT ); Mon, 15 Apr 2019 20:56:21 -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 28FF4218FC; Tue, 16 Apr 2019 00:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555376181; bh=CGEYGCPHPBImd9g2WF+oEkK6ljc3M3P5dkFfsxNvTFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jxcC/hwZKjj6bg4gy+L4bdIkN4a8ETu4cG5ErbTnfoCltVC54pzvDQvn/R3beC6ug JmjGakTZOVanpz0oDIlbChCqVvWeEKuAmTQPTncDM1YYLU1afJp2tvtkZkCBq5N1Me ZyO2ZqasrmZor5NP2CQftlXa1XtO1XVXuhMbjB0Q= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, David Ahern Subject: [PATCH net-next 11/13] ipv6: Pass fib6_result to fib6_table_lookup tracepoint Date: Mon, 15 Apr 2019 17:56:50 -0700 Message-Id: <20190416005652.29286-12-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190416005652.29286-1-dsahern@kernel.org> References: <20190416005652.29286-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Change fib6_table_lookup tracepoint to take the fib6_result and use the fib6_info and fib6_nh from it. Signed-off-by: David Ahern --- include/trace/events/fib6.h | 16 ++++++++-------- net/ipv6/route.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/trace/events/fib6.h b/include/trace/events/fib6.h index 6d05ebdd669c..70e252d926ea 100644 --- a/include/trace/events/fib6.h +++ b/include/trace/events/fib6.h @@ -12,10 +12,10 @@ TRACE_EVENT(fib6_table_lookup, - TP_PROTO(const struct net *net, const struct fib6_info *f6i, + TP_PROTO(const struct net *net, const struct fib6_result *res, struct fib6_table *table, const struct flowi6 *flp), - TP_ARGS(net, f6i, table, flp), + TP_ARGS(net, res, table, flp), TP_STRUCT__entry( __field( u32, tb_id ) @@ -39,7 +39,7 @@ TRACE_EVENT(fib6_table_lookup, struct in6_addr *in6; __entry->tb_id = table->tb6_id; - __entry->err = ip6_rt_type_to_error(f6i->fib6_type); + __entry->err = ip6_rt_type_to_error(res->f6i->fib6_type); __entry->oif = flp->flowi6_oif; __entry->iif = flp->flowi6_iif; __entry->tos = ip6_tclass(flp->flowlabel); @@ -62,20 +62,20 @@ TRACE_EVENT(fib6_table_lookup, __entry->dport = 0; } - if (f6i->fib6_nh.fib_nh_dev) { - __assign_str(name, f6i->fib6_nh.fib_nh_dev); + if (res->nh && res->nh->fib_nh_dev) { + __assign_str(name, res->nh->fib_nh_dev); } else { __assign_str(name, "-"); } - if (f6i == net->ipv6.fib6_null_entry) { + if (res->f6i == net->ipv6.fib6_null_entry) { struct in6_addr in6_zero = {}; in6 = (struct in6_addr *)__entry->gw; *in6 = in6_zero; - } else if (f6i) { + } else if (res->nh) { in6 = (struct in6_addr *)__entry->gw; - *in6 = f6i->fib6_nh.fib_nh_gw6; + *in6 = res->nh->fib_nh_gw6; } ), diff --git a/net/ipv6/route.c b/net/ipv6/route.c index de2a901b4d30..e16d27df5dac 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1130,7 +1130,7 @@ static struct rt6_info *ip6_pol_route_lookup(struct net *net, } out: - trace_fib6_table_lookup(net, res.f6i, table, fl6); + trace_fib6_table_lookup(net, &res, table, fl6); rcu_read_unlock(); @@ -1865,7 +1865,7 @@ struct fib6_info *fib6_table_lookup(struct net *net, struct fib6_table *table, } } - trace_fib6_table_lookup(net, res.f6i, table, fl6); + trace_fib6_table_lookup(net, &res, table, fl6); return res.f6i; } @@ -2534,7 +2534,7 @@ static struct rt6_info *__ip6_route_redirect(struct net *net, rcu_read_unlock(); - trace_fib6_table_lookup(net, rt, table, fl6); + trace_fib6_table_lookup(net, &res, table, fl6); return ret; }; -- 2.11.0