History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller: 1) Unified UDP encapsulation offload methods for drivers, from Alexander Duyck. 2) Make DSA binding more sane, from Andrew Lunn. 3) Support QCA9888 chips in ath10k, from Anilkumar Kolli. 4) Several workqueue usage cleanups, from Bhaktipriya Shridhar. 5) Add XDP (eXpress Data Path), essentially running BPF programs on RX packets as soon as the device sees them, with the option to mirror the packet on TX via the same interface. From Brenden Blanco and others. 6) Allow qdisc/class stats dumps to run lockless, from Eric Dumazet. 7) Add VLAN support to b53 and bcm_sf2, from Florian Fainelli. 8) Simplify netlink conntrack entry layout, from Florian Westphal. 9) Add ipv4 forwarding support to mlxsw spectrum driver, from Ido Schimmel, Yotam Gigi, and Jiri Pirko. 10) Add SKB array infrastructure and convert tun and macvtap over to it. From Michael S Tsirkin and Jason Wang. 11) Support qdisc packet injection in pktgen, from John Fastabend. 12) Add neighbour monitoring framework to TIPC, from Jon Paul Maloy. 13) Add NV congestion control support to TCP, from Lawrence Brakmo. 14) Add GSO support to SCTP, from Marcelo Ricardo Leitner. 15) Allow GRO and RPS to function on macsec devices, from Paolo Abeni. 16) Support MPLS over IPV4, from Simon Horman. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1622 commits) xgene: Fix build warning with ACPI disabled. be2net: perform temperature query in adapter regardless of its interface state l2tp: Correctly return -EBADF from pppol2tp_getname. net/mlx5_core/health: Remove deprecated create_singlethread_workqueue net: ipmr/ip6mr: update lastuse on entry change macsec: ensure rx_sa is set when validation is disabled tipc: dump monitor attributes tipc: add a function to get the bearer name tipc: get monitor threshold for the cluster tipc: make cluster size threshold for monitoring configurable tipc: introduce constants for tipc address validation net: neigh: disallow transition to NUD_STALE if lladdr is unchanged in neigh_update() MAINTAINERS: xgene: Add driver and documentation path Documentation: dtb: xgene: Add MDIO node dtb: xgene: Add MDIO node drivers: net: xgene: ethtool: Use phy_ethtool_gset and sset drivers: net: xgene: Use exported functions drivers: net: xgene: Enable MDIO driver drivers: net: xgene: Add backward compatibility drivers: net: phy: xgene: Add MDIO driver ...

Linus Torvalds committed 10 years ago

Commit 468fc7e2 parents 08fd8c1 36232011390 files · +95887 −36917Browse files

Showing the changes to tools/perf/scripts/python (1 of 1390 files). Show all

Unified · Split

tools/perf/scripts/python/netdev-times.py+7−4
@@ -252,9 +252,10 @@ def irq__irq_handler_exit(name, context, cpu, sec, nsec, pid, comm, callchain, i · 251 unmodified lines
252252 event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, irq, ret)
253253 all_event_list.append(event_info)
254254
255−def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, callchain, napi, dev_name):
255+def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, callchain, napi,
256+ dev_name, work=None, budget=None):
256257 event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
257− napi, dev_name)
258+ napi, dev_name, work, budget)
258259 all_event_list.append(event_info)
259260
260261 def net__netif_receive_skb(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr,
@@ -354,11 +355,13 @@ def handle_irq_softirq_exit(event_info): · 93 unmodified lines
354355 receive_hunk_list.append(rec_data)
355356
356357 def handle_napi_poll(event_info):
357− (name, context, cpu, time, pid, comm, napi, dev_name) = event_info
358+ (name, context, cpu, time, pid, comm, napi, dev_name,
359+ work, budget) = event_info
358360 if cpu in net_rx_dic.keys():
359361 event_list = net_rx_dic[cpu]['event_list']
360362 rec_data = {'event_name':'napi_poll',
361− 'dev':dev_name, 'event_t':time}
363+ 'dev':dev_name, 'event_t':time,
364+ 'work':work, 'budget':budget}
362365 event_list.append(rec_data)
363366
364367 def handle_netif_rx(event_info):