From patchwork Wed Nov 30 09:15:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangchuanlei X-Patchwork-Id: 27699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp816810wrr; Wed, 30 Nov 2022 01:18:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf625gtpQQHpJnEZn/FOSQcChCLWpjgMI01XoPoc+xUVGnVPayl7G94wzD38OcgxOKa9gfqP X-Received: by 2002:a17:906:b34a:b0:755:6595:cd34 with SMTP id cd10-20020a170906b34a00b007556595cd34mr38839234ejb.70.1669799934539; Wed, 30 Nov 2022 01:18:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669799934; cv=none; d=google.com; s=arc-20160816; b=tDlmG/K4V2dZ66CBnIlt2OvSjA3zis2y4lD5f3Vf+orvHNBmnXuOlF6vtXKSIdwhYp EzsT2LMSWDIpNK3qDl4eNPHpaPzjrQpBYh1PNqG0DAkoSBZ5agRA8l7KIwPRYTnQfif5 qZVr9dG1W85L18d8xKVd+3m7sh7A7KKnemUs0/YBKWQgOANzIg09p5rLltGlCb69P65O 1FZtwSifHy/pkKC1mtJqcayAh5Cefbs2zfigMVawuTgeXuppsCgMjElyf7iPISj9BzhY +J4RJuN9z2RZ4IPydLAsDqqUEecmo975tMkoCcoEgNSNefCv05LzH90lGI+vMdqYDoZz j50w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:abuse-reports-to:tuid:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from; bh=E4Ra295HKIFS+6WHNjAMNsZIpnX2obn+l+p+5f9i37o=; b=CNTpytTtn8w1zV5H0Qb4d7ZOXU0GuH4gow3M7Uh9M/p6Ljxsrd8dR+T7mQbV+HxPR3 +tZf1qtffKkSz9mb8f5oKkDEcElN1ESa8ZDllP3hFlIyG7xsk7yO1nBfG8Iv/w2GqF1n XW1YF9f0mQLV4TFi53i5n6bVuWKivUmLi0jFTrYUz/J01S7/1567whbrjBgzImkfZrlb NPtm5oadUIF7NHV748nfLSpcNI8Sf35LCKKPMmqI3xr6Wj4YgWHT9oTRui9vIAhlHCKg n3jP0TLsePrgRPHzWaLpQ1zJWk9g/yY4Yvy9QtzezZ6Ag9J4Gq2uBM41yZMrjzIKx7p9 dtow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ho44-20020a1709070eac00b007a1084820f6si1026036ejc.230.2022.11.30.01.18.30; Wed, 30 Nov 2022 01:18:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231981AbiK3JQP (ORCPT + 99 others); Wed, 30 Nov 2022 04:16:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229790AbiK3JQO (ORCPT ); Wed, 30 Nov 2022 04:16:14 -0500 Received: from ssh248.corpemail.net (ssh248.corpemail.net [210.51.61.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AFE82EF6E; Wed, 30 Nov 2022 01:16:11 -0800 (PST) Received: from ([60.208.111.195]) by ssh248.corpemail.net ((D)) with ASMTP (SSL) id VNR00000; Wed, 30 Nov 2022 17:16:00 +0800 Received: from localhost.localdomain (10.180.206.146) by jtjnmail201609.home.langchao.com (10.100.2.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Wed, 30 Nov 2022 17:16:02 +0800 From: wangchuanlei To: , , , , , , CC: , , , , wangchuanlei Subject: [PATCH] [PATCH v6 net-next] net: openvswitch: Add support to count upcall packets Date: Wed, 30 Nov 2022 04:15:59 -0500 Message-ID: <20221130091559.1120493-1-wangchuanlei@inspur.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Originating-IP: [10.180.206.146] X-ClientProxiedBy: Jtjnmail201613.home.langchao.com (10.100.2.13) To jtjnmail201609.home.langchao.com (10.100.2.9) tUid: 20221130171600ce81488974068f30973d092497f86aa0 X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750912136393375066?= X-GMAIL-MSGID: =?utf-8?q?1750912136393375066?= 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 modify format of code used by comments of v6. Changes since v4 & v5: - optimize the function used by comments 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 --- include/uapi/linux/openvswitch.h | 14 +++++++++ net/openvswitch/datapath.c | 50 ++++++++++++++++++++++++++++++++ net/openvswitch/vport.c | 44 ++++++++++++++++++++++++++++ net/openvswitch/vport.h | 24 +++++++++++++++ 4 files changed, 132 insertions(+) diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 94066f87e9ee..8422ebf6885b 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -277,11 +277,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_SUCCESS: 64-bit upcall success packets. + * @OVS_VPORT_UPCALL_FAIL: 64-bit upcall fail packets. + */ +enum ovs_vport_upcall_attr { + OVS_VPORT_UPCALL_SUCCESS, + OVS_VPORT_UPCALL_FAIL, + __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..f9279aee2adb 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -209,6 +209,26 @@ 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_result) +{ + struct vport *p = OVS_CB(skb)->input_vport; + struct vport_upcall_stats_percpu *vport_stats; + + if (upcall_info->cmd != OVS_PACKET_CMD_MISS && + upcall_info->cmd != OVS_PACKET_CMD_ACTION) + return; + + vport_stats = this_cpu_ptr(p->upcall_stats); + u64_stats_update_begin(&vport_stats->syncp); + if (upcall_result) + u64_stats_inc(&vport_stats->n_success); + else + u64_stats_inc(&vport_stats->n_fail); + u64_stats_update_end(&vport_stats->syncp); +} + void ovs_dp_detach_port(struct vport *p) { ASSERT_OVSL(); @@ -216,6 +236,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->upcall_stats); + /* Then destroy it. */ ovs_vport_del(p); } @@ -305,6 +328,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 +1850,12 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) goto err_destroy_portids; } + vport->upcall_stats = netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu); + if (!vport->upcall_stats) { + err = -ENOMEM; + goto err_destroy_portids; + } + err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid, info->snd_seq, 0, OVS_DP_CMD_NEW); BUG_ON(err < 0); @@ -2068,6 +2099,8 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb, { struct ovs_header *ovs_header; struct ovs_vport_stats vport_stats; + struct ovs_vport_upcall_stats stat; + struct nlattr *nla; int err; ovs_header = genlmsg_put(skb, portid, seq, &dp_vport_genl_family, @@ -2097,6 +2130,15 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb, OVS_VPORT_ATTR_PAD)) goto nla_put_failure; + nla = nla_nest_start_noflag(skb, OVS_VPORT_ATTR_UPCALL_STATS); + if (!nla) + goto nla_put_failure; + + ovs_vport_get_upcall_stats(vport, &stat); + if (ovs_vport_put_upcall_stats(skb, &stat)) + goto nla_put_failure; + nla_nest_end(skb, nla); + if (ovs_vport_get_upcall_portids(vport, skb)) goto nla_put_failure; @@ -2278,6 +2320,13 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) goto exit_unlock_free; } + vport->upcall_stats = netdev_alloc_pcpu_stats(struct vport_upcall_stats_percpu); + + if (!vport->upcall_stats) { + err = -ENOMEM; + goto exit_unlock_free; + } + err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info), info->snd_portid, info->snd_seq, 0, OVS_VPORT_CMD_NEW, GFP_KERNEL); @@ -2507,6 +2556,7 @@ static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = { [OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED }, [OVS_VPORT_ATTR_IFINDEX] = { .type = NLA_U32 }, [OVS_VPORT_ATTR_NETNSID] = { .type = NLA_S32 }, + [OVS_VPORT_ATTR_UPCALL_STATS] = { .type = NLA_NESTED }, }; static const struct genl_small_ops dp_vport_genl_ops[] = { diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 82a74f998966..fd95536b35ef 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -284,6 +284,50 @@ 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->tx_success = 0; + stats->tx_fail = 0; + + for_each_possible_cpu(i) { + const struct vport_upcall_stats_percpu *upcall_stats; + unsigned int start; + + upcall_stats = per_cpu_ptr(vport->upcall_stats, i); + do { + start = u64_stats_fetch_begin(&upcall_stats->syncp); + stats->tx_success += u64_stats_read(&upcall_stats->n_success); + stats->tx_fail += u64_stats_read(&upcall_stats->n_fail); + } while (u64_stats_fetch_retry(&upcall_stats->syncp, start)); + } +} + +int ovs_vport_put_upcall_stats(struct sk_buff *skb, + struct ovs_vport_upcall_stats *stats) +{ + if (nla_put_u64_64bit(skb, OVS_VPORT_UPCALL_SUCCESS, stats->tx_success, + OVS_VPORT_ATTR_PAD)) + return -EMSGSIZE; + + if (nla_put_u64_64bit(skb, OVS_VPORT_UPCALL_FAIL, stats->tx_fail, + OVS_VPORT_ATTR_PAD)) + return -EMSGSIZE; + + return 0; +} + /** * ovs_vport_get_options - retrieve device options * diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 7d276f60c000..5ba9f14df55a 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -32,6 +32,16 @@ struct vport *ovs_vport_locate(const struct net *net, const char *name); void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *); +struct ovs_vport_upcall_stats { + __u64 tx_success; /* total packets upcalls succeed */ + __u64 tx_fail; /* total packets upcalls failed */ +}; + +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 *); @@ -65,6 +75,7 @@ struct vport_portids { * @hash_node: Element in @dev_table hash table in vport.c. * @dp_hash_node: Element in @datapath->ports hash table in datapath.c. * @ops: Class structure. + * @upcall_stats: Upcall stats of every ports. * @detach_list: list used for detaching vport in net-exit call. * @rcu: RCU callback head for deferred destruction. */ @@ -78,6 +89,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 *upcall_stats; struct list_head detach_list; struct rcu_head rcu; @@ -137,6 +149,18 @@ struct vport_ops { struct list_head list; }; +/** + * struct vport_upcall_stats_percpu - per-cpu packet upcall statistics for + * a given vport. + * @n_success: Number of packets that upcall to userspace succeed. + * @n_fail: Number of packets that upcall to userspace failed. + */ +struct vport_upcall_stats_percpu { + struct u64_stats_sync syncp; + u64_stats_t n_success; + u64_stats_t n_fail; +}; + struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *, const struct vport_parms *); void ovs_vport_free(struct vport *);