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;
Message-ID: <3e7b020e-329b-6800-2b60-08207bda8b03@gmail.com>
Date:   Fri, 4 Aug 2023 15:48:34 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [RFC PATCH v1 2/2] test/vsock: shutdowned socket test
Content-Language: en-US
To:     Stefano Garzarella <sgarzare@redhat.com>,
        Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Cc:     Stefan Hajnoczi <stefanha@redhat.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        "Michael S. Tsirkin" <mst@redhat.com>,
        Jason Wang <jasowang@redhat.com>,
        Bobby Eshleman <bobby.eshleman@bytedance.com>,
        kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel@sberdevices.ru
References: <20230801141727.481156-1-AVKrasnov@sberdevices.ru>
 <20230801141727.481156-3-AVKrasnov@sberdevices.ru>
 <76yecufn7766obfi5zae5hpg6yrlestrqocnk56jgnukakkdds@rqbgbhh7xgck>
From:   Arseniy Krasnov <oxffffaa@gmail.com>
In-Reply-To: <76yecufn7766obfi5zae5hpg6yrlestrqocnk56jgnukakkdds@rqbgbhh7xgck>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 02.08.2023 11:00, Stefano Garzarella wrote:
> On Tue, Aug 01, 2023 at 05:17:27PM +0300, Arseniy Krasnov wrote:
>> This adds two tests for 'shutdown()' call. It checks that SIGPIPE is
>> sent when MSG_NOSIGNAL is not set and vice versa. Both flags SHUT_WR
>> and SHUT_RD are tested.
>>
>> Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
>> ---
>> tools/testing/vsock/vsock_test.c | 138 +++++++++++++++++++++++++++++++
>> 1 file changed, 138 insertions(+)
>>
>> diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
>> index 90718c2fd4ea..21d40a8d881c 100644
>> --- a/tools/testing/vsock/vsock_test.c
>> +++ b/tools/testing/vsock/vsock_test.c
>> @@ -19,6 +19,7 @@
>> #include <time.h>
>> #include <sys/mman.h>
>> #include <poll.h>
>> +#include <signal.h>
>>
>> #include "timeout.h"
>> #include "control.h"
>> @@ -1170,6 +1171,133 @@ static void test_seqpacket_msg_peek_server(const struct test_opts *opts)
>>     return test_msg_peek_server(opts, true);
>> }
>>
>> +static bool have_sigpipe;
>                  ^
> We should define it as `volatile sig_atomic_t`:
> 
> the behavior is undefined if the signal handler refers to any object
> [CX] [Option Start]  other than errno [Option End]  with static storage
> duration other than by assigning a value to an object declared as
> volatile sig_atomic_t

Yes, exactly, I forgot about sig_atomic_t.

I'll fix it.

Thanks, Arseniy

> 
> https://pubs.opengroup.org/onlinepubs/9699919799/functions/signal.html
> 
> The rest LGTM!
> 
> Thanks,
> Stefano
> 
>> +
>> +static void sigpipe(int signo)
>> +{
>> +    have_sigpipe = true;
>> +}
>> +
>> +static void test_stream_check_sigpipe(int fd)
>> +{
>> +    ssize_t res;
>> +
>> +    have_sigpipe = false;
>> +
>> +    res = send(fd, "A", 1, 0);
>> +    if (res != -1) {
>> +        fprintf(stderr, "expected send(2) failure, got %zi\n", res);
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    if (!have_sigpipe) {
>> +        fprintf(stderr, "SIGPIPE expected\n");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    have_sigpipe = false;
>> +
>> +    res = send(fd, "A", 1, MSG_NOSIGNAL);
>> +    if (res != -1) {
>> +        fprintf(stderr, "expected send(2) failure, got %zi\n", res);
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    if (have_sigpipe) {
>> +        fprintf(stderr, "SIGPIPE not expected\n");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +}
>> +
>> +static void test_stream_shutwr_client(const struct test_opts *opts)
>> +{
>> +    int fd;
>> +
>> +    struct sigaction act = {
>> +        .sa_handler = sigpipe,
>> +    };
>> +
>> +    sigaction(SIGPIPE, &act, NULL);
>> +
>> +    fd = vsock_stream_connect(opts->peer_cid, 1234);
>> +    if (fd < 0) {
>> +        perror("connect");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    if (shutdown(fd, SHUT_WR)) {
>> +        perror("shutdown");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    test_stream_check_sigpipe(fd);
>> +
>> +    control_writeln("CLIENTDONE");
>> +
>> +    close(fd);
>> +}
>> +
>> +static void test_stream_shutwr_server(const struct test_opts *opts)
>> +{
>> +    int fd;
>> +
>> +    fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL);
>> +    if (fd < 0) {
>> +        perror("accept");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    control_expectln("CLIENTDONE");
>> +
>> +    close(fd);
>> +}
>> +
>> +static void test_stream_shutrd_client(const struct test_opts *opts)
>> +{
>> +    int fd;
>> +
>> +    struct sigaction act = {
>> +        .sa_handler = sigpipe,
>> +    };
>> +
>> +    sigaction(SIGPIPE, &act, NULL);
>> +
>> +    fd = vsock_stream_connect(opts->peer_cid, 1234);
>> +    if (fd < 0) {
>> +        perror("connect");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    control_expectln("SHUTRDDONE");
>> +
>> +    test_stream_check_sigpipe(fd);
>> +
>> +    control_writeln("CLIENTDONE");
>> +
>> +    close(fd);
>> +}
>> +
>> +static void test_stream_shutrd_server(const struct test_opts *opts)
>> +{
>> +    int fd;
>> +
>> +    fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL);
>> +    if (fd < 0) {
>> +        perror("accept");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    if (shutdown(fd, SHUT_RD)) {
>> +        perror("shutdown");
>> +        exit(EXIT_FAILURE);
>> +    }
>> +
>> +    control_writeln("SHUTRDDONE");
>> +    control_expectln("CLIENTDONE");
>> +
>> +    close(fd);
>> +}
>> +
>> static struct test_case test_cases[] = {
>>     {
>>         .name = "SOCK_STREAM connection reset",
>> @@ -1250,6 +1378,16 @@ static struct test_case test_cases[] = {
>>         .run_client = test_seqpacket_msg_peek_client,
>>         .run_server = test_seqpacket_msg_peek_server,
>>     },
>> +    {
>> +        .name = "SOCK_STREAM SHUT_WR",
>> +        .run_client = test_stream_shutwr_client,
>> +        .run_server = test_stream_shutwr_server,
>> +    },
>> +    {
>> +        .name = "SOCK_STREAM SHUT_RD",
>> +        .run_client = test_stream_shutrd_client,
>> +        .run_server = test_stream_shutrd_server,
>> +    },
>>     {},
>> };
>>
>> -- 
>> 2.25.1
>>
>