mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
Merge branch 'tcp-pass-back-data-left-in-socket-after-receive' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux into for-5.19/io_uring-net
Merge net branch with the required patch for supporting the io_uring feature that passes back whether we had more data in the socket or not. * 'tcp-pass-back-data-left-in-socket-after-receive' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux: tcp: pass back data left in socket after receive
This commit is contained in:
commit
a4c7685360
2 changed files with 15 additions and 7 deletions
|
@ -50,6 +50,9 @@ struct linger {
|
|||
struct msghdr {
|
||||
void *msg_name; /* ptr to socket address structure */
|
||||
int msg_namelen; /* size of socket address structure */
|
||||
|
||||
int msg_inq; /* output, data left in socket */
|
||||
|
||||
struct iov_iter msg_iter; /* data */
|
||||
|
||||
/*
|
||||
|
@ -62,8 +65,9 @@ struct msghdr {
|
|||
void __user *msg_control_user;
|
||||
};
|
||||
bool msg_control_is_user : 1;
|
||||
__kernel_size_t msg_controllen; /* ancillary data buffer length */
|
||||
bool msg_get_inq : 1;/* return INQ after receive */
|
||||
unsigned int msg_flags; /* flags on received message */
|
||||
__kernel_size_t msg_controllen; /* ancillary data buffer length */
|
||||
struct kiocb *msg_iocb; /* ptr to iocb for async requests */
|
||||
};
|
||||
|
||||
|
|
|
@ -2335,8 +2335,10 @@ static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len,
|
|||
if (sk->sk_state == TCP_LISTEN)
|
||||
goto out;
|
||||
|
||||
if (tp->recvmsg_inq)
|
||||
if (tp->recvmsg_inq) {
|
||||
*cmsg_flags = TCP_CMSG_INQ;
|
||||
msg->msg_get_inq = 1;
|
||||
}
|
||||
timeo = sock_rcvtimeo(sk, nonblock);
|
||||
|
||||
/* Urgent data needs to be handled specially. */
|
||||
|
@ -2559,7 +2561,7 @@ static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len,
|
|||
int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
|
||||
int flags, int *addr_len)
|
||||
{
|
||||
int cmsg_flags = 0, ret, inq;
|
||||
int cmsg_flags = 0, ret;
|
||||
struct scm_timestamping_internal tss;
|
||||
|
||||
if (unlikely(flags & MSG_ERRQUEUE))
|
||||
|
@ -2576,12 +2578,14 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
|
|||
release_sock(sk);
|
||||
sk_defer_free_flush(sk);
|
||||
|
||||
if (cmsg_flags && ret >= 0) {
|
||||
if ((cmsg_flags || msg->msg_get_inq) && ret >= 0) {
|
||||
if (cmsg_flags & TCP_CMSG_TS)
|
||||
tcp_recv_timestamp(msg, sk, &tss);
|
||||
if (cmsg_flags & TCP_CMSG_INQ) {
|
||||
inq = tcp_inq_hint(sk);
|
||||
put_cmsg(msg, SOL_TCP, TCP_CM_INQ, sizeof(inq), &inq);
|
||||
if (msg->msg_get_inq) {
|
||||
msg->msg_inq = tcp_inq_hint(sk);
|
||||
if (cmsg_flags & TCP_CMSG_INQ)
|
||||
put_cmsg(msg, SOL_TCP, TCP_CM_INQ,
|
||||
sizeof(msg->msg_inq), &msg->msg_inq);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue