2020-03-09 14:12:38 +03:00
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2020 Cloudflare Ltd https://cloudflare.com */
# include <linux/skmsg.h>
# include <net/sock.h>
# include <net/udp.h>
2021-03-31 05:32:34 +03:00
# include <net/inet_common.h>
# include "udp_impl.h"
static struct proto * udpv6_prot_saved __read_mostly ;
static int sk_udp_recvmsg ( struct sock * sk , struct msghdr * msg , size_t len ,
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
int flags , int * addr_len )
2021-03-31 05:32:34 +03:00
{
# if IS_ENABLED(CONFIG_IPV6)
if ( sk - > sk_family = = AF_INET6 )
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
return udpv6_prot_saved - > recvmsg ( sk , msg , len , flags , addr_len ) ;
2021-03-31 05:32:34 +03:00
# endif
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
return udp_prot . recvmsg ( sk , msg , len , flags , addr_len ) ;
2021-03-31 05:32:34 +03:00
}
2021-06-15 05:13:35 +03:00
static bool udp_sk_has_data ( struct sock * sk )
{
return ! skb_queue_empty ( & udp_sk ( sk ) - > reader_queue ) | |
! skb_queue_empty ( & sk - > sk_receive_queue ) ;
}
static bool psock_has_data ( struct sk_psock * psock )
{
return ! skb_queue_empty ( & psock - > ingress_skb ) | |
! sk_psock_queue_empty ( psock ) ;
}
# define udp_msg_has_data(__sk, __psock) \
( { udp_sk_has_data ( __sk ) | | psock_has_data ( __psock ) ; } )
2021-06-30 01:45:27 +03:00
static int udp_msg_wait_data ( struct sock * sk , struct sk_psock * psock ,
long timeo )
2021-06-15 05:13:35 +03:00
{
DEFINE_WAIT_FUNC ( wait , woken_wake_function ) ;
int ret = 0 ;
if ( sk - > sk_shutdown & RCV_SHUTDOWN )
return 1 ;
if ( ! timeo )
return ret ;
add_wait_queue ( sk_sleep ( sk ) , & wait ) ;
sk_set_bit ( SOCKWQ_ASYNC_WAITDATA , sk ) ;
ret = udp_msg_has_data ( sk , psock ) ;
if ( ! ret ) {
wait_woken ( & wait , TASK_INTERRUPTIBLE , timeo ) ;
ret = udp_msg_has_data ( sk , psock ) ;
}
sk_clear_bit ( SOCKWQ_ASYNC_WAITDATA , sk ) ;
remove_wait_queue ( sk_sleep ( sk ) , & wait ) ;
return ret ;
}
2021-03-31 05:32:34 +03:00
static int udp_bpf_recvmsg ( struct sock * sk , struct msghdr * msg , size_t len ,
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
int flags , int * addr_len )
2021-03-31 05:32:34 +03:00
{
struct sk_psock * psock ;
int copied , ret ;
if ( unlikely ( flags & MSG_ERRQUEUE ) )
return inet_recv_error ( sk , msg , len , addr_len ) ;
psock = sk_psock_get ( sk ) ;
if ( unlikely ( ! psock ) )
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
return sk_udp_recvmsg ( sk , msg , len , flags , addr_len ) ;
2021-03-31 05:32:34 +03:00
2021-06-15 05:13:35 +03:00
if ( ! psock_has_data ( psock ) ) {
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
ret = sk_udp_recvmsg ( sk , msg , len , flags , addr_len ) ;
2021-03-31 05:32:34 +03:00
goto out ;
}
msg_bytes_ready :
copied = sk_msg_recvmsg ( sk , psock , msg , len , flags ) ;
if ( ! copied ) {
long timeo ;
2021-05-17 05:23:48 +03:00
int data ;
2021-03-31 05:32:34 +03:00
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
timeo = sock_rcvtimeo ( sk , flags & MSG_DONTWAIT ) ;
2021-06-30 01:45:27 +03:00
data = udp_msg_wait_data ( sk , psock , timeo ) ;
2021-03-31 05:32:34 +03:00
if ( data ) {
2021-06-15 05:13:35 +03:00
if ( psock_has_data ( psock ) )
2021-03-31 05:32:34 +03:00
goto msg_bytes_ready ;
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
f4b41f062c42 ("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: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 15:49:55 +03:00
ret = sk_udp_recvmsg ( sk , msg , len , flags , addr_len ) ;
2021-03-31 05:32:34 +03:00
goto out ;
}
copied = - EAGAIN ;
}
ret = copied ;
out :
sk_psock_put ( sk , psock ) ;
return ret ;
}
2020-03-09 14:12:38 +03:00
enum {
UDP_BPF_IPV4 ,
UDP_BPF_IPV6 ,
UDP_BPF_NUM_PROTS ,
} ;
static DEFINE_SPINLOCK ( udpv6_prot_lock ) ;
static struct proto udp_bpf_prots [ UDP_BPF_NUM_PROTS ] ;
static void udp_bpf_rebuild_protos ( struct proto * prot , const struct proto * base )
{
* prot = * base ;
prot - > close = sock_map_close ;
2021-03-31 05:32:34 +03:00
prot - > recvmsg = udp_bpf_recvmsg ;
2021-10-08 23:33:05 +03:00
prot - > sock_is_readable = sk_msg_is_readable ;
2020-03-09 14:12:38 +03:00
}
2020-08-21 13:29:43 +03:00
static void udp_bpf_check_v6_needs_rebuild ( struct proto * ops )
2020-03-09 14:12:38 +03:00
{
2020-08-21 13:29:43 +03:00
if ( unlikely ( ops ! = smp_load_acquire ( & udpv6_prot_saved ) ) ) {
2020-03-09 14:12:38 +03:00
spin_lock_bh ( & udpv6_prot_lock ) ;
if ( likely ( ops ! = udpv6_prot_saved ) ) {
udp_bpf_rebuild_protos ( & udp_bpf_prots [ UDP_BPF_IPV6 ] , ops ) ;
smp_store_release ( & udpv6_prot_saved , ops ) ;
}
spin_unlock_bh ( & udpv6_prot_lock ) ;
}
}
static int __init udp_bpf_v4_build_proto ( void )
{
udp_bpf_rebuild_protos ( & udp_bpf_prots [ UDP_BPF_IPV4 ] , & udp_prot ) ;
return 0 ;
}
2021-07-14 18:47:50 +03:00
late_initcall ( udp_bpf_v4_build_proto ) ;
2020-03-09 14:12:38 +03:00
2021-04-07 06:21:11 +03:00
int udp_bpf_update_proto ( struct sock * sk , struct sk_psock * psock , bool restore )
2020-03-09 14:12:38 +03:00
{
int family = sk - > sk_family = = AF_INET ? UDP_BPF_IPV4 : UDP_BPF_IPV6 ;
2021-03-31 05:32:31 +03:00
if ( restore ) {
sk - > sk_write_space = psock - > saved_write_space ;
WRITE_ONCE ( sk - > sk_prot , psock - > sk_proto ) ;
return 0 ;
}
2020-03-09 14:12:38 +03:00
2020-08-21 13:29:43 +03:00
if ( sk - > sk_family = = AF_INET6 )
udp_bpf_check_v6_needs_rebuild ( psock - > sk_proto ) ;
2020-03-09 14:12:38 +03:00
2021-03-31 05:32:31 +03:00
WRITE_ONCE ( sk - > sk_prot , & udp_bpf_prots [ family ] ) ;
return 0 ;
2020-03-09 14:12:38 +03:00
}
2021-03-31 05:32:31 +03:00
EXPORT_SYMBOL_GPL ( udp_bpf_update_proto ) ;