From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 0F40A1E2847 for ; Mon, 20 Jan 2025 14:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737382296; cv=none; b=pz+r2EoZeNK+1sftZ1irPgosK28fMeoplin4GXoIgKE0gY4HywWxiYrGxK78MjTYy9+f0cFhWlX7JTPV9PkfS2oh/tDJIRz19k3CsyBzPfckDOe61X3Hjxh9nWJuQ09I1EcPPaAEbGweQ9hzxj0m/Gbpjb6ldMteW1msYgumHcY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737382296; c=relaxed/simple; bh=G91iRyy8ZPXaiIGve01rfDfu+Q4c72Z1k+bMghsZFCc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=tGB12BX5vanfMJvOwpXWalRSaU96CjOC5ElBk5zFpT7yy/1v3MiyxzEPRX/RAa1JhpPnIYFcT7YuvCmYSUgCDP34G6zDv2P5BIV07BXL7GkAMT66Ke2ITEvSozO+jsjpoh4o+X5cjSrNvWHr6kWTRQjMAoyylZSWdEdmNAuC2kM= 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=H46XUhvW; arc=none smtp.client-ip=209.85.218.43 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="H46XUhvW" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-aa68b513abcso839586466b.0 for ; Mon, 20 Jan 2025 06:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1737382292; x=1737987092; 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=u3WDal9+fBArGWLpYhtoY9HwUqfaEAbQY8/AzPXfmcw=; b=H46XUhvWDMyH+knFvbBF8WNxdpGygPHOJAtP5mcm1zebm7BX43l4Z72s/lQMe81nZ8 vFss8IXGVrGQPk8s7d5nOQfJIFw8WWSMB/iSU9S9CsrpsAeFtwt8I5/Sj2+Xu2mJe2eR kxGZsuV3rbFhw4cOfek8R8KKhT3+YguLcYYgmpQbh/KK2Cy1RdYBsuG1FZO2bKZgmwNM 1UjV98AfPe3m80/9SuoNd5VtC536wv3A234+kRgOZrdixUORAAkJ1NEqh/wD1RFG5AZa xCTBJAD/YPJ9c6Q2AojaH7mokgUzhq2KVISWmmz8gp4BkceaK1UQLUu1OhaNKrHZwg6x Yz1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737382292; x=1737987092; 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=u3WDal9+fBArGWLpYhtoY9HwUqfaEAbQY8/AzPXfmcw=; b=H4XkANrF8PUAl0geFDqgS7Xi2z8hAyY6FDnIY/DW73zoksBqRPnuX8eJYpBlH2O6xO DETUQuujzmPEr3ExwBJ+1LJ04a4MLuQ/BG23IRZQmtLA1s27hKKOjzHpOc9uY4ApkhLw 0MTnF5umoGWNV4bjyEsAKo1Rr1sUBfEfDPjXeNRK6Xqhmf6Be8zaMIErYiyX1NBPwoVO 6+tpdH9ZhvFDXl5OJGcrBIdTW73zidQPdTqcozVrFWd1mL3OWVaR4NS/jQ4au/E3Tfwd YOtjErFOgCwcJBiipoN19wjhj8/GZyPsGiENYw+Qt79z5ZNQWq9eeF0dO+sbnAnwQbUC qXng== X-Gm-Message-State: AOJu0YwbrVBjzfqymenNc4RR/pyrXRf8k7TTguL9iemb2+oo/w9FDRHI /aNEN1fvniyNgTZH5pWNEmDPW8aZE5HwYqFgAO92HCjW+QpBPnUiX2HdBlf3cmE= X-Gm-Gg: ASbGncsQRX6gAcSugpbURAVedon6s0htxmJPZGSsR7PEv/B9NzEoHBGjw4faWnLO7mm KwasC2vIDFWA9hP3hxWT6xl7uLgaDwalzW6WwAtW5Ft9SRbSm08q2VyFEiMhr/xs09/Fog99HNs mVZ8wo1K7ezbqB65P1rB4RcDm8r+ItEs7yWXbl+p4EfdRJAR7GsZQT/1GaGp6KNqJnM+OW89NUQ uwsLu8ghQN3nZ1/zlST8dOB+TwO/wWw2COT0AixIGy9rnp4zP1Typf/joKLpzLPYlvQ7qhf/C51 lq52vDORCWZbKGFXW2j9Q4olSbMOkQFR X-Google-Smtp-Source: AGHT+IHQx7EFjdBMAzc2wTch6cot/TbyJDRmy0xgRMOZOBQgwY8dt49gB0eWKuVf4Bqp8dXelVYULg== X-Received: by 2002:a17:907:6d1b:b0:aaf:ada2:181e with SMTP id a640c23a62f3a-ab38b162851mr1050918466b.26.1737382292257; Mon, 20 Jan 2025 06:11:32 -0800 (PST) Received: from ?IPV6:2001:67c:2fbc:1:113d:ece6:3d2f:3a40? ([2001:67c:2fbc:1:113d:ece6:3d2f:3a40]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab384f29260sm624491566b.94.2025.01.20.06.11.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Jan 2025 06:11:31 -0800 (PST) Message-ID: <6ef40195-9648-40db-8e36-a2a0095aa411@openvpn.net> Date: Mon, 20 Jan 2025 15:12:28 +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= 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 Organization: OpenVPN Inc. In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 17/01/2025 18:14, Sabrina Dubroca wrote: > 2025-01-13, 10:31:31 +0100, Antonio Quartulli wrote: >> +static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, >> + int flags, int *addr_len) >> +{ >> + int err = 0, off, copied = 0, ret; >> + struct ovpn_socket *sock; >> + struct ovpn_peer *peer; >> + struct sk_buff *skb; >> + >> + rcu_read_lock(); >> + sock = rcu_dereference_sk_user_data(sk); >> + if (!sock || !sock->peer) { >> + rcu_read_unlock(); >> + return -EBADF; >> + } >> + /* we take a reference to the peer linked to this TCP socket, because >> + * in turn the peer holds a reference to the socket itself. Going back now to this specific comment: > > Not anymore since v12? [*] > > I think it's ok here because we're only using peer and sk (not > anything from ovpn_socket), but it is relevant in _sendmsg, which has > the same peer_hold pattern without this comment. After applying to _sendmsg() the modifications you suggested (i.e. reference peer directly instead of sock->peer), it also only uses peer and sk, but not ovpn_socket. Therefore it should be fine too. This said, the comment above should go away or at least should be modified. > > [*] > v11: > - https://lore.kernel.org/netdev/20241029-b4-ovpn-v11-8-de4698c73a25@openvpn.net/ > ovpn_peer_release -> ovpn_socket_put > > v12: > - https://lore.kernel.org/netdev/20241202-b4-ovpn-v12-9-239ff733bf97@openvpn.net/ > ovpn_peer_release doesn't do ovpn_socket_put > > - https://lore.kernel.org/netdev/20241202-b4-ovpn-v12-7-239ff733bf97@openvpn.net/ > ovpn_socket_put is done directly at ovpn_peer_remove time, before the final peer_put Right - the lifetime of ovpn_socket is not tied to ovpn_peer anymore. However, with the current code I don't think we ever assume that. Regards, -- Antonio Quartulli OpenVPN Inc.