Re: [PATCH] [openvswitch v4] openvswitch: Add support to count upcall packets

Add support to count upall packets, when kmod of openvswitch upcall to 
userspace , here count the number of packets for upcall succeed and 
failed, which is a better way to see how many packets upcalled to 
userspace(ovs-vswitchd) on every interfaces.

Here optimize the function used by comments of v3.

Changes since v3:
- use nested NLA_NESTED attribute in netlink message

Changes since v2:
- add count of upcall failed packets

Changes since v1:
- add count of upcall succeed packets

Signed-off-by: wangchuanlei <redacted>
---
 include/uapi/linux/openvswitch.h | 19 ++++++++++++
 net/openvswitch/datapath.c       | 52 ++++++++++++++++++++++++++++++++
 net/openvswitch/datapath.h       | 12 ++++++++
 net/openvswitch/vport.c          | 48 +++++++++++++++++++++++++++++
 net/openvswitch/vport.h          |  6 ++++
 5 files changed, 137 insertions(+)

diff --git a/include/uapi/linux/openvswitch.h 

b/include/uapi/linux/openvswitch.h
index 94066f87e9ee..fa13bce15fae 100644

--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h

@@ -126,6 +126,11 @@ struct ovs_vport_stats {
 	__u64   tx_dropped;		/* no space available in linux  */
 };
 
+struct ovs_vport_upcall_stats {
+	uint64_t   upcall_success;	/* total packets upcalls succeed */
+	uint64_t   upcall_fail;		/* total packets upcalls failed  */

+};
+
 /* Allow last Netlink attribute to be unaligned */
 #define OVS_DP_F_UNALIGNED	(1 << 0)
 

@@ -277,11 +282,25 @@ enum ovs_vport_attr {
 	OVS_VPORT_ATTR_PAD,
 	OVS_VPORT_ATTR_IFINDEX,
 	OVS_VPORT_ATTR_NETNSID,
+	OVS_VPORT_ATTR_UPCALL_STATS, /* struct ovs_vport_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_SUCCESS: 64-bit upcall success packets.
+ * @OVS_VPORT_UPCALL_FAIL: 64-bit upcall fail packets.
+ */
+enum ovs_vport_upcall_attr {
+	OVS_VPORT_UPCALL_SUCCESS, /* 64-bit upcall success packets */
+	OVS_VPORT_UPCALL_FAIL, /* 64-bit upcall fail packets */
+	__OVS_VPORT_UPCALL_MAX
+};
+
+#define OVS_VPORT_UPCALL_MAX (__OVS_VPORT_UPCALL_MAX-1)

+
 enum {
 	OVS_VXLAN_EXT_UNSPEC,
 	OVS_VXLAN_EXT_GBP,	/* Flag or __u32 */

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c 
index c8a9075ddd0a..5254c51cfa60 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c

@@ -209,6 +209,25 @@ static struct vport *new_vport(const struct vport_parms *parms)
 	return vport;
 }
 
+static void ovs_vport_upcalls(struct sk_buff *skb,
+			      const struct dp_upcall_info *upcall_info,
+			      bool upcall_success)

+		u64_stats_update_begin(&vport_stats->syncp);
+		if (upcall_success)
+			u64_stats_inc(&vport_stats->n_upcall_success);
+		else
+			u64_stats_inc(&vport_stats->n_upcall_fail);
+		u64_stats_update_end(&vport_stats->syncp);
+	}
+}
+
 void ovs_dp_detach_port(struct vport *p)  {
 	ASSERT_OVSL();

@@ -216,6 +235,9 @@ void ovs_dp_detach_port(struct vport *p)
 	/* First drop references to device. */
 	hlist_del_rcu(&p->dp_hash_node);
 
+	/* Free percpu memory */
+	free_percpu(p->vport_upcall_stats_percpu);
+
 	/* Then destroy it. */
 	ovs_vport_del(p);
 }

@@ -305,6 +327,8 @@ int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb,
 		err = queue_userspace_packet(dp, skb, key, upcall_info, cutlen);
 	else
 		err = queue_gso_packets(dp, skb, key, upcall_info, cutlen);
+
+	ovs_vport_upcalls(skb, upcall_info, !err);
 	if (err)
 		goto err;

@@ -1825,6 +1849,13 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
 		goto err_destroy_portids;
 	}
 
+	vport->vport_upcall_stats_percpu =

@@ -2278,6 +2321,14 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
 		goto exit_unlock_free;
 	}
 
+	vport->vport_upcall_stats_percpu =
+		netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu);
+
+	if (!vport->vport_upcall_stats_percpu) {
+		err = -ENOMEM;
+		goto exit_unlock_free;
+	}

@@ -50,6 +50,18 @@ struct dp_stats_percpu {
 	struct u64_stats_sync syncp;
 };
 
+/**
+ * struct vport_upcall_stats_percpu - per-cpu packet upcall 
+statistics for
+ * a given vport.
+ * @n_upcall_success: Number of packets that upcall to userspace succeed.
+ * @n_upcall_fail:    Number of packets that upcall to userspace failed.
+ */
+struct vport_upcall_stats_percpu {
+	u64_stats_t n_upcall_success;
+	u64_stats_t n_upcall_fail;
+	struct u64_stats_sync syncp;

+};
+
 /**
  * struct dp_nlsk_pids - array of netlink portids of for a datapath.
  *                       This is used when OVS_DP_F_DISPATCH_UPCALL_PER_CPU

diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 

82a74f998966..a69c9356b57c 100644

--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c

@@ -284,6 +284,54 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
 	stats->tx_packets = dev_stats->tx_packets;  }
 
+/**
+ *	ovs_vport_get_upcall_stats - retrieve upcall stats
+ *
+ * @vport: vport from which to retrieve the stats
+ * @ovs_vport_upcall_stats: location to store stats
+ *
+ * Retrieves upcall stats for the given device.
+ *
+ * Must be called with ovs_mutex or rcu_read_lock.
+ */
+void ovs_vport_get_upcall_stats(struct vport *vport, struct 
+ovs_vport_upcall_stats *stats) {
+	int i;
+
+	stats->upcall_success = 0;
+	stats->upcall_fail = 0;
+
+	for_each_possible_cpu(i) {
+		const struct vport_upcall_stats_percpu *percpu_upcall_stats;

+}
+
 /**
  *	ovs_vport_get_options - retrieve device options
  *

diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 

7d276f60c000..02cf8c589588 100644

--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h

@@ -32,6 +32,11 @@ struct vport *ovs_vport_locate(const struct net 

*net, const char *name);
 
 void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *);
 
+void ovs_vport_get_upcall_stats(struct vport *vport,
+				struct ovs_vport_upcall_stats *stats); int 
+ovs_vport_put_upcall_stats(struct sk_buff *skb,
+			       struct ovs_vport_upcall_stats *stats);
+
 int ovs_vport_set_options(struct vport *, struct nlattr *options);  
int ovs_vport_get_options(const struct vport *, struct sk_buff *);
 

@@ -78,6 +83,7 @@ struct vport {
 	struct hlist_node hash_node;
 	struct hlist_node dp_hash_node;
 	const struct vport_ops *ops;
+	struct vport_upcall_stats_percpu __percpu 
+*vport_upcall_stats_percpu;