{"id":808032,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808032/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504156693-24692-1-git-send-email-roopa@cumulusnetworks.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504156693-24692-1-git-send-email-roopa@cumulusnetworks.com>","list_archive_url":null,"date":"2017-08-31T05:18:13","name":"[net-next] bridge: add tracepoint in br_fdb_update","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"7b29e672c7bcbead27aa5c8e45755b9523627414","submitter":{"id":23500,"url":"http://patchwork.ozlabs.org/api/1.2/people/23500/?format=json","name":"Roopa Prabhu","email":"roopa@cumulusnetworks.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504156693-24692-1-git-send-email-roopa@cumulusnetworks.com/mbox/","series":[{"id":748,"url":"http://patchwork.ozlabs.org/api/1.2/series/748/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=748","date":"2017-08-31T05:18:13","name":"[net-next] bridge: add tracepoint in br_fdb_update","version":1,"mbox":"http://patchwork.ozlabs.org/series/748/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808032/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808032/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=cumulusnetworks.com\n\theader.i=@cumulusnetworks.com header.b=\"EZJcXyyw\"; \n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjVyd6M2Tz9s4q\n\tfor ;\n\tThu, 31 Aug 2017 15:18:33 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750886AbdHaFSc (ORCPT );\n\tThu, 31 Aug 2017 01:18:32 -0400","from mail-pf0-f182.google.com ([209.85.192.182]:36215 \"EHLO\n\tmail-pf0-f182.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750714AbdHaFSb (ORCPT\n\t); Thu, 31 Aug 2017 01:18:31 -0400","by mail-pf0-f182.google.com with SMTP id r187so4683776pfr.3\n\tfor ; Wed, 30 Aug 2017 22:18:30 -0700 (PDT)","from hydra-01.cumulusnetworks.com (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\tj187sm6150459pgc.10.2017.08.30.22.18.29\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 30 Aug 2017 22:18:29 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=cumulusnetworks.com; s=google;\n\th=from:to:cc:subject:date:message-id;\n\tbh=avEPlIgYzWXuN4vDVe7scBPphM/BsipqfPFyCt7Ki98=;\n\tb=EZJcXyywhrumc+nXbUZBtMu48vHiZAuBNET9+rVSgl+YmNXPzftVDhBWA/G9/IFTQG\n\tVrTCwfNXEVYKvUaKke4naTi+5UiXjisb6uacxRmqiywVLwEfb9Gadq8KgTzppeEaM/1o\n\t5XdftLYD4oCOaw6hMud9AB+acrPBSOxOjlyLQ=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=avEPlIgYzWXuN4vDVe7scBPphM/BsipqfPFyCt7Ki98=;\n\tb=Rh0AsbIngR9ELv/l7t7GWkt/294ls5BRcWF0feW9ZshLQzztXnuYe0v6q68iC9+GhY\n\tdg5BCvhHaJ9RVPGL7fmXUi7m5UKvTMInaHm1JblyUHFvig/UV1Qj4Rz4ui+svy5mmaon\n\tjkbIVfnCjFvpcwTBSZuuyFVxSP57j+DUGJAZPE7O04WmVyaeLNKjdxrA+bG47ig0M8/B\n\txQ5KXKwu3DRb3/ZL2/7MXJYJZWrDhRf2zE1R6b39dGYSr84rPT4lZJPToIQIj0mL73ZM\n\tZ1DiX3WUeiPaQX7Owq2TjaEvu16/FagwaI39AbSpajyIvbyX5btDJCsQaxrQUsM/y1AM\n\tTrRw==","X-Gm-Message-State":"AHYfb5iqQQ9LD/mDgagPM5lJ3iUc2d5NXBdfqL0tTHwX5hIRxcN2ovfU\n\ttSjPhkoEWAp3Rf1fm+Q=","X-Received":"by 10.84.134.129 with SMTP id 1mr1267225plh.358.1504156710410;\n\tWed, 30 Aug 2017 22:18:30 -0700 (PDT)","From":"Roopa Prabhu ","X-Google-Original-From":"Roopa Prabhu","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, nikolay@cumulusnetworks.com,\n\tf.fainelli@gmail.com, andrew@lunn.ch, bridge@lists.linux-foundation.org","Subject":"[PATCH net-next] bridge: add tracepoint in br_fdb_update","Date":"Wed, 30 Aug 2017 22:18:13 -0700","Message-Id":"<1504156693-24692-1-git-send-email-roopa@cumulusnetworks.com>","X-Mailer":"git-send-email 2.1.4","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Roopa Prabhu \n\nThis extends bridge fdb table tracepoints to also cover\nlearned fdb entries in the br_fdb_update path. Note that\nunlike other tracepoints I have moved this to when the fdb\nis modified because this is in the datapath and can generate\na lot of noise in the trace output. br_fdb_update is also called\nfrom added_by_user context in the NTF_USE case which is already\ntraced ..hence the !added_by_user check.\n\nSigned-off-by: Roopa Prabhu \n---\n include/trace/events/bridge.h | 31 +++++++++++++++++++++++++++++++\n net/bridge/br_fdb.c | 5 ++++-\n net/core/net-traces.c | 1 +\n 3 files changed, 36 insertions(+), 1 deletion(-)","diff":"diff --git a/include/trace/events/bridge.h b/include/trace/events/bridge.h\nindex 0f1cde0..1bee3e7 100644\n--- a/include/trace/events/bridge.h\n+++ b/include/trace/events/bridge.h\n@@ -92,6 +92,37 @@ TRACE_EVENT(fdb_delete,\n \t\t __entry->addr[4], __entry->addr[5], __entry->vid)\n );\n \n+TRACE_EVENT(br_fdb_update,\n+\n+\tTP_PROTO(struct net_bridge *br, struct net_bridge_port *source,\n+\t\t const unsigned char *addr, u16 vid, bool added_by_user),\n+\n+\tTP_ARGS(br, source, addr, vid, added_by_user),\n+\n+\tTP_STRUCT__entry(\n+\t\t__string(br_dev, br->dev->name)\n+\t\t__string(dev, source->dev->name)\n+\t\t__array(unsigned char, addr, ETH_ALEN)\n+\t\t__field(u16, vid)\n+\t\t__field(bool, added_by_user)\n+\t),\n+\n+\tTP_fast_assign(\n+\t\t__assign_str(br_dev, br->dev->name);\n+\t\t__assign_str(dev, source->dev->name);\n+\t\tmemcpy(__entry->addr, addr, ETH_ALEN);\n+\t\t__entry->vid = vid;\n+\t\t__entry->added_by_user = added_by_user;\n+\t),\n+\n+\tTP_printk(\"br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u added_by_user %d\",\n+\t\t __get_str(br_dev), __get_str(dev), __entry->addr[0],\n+\t\t __entry->addr[1], __entry->addr[2], __entry->addr[3],\n+\t\t __entry->addr[4], __entry->addr[5], __entry->vid,\n+\t\t __entry->added_by_user)\n+);\n+\n+\n #endif /* _TRACE_BRIDGE_H */\n \n /* This part must be outside protection */\ndiff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c\nindex be5e1da..4ea5c8b 100644\n--- a/net/bridge/br_fdb.c\n+++ b/net/bridge/br_fdb.c\n@@ -583,8 +583,10 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,\n \t\t\t\tfdb->updated = now;\n \t\t\tif (unlikely(added_by_user))\n \t\t\t\tfdb->added_by_user = 1;\n-\t\t\tif (unlikely(fdb_modified))\n+\t\t\tif (unlikely(fdb_modified)) {\n+\t\t\t\ttrace_br_fdb_update(br, source, addr, vid, added_by_user);\n \t\t\t\tfdb_notify(br, fdb, RTM_NEWNEIGH);\n+\t\t\t}\n \t\t}\n \t} else {\n \t\tspin_lock(&br->hash_lock);\n@@ -593,6 +595,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,\n \t\t\tif (fdb) {\n \t\t\t\tif (unlikely(added_by_user))\n \t\t\t\t\tfdb->added_by_user = 1;\n+\t\t\t\ttrace_br_fdb_update(br, source, addr, vid, added_by_user);\n \t\t\t\tfdb_notify(br, fdb, RTM_NEWNEIGH);\n \t\t\t}\n \t\t}\ndiff --git a/net/core/net-traces.c b/net/core/net-traces.c\nindex 4a0292c..1132820 100644\n--- a/net/core/net-traces.c\n+++ b/net/core/net-traces.c\n@@ -42,6 +42,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(fib6_table_lookup);\n EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_add);\n EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_external_learn_add);\n EXPORT_TRACEPOINT_SYMBOL_GPL(fdb_delete);\n+EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_update);\n #endif\n \n EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);\n","prefixes":["net-next"]}