Re: [PATCH v5 6/8] vhost-user: compare mode MODE_PASTA and not MODE_PASST

[Stefano Brivio <sbrivio@redhat.com>]

On Wed,  5 Jun 2024 17:21:27 +0200
Laurent Vivier <lvivier@redhat.com> wrote:

> As we are going to introduce the MODE_VU that will act like
> the mode MODE_PASST, compare to MODE_PASTA rather than to add
> a comparison to MODE_VU when we check for MODE_PASST.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  conf.c      | 14 +++++++-------
>  isolation.c | 10 +++++-----
>  passt.c     |  2 +-
>  tap.c       | 12 ++++++------
>  tcp_buf.c   |  2 +-
>  udp.c       |  2 +-
>  6 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/conf.c b/conf.c
> index 50383a392f8d..b9d189ff4d26 100644
> --- a/conf.c
> +++ b/conf.c
> @@ -147,7 +147,7 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg,
>  		if (fwd->mode)
>  			goto mode_conflict;
>  
> -		if (c->mode != MODE_PASST)
> +		if (c->mode == MODE_PASTA)
>  			die("'all' port forwarding is only allowed for passt");
>  
>  		fwd->mode = FWD_ALL;
> @@ -1120,7 +1120,7 @@ static void conf_ugid(char *runas, uid_t *uid, gid_t *gid)
>   */
>  static void conf_open_files(struct ctx *c)
>  {
> -	if (c->mode == MODE_PASST && c->fd_tap == -1)
> +	if (c->mode != MODE_PASTA && c->fd_tap == -1)
>  		c->fd_tap_listen = tap_sock_unix_open(c->sock_path);
>  
>  	c->pidfile_fd = pidfile_open(c->pidfile);
> @@ -1261,7 +1261,7 @@ void conf(struct ctx *c, int argc, char **argv)
>  			c->no_dhcp_dns = 0;
>  			break;
>  		case 6:
> -			if (c->mode != MODE_PASST)
> +			if (c->mode == MODE_PASTA)
>  				die("--no-dhcp-dns is for passt mode only");
>  
>  			c->no_dhcp_dns = 1;
> @@ -1273,7 +1273,7 @@ void conf(struct ctx *c, int argc, char **argv)
>  			c->no_dhcp_dns_search = 0;
>  			break;
>  		case 8:
> -			if (c->mode != MODE_PASST)
> +			if (c->mode == MODE_PASTA)
>  				die("--no-dhcp-search is for passt mode only");
>  
>  			c->no_dhcp_dns_search = 1;
> @@ -1328,7 +1328,7 @@ void conf(struct ctx *c, int argc, char **argv)
>  			break;
>  		case 14:
>  			fprintf(stdout,
> -				c->mode == MODE_PASST ? "passt " : "pasta ");
> +				c->mode == MODE_PASTA ? "pasta " : "passt ");
>  			fprintf(stdout, VERSION_BLOB);
>  			exit(EXIT_SUCCESS);
>  		case 15:
> @@ -1631,7 +1631,7 @@ void conf(struct ctx *c, int argc, char **argv)
>  			v6_only = true;
>  			break;
>  		case '1':
> -			if (c->mode != MODE_PASST)
> +			if (c->mode == MODE_PASTA)
>  				die("--one-off is for passt mode only");
>  
>  			if (c->one_off)
> @@ -1678,7 +1678,7 @@ void conf(struct ctx *c, int argc, char **argv)
>  	conf_ugid(runas, &uid, &gid);
>  
>  	if (logfile) {
> -		logfile_init(c->mode == MODE_PASST ? "passt" : "pasta",
> +		logfile_init(c->mode == MODE_PASTA ? "pasta" : "passt",
>  			     logfile, logsize);
>  	}
>  
> diff --git a/isolation.c b/isolation.c
> index f394e93b8526..ca2c68b52ec7 100644
> --- a/isolation.c
> +++ b/isolation.c
> @@ -312,7 +312,7 @@ int isolate_prefork(const struct ctx *c)
>  	 * PID namespace. For passt, use CLONE_NEWPID anyway, in case somebody
>  	 * ever gets around seccomp profiles -- there's no harm in passing it.
>  	 */
> -	if (!c->foreground || c->mode == MODE_PASST)
> +	if (!c->foreground || c->mode != MODE_PASTA)
>  		flags |= CLONE_NEWPID;
>  
>  	if (unshare(flags)) {
> @@ -379,12 +379,12 @@ void isolate_postfork(const struct ctx *c)
>  
>  	prctl(PR_SET_DUMPABLE, 0);
>  
> -	if (c->mode == MODE_PASST) {
> -		prog.len = (unsigned short)ARRAY_SIZE(filter_passt);
> -		prog.filter = filter_passt;
> -	} else {
> +	if (c->mode == MODE_PASTA) {
>  		prog.len = (unsigned short)ARRAY_SIZE(filter_pasta);
>  		prog.filter = filter_pasta;
> +	} else {
> +		prog.len = (unsigned short)ARRAY_SIZE(filter_passt);
> +		prog.filter = filter_passt;
>  	}
>  
>  	if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) ||
> diff --git a/passt.c b/passt.c
> index 69a59f1e9b6d..b02a0df17347 100644
> --- a/passt.c
> +++ b/passt.c
> @@ -333,7 +333,7 @@ loop:
>  		uint32_t eventmask = events[i].events;
>  
>  		trace("%s: epoll event on %s %i (events: 0x%08x)",
> -		      c.mode == MODE_PASST ? "passt" : "pasta",
> +		      c.mode == MODE_PASTA ? "pasta" : "passt",
>  		      EPOLL_TYPE_STR(ref.type), ref.fd, eventmask);
>  
>  		switch (ref.type) {
> diff --git a/tap.c b/tap.c
> index 5fb3cb83f3d2..887cb7a279a9 100644
> --- a/tap.c
> +++ b/tap.c
> @@ -416,10 +416,10 @@ size_t tap_send_frames(const struct ctx *c, const struct iovec *iov,
>  	if (!nframes)
>  		return 0;
>  
> -	if (c->mode == MODE_PASST)
> -		m = tap_send_frames_passt(c, iov, bufs_per_frame, nframes);
> -	else
> +	if (c->mode == MODE_PASTA)
>  		m = tap_send_frames_pasta(c, iov, bufs_per_frame, nframes);
> +	else
> +		m = tap_send_frames_passt(c, iov, bufs_per_frame, nframes);
>  
>  	if (m < nframes)
>  		debug("tap: failed to send %zu frames of %zu",
> @@ -1332,7 +1332,9 @@ void tap_sock_init(struct ctx *c)
>  		return;
>  	}
>  
> -	if (c->mode == MODE_PASST) {
> +	if (c->mode == MODE_PASTA)
> +		tap_sock_tun_init(c);
> +	else {

For consistency: if the else clause has curly brackets, then the main
clause should have them as well.

>  		tap_sock_unix_init(c);
>  
>  		/* In passt mode, we don't know the guest's MAC address until it
> @@ -1340,7 +1342,5 @@ void tap_sock_init(struct ctx *c)
>  		 * first packets will reach it.
>  		 */
>  		memset(&c->mac_guest, 0xff, sizeof(c->mac_guest));
> -	} else {
> -		tap_sock_tun_init(c);
>  	}
>  }
> diff --git a/tcp_buf.c b/tcp_buf.c
> index 89e19f598cc0..4175c4219215 100644
> --- a/tcp_buf.c
> +++ b/tcp_buf.c
> @@ -35,7 +35,7 @@
>  
>  #define TCP_FRAMES_MEM			128
>  #define TCP_FRAMES							   \
> -	(c->mode == MODE_PASST ? TCP_FRAMES_MEM : 1)
> +	(c->mode == MODE_PASTA ? 1 : TCP_FRAMES_MEM)
>  
>  /**
>   * tcp_buf_seq_update - Sequences to update with length of frames once sent
> diff --git a/udp.c b/udp.c
> index a13013901e26..def3d57a6183 100644
> --- a/udp.c
> +++ b/udp.c
> @@ -748,7 +748,7 @@ void udp_buf_sock_handler(const struct ctx *c, union epoll_ref ref, uint32_t eve
>  	 * whether we'll use tap or splice, always go one at a time
>  	 * for pasta mode.
>  	 */
> -	ssize_t n = (c->mode == MODE_PASST ? UDP_MAX_FRAMES : 1);
> +	ssize_t n = (c->mode == MODE_PASTA ? 1 : UDP_MAX_FRAMES);
>  	in_port_t dstport = ref.udp.port;
>  	bool v6 = ref.udp.v6;
>  	struct mmsghdr *mmh_recv;

The rest of the series looks good to me.

-- 
Stefano