niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

rxrpc: Call udp_sendmsg() directly

Browse source 
Call udp_sendmsg() and udpv6_sendmsg() directly rather than calling
kernel_sendmsg() as the latter assumes we want a kvec-class iterator.
However, zerocopy explicitly doesn't work with such an iterator.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
This commit is contained in:
David Howells 2022-03-22 11:07:20 +00:00
parent b6c66c4324
commit ed472b0c87
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/ipv6/udp.c
View file

@ -1639,6 +1639,7 @@ do_confirm:
err = 0; err = 0;
goto out; goto out;
} }
EXPORT_SYMBOL(udpv6_sendmsg);
void udpv6_destroy_sock(struct sock *sk) void udpv6_destroy_sock(struct sock *sk)
{ {

37
net/rxrpc/output.c
View file

@ -13,6 +13,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/af_rxrpc.h> #include <net/af_rxrpc.h>
#include <net/udp.h>
#include "ar-internal.h" #include "ar-internal.h"
struct rxrpc_ack_buffer { struct rxrpc_ack_buffer {
@ -23,6 +24,19 @@ struct rxrpc_ack_buffer {
struct rxrpc_ackinfo ackinfo; struct rxrpc_ackinfo ackinfo;
}; };
extern int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
static ssize_t do_udp_sendmsg(struct socket *sk, struct msghdr *msg, size_t len)
{
#if IS_ENABLED(CONFIG_AF_RXRPC_IPV6)
struct sockaddr *sa = msg->msg_name;
if (sa->sa_family == AF_INET6)
return udpv6_sendmsg(sk->sk, msg, len);
#endif
return udp_sendmsg(sk->sk, msg, len);
}
struct rxrpc_abort_buffer { struct rxrpc_abort_buffer {
struct rxrpc_wire_header whdr; struct rxrpc_wire_header whdr;
__be32 abort_code; __be32 abort_code;
@ -258,8 +272,10 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, bool ping,
rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_ping); rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_ping);
rxrpc_inc_stat(call->rxnet, stat_tx_ack_send); rxrpc_inc_stat(call->rxnet, stat_tx_ack_send);
ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 2, len);
conn->params.peer->last_tx_at = ktime_get_seconds(); iov_iter_kvec(&msg.msg_iter, WRITE, iov, 2, len);
ret = do_udp_sendmsg(conn->params.local->socket, &msg, len);
call->peer->last_tx_at = ktime_get_seconds();
if (ret < 0) if (ret < 0)
trace_rxrpc_tx_fail(call->debug_id, serial, ret, trace_rxrpc_tx_fail(call->debug_id, serial, ret,
rxrpc_tx_point_call_ack); rxrpc_tx_point_call_ack);
@ -336,8 +352,8 @@ int rxrpc_send_abort_packet(struct rxrpc_call *call)
serial = atomic_inc_return(&conn->serial); serial = atomic_inc_return(&conn->serial);
pkt.whdr.serial = htonl(serial); pkt.whdr.serial = htonl(serial);
ret = kernel_sendmsg(conn->params.local->socket, iov_iter_kvec(&msg.msg_iter, WRITE, iov, 1, sizeof(pkt));
&msg, iov, 1, sizeof(pkt)); ret = do_udp_sendmsg(conn->params.local->socket, &msg, sizeof(pkt));
conn->params.peer->last_tx_at = ktime_get_seconds(); conn->params.peer->last_tx_at = ktime_get_seconds();
if (ret < 0) if (ret < 0)
trace_rxrpc_tx_fail(call->debug_id, serial, ret, trace_rxrpc_tx_fail(call->debug_id, serial, ret,
@ -397,6 +413,7 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb,
iov[1].iov_base = skb->head; iov[1].iov_base = skb->head;
iov[1].iov_len = skb->len; iov[1].iov_len = skb->len;
len = iov[0].iov_len + iov[1].iov_len; len = iov[0].iov_len + iov[1].iov_len;
iov_iter_kvec(&msg.msg_iter, WRITE, iov, 2, len);
msg.msg_name = &call->peer->srx.transport; msg.msg_name = &call->peer->srx.transport;
msg.msg_namelen = call->peer->srx.transport_len; msg.msg_namelen = call->peer->srx.transport_len;
@ -469,7 +486,7 @@ dont_set_request_ack:
* message and update the peer record * message and update the peer record
*/ */
rxrpc_inc_stat(call->rxnet, stat_tx_data_send); rxrpc_inc_stat(call->rxnet, stat_tx_data_send);
ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 2, len); ret = do_udp_sendmsg(conn->params.local->socket, &msg, len);
conn->params.peer->last_tx_at = ktime_get_seconds(); conn->params.peer->last_tx_at = ktime_get_seconds();
up_read(&conn->params.local->defrag_sem); up_read(&conn->params.local->defrag_sem);
@ -545,8 +562,7 @@ send_fragmentable:
ip_sock_set_mtu_discover(conn->params.local->socket->sk, ip_sock_set_mtu_discover(conn->params.local->socket->sk,
IP_PMTUDISC_DONT); IP_PMTUDISC_DONT);
rxrpc_inc_stat(call->rxnet, stat_tx_data_send_frag); rxrpc_inc_stat(call->rxnet, stat_tx_data_send_frag);
ret = kernel_sendmsg(conn->params.local->socket, &msg, ret = do_udp_sendmsg(conn->params.local->socket, &msg, len);
iov, 2, len);
conn->params.peer->last_tx_at = ktime_get_seconds(); conn->params.peer->last_tx_at = ktime_get_seconds();
ip_sock_set_mtu_discover(conn->params.local->socket->sk, ip_sock_set_mtu_discover(conn->params.local->socket->sk,
@ -632,8 +648,8 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
whdr.flags ^= RXRPC_CLIENT_INITIATED; whdr.flags ^= RXRPC_CLIENT_INITIATED;
whdr.flags &= RXRPC_CLIENT_INITIATED; whdr.flags &= RXRPC_CLIENT_INITIATED;
ret = kernel_sendmsg(local->socket, &msg, iov_iter_kvec(&msg.msg_iter, WRITE, iov, ioc, size);
iov, ioc, size); ret = do_udp_sendmsg(local->socket, &msg, size);
if (ret < 0) if (ret < 0)
trace_rxrpc_tx_fail(local->debug_id, 0, ret, trace_rxrpc_tx_fail(local->debug_id, 0, ret,
rxrpc_tx_point_reject); rxrpc_tx_point_reject);
@ -688,7 +704,8 @@ void rxrpc_send_keepalive(struct rxrpc_peer *peer)
_proto("Tx VERSION (keepalive)"); _proto("Tx VERSION (keepalive)");
ret = kernel_sendmsg(peer->local->socket, &msg, iov, 2, len); iov_iter_kvec(&msg.msg_iter, WRITE, iov, 2, len);
ret = do_udp_sendmsg(peer->local->socket, &msg, len);
if (ret < 0) if (ret < 0)
trace_rxrpc_tx_fail(peer->debug_id, 0, ret, trace_rxrpc_tx_fail(peer->debug_id, 0, ret,
rxrpc_tx_point_version_keepalive); rxrpc_tx_point_version_keepalive);