From: William Tu <u9012063@gmail.com>
To: xiangxia.m.yue@gmail.com
Cc: Greg Rose <gvrose8192@gmail.com>, pravin shelar <pshelar@ovn.org>,
"<dev@openvswitch.org>" <dev@openvswitch.org>,
Linux Kernel Network Developers <netdev@vger.kernel.org>
Subject: Re: [ovs-dev] [PATCH net-next v4 10/10] net: openvswitch: simplify the ovs_dp_cmd_new
Date: Fri, 18 Oct 2019 16:29:04 -0700 [thread overview]
Message-ID: <CALDO+SYg16y1pkc=9exoJP+Gp_EyXrxkmb1cKatv10xZtXypUQ@mail.gmail.com> (raw)
In-Reply-To: <1571135440-24313-11-git-send-email-xiangxia.m.yue@gmail.com>
On Wed, Oct 16, 2019 at 5:56 AM <xiangxia.m.yue@gmail.com> wrote:
>
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>
> use the specified functions to init resource.
>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> Tested-by: Greg Rose <gvrose8192@gmail.com>
> ---
Looks like this is simply moving code around.
I don't have any opinion.
> net/openvswitch/datapath.c | 60 +++++++++++++++++++++++++++++-----------------
> 1 file changed, 38 insertions(+), 22 deletions(-)
>
> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
> index aeb76e4..4d48e48 100644
> --- a/net/openvswitch/datapath.c
> +++ b/net/openvswitch/datapath.c
> @@ -1576,6 +1576,31 @@ static int ovs_dp_change(struct datapath *dp, struct nlattr *a[])
> return 0;
> }
>
> +static int ovs_dp_stats_init(struct datapath *dp)
> +{
> + dp->stats_percpu = netdev_alloc_pcpu_stats(struct dp_stats_percpu);
> + if (!dp->stats_percpu)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> +static int ovs_dp_vport_init(struct datapath *dp)
> +{
> + int i;
> +
> + dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS,
> + sizeof(struct hlist_head),
> + GFP_KERNEL);
> + if (!dp->ports)
> + return -ENOMEM;
> +
> + for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)
> + INIT_HLIST_HEAD(&dp->ports[i]);
> +
> + return 0;
> +}
> +
> static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
> {
> struct nlattr **a = info->attrs;
> @@ -1584,7 +1609,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
> struct datapath *dp;
> struct vport *vport;
> struct ovs_net *ovs_net;
> - int err, i;
> + int err;
>
> err = -EINVAL;
> if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID])
> @@ -1597,35 +1622,26 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
> err = -ENOMEM;
> dp = kzalloc(sizeof(*dp), GFP_KERNEL);
> if (dp == NULL)
> - goto err_free_reply;
> + goto err_destroy_reply;
>
> ovs_dp_set_net(dp, sock_net(skb->sk));
>
> /* Allocate table. */
> err = ovs_flow_tbl_init(&dp->table);
> if (err)
> - goto err_free_dp;
> + goto err_destroy_dp;
>
> - dp->stats_percpu = netdev_alloc_pcpu_stats(struct dp_stats_percpu);
> - if (!dp->stats_percpu) {
> - err = -ENOMEM;
> + err = ovs_dp_stats_init(dp);
> + if (err)
> goto err_destroy_table;
> - }
>
> - dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS,
> - sizeof(struct hlist_head),
> - GFP_KERNEL);
> - if (!dp->ports) {
> - err = -ENOMEM;
> - goto err_destroy_percpu;
> - }
> -
> - for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)
> - INIT_HLIST_HEAD(&dp->ports[i]);
> + err = ovs_dp_vport_init(dp);
> + if (err)
> + goto err_destroy_stats;
>
> err = ovs_meters_init(dp);
> if (err)
> - goto err_destroy_ports_array;
> + goto err_destroy_ports;
>
> /* Set up our datapath device. */
> parms.name = nla_data(a[OVS_DP_ATTR_NAME]);
> @@ -1675,15 +1691,15 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
>
> err_destroy_meters:
> ovs_meters_exit(dp);
> -err_destroy_ports_array:
> +err_destroy_ports:
> kfree(dp->ports);
> -err_destroy_percpu:
> +err_destroy_stats:
> free_percpu(dp->stats_percpu);
> err_destroy_table:
> ovs_flow_tbl_destroy(&dp->table);
> -err_free_dp:
> +err_destroy_dp:
> kfree(dp);
> -err_free_reply:
> +err_destroy_reply:
> kfree_skb(reply);
> err:
> return err;
> --
> 1.8.3.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
next prev parent reply other threads:[~2019-10-18 23:29 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 10:30 [PATCH net-next v4 00/10] optimize openvswitch flow looking up xiangxia.m.yue
2019-10-15 10:30 ` [PATCH net-next v4 01/10] net: openvswitch: add flow-mask cache for performance xiangxia.m.yue
2019-10-18 23:29 ` [ovs-dev] " William Tu
2019-10-15 10:30 ` [PATCH net-next v4 02/10] net: openvswitch: convert mask list in mask array xiangxia.m.yue
2019-10-18 23:30 ` [ovs-dev] " William Tu
2019-10-15 10:30 ` [PATCH net-next v4 03/10] net: openvswitch: shrink the mask array if necessary xiangxia.m.yue
2019-10-18 23:33 ` [ovs-dev] " William Tu
2019-10-15 10:30 ` [PATCH net-next v4 04/10] net: openvswitch: optimize flow mask cache hash collision xiangxia.m.yue
2019-10-15 10:30 ` [PATCH net-next v4 05/10] net: openvswitch: optimize flow-mask looking up xiangxia.m.yue
2019-10-18 23:26 ` [ovs-dev] " William Tu
2019-10-21 4:51 ` Tonghao Zhang
2019-10-21 17:58 ` William Tu
2019-10-15 10:30 ` [PATCH net-next v4 06/10] net: openvswitch: simplify the flow_hash xiangxia.m.yue
2019-10-18 23:27 ` [ovs-dev] " William Tu
2019-10-15 10:30 ` [PATCH net-next v4 07/10] net: openvswitch: add likely in flow_lookup xiangxia.m.yue
2019-10-18 23:27 ` [ovs-dev] " William Tu
2019-10-15 10:30 ` [PATCH net-next v4 08/10] net: openvswitch: fix possible memleak on destroy flow-table xiangxia.m.yue
2019-10-17 22:38 ` Pravin Shelar
2019-10-18 3:16 ` Tonghao Zhang
2019-10-18 18:12 ` Pravin Shelar
2019-10-21 5:01 ` Tonghao Zhang
2019-10-22 6:57 ` Pravin Shelar
2019-10-23 2:35 ` Tonghao Zhang
2019-10-24 7:14 ` Pravin Shelar
2019-10-28 6:49 ` Tonghao Zhang
2019-10-29 7:37 ` Pravin Shelar
2019-10-29 11:30 ` Tonghao Zhang
2019-10-29 20:27 ` Pravin Shelar
2019-10-15 10:30 ` [PATCH net-next v4 09/10] net: openvswitch: don't unlock mutex when changing the user_features fails xiangxia.m.yue
2019-10-18 23:27 ` [ovs-dev] " William Tu
2019-10-15 10:30 ` [PATCH net-next v4 10/10] net: openvswitch: simplify the ovs_dp_cmd_new xiangxia.m.yue
2019-10-18 23:29 ` William Tu [this message]
2019-10-17 19:22 ` [PATCH net-next v4 00/10] optimize openvswitch flow looking up David Miller
2019-10-17 20:29 ` Gregory Rose
2019-10-21 17:14 ` [ovs-dev] " William Tu
2019-10-22 1:16 ` Tonghao Zhang
2019-10-22 15:44 ` William Tu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALDO+SYg16y1pkc=9exoJP+Gp_EyXrxkmb1cKatv10xZtXypUQ@mail.gmail.com' \
--to=u9012063@gmail.com \
--cc=dev@openvswitch.org \
--cc=gvrose8192@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pshelar@ovn.org \
--cc=xiangxia.m.yue@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).