xfrm: a few fixes for espintcp
Subsystems (3)
cover xfrm: a few fixes for espintcp
Andrew Cagney reported some issues when trying to use async operations on the encapsulation socket. Patches 1 and 2 take care of these bugs.
In addition, I missed a spot when adding IPv6 support and converting to the common config option.
Sabrina Dubroca (3):
espintcp: support non-blocking sends
espintcp: recv() should return 0 when the peer socket is closed
xfrm: policy: fix IPv6-only espintcp
net/xfrm/espintcp.c | 31 +++++++++++++++++-------------- net/xfrm/xfrm_policy.c | 4 ++-- 2 files changed, 19 insertions(+), 16 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/3 espintcp: support non-blocking sends
Currently, non-blocking sends from userspace result in EOPNOTSUPP.
To support this, we need to tell espintcp_sendskb_locked() and espintcp_sendskmsg_locked() that non-blocking operation was requested from espintcp_sendmsg().
--- net/xfrm/espintcp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
net/xfrm/espintcp.c +13 -13
@@ -213,7 +213,7 @@ static int espintcp_sendskmsg_locked(struct sock *sk,return 0 ; } -static int espintcp_push_msgs (struct sock *sk) +static int espintcp_push_msgs (struct sock *sk,int flags) {struct espintcp_ctx *ctx =espintcp_getctx (sk);struct espintcp_msg *emsg = &ctx->partial;
@@ -227,12 +227,12 @@ static int espintcp_push_msgs(struct sock *sk) ctx->tx_running =1 ;if (emsg->skb) - err =espintcp_sendskb_locked (sk, emsg,0 ); + err =espintcp_sendskb_locked (sk, emsg, flags);else - err =espintcp_sendskmsg_locked (sk, emsg,0 ); + err =espintcp_sendskmsg_locked (sk, emsg, flags);if (err == -EAGAIN ) { ctx->tx_running =0 ; -return 0 ; +return flags &MSG_DONTWAIT ? -EAGAIN :0 ; }if (!err)memset (emsg,0 ,sizeof (*emsg));
@@ -257,7 +257,7 @@ int espintcp_push_skb(struct sock *sk, struct sk_buff *skb) offset =skb_transport_offset (skb); len = skb->len - offset; -espintcp_push_msgs (sk); +espintcp_push_msgs (sk,0 );if (emsg->len) {kfree_skb (skb);
@@ -270,7 +270,7 @@ int espintcp_push_skb(struct sock *sk, struct sk_buff *skb) emsg->len = len; emsg->skb = skb; -espintcp_push_msgs (sk); +espintcp_push_msgs (sk,0 );return 0 ; }
@@ -287,7 +287,7 @@ static int espintcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)char buf[2 ] = {0 };int err, end; -if (msg->msg_flags) +if (msg->msg_flags & ~MSG_DONTWAIT )return -EOPNOTSUPP ;if (size >MAX_ESPINTCP_MSG )
@@ -298,9 +298,10 @@ static int espintcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)lock_sock (sk); - err =espintcp_push_msgs (sk); + err =espintcp_push_msgs (sk, msg->msg_flags &MSG_DONTWAIT );if (err <0 ) { - err = -ENOBUFS ; +if (err != -EAGAIN || !(msg->msg_flags &MSG_DONTWAIT )) + err = -ENOBUFS ; goto unlock; }
@@ -337,10 +338,9 @@ static int espintcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)tcp_rate_check_app_limited (sk); - err =espintcp_push_msgs (sk); + err =espintcp_push_msgs (sk, msg->msg_flags &MSG_DONTWAIT );/* this message could be partially sent, keep it */ -if (err <0 ) - goto unlock; +release_sock (sk);return size;
@@ -374,7 +374,7 @@ static void espintcp_tx_work(struct work_struct *work)lock_sock (sk);if (!ctx->tx_running) -espintcp_push_msgs (sk); +espintcp_push_msgs (sk,0 );release_sock (sk); }
Signature · 1 line
2.27.0
PATCH 2/3 espintcp: recv() should return 0 when the peer socket is closed
In reply to Sabrina Dubrocaman 2 recv says:
RETURN VALUE
When a stream socket peer has performed an orderly shutdown, the return value will be 0 (the traditional "end-of-file" return).
Currently, this works for blocking reads, but non-blocking reads will return -EAGAIN. This patch overwrites that return value when the peer won't send us any more data.
--- net/xfrm/espintcp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/xfrm/espintcp.c +4 -1
@@ -109,8 +109,11 @@ static int espintcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, flags |= nonblock ?MSG_DONTWAIT :0 ; skb =__skb_recv_datagram (sk, &ctx->ike_queue, flags, &off, &err); -if (!skb) +if (!skb) { +if (err == -EAGAIN && sk->sk_shutdown &RCV_SHUTDOWN ) +return 0 ;return err; + } copied = len;if (copied > skb->len)
Signature · 1 line
2.27.0
PATCH 3/3 xfrm: policy: fix IPv6-only espintcp compilation
In reply to Sabrina DubrocaIn case we're compiling espintcp support only for IPv6, we should still initialize the common code.
--- net/xfrm/xfrm_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/xfrm/xfrm_policy.c +2 -2
@@ -39,7 +39,7 @@#ifdef CONFIG_XFRM_STATISTICS #include <net/snmp.h> #endif -#ifdef CONFIG_INET_ESPINTCP +#ifdef CONFIG_XFRM_ESPINTCP #include <net/espintcp.h> #endif
@@ -4149,7 +4149,7 @@ void __init xfrm_init(void)seqcount_init (&xfrm_policy_hash_generation);xfrm_input_init (); -#ifdef CONFIG_INET_ESPINTCP +#ifdef CONFIG_XFRM_ESPINTCP espintcp_init ();#endif
Signature · 1 line
2.27.0
Steffen Klassert
maintainerQuoted 10 lines · Sabrina Dubroca
Andrew Cagney reported some issues when trying to use async operations on the encapsulation socket. Patches 1 and 2 take care of these bugs.
In addition, I missed a spot when adding IPv6 support and converting to the common config option.
Sabrina Dubroca (3):
espintcp: support non-blocking sends
espintcp:recv()should return 0 when the peer socket is closed
xfrm: policy: fix IPv6-only espintcp
All applied, thanks a lot Sabrina!