Commit ec095263 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Paolo Abeni
Browse files

net: remove noblock parameter from recvmsg() entities 



The internal recvmsg() functions have two parameters 'flags' and 'noblock'
that were merged inside skb_recv_datagram(). As a follow up patch to commit
f4b41f06 ("net: remove noblock parameter from skb_recv_datagram()")
this patch removes the separate 'noblock' parameter for recvmsg().

Analogue to the referenced patch for skb_recv_datagram() the 'flags' and
'noblock' parameters are unnecessarily split up with e.g.

err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
                           flags & ~MSG_DONTWAIT, &addr_len);

or in

err = INDIRECT_CALL_2(sk->sk_prot->recvmsg, tcp_recvmsg, udp_recvmsg,
                      sk, msg, size, flags & MSG_DONTWAIT,
                      flags & ~MSG_DONTWAIT, &addr_len);

instead of simply using only flags all the time and check for MSG_DONTWAIT
where needed (to preserve for the formerly separated no(n)block condition).

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f0159809

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ void chtls_shutdown(struct sock *sk, int how); 
void chtls_destroy_sock(struct sock *sk);

int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);

int chtls_recvmsg(struct sock *sk, struct msghdr *msg,

		  size_t len, int nonblock, int flags, int *addr_len);

		  size_t len, int flags, int *addr_len);

int chtls_sendpage(struct sock *sk, struct page *page,

		   int offset, size_t size, int flags);

int send_tx_flowc_wr(struct sock *sk, int compl,

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c

+10 −12
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ static void chtls_cleanup_rbuf(struct sock *sk, int copied) 
}



static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

			    int nonblock, int flags, int *addr_len)

			    int flags, int *addr_len)

{

	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);

	struct chtls_hws *hws = &csk->tlshws;
@@ -1441,7 +1441,7 @@ static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 


	buffers_freed = 0;



	timeo = sock_rcvtimeo(sk, nonblock);

	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);

	target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);



	if (unlikely(csk_flag(sk, CSK_UPDATE_RCV_WND)))
@@ -1616,7 +1616,7 @@ static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
 * Peek at data in a socket's receive buffer.

 */

static int peekmsg(struct sock *sk, struct msghdr *msg,

		   size_t len, int nonblock, int flags)

		   size_t len, int flags)

{

	struct tcp_sock *tp = tcp_sk(sk);

	u32 peek_seq, offset;
@@ -1626,7 +1626,7 @@ static int peekmsg(struct sock *sk, struct msghdr *msg, 
	long timeo;



	lock_sock(sk);

	timeo = sock_rcvtimeo(sk, nonblock);

	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);

	peek_seq = tp->copied_seq;



	do {
@@ -1737,7 +1737,7 @@ static int peekmsg(struct sock *sk, struct msghdr *msg, 
}



int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

		  int nonblock, int flags, int *addr_len)

		  int flags, int *addr_len)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct chtls_sock *csk;
@@ -1750,25 +1750,23 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
	buffers_freed = 0;



	if (unlikely(flags & MSG_OOB))

		return tcp_prot.recvmsg(sk, msg, len, nonblock, flags,

					addr_len);

		return tcp_prot.recvmsg(sk, msg, len, flags, addr_len);



	if (unlikely(flags & MSG_PEEK))

		return peekmsg(sk, msg, len, nonblock, flags);

		return peekmsg(sk, msg, len, flags);



	if (sk_can_busy_loop(sk) &&

	    skb_queue_empty_lockless(&sk->sk_receive_queue) &&

	    sk->sk_state == TCP_ESTABLISHED)

		sk_busy_loop(sk, nonblock);

		sk_busy_loop(sk, flags & MSG_DONTWAIT);



	lock_sock(sk);

	csk = rcu_dereference_sk_user_data(sk);



	if (is_tls_rx(csk))

		return chtls_pt_recvmsg(sk, msg, len, nonblock,

					flags, addr_len);

		return chtls_pt_recvmsg(sk, msg, len, flags, addr_len);



	timeo = sock_rcvtimeo(sk, nonblock);

	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);

	target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);



	if (unlikely(csk_flag(sk, CSK_UPDATE_RCV_WND)))

include/net/ping.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info); 
int  ping_getfrag(void *from, char *to, int offset, int fraglen, int odd,

		  struct sk_buff *);



int  ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,

int  ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

		  int flags, int *addr_len);

int  ping_common_sendmsg(int family, struct msghdr *msg, size_t len,

			 void *user_icmph, size_t icmph_len);

include/net/sctp/sctp.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, 
		    struct sctp_association *asoc);

extern struct percpu_counter sctp_sockets_allocated;

int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *);

struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int, int *);

struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int *);



typedef int (*sctp_callback_t)(struct sctp_endpoint *, struct sctp_transport *, void *);

void sctp_transport_walk_start(struct rhashtable_iter *iter);

include/net/sock.h

+1 −2
Original line number Diff line number Diff line
@@ -1202,8 +1202,7 @@ struct proto { 
	int			(*sendmsg)(struct sock *sk, struct msghdr *msg,

					   size_t len);

	int			(*recvmsg)(struct sock *sk, struct msghdr *msg,

					   size_t len, int noblock, int flags,

					   int *addr_len);

					   size_t len, int flags, int *addr_len);

	int			(*sendpage)(struct sock *sk, struct page *page,

					int offset, size_t size, int flags);

	int			(*bind)(struct sock *sk,