mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
fbd01e6c44
Now that send might be implemented calling sendto syscall on Linux,
I am seeing some issue in some kernel configurations where tst-cancel4
sendto do not block as expected.
The socket used to force the syscall blocking is used with default
system configuration for buffer sending size, which might not be
suffice to force blocking. This patch fixes it by explicit setting
buffer socket lower than the buffer size used. It also enables sendto
cancellation tests to work in both ways (since internally send is
implemented routing to sendto on Linux kernel).
The patch also removes unrequired make rules on some archictures
for send/recv. The generic nptl Makefile already set the compiler flags
required on some architectures for correct unwinding and libc object
are not strictly required to support unwind (since pthread_cancel
requires linking against libpthread).
Checked on aarch64-linux-gnu and x86_64-linux-gnu. I also did a
sniff test with tst-cancel{4,5} on a simulated mips64-linux-gnu.
* nptl/tst-cancel4-common.h (set_socket_buffer): New function.
* nptl/tst-cancel4-common.c (do_test): Call set_socket_buffer
for socketpair endpoint.
* nptl/tst-cancel4.c (tf_send): Call set_socket_buffer and use
WRITE_BUFFER_SIZE as buffer size for sending socket.
(tf_sendto): Use SOCK_STREAM instead of SOCK_DGRAM and fix an
issue on system where send is implemented with sendto syscall.
* sysdeps/unix/sysv/linux/mips/mips64/Makefile [$(subdir) = socket]
(CFLAGS-recv.c, CFLAGS-send.c): Remove rules.
[$(subdir) = nptl] (CFLAGS-recv.c, CFLAGS-send.c): Likewise.
* sysdeps/unix/sysv/linux/riscv/rv64/Makefile: Remove file.
112 lines
3.3 KiB
C
112 lines
3.3 KiB
C
/* Common definition for tst-cancel4_* tests.
|
|
|
|
Copyright (C) 2016-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <pthread.h>
|
|
|
|
#include <support/check.h>
|
|
#include <support/xthread.h>
|
|
#include <support/xunistd.h>
|
|
|
|
/* Pipe descriptors. */
|
|
static int fds[2];
|
|
|
|
/* Temporary file descriptor, to be closed after each round. */
|
|
static int tempfd = -1;
|
|
static int tempfd2 = -1;
|
|
/* Name of temporary file to be removed after each round. */
|
|
static char *tempfname;
|
|
/* Temporary message queue. */
|
|
static int tempmsg = -1;
|
|
|
|
/* Often used barrier for two threads. */
|
|
static pthread_barrier_t b2;
|
|
|
|
/* The WRITE_BUFFER_SIZE value needs to be chosen such that if we set
|
|
the socket send buffer size to '1', a write of this size on that
|
|
socket will block.
|
|
|
|
The Linux kernel imposes a minimum send socket buffer size which
|
|
has changed over the years. As of Linux 3.10 the value is:
|
|
|
|
2 * (2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff)))
|
|
|
|
which is attempting to make sure that with standard MTUs,
|
|
TCP can always queue up at least 2 full sized packets.
|
|
|
|
Furthermore, there is logic in the socket send paths that
|
|
will allow one more packet (of any size) to be queued up as
|
|
long as some socket buffer space remains. Blocking only
|
|
occurs when we try to queue up a new packet and the send
|
|
buffer space has already been fully consumed.
|
|
|
|
Therefore we must set this value to the largest possible value of
|
|
the formula above (and since it depends upon the size of "struct
|
|
sk_buff", it is dependent upon machine word size etc.) plus some
|
|
slack space. */
|
|
|
|
#define WRITE_BUFFER_SIZE 16384
|
|
|
|
/* Set the send buffer of socket S to 1 byte so any send operation
|
|
done with WRITE_BUFFER_SIZE bytes will force syscall blocking. */
|
|
static void
|
|
set_socket_buffer (int s)
|
|
{
|
|
int val = 1;
|
|
socklen_t len = sizeof(val);
|
|
|
|
TEST_VERIFY_EXIT (setsockopt (s, SOL_SOCKET, SO_SNDBUF, &val,
|
|
sizeof(val)) == 0);
|
|
TEST_VERIFY_EXIT (getsockopt (s, SOL_SOCKET, SO_SNDBUF, &val, &len) == 0);
|
|
TEST_VERIFY_EXIT (val < WRITE_BUFFER_SIZE);
|
|
}
|
|
|
|
/* Cleanup handling test. */
|
|
static int cl_called;
|
|
|
|
static void
|
|
cl (void *arg)
|
|
{
|
|
++cl_called;
|
|
}
|
|
|
|
/* Named pipe used to check for blocking open. It should be closed
|
|
after the cancellation handling. */
|
|
static char fifoname[] = "/tmp/tst-cancel4-fifo-XXXXXX";
|
|
static int fifofd;
|
|
|
|
static void
|
|
__attribute__ ((used))
|
|
cl_fifo (void *arg)
|
|
{
|
|
++cl_called;
|
|
|
|
unlink (fifoname);
|
|
close (fifofd);
|
|
fifofd = -1;
|
|
}
|
|
|
|
struct cancel_tests
|
|
{
|
|
const char *name;
|
|
void *(*tf) (void *);
|
|
int nb;
|
|
int only_early;
|
|
};
|
|
#define ADD_TEST(name, nbar, early) { #name, tf_##name, nbar, early }
|