From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 0D43C2F39B4 for ; Tue, 16 Sep 2025 23:43:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066240; cv=none; b=i+zYJFMVb/1Krg3uUgN7OVlH/4aV3kerZD3qKDxWfcAFeufARu5g21bAOeyJB8vANvXHkURCbzD6alxkmCfYI6cf5Put7tIya3qFPGZj8+6uc+RoIybCVlnzI06FWJfa4jF5gQljtttkvGj4fpo12gtykENR7J7C9yzNd6fHISQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066240; c=relaxed/simple; bh=9Wny9EveYUKuOodiYR//AaIkSgCmI3lCDOCST2vOIoM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bRSMc4ToKhD6gt8NIMgjSRtw6ln5ORIq8UYIAJLmmoACV4Fq4o3IQziqUnA+7k11VMYziJwdFLpwtH8aQdfaY4Z9yi2phITMRyGnEUvTphGdJ/XjNlHJz5S2WJ6rn+cNESsfXaT6gt1Yu6mHUxNiSTTPXMIrBQ/vDZF9ufpvqNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U8HDXzeQ; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U8HDXzeQ" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-268107d8662so485695ad.2 for ; Tue, 16 Sep 2025 16:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758066237; x=1758671037; darn=lists.linux.dev; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xznpXjSPg14L8u6GPVNf9rVdoH0mv1cEtj7GXHqOaxM=; b=U8HDXzeQ4E7Ng/k4zY77vBKDE9niS7jrO3cz3uPoOfvP0a9Rh5/vGtT4yOm7iOAiYL 83Fw9n2ABD0A2aVcHTIJ3HAskFF6S3OflkwGJSgu/0O1SlTZ00s28RixH0e26fq2vd5r nfcoAtWco8H8OPlL7a5dFAV7xrJTt5+yjblnZ+IMTbMY8FrJID7i0fpBbDNLM9PEr+vC D8mpUVgM1CjQzkyeGQwRHho7GiYd6YdPb7bGYAlnGIOarmNbUREVmQpEPgaF7OpjRHMp Z4NztI6JKqZNXlg/Cihnasuf81MJ8rY+RQKqm9B4HHgDOQ0Vgi7DUaDdpsasRnDHI3gG ld6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758066237; x=1758671037; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xznpXjSPg14L8u6GPVNf9rVdoH0mv1cEtj7GXHqOaxM=; b=CeQq5QK2f4D5rpDZFi7m8tFqOur0eCJIf9oBYYwKjy/AjB+gezzy9frKrinVR4zxqB qvFMYM4iZG1xQ4InF0jpQLxrYo/l66ftVADeDA7bEbsraPaAV2RaMfuamuBcXATjbcdL +a0kYs4RgP+USE1OwEM4agpXGFkxdHfWWUo0JMVe69CuqbPMjqN/iJ0lZTR7slBJPhoC 8iQKesOS5KXWDc2zJ/ch/u1egueJFYw1CkgjL546Nf5PEumxakEZeRsLjWKFwbQG9XFi 2/lNihyFDtubHiatDWQe/+zZgHHbJAFxLjohH3nyrhhTNn2PI337rHtI9g1TBgpCGybP uwwQ== X-Gm-Message-State: AOJu0Yxjua41RSMenyJJ6lCpvnQDZO01Tp+sp4bxwbBnvmJ+1T4J+1B+ VpZj1GT+93qyv2sYoyYsCzqxxggKnlBHK4yIPO2Utt1VubgFARfVxAZV X-Gm-Gg: ASbGnct7qlFe7npa+nZGPATC1PqcgzcT6ECfgL9cBc347MFQDw1mX2/ChrSh1WnEOic rC/gaUGMOB3MY6xJr6I8UZ9wGJpDTZH4wRsPGorLLcf0wIBjEk9rqkdD+5WD1QN0pSzpS19P6/6 4KuicMn3c+uKNs7EwUdJHHvpPew4eMgbdX0E9uTyMytKFTjw2nVwvvQQ1W0XOuJ/rH3oz/VJl9D X2Ien71t6o3cl5mZPkzjlYhOSgN9BdYCBDbPDpgGkuDmq1UQmX5tMrbJVi0xWcuz5Zm2juV9Xkp XfO6z/sPAFZlTqnab0hcNRdORyUPLR6nimi8JoxRzFRzwwomPLLU25uul5XEU0cl34XESgtqsA2 7rvYDPGIYdFhNEuUMMBcrnMvxPTXiVVA= X-Google-Smtp-Source: AGHT+IGgEOkn91Dg5X4PgnpAYAK6sltdoKTmbUSmUOQXkvL2vD/GIGzT/HGBTqnu8s5A/IqxmQFqpw== X-Received: by 2002:a17:902:e84f:b0:264:f3ed:ee2c with SMTP id d9443c01a7336-268119b2af4mr1220725ad.12.1758066237368; Tue, 16 Sep 2025 16:43:57 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-267f4d286aesm14613895ad.63.2025.09.16.16.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 16:43:56 -0700 (PDT) From: Bobby Eshleman Date: Tue, 16 Sep 2025 16:43:48 -0700 Subject: [PATCH net-next v6 4/9] vsock/loopback: add netns support Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250916-vsock-vmtest-v6-4-064d2eb0c89d@meta.com> References: <20250916-vsock-vmtest-v6-0-064d2eb0c89d@meta.com> In-Reply-To: <20250916-vsock-vmtest-v6-0-064d2eb0c89d@meta.com> To: Stefano Garzarella , Shuah Khan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, Bobby Eshleman , berrange@redhat.com, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Add NS support to vsock loopback. Sockets in a global mode netns communicate with each other, regardless of namespace. Sockets in a local mode netns may only communicate with other sockets within the same namespace. Use pernet_ops to install a vsock_loopback for every namespace that is created (to be used if local mode is enabled). Retroactively call init/exit on every namespace when the vsock_loopback module is loaded in order to initialize the per-ns device. Signed-off-by: Bobby Eshleman --- Changes in v6: - init pernet ops for vsock_loopback module - vsock_loopback: add space in struct to clarify lock protection - do proper cleanup/unregister on vsock_loopback_exit() - vsock_loopback: use virtio_vsock_skb_net() Changes in v5: - add callbacks code to avoid reverse dependency - add logic for handling vsock_loopback setup for already existing namespaces --- include/net/af_vsock.h | 1 + include/net/netns/vsock.h | 6 +++ net/vmw_vsock/vsock_loopback.c | 98 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 97 insertions(+), 8 deletions(-) diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index 628e35ae9d00..5180b7dbb6d6 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -320,4 +320,5 @@ static inline bool vsock_net_check_mode(struct vsock_sock *vsk, struct net *net, return orig_net_mode == VSOCK_NET_MODE_GLOBAL && vsk->orig_net_mode == VSOCK_NET_MODE_GLOBAL; } + #endif /* __AF_VSOCK_H__ */ diff --git a/include/net/netns/vsock.h b/include/net/netns/vsock.h index d4593c0b8dc4..a32d546793a2 100644 --- a/include/net/netns/vsock.h +++ b/include/net/netns/vsock.h @@ -9,6 +9,8 @@ enum vsock_net_mode { VSOCK_NET_MODE_LOCAL, }; +struct vsock_loopback; + struct netns_vsock { struct ctl_table_header *vsock_hdr; spinlock_t lock; @@ -16,5 +18,9 @@ struct netns_vsock { /* protected by lock */ enum vsock_net_mode mode; bool written; + +#if IS_ENABLED(CONFIG_VSOCKETS_LOOPBACK) + struct vsock_loopback *loopback; +#endif }; #endif /* __NET_NET_NAMESPACE_VSOCK_H */ diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c index 1b2fab73e0d0..134e0619de07 100644 --- a/net/vmw_vsock/vsock_loopback.c +++ b/net/vmw_vsock/vsock_loopback.c @@ -28,8 +28,16 @@ static u32 vsock_loopback_get_local_cid(void) static int vsock_loopback_send_pkt(struct sk_buff *skb) { - struct vsock_loopback *vsock = &the_vsock_loopback; + struct vsock_loopback *vsock; int len = skb->len; + struct net *net; + + net = virtio_vsock_skb_net(skb); + + if (net && net->vsock.mode == VSOCK_NET_MODE_LOCAL) + vsock = net->vsock.loopback; + else + vsock = &the_vsock_loopback; virtio_vsock_skb_queue_tail(&vsock->pkt_queue, skb); queue_work(vsock->workqueue, &vsock->pkt_work); @@ -134,27 +142,99 @@ static void vsock_loopback_work(struct work_struct *work) } } -static int __init vsock_loopback_init(void) +static int vsock_loopback_init_vsock(struct vsock_loopback *vsock) { - struct vsock_loopback *vsock = &the_vsock_loopback; - int ret; - vsock->workqueue = alloc_workqueue("vsock-loopback", 0, 0); if (!vsock->workqueue) return -ENOMEM; skb_queue_head_init(&vsock->pkt_queue); INIT_WORK(&vsock->pkt_work, vsock_loopback_work); + return 0; +} + +static void vsock_loopback_deinit_vsock(struct vsock_loopback *vsock) +{ + if (vsock->workqueue) + destroy_workqueue(vsock->workqueue); +} + +static int vsock_loopback_init_net(struct net *net) +{ + if (WARN_ON_ONCE(net->vsock.loopback)) + return 0; + + net->vsock.loopback = kmalloc(sizeof(*net->vsock.loopback), GFP_KERNEL); + if (!net->vsock.loopback) + return -ENOMEM; + + return vsock_loopback_init_vsock(net->vsock.loopback); +} + +static void vsock_loopback_exit_net(struct net *net) +{ + if (net->vsock.loopback) { + vsock_loopback_deinit_vsock(net->vsock.loopback); + kfree(net->vsock.loopback); + net->vsock.loopback = NULL; + } +} + +static void vsock_loopback_deinit_all(void) +{ + struct net *net; + + down_read(&net_rwsem); + for_each_net(net) + vsock_loopback_exit_net(net); + up_read(&net_rwsem); +} + +static struct pernet_operations vsock_loopback_net_ops = { + .init = vsock_loopback_init_net, + .exit = vsock_loopback_exit_net, +}; + +static int __init vsock_loopback_init(void) +{ + struct vsock_loopback *vsock = &the_vsock_loopback; + struct net *net; + int ret; + + ret = vsock_loopback_init_vsock(vsock); + if (ret < 0) + return ret; + + ret = register_pernet_subsys(&vsock_loopback_net_ops); + if (ret < 0) + goto out_deinit_vsock; + + /* call callbacks on any net previously created */ + down_read(&net_rwsem); + for_each_net(net) { + ret = vsock_loopback_init_net(net); + if (ret < 0) + break; + } + up_read(&net_rwsem); + + /* undo any initializations that succeeded */ + if (ret < 0) + goto out_deinit_pernet_vsock; ret = vsock_core_register(&loopback_transport.transport, VSOCK_TRANSPORT_F_LOCAL); if (ret) - goto out_wq; + goto out_deinit_pernet_vsock; + return 0; -out_wq: - destroy_workqueue(vsock->workqueue); +out_deinit_pernet_vsock: + vsock_loopback_deinit_all(); + unregister_pernet_subsys(&vsock_loopback_net_ops); +out_deinit_vsock: + vsock_loopback_deinit_vsock(vsock); return ret; } @@ -164,6 +244,8 @@ static void __exit vsock_loopback_exit(void) vsock_core_unregister(&loopback_transport.transport); + vsock_loopback_deinit_all(); + flush_work(&vsock->pkt_work); virtio_vsock_skb_queue_purge(&vsock->pkt_queue); -- 2.47.3