From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC27E2036E1 for ; Mon, 3 Feb 2025 13:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738588309; cv=none; b=OQOYbvU63mHnTmYg24rjtjK36Qlo0WaDL5GJi+Osjm1lRPH/Zp/n8xu1cESAqi5yrxKVJTS+l01OWwqIiBfhpECSJWWH+Ykc8CcMrjeVwtPxmS180sU2EIMmmjXCTpLoFBgelshC3djBUJ5Bcfe4Z2d5Xvq4SOYMLECcZElTY+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738588309; c=relaxed/simple; bh=PDfO2TqiHOQOswp1r7MD60aF2gzSJU3JaaoTdmxlwEw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=kf6cWRR3Nj692Kku1Dy6C+2M/pWef+eh5h74QquVMDE8Qajq+hCCb5zhzSTitwzwpxy8ywYvYI6k4sTB0AkOSlBVdB97nDrA7gQo3Z2VZVDixujNXRguYsGhh/Y2FxK4JMeraPXTuRLpQexjnNfxWEV5UHdjhtqIjHnrSflIT40= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=openvpn.net; spf=pass smtp.mailfrom=openvpn.com; dkim=pass (2048-bit key) header.d=openvpn.net header.i=@openvpn.net header.b=N90y90gQ; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=openvpn.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=openvpn.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=openvpn.net header.i=@openvpn.net header.b="N90y90gQ" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43690d4605dso29818345e9.0 for ; Mon, 03 Feb 2025 05:11:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1738588305; x=1739193105; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=W0RwX06YNoQDRCRmvfoCjGCfN9QTBGFckStparosZZg=; b=N90y90gQnyZDbawzAUUwKAxucHfrEu5a9AXbCBVfIu7mSKWpVkOZDj1Ejd2JjCLpmK LcAVowU/5XFa7TBVdHr4fNi/Pk3Fn/I3+zrtfeEPR2xb0660TU/UDpqqGyAjVS3CxVsg yDww6964tbJa/JGjZ7q+9rkDtcpEJHXiwScwKHAm7ED0E1pQmIJUufV+YVelzGNDSF/y bkp2Ji0wMec/YwJOAVTMaFzB96CCCwC/Ok8ttsTLVhM0WaQbZjMY/EByC13KsyykqsNq 0fv92vpmoJcfs1Jep0zZ2wu6vTL6IXMd1LWitpelrSyz/PClzyH6rt4tVygdg4WFODEF OCQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738588305; x=1739193105; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=W0RwX06YNoQDRCRmvfoCjGCfN9QTBGFckStparosZZg=; b=tPgLsf9avj5GmJRP3rfEjATPfVEY1gAyFenQ3cV0RLLLN24cyKKuk3C/oSOzNhGqFz AqhlleB42rFL63r3aTKjjdafNfKo4eUBYSXpQjxwV1I5RBUHbkc03eJBfWfRfGROhR0m FNU35NH/G0Mqtw1fpg2Adu+Da2LswL6vjwfmTn2qubH5Yu7dOxES6D9tTgEBZK14BNVh JGekAIx7SbzQJllB51Tf1r217jjcdXdVa6zcUHovSm9Zn3/VeGOB8UZQCFfuexCa7LA5 i2+7Y1x1u9tWBXGLCOeE27RB7Z+TJzFBl1iMVOREOWAR4UcZKGwHji/ITPnJJLXPY9wf spEA== X-Gm-Message-State: AOJu0YyADgfeET+Ex3iLxF4K3OP6/EQJZUvmh4RUqQ4Nh4jagHCJOwzQ RL+y/nzi/wwRknSkyLn2EWiuBoevEqTpcSGr80haidqPy8eanAGTFPDvqBG047M= X-Gm-Gg: ASbGncsDBYPP9jgvOA+INjp0cj2RWlvxsnmmU+JoW+/kVnhv4IDc2B6fBTOnJTrwpDq FFPgZwh0IutsChMsQDh75AAUhDwgr0IaAFMW5Gu9KakfnAmGcwqne+Rthf1082m6l2snVLXPDzs OHMvnRPS9MzPaoEoYk05HgBzsYnejgqDnAIB/fub0uVguqY0yMHgFGZ14cD7mLSHzIRBkiktQ9U YJfV6xg6dHp8MWHOMr2eKjcraR0BzS5cCSrfvcnjxBG4eH29eng8JlijF8B973/etDOdl2WOWra GSQ1PK+6U2Nm/NYFP0QY2BrpFOPCP/a62BWNx6kGnkMauAzcPT6tPg== X-Google-Smtp-Source: AGHT+IGix2KKhAS1u/WXZkqDrxDELKSomSjX0SZ+43f7IZjAxUu2W/Ytm+kXaqZ0WXxeZUkc/HDk8w== X-Received: by 2002:a05:600c:3b94:b0:434:a923:9310 with SMTP id 5b1f17b1804b1-438dc3cc3b1mr197184575e9.15.1738588305116; Mon, 03 Feb 2025 05:11:45 -0800 (PST) Received: from ?IPV6:2001:67c:2fbc:1:b4fe:e6fa:32a0:6a72? ([2001:67c:2fbc:1:b4fe:e6fa:32a0:6a72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc2e384sm194539245e9.19.2025.02.03.05.11.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Feb 2025 05:11:44 -0800 (PST) Message-ID: <78e59cd0-332e-4a97-8060-ccdf023e8a91@openvpn.net> Date: Mon, 3 Feb 2025 14:12:52 +0100 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v18 12/25] ovpn: implement TCP transport To: Sabrina Dubroca Cc: netdev@vger.kernel.org, Eric Dumazet , Jakub Kicinski , Paolo Abeni , Donald Hunter , Shuah Khan , ryazanov.s.a@gmail.com, Andrew Lunn , Simon Horman , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Xiao Liang References: <20250113-b4-ovpn-v18-0-1f00db9c2bd6@openvpn.net> <20250113-b4-ovpn-v18-12-1f00db9c2bd6@openvpn.net> Content-Language: en-US From: Antonio Quartulli Autocrypt: addr=antonio@openvpn.net; keydata= xsFNBFN3k+ABEADEvXdJZVUfqxGOKByfkExNpKzFzAwHYjhOb3MTlzSLlVKLRIHxe/Etj13I X6tcViNYiIiJxmeHAH7FUj/yAISW56lynAEt7OdkGpZf3HGXRQz1Xi0PWuUINa4QW+ipaKmv voR4b1wZQ9cZ787KLmu10VF1duHW/IewDx9GUQIzChqQVI3lSHRCo90Z/NQ75ZL/rbR3UHB+ EWLIh8Lz1cdE47VaVyX6f0yr3Itx0ZuyIWPrctlHwV5bUdA4JnyY3QvJh4yJPYh9I69HZWsj qplU2WxEfM6+OlaM9iKOUhVxjpkFXheD57EGdVkuG0YhizVF4p9MKGB42D70pfS3EiYdTaKf WzbiFUunOHLJ4hyAi75d4ugxU02DsUjw/0t0kfHtj2V0x1169Hp/NTW1jkqgPWtIsjn+dkde dG9mXk5QrvbpihgpcmNbtloSdkRZ02lsxkUzpG8U64X8WK6LuRz7BZ7p5t/WzaR/hCdOiQCG RNup2UTNDrZpWxpwadXMnJsyJcVX4BAKaWGsm5IQyXXBUdguHVa7To/JIBlhjlKackKWoBnI Ojl8VQhVLcD551iJ61w4aQH6bHxdTjz65MT2OrW/mFZbtIwWSeif6axrYpVCyERIDEKrX5AV rOmGEaUGsCd16FueoaM2Hf96BH3SI3/q2w+g058RedLOZVZtyQARAQABzSdBbnRvbmlvIFF1 YXJ0dWxsaSA8YW50b25pb0BvcGVudnBuLm5ldD7Cwa0EEwEIAFcCGwMFCwkIBwMFFQoJCAsF FgIDAQACHgECF4AFCRWQ2TIWIQTKvaEoIBfCZyGYhcdI8My2j1nRTAUCYRUquBgYaGtwczov L2tleXMub3BlbnBncC5vcmcACgkQSPDMto9Z0UzmcxAAjzLeD47We0R4A/14oDKlZxXO0mKL fCzaWFsdhQCDhZkgxoHkYRektK2cEOh4Vd+CnfDcPs/iZ1i2+Zl+va79s4fcUhRReuwi7VCg 7nHiYSNC7qZo84Wzjz3RoGYyJ6MKLRn3zqAxUtFECoS074/JX1sLG0Z3hi19MBmJ/teM84GY IbSvRwZu+VkJgIvZonFZjbwF7XyoSIiEJWQC+AKvwtEBNoVOMuH0tZsgqcgMqGs6lLn66RK4 tMV1aNeX6R+dGSiu11i+9pm7sw8tAmsfu3kQpyk4SB3AJ0jtXrQRESFa1+iemJtt+RaSE5LK 5sGLAO+oN+DlE0mRNDQowS6q/GBhPCjjbTMcMfRoWPCpHZZfKpv5iefXnZ/xVj7ugYdV2T7z r6VL2BRPNvvkgbLZgIlkWyfxRnGh683h4vTqRqTb1wka5pmyBNAv7vCgqrwfvaV1m7J9O4B5 PuRjYRelmCygQBTXFeJAVJvuh2efFknMh41R01PP2ulXAQuVYEztq3t3Ycw6+HeqjbeqTF8C DboqYeIM18HgkOqRrn3VuwnKFNdzyBmgYh/zZx/dJ3yWQi/kfhR6TawAwz6GdbQGiu5fsx5t u14WBxmzNf9tXK7hnXcI24Z1z6e5jG6U2Swtmi8sGSh6fqV4dBKmhobEoS7Xl496JN2NKuaX jeWsF2rOwE0EZmhJFwEIAOAWiIj1EYkbikxXSSP3AazkI+Y/ICzdFDmiXXrYnf/mYEzORB0K vqNRQOdLyjbLKPQwSjYEt1uqwKaD1LRLbA7FpktAShDK4yIljkxhvDI8semfQ5WE/1Jj/I/Q U+4VXhkd6UvvpyQt/LiWvyAfvExPEvhiMnsg2zkQbBQ/M4Ns7ck0zQ4BTAVzW/GqoT2z03mg p1FhxkfzHMKPQ6ImEpuY5cZTQwrBUgWif6HzCtQJL7Ipa2fFnDaIHQeiJG0RXl/g9x3YlwWG sxOFrpWWsh6GI0Mo2W2nkinEIts48+wNDBCMcMlOaMYpyAI7fT5ziDuG2CBA060ZT7qqdl6b aXUAEQEAAcLBfAQYAQgAJhYhBMq9oSggF8JnIZiFx0jwzLaPWdFMBQJmaEkXAhsMBQkB4TOA AAoJEEjwzLaPWdFMbRUP/0t5FrjF8KY6uCU4Tx029NYKDN9zJr0CVwSGsNfC8WWonKs66QE1 pd6xBVoBzu5InFRWa2ed6d6vBw2BaJHC0aMg3iwwBbEgPn4Jx89QfczFMJvFm+MNc2DLDrqN zaQSqBzQ5SvUjxh8lQ+iqAhi0MPv4e2YbXD0ROyO+ITRgQVZBVXoPm4IJGYWgmVmxP34oUQh BM7ipfCVbcOFU5OPhd9/jn1BCHzir+/i0fY2Z/aexMYHwXUMha/itvsBHGcIEYKk7PL9FEfs wlbq+vWoCtUTUc0AjDgB76AcUVxxJtxxpyvES9aFxWD7Qc+dnGJnfxVJI0zbN2b37fX138Bf 27NuKpokv0sBnNEtsD7TY4gBz4QhvRNSBli0E5bGUbkM31rh4Iz21Qk0cCwR9D/vwQVsgPvG ioRqhvFWtLsEt/xKolOmUWA/jP0p8wnQ+3jY6a/DJ+o5LnVFzFqbK3fSojKbfr3bY33iZTSj DX9A4BcohRyqhnpNYyHL36gaOnNnOc+uXFCdoQkI531hXjzIsVs2OlfRufuDrWwAv+em2uOT BnRX9nFx9kPSO42TkFK55Dr5EDeBO3v33recscuB8VVN5xvh0GV57Qre+9sJrEq7Es9W609a +M0yRJWJEjFnMa/jsGZ+QyLD5QTL6SGuZ9gKI3W1SfFZOzV7hHsxPTZ6 Organization: OpenVPN Inc. In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 03/02/2025 11:05, Sabrina Dubroca wrote: > 2025-01-13, 10:31:31 +0100, Antonio Quartulli wrote: >> +static void ovpn_tcp_rcv(struct strparser *strp, struct sk_buff *skb) >> +{ > [...] >> + /* we need the first byte of data to be accessible >> + * to extract the opcode and the key ID later on >> + */ >> + if (!pskb_may_pull(skb, 1)) { > > make sure we have 1B... > >> + net_warn_ratelimited("%s: packet too small to fetch opcode for peer %u\n", >> + netdev_name(peer->ovpn->dev), peer->id); >> + goto err; >> + } >> + >> + /* DATA_V2 packets are handled in kernel, the rest goes to user space */ >> + opcode = ovpn_opcode_from_skb(skb, 0); > > but this reads a u32 (4B) from skb->data ACK, hand-in-hand with the comment not updated. Will fix this. > > [...] >> +void ovpn_tcp_socket_detach(struct ovpn_socket *ovpn_sock) >> +{ >> + struct ovpn_peer *peer = ovpn_sock->peer; >> + struct socket *sock = ovpn_sock->sock; >> + >> + strp_stop(&peer->tcp.strp); >> + >> + skb_queue_purge(&peer->tcp.user_queue); >> >> + /* restore CBs that were saved in ovpn_sock_set_tcp_cb() */ >> + sock->sk->sk_data_ready = peer->tcp.sk_cb.sk_data_ready; >> + sock->sk->sk_write_space = peer->tcp.sk_cb.sk_write_space; >> + sock->sk->sk_prot = peer->tcp.sk_cb.prot; >> + sock->sk->sk_socket->ops = peer->tcp.sk_cb.ops; >> + >> + /* drop reference to peer */ > > nit: not really :) drop comment :) > >> + rcu_assign_sk_user_data(sock->sk, NULL); >> + >> + /* before canceling any ongoing work we must ensure that CBs >> + * have been reset to prevent workers from being re-armed >> + */ >> + barrier(); >> + >> + cancel_work_sync(&peer->tcp.tx_work); >> + strp_done(&peer->tcp.strp); >> + skb_queue_purge(&peer->tcp.out_queue); > > Also kfree_skb(peer->tcp.out_msg.skb)? hm yeah, it could be we allocated one but did not finish filling it. > >> + ovpn_peer_put(peer); >> +} > > > [...] >> +static int ovpn_tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) >> +{ > [...] >> + ret = skb_copy_datagram_from_iter(skb, 0, &msg->msg_iter, size); >> + if (ret) { >> + kfree_skb(skb); >> + net_err_ratelimited("%s: skb copy from iter failed: %d\n", >> + netdev_name(sock->peer->ovpn->dev), ret); >> + goto peer_free; >> + } >> + >> + ovpn_tcp_send_sock_skb(sock->peer, skb); > > This isn't propagating MSG_DONTWAIT down to ovpn_tcp_send_sock? > patch 14/25 will add a new member to ovpn_cb which will be filled right before calling ovpn_tcp_send_sock_skb() and that gets picked later. Cheers, -- Antonio Quartulli OpenVPN Inc.