From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 E1DA4141987 for ; Mon, 3 Mar 2025 14:45:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741013129; cv=none; b=OQJ9IhcBxRYYJuiCBFDipHOG2EMJXsuP2Kegko071+XoQMKbxrlyXq6JoLsK20D1pzbVEltTDTs2a3a2g/3uPEIs2XEIhZtVdPv7SXvuK6c1/7TKHcZ+Ae//rstLiNd7YwAX3lB2Xm2GkmbQ1e2oosMvkSW4pD+xXN5jmB0ArTY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741013129; c=relaxed/simple; bh=kxRrZd4Iu1g3Ar2HC6xOBpvwsjl7MXVzQnlV/fNUQEE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=J6GkqapkvWJsjaemcN4F6iChAODW0r3/JYXKHgC6CYHjg8rLZYGrT93r42J9tJgp8qunZ66HQ6oerpHiHZi5XNMFabNgATHI6q+7GWbcvDoOYNgaxhkI9ANFi+lyyf9Ys7LYkLhvZhQB7z58FkKEjz39e6mtaSfE37Ajh7dofV0= 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=cpHL34xq; arc=none smtp.client-ip=209.85.218.45 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="cpHL34xq" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-abf45d8db04so370541366b.1 for ; Mon, 03 Mar 2025 06:45:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1741013125; x=1741617925; 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=2BmXwqganJLn8jq8+b923KGArAolI7ifnS0mWRMdxaY=; b=cpHL34xqxtndZQg5NgLZtyQYbjurB2qhzFdaFdG4Lv4VcOn+fbARQTfdmbXiP7CKUm pObve5sucTeWJNIpMXn+RUyHqGYhCt8Bm5hEsCfynHjwusk33G+WExHDkQZYUk84f3ut oXazGE4s/hHqQ0YZgKRmdSTsV4oqSyPKITvWds7ntd9fLAodp1cA9/U9O8RJOF6fXMHx 3zfBM5VIaCpilwS/ECddjTs5pMGNUn+NxBGzUCQ086oUp13lsoNsSQKzar/U/vz+H5UV 9s/BzbpBgsXg8Zyg2kuKuEzzaQcSxFcYYuNn3gFPWpxWyO4FHXzyBPYOETGiBocIl+OZ tOfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741013125; x=1741617925; 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=2BmXwqganJLn8jq8+b923KGArAolI7ifnS0mWRMdxaY=; b=DUmxfSXqJXDmP0sykbX4QgynJqBAKuJV6sOdl4gvP4uihcATaWvbEfznT11Ei6GAAq Lvq7fcqB75DR7BPWUunY4kRq9Pjah+1E59O3ZC3CMgtVHt2K+dhstJgUPDP1lqIncftR sahgVuA3ObT+1pRX14Ix8eofUPSVTcG7ny+/C5zge4FYp63ZOIcmHx3K7YsewgNR4RLK V4jg+04g59sewYdpE3LvcX/Q3mhzLR2/CVIAMSY/6W+vn9u7b194XjNREdAyA5iVQbIu AUFpn5FqUi/LuEbBe8OlB8Zn8qPSuRk4DtKRo6xueG0hd3EpKtzwY6WVBNvI9TVFkmQv +y/A== X-Forwarded-Encrypted: i=1; AJvYcCVxa5u31gnmm24vasWckB8fkjM84QIpMgl0uRQMy2nJcZI5/cbz25FQ5dhoslx/Dp0eDk9JJDeyINxTmUE=@vger.kernel.org X-Gm-Message-State: AOJu0YzWYtSdo/z0t7sk31w1IUeAOCdgyFZncO5ZYUILJRF/R4OlT0FE LBgTeXW5MUfH/wvsweG5VWKqObzf0UxG9GZ6krimHGO0v4bALDFBxQb0TnecvlI= X-Gm-Gg: ASbGncsdDhuNbSo6ED10q0V1hJY6kb8uTfFo2+1aSeBcTbxnus/+PfMI9kpRVuBokt/ blKjJBsXFkXNC2EhbAJZO3ueygHr8B3EAbAzY3gdDGcmPoFhQspR0SWY1M90463YbL5J7Pb9a9s gZ3gZzf3vUSQqruJEKnzthPC4NshU42XH11cdUgP2HcPggHgAbo8DfF6NpH8EVt3jEOZ6EwOmgl IKzN9FAl3qVKLba+CecRdZtq/orkWWuA4CvrqyC6cbnTJ+DZ1xo8lGF4TnPcs5pr2Boy1I8CXlV t3c1io2Pnw4lMObE9VWmuD08E+O2s45RXMfLe+tTr+9n4um4UxnvAhsWoPCznEOIuzaSElagr+u CAfFfr98= X-Google-Smtp-Source: AGHT+IHAVJy7KLpojW8TWmlql5y/dSIA4s5XaEQW3g8y6zIpGcUjWmntI7HZ8QA/Igg7m+fa6psmSA== X-Received: by 2002:a17:907:a810:b0:ac1:e881:89b1 with SMTP id a640c23a62f3a-ac1e8818cc1mr141191466b.30.1741013125157; Mon, 03 Mar 2025 06:45:25 -0800 (PST) Received: from ?IPV6:2001:67c:2fbc:1:4d41:ca07:21a5:f110? ([2001:67c:2fbc:1:4d41:ca07:21a5:f110]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e1d620a8sm82187366b.108.2025.03.03.06.45.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Mar 2025 06:45:24 -0800 (PST) Message-ID: <2682e274-6be1-4366-a2f6-c870aa9e1252@openvpn.net> Date: Mon, 3 Mar 2025 15:45:23 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v20 15/25] ovpn: implement multi-peer support 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: <20250227-b4-ovpn-v20-0-93f363310834@openvpn.net> <20250227-b4-ovpn-v20-15-93f363310834@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 03/03/2025 14:08, Sabrina Dubroca wrote: > Hello, a few minor coding style nits on this patch. > > 2025-02-27, 02:21:40 +0100, Antonio Quartulli wrote: >> @@ -197,9 +254,16 @@ static int ovpn_netdev_notifier_call(struct notifier_block *nb, >> netif_carrier_off(dev); >> ovpn->registered = false; >> >> - if (ovpn->mode == OVPN_MODE_P2P) >> + switch (ovpn->mode) { >> + case OVPN_MODE_P2P: >> ovpn_peer_release_p2p(ovpn, NULL, >> OVPN_DEL_PEER_REASON_TEARDOWN); >> + break; >> + case OVPN_MODE_MP: >> + ovpn_peers_free(ovpn, NULL, >> + OVPN_DEL_PEER_REASON_TEARDOWN); >> + break; >> + } > > nit: maybe that switch could be done inside ovpn_peers_free, since > both places calling ovpn_peers_free do the same thing? > (it would also be more consistent with the rest of the peer-related > functions that are wrappers for the _mp/_p2p variant, rather than > pushing the switch down to the caller) Yeah, makes sense! > > >> +void ovpn_peers_free(struct ovpn_priv *ovpn, struct sock *sk, >> + enum ovpn_del_peer_reason reason) >> +{ >> + struct ovpn_socket *ovpn_sock; >> + LLIST_HEAD(release_list); >> + struct ovpn_peer *peer; >> + struct hlist_node *tmp; >> + bool skip; >> + int bkt; >> + >> + spin_lock_bh(&ovpn->lock); >> + hash_for_each_safe(ovpn->peers->by_id, bkt, tmp, peer, hash_entry_id) { >> + /* if a socket was passed as argument, skip all peers except >> + * those using it >> + */ >> + if (sk) { >> + skip = true; >> + >> + rcu_read_lock(); >> + ovpn_sock = rcu_access_pointer(peer->sock); > > rcu_dereference, since you're actually accessing ovpn_sock->sock > afterwards? Ouch, good catch. > >> + if (ovpn_sock && ovpn_sock->sock->sk == sk) >> + skip = false; >> + rcu_read_unlock(); >> + >> + if (skip) >> + continue; > > > The skip/continue logic looks a tiny bit strange to me, maybe this: Hehe, it's like a double negation. I agree it can be improved. > > hash_for_each_safe(ovpn->peers->by_id, bkt, tmp, peer, hash_entry_id) { > bool remove = true; does the netdev coding style allow to use locally scoped variables? Or should I declare everything at the beginning of the function? I had this rule in mind, but it may have been eliminated by now. > > /* if a socket was passed as argument, skip all peers except > * those using it > */ > if (sk) { > rcu_read_lock(); > ovpn_sock = rcu_dereference(peer->sock); > remove = ovpn_sock && ovpn_sock->sock->sk == sk; > rcu_read_unlock(); > } > > if (remove) > ovpn_peer_remove(peer, reason, &release_list); > } > > > (only if you agree it looks better - if it's my opinion against yours, > ignore me since it's really just coding style/taste) Yours look simpler/cleaner. I'll go with it. Thanks! Cheers, > -- Antonio Quartulli OpenVPN Inc.