mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 01:51:26 +00:00
Code Issues Releases Wiki Activity

dpctl: Add support to count upcall packets.

Browse Source 
Add support to count upcall packets per port, both succeed and failed,
which is a better way to see how many packets upcalled on each interface.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: wangchuanlei <wangchuanlei@inspur.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
wangchuanlei 2023-01-18 20:31:17 -05:00 committed by Ilya Maximets
parent e1e5eac5b0
commit e22e1f6725
8 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,5 +1,9 @@
Post-v3.1.0
--------------------
- Linux kernel datapath:
* OVS now collects per-interface upcall statistics that can be obtained
via 'ovs-appctl dpctl/show -s' or the interface's statistics column
in OVSDB. Available with upstream kernel 6.2+.
v3.1.0 - xx xxx xxxx

14
include/linux/openvswitch.h
View File

@ -301,11 +301,25 @@ enum ovs_vport_attr {
OVS_VPORT_ATTR_PAD,
OVS_VPORT_ATTR_IFINDEX,
OVS_VPORT_ATTR_NETNSID,
OVS_VPORT_ATTR_UPCALL_STATS,
__OVS_VPORT_ATTR_MAX
};
#define OVS_VPORT_ATTR_MAX (__OVS_VPORT_ATTR_MAX - 1)
/**
* enum ovs_vport_upcall_attr - attributes for %OVS_VPORT_UPCALL* commands
* @OVS_VPORT_UPCALL_ATTR_SUCCESS: 64-bit upcall success packets.
* @OVS_VPORT_UPCALL_ATTR_FAIL: 64-bit upcall fail packets.
*/
enum ovs_vport_upcall_attr {
OVS_VPORT_UPCALL_ATTR_SUCCESS,
OVS_VPORT_UPCALL_ATTR_FAIL,
__OVS_VPORT_UPCALL_ATTR_MAX,
};
#define OVS_VPORT_UPCALL_ATTR_MAX (__OVS_VPORT_UPCALL_ATTR_MAX - 1)
enum {
OVS_VXLAN_EXT_UNSPEC,
OVS_VXLAN_EXT_GBP,

4
include/openvswitch/netdev.h
View File

@ -87,6 +87,10 @@ struct netdev_stats {
uint64_t rx_oversize_errors;
uint64_t rx_fragmented_errors;
uint64_t rx_jabber_errors;
/* Datapath upcall statistics. */
uint64_t upcall_packets; /* Rx packets forwarded to userspace. */
uint64_t upcall_errors; /* Rx packets failed forwarding to userspace. */
};
/* Structure representation of custom statistics counter */

4
lib/dpctl.c
View File

@ -750,6 +750,10 @@ show_dpif(struct dpif *dpif, struct dpctl_params *dpctl_p)
print_stat(dpctl_p, " TX bytes:", s.tx_bytes);
print_human_size(dpctl_p, s.tx_bytes);
dpctl_print(dpctl_p, "\n");
print_stat(dpctl_p, " UPCALL packets:", s.upcall_packets);
print_stat(dpctl_p, " errors:", s.upcall_errors);
dpctl_print(dpctl_p, "\n");
} else {
dpctl_print(dpctl_p, ", could not retrieve stats (%s)",
ovs_strerror(error));

17
lib/dpif-netlink.c
View File

@ -4685,6 +4685,8 @@ dpif_netlink_vport_from_ofpbuf(struct dpif_netlink_vport *vport,
.optional = true },
[OVS_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true },
[OVS_VPORT_ATTR_NETNSID] = { .type = NL_A_U32, .optional = true },
[OVS_VPORT_ATTR_UPCALL_STATS] = { .type = NL_A_NESTED,
.optional = true },
};
dpif_netlink_vport_init(vport);
@ -4716,6 +4718,21 @@ dpif_netlink_vport_from_ofpbuf(struct dpif_netlink_vport *vport,
if (a[OVS_VPORT_ATTR_STATS]) {
vport->stats = nl_attr_get(a[OVS_VPORT_ATTR_STATS]);
}
if (a[OVS_VPORT_ATTR_UPCALL_STATS]) {
const struct nlattr *nla;
size_t left;
NL_NESTED_FOR_EACH (nla, left, a[OVS_VPORT_ATTR_UPCALL_STATS]) {
if (nl_attr_type(nla) == OVS_VPORT_UPCALL_ATTR_SUCCESS) {
vport->upcall_success = nl_attr_get_u64(nla);
} else if (nl_attr_type(nla) == OVS_VPORT_UPCALL_ATTR_FAIL) {
vport->upcall_fail = nl_attr_get_u64(nla);
}
}
} else {
vport->upcall_success = UINT64_MAX;
vport->upcall_fail = UINT64_MAX;
}
if (a[OVS_VPORT_ATTR_OPTIONS]) {
vport->options = nl_attr_get(a[OVS_VPORT_ATTR_OPTIONS]);
vport->options_len = nl_attr_get_size(a[OVS_VPORT_ATTR_OPTIONS]);

2
lib/dpif-netlink.h
View File

@ -44,6 +44,8 @@ struct dpif_netlink_vport {
uint32_t n_upcall_pids;
const uint32_t *upcall_pids; /* OVS_VPORT_ATTR_UPCALL_PID. */
const struct ovs_vport_stats *stats; /* OVS_VPORT_ATTR_STATS. */
uint64_t upcall_success; /* OVS_VPORT_UPCALL_ATTR_SUCCESS. */
uint64_t upcall_fail; /* OVS_VPORT_UPCALL_ATTR_FAIL. */
const struct nlattr *options; /* OVS_VPORT_ATTR_OPTIONS. */
size_t options_len;
};

22
lib/netdev-linux.c
View File

@ -2156,16 +2156,16 @@ swap_uint64(uint64_t *a, uint64_t *b)
* 'src' is allowed to be misaligned. */
static void
netdev_stats_from_ovs_vport_stats(struct netdev_stats *dst,
const struct ovs_vport_stats *src)
const struct dpif_netlink_vport *vport)
{
dst->rx_packets = get_32aligned_u64(&src->rx_packets);
dst->tx_packets = get_32aligned_u64(&src->tx_packets);
dst->rx_bytes = get_32aligned_u64(&src->rx_bytes);
dst->tx_bytes = get_32aligned_u64(&src->tx_bytes);
dst->rx_errors = get_32aligned_u64(&src->rx_errors);
dst->tx_errors = get_32aligned_u64(&src->tx_errors);
dst->rx_dropped = get_32aligned_u64(&src->rx_dropped);
dst->tx_dropped = get_32aligned_u64(&src->tx_dropped);
dst->rx_packets = get_32aligned_u64(&vport->stats->rx_packets);
dst->tx_packets = get_32aligned_u64(&vport->stats->tx_packets);
dst->rx_bytes = get_32aligned_u64(&vport->stats->rx_bytes);
dst->tx_bytes = get_32aligned_u64(&vport->stats->tx_bytes);
dst->rx_errors = get_32aligned_u64(&vport->stats->rx_errors);
dst->tx_errors = get_32aligned_u64(&vport->stats->tx_errors);
dst->rx_dropped = get_32aligned_u64(&vport->stats->rx_dropped);
dst->tx_dropped = get_32aligned_u64(&vport->stats->tx_dropped);
dst->multicast = 0;
dst->collisions = 0;
dst->rx_length_errors = 0;
@ -2179,6 +2179,8 @@ netdev_stats_from_ovs_vport_stats(struct netdev_stats *dst,
dst->tx_fifo_errors = 0;
dst->tx_heartbeat_errors = 0;
dst->tx_window_errors = 0;
dst->upcall_packets = vport->upcall_success;
dst->upcall_errors = vport->upcall_fail;
}
static int
@ -2196,7 +2198,7 @@ get_stats_via_vport__(const struct netdev *netdev, struct netdev_stats *stats)
return EOPNOTSUPP;
}
netdev_stats_from_ovs_vport_stats(stats, reply.stats);
netdev_stats_from_ovs_vport_stats(stats, &reply);
ofpbuf_delete(buf);

4
vswitchd/bridge.c
View File

@ -2626,7 +2626,9 @@ iface_refresh_stats(struct iface *iface)
IFACE_STAT(rx_undersized_errors, "rx_undersized_errors") \
IFACE_STAT(rx_oversize_errors, "rx_oversize_errors") \
IFACE_STAT(rx_fragmented_errors, "rx_fragmented_errors") \
IFACE_STAT(rx_jabber_errors, "rx_jabber_errors")
IFACE_STAT(rx_jabber_errors, "rx_jabber_errors") \
IFACE_STAT(upcall_packets, "upcall_packets") \
IFACE_STAT(upcall_errors, "upcall_errors")
#define IFACE_STAT(MEMBER, NAME) + 1
enum { N_IFACE_STATS = IFACE_STATS };