[dpdk-dev,2/2] examples/vhost: support multiple socket files

  When examples/vhost runs in client mode, only one QEMU can be connected.
This is because that examples/vhost just supports one socket file. This
patch is to add multiple sockets support for examples/vhost.

Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
---
 examples/vhost/main.c | 50 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 12 deletions(-)
  

On Tue, Aug 16, 2016 at 12:14:39PM -0400, Jiayu Hu wrote:
> +/*
> + * This function is used to unregister drivers.
> + */
> +static void
> +unregister_drivers(int socket_num)
> +{

Redundant comment. The function name already explains it well.


>  	/* Register vhost user driver to handle vhost messages. */
> -	ret = rte_vhost_driver_register(socket_file, flags);
> -	if (ret != 0)
> -		rte_exit(EXIT_FAILURE, "vhost driver register failure.\n");
> +	for (i = 0; i < nb_sockets; i++) {
> +		ret = rte_vhost_driver_register
> +				(socket_files + i * PATH_MAX, flags);
> +		if (ret != 0) {
> +			unregister_drivers(i);
> +			rte_exit(EXIT_FAILURE, "vhost driver register failure.\n");

Lines over 80 chars.

Besides, please cc corresponding maintainers while sending patches, say
cc me for virtio/vhost changes. From MAINTAINERS you could find the
names.

So, please make a v2, with above 2 minor fixed. And also, please follow
the guide on http://dpdk.org/dev to send v2:

    If a previous version of the patch has already been sent, a version
    number and changelog annotations are helpful:

    git send-email -1 -v2 --annotate --in-reply-to <Message-ID of the previous patch>
    --to dev@dpdk.org --cc <everybody discussing the patch>


	--yliu
  

On 08/16/2016 06:14 PM, Jiayu Hu wrote:
> When examples/vhost runs in client mode, only one QEMU can be connected.
> This is because that examples/vhost just supports one socket file. This
> patch is to add multiple sockets support for examples/vhost.
>
> Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
> ---
>  examples/vhost/main.c | 50 ++++++++++++++++++++++++++++++++++++++------------
>  1 file changed, 38 insertions(+), 12 deletions(-)
>
> diff --git a/examples/vhost/main.c b/examples/vhost/main.c
> index a718577..9974f0b 100644
> --- a/examples/vhost/main.c
> +++ b/examples/vhost/main.c
> @@ -136,8 +136,9 @@ static uint32_t burst_rx_delay_time = BURST_RX_WAIT_US;
>  /* Specify the number of retries on RX. */
>  static uint32_t burst_rx_retry_num = BURST_RX_RETRIES;
>
> -/* Socket file path. Can be set by user */
> -static char socket_file[PATH_MAX] = "vhost-net";
Default name being removed, you can drop my comment on patch 1. :)

> +/* Socket file paths. Can be set by user */
> +static char *socket_files;
> +int nb_sockets;
Any reason not to make it static?

>  /* empty vmdq configuration structure. Filled in programatically */
>  static struct rte_eth_conf vmdq_conf_default = {
> @@ -395,11 +396,12 @@ static int
>  us_vhost_parse_socket_path(const char *q_arg)
>  {
>  	/* parse number string */
> -
>  	if (strnlen(q_arg, PATH_MAX) > PATH_MAX)
>  		return -1;
> -	else
> -		snprintf((char *)&socket_file, PATH_MAX, "%s", q_arg);
> +
> +	socket_files = realloc(socket_files, PATH_MAX * (nb_sockets + 1));
> +	snprintf(socket_files + nb_sockets * PATH_MAX, PATH_MAX, "%s", q_arg);
> +	nb_sockets++;
>
>  	return 0;
>  }
> @@ -1341,14 +1343,30 @@ print_stats(void)
>  	}
>  }
>
> +/*
> + * This function is used to unregister drivers.
> + */
> +static void
> +unregister_drivers(int socket_num)
> +{
> +	int i, ret;
> +
> +	for (i = 0; i < socket_num; i++) {
> +		ret = rte_vhost_driver_unregister(socket_files + i * PATH_MAX);
> +		if (ret != 0)
> +			RTE_LOG(ERR, VHOST_CONFIG,
> +				"Fail to unregister vhost driver for %s.\n",
> +				socket_files + i * PATH_MAX);
> +	}
> +}
> +
>  /* When we receive a INT signal, unregister vhost driver */
>  static void
>  sigint_handler(__rte_unused int signum)
>  {
>  	/* Unregister vhost driver. */
> -	int ret = rte_vhost_driver_unregister((char *)&socket_file);
> -	if (ret != 0)
> -		rte_exit(EXIT_FAILURE, "vhost driver unregister failure.\n");
> +	unregister_drivers(nb_sockets);
> +
>  	exit(0);
>  }
>
> @@ -1412,12 +1430,15 @@ main(int argc, char *argv[])
>  {
>  	unsigned lcore_id, core_id = 0;
>  	unsigned nb_ports, valid_num_ports;
> -	int ret;
> +	int ret, i;
>  	uint8_t portid;
>  	static pthread_t tid;
>  	char thread_name[RTE_MAX_THREAD_NAME_LEN];
>  	uint64_t flags = 0;
>
> +	nb_sockets = 0;
> +	socket_files = NULL;
Since socket_files is static, no need to initialize it to NULL.
If you staticize nb_sockets, same remark will apply.
  

On Thu, Aug 18, 2016 at 10:27:55AM +0200, Maxime Coquelin wrote:
> 
> 
> On 08/16/2016 06:14 PM, Jiayu Hu wrote:
> >When examples/vhost runs in client mode, only one QEMU can be connected.
> >This is because that examples/vhost just supports one socket file. This
> >patch is to add multiple sockets support for examples/vhost.
> >
> >Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
> >---
> > examples/vhost/main.c | 50 ++++++++++++++++++++++++++++++++++++++------------
> > 1 file changed, 38 insertions(+), 12 deletions(-)
> >
> >diff --git a/examples/vhost/main.c b/examples/vhost/main.c
> >index a718577..9974f0b 100644
> >--- a/examples/vhost/main.c
> >+++ b/examples/vhost/main.c
> >@@ -136,8 +136,9 @@ static uint32_t burst_rx_delay_time = BURST_RX_WAIT_US;
> > /* Specify the number of retries on RX. */
> > static uint32_t burst_rx_retry_num = BURST_RX_RETRIES;
> >
> >-/* Socket file path. Can be set by user */
> >-static char socket_file[PATH_MAX] = "vhost-net";
> Default name being removed, you can drop my comment on patch 1. :)
> 
> >+/* Socket file paths. Can be set by user */
> >+static char *socket_files;
> >+int nb_sockets;
> Any reason not to make it static?

Right, it should be "static". Hmm, I missed it in review :(

	--yliu