Received: by 2002:a05:7412:8d11:b0:fa:4934:9f with SMTP id bj17csp481649rdb; Mon, 15 Jan 2024 03:55:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IG99MN7yk5H00Nw/xloOp4RpXFG2WgEZ0a8xaJQaCh3dvbSM8Kli2s14jgctkEOkbiwIymu X-Received: by 2002:a17:907:c306:b0:a2e:174e:1092 with SMTP id tl6-20020a170907c30600b00a2e174e1092mr469749ejc.23.1705319736369; Mon, 15 Jan 2024 03:55:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705319736; cv=none; d=google.com; s=arc-20160816; b=Dwu2j3+NVBBRDVTj6mRT+27nxYfk/dX8n51odn9UHzbrI4YQD7nOayk5U5yHkkHZE9 Vrp3lxJtIYKxfcG4XL81ukVZKGUvYhQUHbftT4j0SPcRz/mSN3Zg6W0bAMOGe0BOcale 1eGbbZ8amAOEwXR2pL9QEF3vvA/3Eg8swkBcmZyFay4Y+3ft/mw8hgKydVogdvPxs8PW YV1oO8VFbKbflAgwdx++fMQo/U3t3VWRAmvG7dZG3nCgm+RcjVocbDLA0Wnp66qluYWS 0gtLlkBl+ZcW4dm3GlCRF59x/LxA8LTck5LMtk7gM1x4RPEmdiDpbEX3eypk1Wh3xDeX hhNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=n1jj4dekwK/COh8GVTj4xzGWnHN1tYEzBuBMudiuoPA=; fh=JEq7ZyqHwnKMAbPjHbEHIOO1u1YxTWxtQlCbJmwG+xw=; b=cXWaYkyp9UQ8JLpqlJJD15MhoJrKFBxhN0Xaj66tdp89D08VWDp/rHsrNuXRNT41RK WvxubNqt500kjqlSzXwVjR3OkM6C5Iuj1HsnQvJkSJvRobQFbl8f5d6sawS1NwhmjZBm wYIIk/x87/0fyo32AaBi/fwQGsPhEvIn1kpZ4m9Lb9ADW8GqNOomvEJfpUbkPuBwtS93 xruaF2RZ0cvLmwsxyIRfmEXDZI6GySb4uBtGNCt8BSfrpOu1329go3M5c41OG0bkznnD yNtNoaaBQe+59d7HuLWdK2s/7ziR4Zkz8fLZAAGzWAvUN0PUCAThIAdO1Pghur3FSdNK nbWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=R4pcKOwU; spf=pass (google.com: domain of linux-kernel+bounces-25942-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25942-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ds14-20020a0564021cce00b00553756f10aasi3960638edb.592.2024.01.15.03.55.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 03:55:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25942-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=R4pcKOwU; spf=pass (google.com: domain of linux-kernel+bounces-25942-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25942-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 773141F225A5 for ; Mon, 15 Jan 2024 11:55:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BBECD2C855; Mon, 15 Jan 2024 11:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R4pcKOwU" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 943852C68A for ; Mon, 15 Jan 2024 11:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705319688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n1jj4dekwK/COh8GVTj4xzGWnHN1tYEzBuBMudiuoPA=; b=R4pcKOwUx1ljQmVe+HCT5AsLFfISZJF7RNSvD1HiWeV+WD1eVubP0t92XrI56JQyHgvine 6/4euS8dfDtYX6ka9TUAoakQpUPFXUdYRQO1YfO6Ot6KoXrQJE9rdsrLN5UkSTfrl4S+RQ EClJJNwjIBuL384/up0L/667purZ7ug= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-591-G-HmZylcOQ2FImkPuV-CBQ-1; Mon, 15 Jan 2024 06:54:46 -0500 X-MC-Unique: G-HmZylcOQ2FImkPuV-CBQ-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6800a9505ddso157126246d6.3 for ; Mon, 15 Jan 2024 03:54:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705319686; x=1705924486; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=n1jj4dekwK/COh8GVTj4xzGWnHN1tYEzBuBMudiuoPA=; b=T/EScETmQSOE1G580CMRYi3j4gyy6DDh6IKwvyoct39KhuIIAZmMNIT9TMGg3nEErE q1P6TxhmBa0SYayO9gnMrzonY/BOLDKV8aoDgg0TEMKqh3XSKvfgOQZCcZAVWCRLUFgA HNDJm6RfmuxUXWnPTzW/TVnXDftziY590mcE2EbKnj6fFMbN7hJeI6aO/Xitfch3cLy+ hL/uDTgU48k5flAQG1xsv1GbKOyvu9Gs41Ozf8IxpqOOukbkpTzUVlxRf+QxIhOD1vEl aAtmQ0HLCv9NVwpaz6WOYxrBs4EnmRxBR87Gj+NEy3WDpgnbca5D/UM/0WTR3fH0lLSt B1VA== X-Gm-Message-State: AOJu0YzWF9/apWsA8+5HWrQrr6zOA3PcblVvyAVn+yedpcPmuqmOCH+r dvKTSj7SyoHRRkQozdrkLNLEmRGVAsoaAfxKeKh0a58czRKIRvpFy8Ez3x7oKP5WZa1IkpRqicd qHCRfByUdDSgFaKnBJKNByqlTbc5LvyeM X-Received: by 2002:a05:6214:5188:b0:680:b2aa:c746 with SMTP id kl8-20020a056214518800b00680b2aac746mr7289086qvb.64.1705319685912; Mon, 15 Jan 2024 03:54:45 -0800 (PST) X-Received: by 2002:a05:6214:5188:b0:680:b2aa:c746 with SMTP id kl8-20020a056214518800b00680b2aac746mr7289065qvb.64.1705319685537; Mon, 15 Jan 2024 03:54:45 -0800 (PST) Received: from sgarzare-redhat (host-82-53-134-159.retail.telecomitalia.it. [82.53.134.159]) by smtp.gmail.com with ESMTPSA id u4-20020a0ced24000000b00680ec916840sm3273715qvq.118.2024.01.15.03.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 03:54:44 -0800 (PST) Date: Mon, 15 Jan 2024 12:54:38 +0100 From: Stefano Garzarella To: Arseniy Krasnov Cc: Stefan Hajnoczi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Michael S. Tsirkin" , Jason Wang , Bobby Eshleman , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@sberdevices.ru, oxffffaa@gmail.com Subject: Re: [RFC PATCH v1] vsock/test: add '--peer-port' input argument Message-ID: <4uvvqjlo6ncoyts3rv3dd7joxrgrde4q2ddjd2eexclhhxx2zm@27thero57yam> References: <20240112212110.1906150-1-avkrasnov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20240112212110.1906150-1-avkrasnov@salutedevices.com> Hi Arseniy, thanks for this patch! On Sat, Jan 13, 2024 at 12:21:10AM +0300, Arseniy Krasnov wrote: >Implement port for given CID as input argument instead of using >hardcoded value '1234'. This allows to run different test instances >on a single CID. Port argument is not required parameter and if it is >not set, then default value will be '1234' - thus we preserve previous >behaviour. > >Signed-off-by: Arseniy Krasnov >--- > tools/testing/vsock/util.c | 17 +++- > tools/testing/vsock/util.h | 4 + > tools/testing/vsock/vsock_diag_test.c | 18 ++++- > tools/testing/vsock/vsock_test.c | 96 +++++++++++++---------- > tools/testing/vsock/vsock_test_zerocopy.c | 12 +-- > tools/testing/vsock/vsock_uring_test.c | 16 +++- > 6 files changed, 107 insertions(+), 56 deletions(-) > >diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c >index ae2b33c21c45..554b290fefdc 100644 >--- a/tools/testing/vsock/util.c >+++ b/tools/testing/vsock/util.c >@@ -33,8 +33,7 @@ void init_signals(void) > signal(SIGPIPE, SIG_IGN); > } > >-/* Parse a CID in string representation */ >-unsigned int parse_cid(const char *str) >+static unsigned int parse_uint(const char *str, const char *err_str) > { > char *endptr = NULL; > unsigned long n; >@@ -42,12 +41,24 @@ unsigned int parse_cid(const char *str) > errno = 0; > n = strtoul(str, &endptr, 10); > if (errno || *endptr != '\0') { >- fprintf(stderr, "malformed CID \"%s\"\n", str); >+ fprintf(stderr, "malformed %s \"%s\"\n", err_str, str); > exit(EXIT_FAILURE); > } > return n; > } > >+/* Parse a CID in string representation */ >+unsigned int parse_cid(const char *str) >+{ >+ return parse_uint(str, "CID"); >+} >+ >+/* Parse a port in string representation */ >+unsigned int parse_port(const char *str) >+{ >+ return parse_uint(str, "port"); >+} >+ > /* Wait for the remote to close the connection */ > void vsock_wait_remote_close(int fd) > { >diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h >index 03c88d0cb861..e95e62485959 100644 >--- a/tools/testing/vsock/util.h >+++ b/tools/testing/vsock/util.h >@@ -12,10 +12,13 @@ enum test_mode { > TEST_MODE_SERVER > }; > >+#define DEFAULT_PEER_PORT 1234 >+ > /* Test runner options */ > struct test_opts { > enum test_mode mode; > unsigned int peer_cid; >+ unsigned int peer_port; > }; > > /* A test case definition. Test functions must print failures to stderr and >@@ -35,6 +38,7 @@ struct test_case { > > void init_signals(void); > unsigned int parse_cid(const char *str); >+unsigned int parse_port(const char *str); > int vsock_stream_connect(unsigned int cid, unsigned int port); > int vsock_bind_connect(unsigned int cid, unsigned int port, > unsigned int bind_port, int type); >diff --git a/tools/testing/vsock/vsock_diag_test.c b/tools/testing/vsock/vsock_diag_test.c >index fa927ad16f8a..5e6049226b77 100644 >--- a/tools/testing/vsock/vsock_diag_test.c >+++ b/tools/testing/vsock/vsock_diag_test.c >@@ -342,7 +342,7 @@ static void test_listen_socket_server(const struct test_opts *opts) > } addr = { > .svm = { > .svm_family = AF_VSOCK, >- .svm_port = 1234, >+ .svm_port = opts->peer_port, > .svm_cid = VMADDR_CID_ANY, > }, > }; >@@ -378,7 +378,7 @@ static void test_connect_client(const struct test_opts *opts) > LIST_HEAD(sockets); > struct vsock_stat *st; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -403,7 +403,7 @@ static void test_connect_server(const struct test_opts *opts) > LIST_HEAD(sockets); > int client_fd; > >- client_fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ client_fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (client_fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -461,6 +461,11 @@ static const struct option longopts[] = { > .has_arg = required_argument, > .val = 'p', > }, >+ { >+ .name = "peer-port", >+ .has_arg = required_argument, >+ .val = 'q', >+ }, > { > .name = "list", > .has_arg = no_argument, >@@ -481,7 +486,7 @@ static const struct option longopts[] = { > > static void usage(void) > { >- fprintf(stderr, "Usage: vsock_diag_test [--help] [--control-host=] --control-port= --mode=client|server --peer-cid= [--list] [--skip=]\n" >+ fprintf(stderr, "Usage: vsock_diag_test [--help] [--control-host=] --control-port= --mode=client|server --peer-cid= [--peer-port=] [--list] [--skip=]\n" > "\n" > " Server: vsock_diag_test --control-port=1234 --mode=server --peer-cid=3\n" > " Client: vsock_diag_test --control-host=192.168.0.1 --control-port=1234 --mode=client --peer-cid=2\n" >@@ -503,6 +508,7 @@ static void usage(void) > " --control-port Server port to listen on/connect to\n" > " --mode client|server Server or client mode\n" > " --peer-cid CID of the other side\n" >+ " --peer-port Port of the other side\n" I'd suggest adding the default value and rewording a bit. Something like this (applied on vsock_test, but should be similar): --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -1595,10 +1595,11 @@ static void usage(void) " --control-port Server port to listen on/connect to\n" " --mode client|server Server or client mode\n" " --peer-cid CID of the other side\n" - " --peer-port Port of the other side\n" + " --peer-port AF_VSOCK port used for the test [default: %d]\n" " --list List of tests that will be executed\n" " --skip Test ID to skip;\n" - " use multiple --skip options to skip more tests\n" + " use multiple --skip options to skip more tests\n", + DEFAULT_PEER_PORT ); exit(EXIT_FAILURE); } > " --list List of tests that will be executed\n" > " --skip Test ID to skip;\n" > " use multiple --skip options to skip more tests\n" >@@ -517,6 +523,7 @@ int main(int argc, char **argv) > struct test_opts opts = { > .mode = TEST_MODE_UNSET, > .peer_cid = VMADDR_CID_ANY, >+ .peer_port = DEFAULT_PEER_PORT I'd add a comma: .peer_port = DEFAULT_PEER_PORT, > }; > > init_signals(); >@@ -544,6 +551,9 @@ int main(int argc, char **argv) > case 'p': > opts.peer_cid = parse_cid(optarg); > break; >+ case 'q': >+ opts.peer_port = parse_port(optarg); >+ break; > case 'P': > control_port = optarg; > break; >diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c >index 66246d81d654..58574f4d1fe1 100644 >--- a/tools/testing/vsock/vsock_test.c >+++ b/tools/testing/vsock/vsock_test.c >@@ -34,7 +34,7 @@ static void test_stream_connection_reset(const struct test_opts *opts) > } addr = { > .svm = { > .svm_family = AF_VSOCK, >- .svm_port = 1234, >+ .svm_port = opts->peer_port, > .svm_cid = opts->peer_cid, > }, > }; >@@ -70,7 +70,7 @@ static void test_stream_bind_only_client(const struct test_opts *opts) > } addr = { > .svm = { > .svm_family = AF_VSOCK, >- .svm_port = 1234, >+ .svm_port = opts->peer_port, > .svm_cid = opts->peer_cid, > }, > }; >@@ -112,7 +112,7 @@ static void test_stream_bind_only_server(const struct test_opts *opts) > } addr = { > .svm = { > .svm_family = AF_VSOCK, >- .svm_port = 1234, >+ .svm_port = opts->peer_port, > .svm_cid = VMADDR_CID_ANY, > }, > }; >@@ -138,7 +138,7 @@ static void test_stream_client_close_client(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -152,7 +152,7 @@ static void test_stream_client_close_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -173,7 +173,7 @@ static void test_stream_server_close_client(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -194,7 +194,7 @@ static void test_stream_server_close_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -215,7 +215,7 @@ static void test_stream_multiconn_client(const struct test_opts *opts) > int i; > > for (i = 0; i < MULTICONN_NFDS; i++) { >- fds[i] = vsock_stream_connect(opts->peer_cid, 1234); >+ fds[i] = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fds[i] < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -239,7 +239,7 @@ static void test_stream_multiconn_server(const struct test_opts *opts) > int i; > > for (i = 0; i < MULTICONN_NFDS; i++) { >- fds[i] = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fds[i] = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fds[i] < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -267,9 +267,9 @@ static void test_msg_peek_client(const struct test_opts *opts, > int i; > > if (seqpacket) >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > else >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > > if (fd < 0) { > perror("connect"); >@@ -295,9 +295,9 @@ static void test_msg_peek_server(const struct test_opts *opts, > int fd; > > if (seqpacket) >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > else >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > > if (fd < 0) { > perror("accept"); >@@ -363,7 +363,7 @@ static void test_seqpacket_msg_bounds_client(const struct test_opts *opts) > int msg_count; > int fd; > >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -434,7 +434,7 @@ static void test_seqpacket_msg_bounds_server(const struct test_opts *opts) > struct msghdr msg = {0}; > struct iovec iov = {0}; > >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -505,7 +505,7 @@ static void test_seqpacket_msg_trunc_client(const struct test_opts *opts) > int fd; > char buf[MESSAGE_TRUNC_SZ]; > >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -524,7 +524,7 @@ static void test_seqpacket_msg_trunc_server(const struct test_opts *opts) > struct msghdr msg = {0}; > struct iovec iov = {0}; > >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -575,7 +575,7 @@ static void test_seqpacket_timeout_client(const struct test_opts *opts) > time_t read_enter_ns; > time_t read_overhead_ns; > >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -620,7 +620,7 @@ static void test_seqpacket_timeout_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -639,7 +639,7 @@ static void test_seqpacket_bigmsg_client(const struct test_opts *opts) > > len = sizeof(sock_buf_size); > >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -671,7 +671,7 @@ static void test_seqpacket_bigmsg_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -692,7 +692,7 @@ static void test_seqpacket_invalid_rec_buffer_client(const struct test_opts *opt > unsigned char *buf2; > int buf_size = getpagesize() * 3; > >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -732,7 +732,7 @@ static void test_seqpacket_invalid_rec_buffer_server(const struct test_opts *opt > int flags = MAP_PRIVATE | MAP_ANONYMOUS; > int i; > >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -808,7 +808,7 @@ static void test_stream_poll_rcvlowat_server(const struct test_opts *opts) > int fd; > int i; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -839,7 +839,7 @@ static void test_stream_poll_rcvlowat_client(const struct test_opts *opts) > short poll_flags; > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -906,9 +906,9 @@ static void test_inv_buf_client(const struct test_opts *opts, bool stream) > int fd; > > if (stream) >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > else >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > > if (fd < 0) { > perror("connect"); >@@ -941,9 +941,9 @@ static void test_inv_buf_server(const struct test_opts *opts, bool stream) > int fd; > > if (stream) >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > else >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > > if (fd < 0) { > perror("accept"); >@@ -986,7 +986,7 @@ static void test_stream_virtio_skb_merge_client(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -1015,7 +1015,7 @@ static void test_stream_virtio_skb_merge_server(const struct test_opts *opts) > unsigned char buf[64]; > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -1108,7 +1108,7 @@ static void test_stream_shutwr_client(const struct test_opts *opts) > > sigaction(SIGPIPE, &act, NULL); > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -1130,7 +1130,7 @@ static void test_stream_shutwr_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -1151,7 +1151,7 @@ static void test_stream_shutrd_client(const struct test_opts *opts) > > sigaction(SIGPIPE, &act, NULL); > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -1170,7 +1170,7 @@ static void test_stream_shutrd_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -1193,7 +1193,7 @@ static void test_double_bind_connect_server(const struct test_opts *opts) > struct sockaddr_vm sa_client; > socklen_t socklen_client = sizeof(sa_client); > >- listen_fd = vsock_stream_listen(VMADDR_CID_ANY, 1234); >+ listen_fd = vsock_stream_listen(VMADDR_CID_ANY, opts->peer_port); > > for (i = 0; i < 2; i++) { > control_writeln("LISTENING"); >@@ -1226,7 +1226,13 @@ static void test_double_bind_connect_client(const struct test_opts *opts) > /* Wait until server is ready to accept a new connection */ > control_expectln("LISTENING"); > >- client_fd = vsock_bind_connect(opts->peer_cid, 1234, 4321, SOCK_STREAM); >+ /* We use 'peer_port + 1' as "some" port for the 'bind()' >+ * call. It is safe for overflow, but must be considered, >+ * when running multiple test applications simultaneously >+ * where 'peer-port' argument differs by 1. >+ */ It is pre-existing, but I think we can fix here: Should we mention in the help/usage that we use peer_port and peer_port + 1 during the test? Something like this: @@ -1588,6 +1588,9 @@ static void usage(void) "connect to.\n" "\n" "The CID of the other side must be given with --peer-cid=.\n" + "During the test, two AF_VSOCK ports will be used: the port\n" + "specified with --peer-port= (or the default port)\n" + "and the next one.\n" "\n" "Options:\n" " --help This help message\n" >+ client_fd = vsock_bind_connect(opts->peer_cid, opts->peer_port, >+ opts->peer_port + 1, SOCK_STREAM); > > close(client_fd); > } >@@ -1246,7 +1252,7 @@ static void test_stream_rcvlowat_def_cred_upd_client(const struct test_opts *opt > void *buf; > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -1282,7 +1288,7 @@ static void test_stream_credit_update_test(const struct test_opts *opts, > void *buf; > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -1542,6 +1548,11 @@ static const struct option longopts[] = { > .has_arg = required_argument, > .val = 'p', > }, >+ { >+ .name = "peer-port", >+ .has_arg = required_argument, >+ .val = 'q', >+ }, > { > .name = "list", > .has_arg = no_argument, >@@ -1562,7 +1573,7 @@ static const struct option longopts[] = { > > static void usage(void) > { >- fprintf(stderr, "Usage: vsock_test [--help] [--control-host=] --control-port= --mode=client|server --peer-cid= [--list] [--skip=]\n" >+ fprintf(stderr, "Usage: vsock_test [--help] [--control-host=] --control-port= --mode=client|server --peer-cid= [--peer-port=] [--list] [--skip=]\n" > "\n" > " Server: vsock_test --control-port=1234 --mode=server --peer-cid=3\n" > " Client: vsock_test --control-host=192.168.0.1 --control-port=1234 --mode=client --peer-cid=2\n" >@@ -1584,6 +1595,7 @@ static void usage(void) > " --control-port Server port to listen on/connect to\n" > " --mode client|server Server or client mode\n" > " --peer-cid CID of the other side\n" >+ " --peer-port Port of the other side\n" Ditto (the default and rewording). > " --list List of tests that will be executed\n" > " --skip Test ID to skip;\n" > " use multiple --skip options to > skip more tests\n" >@@ -1598,6 +1610,7 @@ int main(int argc, char **argv) > struct test_opts opts = { > .mode = TEST_MODE_UNSET, > .peer_cid = VMADDR_CID_ANY, >+ .peer_port = DEFAULT_PEER_PORT Ditto (the comma). > }; > > srand(time(NULL)); >@@ -1626,6 +1639,9 @@ int main(int argc, char **argv) > case 'p': > opts.peer_cid = parse_cid(optarg); > break; >+ case 'q': >+ opts.peer_port = parse_port(optarg); >+ break; > case 'P': > control_port = optarg; > break; >diff --git a/tools/testing/vsock/vsock_test_zerocopy.c b/tools/testing/vsock/vsock_test_zerocopy.c >index a16ff76484e6..04c376b6937f 100644 >--- a/tools/testing/vsock/vsock_test_zerocopy.c >+++ b/tools/testing/vsock/vsock_test_zerocopy.c >@@ -152,9 +152,9 @@ static void test_client(const struct test_opts *opts, > int fd; > > if (sock_seqpacket) >- fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ fd = vsock_seqpacket_connect(opts->peer_cid, opts->peer_port); > else >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > > if (fd < 0) { > perror("connect"); >@@ -248,9 +248,9 @@ static void test_server(const struct test_opts *opts, > int fd; > > if (sock_seqpacket) >- fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > else >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > > if (fd < 0) { > perror("accept"); >@@ -323,7 +323,7 @@ void test_stream_msgzcopy_empty_errq_client(const struct test_opts *opts) > ssize_t res; > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -347,7 +347,7 @@ void test_stream_msgzcopy_empty_errq_server(const struct test_opts *opts) > { > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >diff --git a/tools/testing/vsock/vsock_uring_test.c b/tools/testing/vsock/vsock_uring_test.c >index d976d35f0ba9..4e363c6d6e4d 100644 >--- a/tools/testing/vsock/vsock_uring_test.c >+++ b/tools/testing/vsock/vsock_uring_test.c >@@ -66,7 +66,7 @@ static void vsock_io_uring_client(const struct test_opts *opts, > struct msghdr msg; > int fd; > >- fd = vsock_stream_connect(opts->peer_cid, 1234); >+ fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); > if (fd < 0) { > perror("connect"); > exit(EXIT_FAILURE); >@@ -120,7 +120,7 @@ static void vsock_io_uring_server(const struct test_opts *opts, > void *data; > int fd; > >- fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL); > if (fd < 0) { > perror("accept"); > exit(EXIT_FAILURE); >@@ -247,6 +247,11 @@ static const struct option longopts[] = { > .has_arg = required_argument, > .val = 'p', > }, >+ { >+ .name = "peer-port", >+ .has_arg = required_argument, >+ .val = 'q', >+ }, > { > .name = "help", > .has_arg = no_argument, >@@ -257,7 +262,7 @@ static const struct option longopts[] = { > > static void usage(void) > { >- fprintf(stderr, "Usage: vsock_uring_test [--help] [--control-host=] --control-port= --mode=client|server --peer-cid=\n" >+ fprintf(stderr, "Usage: vsock_uring_test [--help] [--control-host=] --control-port= --mode=client|server --peer-cid= [--peer-port=]\n" > "\n" > " Server: vsock_uring_test --control-port=1234 --mode=server --peer-cid=3\n" > " Client: vsock_uring_test --control-host=192.168.0.1 --control-port=1234 --mode=client --peer-cid=2\n" >@@ -271,6 +276,7 @@ static void usage(void) > " --control-port Server port to listen on/connect to\n" > " --mode client|server Server or client mode\n" > " --peer-cid CID of the other side\n" >+ " --peer-port Port of the other side\n" Ditto (the default and rewording). > ); > exit(EXIT_FAILURE); > } >@@ -282,6 +288,7 @@ int main(int argc, char **argv) > struct test_opts opts = { > .mode = TEST_MODE_UNSET, > .peer_cid = VMADDR_CID_ANY, >+ .peer_port = DEFAULT_PEER_PORT Ditto (the comma). > }; > > init_signals(); >@@ -309,6 +316,9 @@ int main(int argc, char **argv) > case 'p': > opts.peer_cid = parse_cid(optarg); > break; >+ case 'q': >+ opts.peer_port = parse_port(optarg); >+ break; > case 'P': > control_port = optarg; > break; >-- >2.25.1 > The rest LGTM, I think you can send the next version without RFC, targeting net-next. Thanks, Stefano