| Message ID | 20200116172428.311437-2-sgarzare@redhat.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | vsock: support network namespace | expand |
From: Stefano Garzarella <sgarzare@redhat.com> Date: Thu, 16 Jan 2020 18:24:26 +0100 > This patch adds 'netns' module param to enable this new feature > (disabled by default), because it changes vsock's behavior with > network namespaces and could break existing applications. Sorry, no. I wonder if you can even design a legitimate, reasonable, use case where these netns changes could break things. I am totally against adding a module parameter for this, it's incredibly confusing for users and will create a test scenerio that is strongly less likely to be covered.
On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > From: Stefano Garzarella <sgarzare@redhat.com> > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > This patch adds 'netns' module param to enable this new feature > > (disabled by default), because it changes vsock's behavior with > > network namespaces and could break existing applications. > > Sorry, no. > > I wonder if you can even design a legitimate, reasonable, use case > where these netns changes could break things. I forgot to mention the use case. I tried the RFC with Kata containers and we found that Kata shim-v1 doesn't work (Kata shim-v2 works as is) because there are the following processes involved: - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and passes it to qemu - kata-shim (runs in a container) wants to talk with the guest but the vsock device is assigned to the init_netns and kata-shim runs in a different netns, so the communication is not allowed But, as you said, this could be a wrong design, indeed they already found a fix, but I was not sure if others could have the same issue. In this case, do you think it is acceptable to make this change in the vsock's behavior with netns and ask the user to change the design? > > I am totally against adding a module parameter for this, it's > incredibly confusing for users and will create a test scenerio > that is strongly less likely to be covered. > Got it, I'll remove the module parameter! Thanks, Stefano
On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > From: Stefano Garzarella <sgarzare@redhat.com> > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > This patch adds 'netns' module param to enable this new feature > > > (disabled by default), because it changes vsock's behavior with > > > network namespaces and could break existing applications. > > > > Sorry, no. > > > > I wonder if you can even design a legitimate, reasonable, use case > > where these netns changes could break things. > > I forgot to mention the use case. > I tried the RFC with Kata containers and we found that Kata shim-v1 > doesn't work (Kata shim-v2 works as is) because there are the following > processes involved: > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > passes it to qemu > - kata-shim (runs in a container) wants to talk with the guest but the > vsock device is assigned to the init_netns and kata-shim runs in a > different netns, so the communication is not allowed > But, as you said, this could be a wrong design, indeed they already > found a fix, but I was not sure if others could have the same issue. > > In this case, do you think it is acceptable to make this change in > the vsock's behavior with netns and ask the user to change the design? David's question is what would be a usecase that's broken (as opposed to fixed) by enabling this by default. If it does exist, you need a way for userspace to opt-in, module parameter isn't that. > > > > > I am totally against adding a module parameter for this, it's > > incredibly confusing for users and will create a test scenerio > > that is strongly less likely to be covered. > > > > Got it, I'll remove the module parameter! > > Thanks, > Stefano
On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > (disabled by default), because it changes vsock's behavior with > > > > network namespaces and could break existing applications. > > > > > > Sorry, no. > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > where these netns changes could break things. > > > > I forgot to mention the use case. > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > doesn't work (Kata shim-v2 works as is) because there are the following > > processes involved: > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > passes it to qemu > > - kata-shim (runs in a container) wants to talk with the guest but the > > vsock device is assigned to the init_netns and kata-shim runs in a > > different netns, so the communication is not allowed > > But, as you said, this could be a wrong design, indeed they already > > found a fix, but I was not sure if others could have the same issue. > > > > In this case, do you think it is acceptable to make this change in > > the vsock's behavior with netns and ask the user to change the design? > > David's question is what would be a usecase that's broken > (as opposed to fixed) by enabling this by default. Yes, I got that. Thanks for clarifying. I just reported a broken example that can be fixed with a different design (due to the fact that before this series, vsock devices were accessible to all netns). > > If it does exist, you need a way for userspace to opt-in, > module parameter isn't that. Okay, but I honestly can't find a case that can't be solved. So I don't know whether to add an option (ioctl, sysfs ?) or wait for a real case to come up. I'll try to see better if there's any particular case where we need to disable netns in vsock. Thanks, Stefano
On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > (disabled by default), because it changes vsock's behavior with > > > > > network namespaces and could break existing applications. > > > > > > > > Sorry, no. > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > where these netns changes could break things. > > > > > > I forgot to mention the use case. > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > processes involved: > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > passes it to qemu > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > different netns, so the communication is not allowed > > > But, as you said, this could be a wrong design, indeed they already > > > found a fix, but I was not sure if others could have the same issue. > > > > > > In this case, do you think it is acceptable to make this change in > > > the vsock's behavior with netns and ask the user to change the design? > > > > David's question is what would be a usecase that's broken > > (as opposed to fixed) by enabling this by default. > > Yes, I got that. Thanks for clarifying. > I just reported a broken example that can be fixed with a different > design (due to the fact that before this series, vsock devices were > accessible to all netns). > > > > > If it does exist, you need a way for userspace to opt-in, > > module parameter isn't that. > > Okay, but I honestly can't find a case that can't be solved. > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > a real case to come up. > > I'll try to see better if there's any particular case where we need > to disable netns in vsock. > > Thanks, > Stefano Me neither. so what did you have in mind when you wrote: "could break existing applications"?
On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > network namespaces and could break existing applications. > > > > > > > > > > Sorry, no. > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > where these netns changes could break things. > > > > > > > > I forgot to mention the use case. > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > processes involved: > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > passes it to qemu > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > different netns, so the communication is not allowed > > > > But, as you said, this could be a wrong design, indeed they already > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > David's question is what would be a usecase that's broken > > > (as opposed to fixed) by enabling this by default. > > > > Yes, I got that. Thanks for clarifying. > > I just reported a broken example that can be fixed with a different > > design (due to the fact that before this series, vsock devices were > > accessible to all netns). > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > module parameter isn't that. > > > > Okay, but I honestly can't find a case that can't be solved. > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > a real case to come up. > > > > I'll try to see better if there's any particular case where we need > > to disable netns in vsock. > > > > Thanks, > > Stefano > > Me neither. so what did you have in mind when you wrote: > "could break existing applications"? I had in mind: 1. the Kata case. It is fixable (the fix is not merged on kata), but older versions will not work with newer Linux. 2. a single process running on init_netns that wants to communicate with VMs handled by VMMs running in different netns, but this case can be solved opening the /dev/vhost-vsock in the same netns of the process that wants to communicate with the VMs (init_netns in this case), and passig it to the VMM. These cases can work with vsock+netns, but they require changes because I'm modifying the vsock behavior with netns.
On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > where these netns changes could break things. > > > > > > > > > > I forgot to mention the use case. > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > processes involved: > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > passes it to qemu > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > different netns, so the communication is not allowed > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > David's question is what would be a usecase that's broken > > > > (as opposed to fixed) by enabling this by default. > > > > > > Yes, I got that. Thanks for clarifying. > > > I just reported a broken example that can be fixed with a different > > > design (due to the fact that before this series, vsock devices were > > > accessible to all netns). > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > module parameter isn't that. > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > a real case to come up. > > > > > > I'll try to see better if there's any particular case where we need > > > to disable netns in vsock. > > > > > > Thanks, > > > Stefano > > > > Me neither. so what did you have in mind when you wrote: > > "could break existing applications"? > > I had in mind: > 1. the Kata case. It is fixable (the fix is not merged on kata), but > older versions will not work with newer Linux. meaning they will keep not working, right? > 2. a single process running on init_netns that wants to communicate with > VMs handled by VMMs running in different netns, but this case can be > solved opening the /dev/vhost-vsock in the same netns of the process > that wants to communicate with the VMs (init_netns in this case), and > passig it to the VMM. again right now they just don't work, right? > These cases can work with vsock+netns, but they require changes because > I'm modifying the vsock behavior with netns.
On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > where these netns changes could break things. > > > > > > > > > > > > I forgot to mention the use case. > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > processes involved: > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > passes it to qemu > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > different netns, so the communication is not allowed > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > I just reported a broken example that can be fixed with a different > > > > design (due to the fact that before this series, vsock devices were > > > > accessible to all netns). > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > module parameter isn't that. > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > a real case to come up. > > > > > > > > I'll try to see better if there's any particular case where we need > > > > to disable netns in vsock. > > > > > > > > Thanks, > > > > Stefano > > > > > > Me neither. so what did you have in mind when you wrote: > > > "could break existing applications"? > > > > I had in mind: > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > older versions will not work with newer Linux. > > meaning they will keep not working, right? Right, I mean without this series they work, with this series they work only if the netns support is disabled or with a patch proposed but not merged in kata. > > > 2. a single process running on init_netns that wants to communicate with > > VMs handled by VMMs running in different netns, but this case can be > > solved opening the /dev/vhost-vsock in the same netns of the process > > that wants to communicate with the VMs (init_netns in this case), and > > passig it to the VMM. > > again right now they just don't work, right? Right, as above. What do you recommend I do? Thanks, Stefano
On Tue, Jan 21, 2020 at 10:07:06AM +0100, Stefano Garzarella wrote: > On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > > where these netns changes could break things. > > > > > > > > > > > > > > I forgot to mention the use case. > > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > > processes involved: > > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > > passes it to qemu > > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > > different netns, so the communication is not allowed > > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > > I just reported a broken example that can be fixed with a different > > > > > design (due to the fact that before this series, vsock devices were > > > > > accessible to all netns). > > > > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > > module parameter isn't that. > > > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > > a real case to come up. > > > > > > > > > > I'll try to see better if there's any particular case where we need > > > > > to disable netns in vsock. > > > > > > > > > > Thanks, > > > > > Stefano > > > > > > > > Me neither. so what did you have in mind when you wrote: > > > > "could break existing applications"? > > > > > > I had in mind: > > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > > older versions will not work with newer Linux. > > > > meaning they will keep not working, right? > > Right, I mean without this series they work, with this series they work > only if the netns support is disabled or with a patch proposed but not > merged in kata. > > > > > > 2. a single process running on init_netns that wants to communicate with > > > VMs handled by VMMs running in different netns, but this case can be > > > solved opening the /dev/vhost-vsock in the same netns of the process > > > that wants to communicate with the VMs (init_netns in this case), and > > > passig it to the VMM. > > > > again right now they just don't work, right? > > Right, as above. > > What do you recommend I do? > > Thanks, > Stefano If this breaks userspace, then we need to maintain compatibility. For example, have two devices, /dev/vhost-vsock and /dev/vhost-vsock-netns?
On Tue, Jan 21, 2020 at 06:14:48AM -0500, Michael S. Tsirkin wrote: > On Tue, Jan 21, 2020 at 10:07:06AM +0100, Stefano Garzarella wrote: > > On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > > > where these netns changes could break things. > > > > > > > > > > > > > > > > I forgot to mention the use case. > > > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > > > processes involved: > > > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > > > passes it to qemu > > > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > > > different netns, so the communication is not allowed > > > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > > > I just reported a broken example that can be fixed with a different > > > > > > design (due to the fact that before this series, vsock devices were > > > > > > accessible to all netns). > > > > > > > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > > > module parameter isn't that. > > > > > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > > > a real case to come up. > > > > > > > > > > > > I'll try to see better if there's any particular case where we need > > > > > > to disable netns in vsock. > > > > > > > > > > > > Thanks, > > > > > > Stefano > > > > > > > > > > Me neither. so what did you have in mind when you wrote: > > > > > "could break existing applications"? > > > > > > > > I had in mind: > > > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > > > older versions will not work with newer Linux. > > > > > > meaning they will keep not working, right? > > > > Right, I mean without this series they work, with this series they work > > only if the netns support is disabled or with a patch proposed but not > > merged in kata. > > > > > > > > > 2. a single process running on init_netns that wants to communicate with > > > > VMs handled by VMMs running in different netns, but this case can be > > > > solved opening the /dev/vhost-vsock in the same netns of the process > > > > that wants to communicate with the VMs (init_netns in this case), and > > > > passig it to the VMM. > > > > > > again right now they just don't work, right? > > > > Right, as above. > > > > What do you recommend I do? > > > > Thanks, > > Stefano > > If this breaks userspace, then we need to maintain compatibility. > For example, have two devices, /dev/vhost-vsock and /dev/vhost-vsock-netns? Interesting! So, VMs handled with /dev/vhost-vsock will be reachable from any netns (as it happens now) and VMs handled with /dev/vhost-vsock-netns will be reachable only from the same netns of the process that opens it. It requires more changes, but we will preserve the previous behavior, adding the new feature! Thanks a lot for this idea! I'll try to implement it! Stefano
On Tue, Jan 21, 2020 at 10:07:06AM +0100, Stefano Garzarella wrote: > On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > > where these netns changes could break things. > > > > > > > > > > > > > > I forgot to mention the use case. > > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > > processes involved: > > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > > passes it to qemu > > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > > different netns, so the communication is not allowed > > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > > I just reported a broken example that can be fixed with a different > > > > > design (due to the fact that before this series, vsock devices were > > > > > accessible to all netns). > > > > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > > module parameter isn't that. > > > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > > a real case to come up. > > > > > > > > > > I'll try to see better if there's any particular case where we need > > > > > to disable netns in vsock. > > > > > > > > > > Thanks, > > > > > Stefano > > > > > > > > Me neither. so what did you have in mind when you wrote: > > > > "could break existing applications"? > > > > > > I had in mind: > > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > > older versions will not work with newer Linux. > > > > meaning they will keep not working, right? > > Right, I mean without this series they work, with this series they work > only if the netns support is disabled or with a patch proposed but not > merged in kata. > > > > > > 2. a single process running on init_netns that wants to communicate with > > > VMs handled by VMMs running in different netns, but this case can be > > > solved opening the /dev/vhost-vsock in the same netns of the process > > > that wants to communicate with the VMs (init_netns in this case), and > > > passig it to the VMM. > > > > again right now they just don't work, right? > > Right, as above. > > What do you recommend I do? Existing userspace applications must continue to work. Guests are fine because G2H transports are always in the initial network namespace. On the host side we have a real case where Kata Containers and other vsock users break. Existing applications run in other network namespaces and assume they can communicate over vsock (it's only available in the initial network namespace by default). It seems we cannot isolate new network namespaces from the initial network namespace by default because it will break existing applications. That's a bummer. There is one solution that maintains compatibility: Introduce a per-namespace vsock isolation flag that can only transition from false to true. Once it becomes true it cannot be reset to false anymore (for security). When vsock isolation is false the initial network namespace is used for <CID, port> addressing. When vsock isolation is true the current namespace is used for <CID, port> addressing. I guess the vsock isolation flag would be set via a rtnetlink message, but I haven't checked. The upshot is: existing software doesn't benefit from namespaces for vsock isolation but it continues to work! New software makes 1 special call after creating the namespace to opt in to vsock isolation. This approach is secure because whoever sets up namespaces can transition the flag from false to true and know that it can never be reset to false anymore. Does this make sense to everyone? Stefan
On Tue, Jan 21, 2020 at 01:59:07PM +0000, Stefan Hajnoczi wrote: > On Tue, Jan 21, 2020 at 10:07:06AM +0100, Stefano Garzarella wrote: > > On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > > > where these netns changes could break things. > > > > > > > > > > > > > > > > I forgot to mention the use case. > > > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > > > processes involved: > > > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > > > passes it to qemu > > > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > > > different netns, so the communication is not allowed > > > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > > > I just reported a broken example that can be fixed with a different > > > > > > design (due to the fact that before this series, vsock devices were > > > > > > accessible to all netns). > > > > > > > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > > > module parameter isn't that. > > > > > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > > > a real case to come up. > > > > > > > > > > > > I'll try to see better if there's any particular case where we need > > > > > > to disable netns in vsock. > > > > > > > > > > > > Thanks, > > > > > > Stefano > > > > > > > > > > Me neither. so what did you have in mind when you wrote: > > > > > "could break existing applications"? > > > > > > > > I had in mind: > > > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > > > older versions will not work with newer Linux. > > > > > > meaning they will keep not working, right? > > > > Right, I mean without this series they work, with this series they work > > only if the netns support is disabled or with a patch proposed but not > > merged in kata. > > > > > > > > > 2. a single process running on init_netns that wants to communicate with > > > > VMs handled by VMMs running in different netns, but this case can be > > > > solved opening the /dev/vhost-vsock in the same netns of the process > > > > that wants to communicate with the VMs (init_netns in this case), and > > > > passig it to the VMM. > > > > > > again right now they just don't work, right? > > > > Right, as above. > > > > What do you recommend I do? > > Existing userspace applications must continue to work. > > Guests are fine because G2H transports are always in the initial network > namespace. > > On the host side we have a real case where Kata Containers and other > vsock users break. Existing applications run in other network > namespaces and assume they can communicate over vsock (it's only > available in the initial network namespace by default). > > It seems we cannot isolate new network namespaces from the initial > network namespace by default because it will break existing > applications. That's a bummer. > > There is one solution that maintains compatibility: > > Introduce a per-namespace vsock isolation flag that can only transition > from false to true. Once it becomes true it cannot be reset to false > anymore (for security). > > When vsock isolation is false the initial network namespace is used for > <CID, port> addressing. > > When vsock isolation is true the current namespace is used for <CID, > port> addressing. > > I guess the vsock isolation flag would be set via a rtnetlink message, > but I haven't checked. > > The upshot is: existing software doesn't benefit from namespaces for > vsock isolation but it continues to work! New software makes 1 special > call after creating the namespace to opt in to vsock isolation. > > This approach is secure because whoever sets up namespaces can > transition the flag from false to true and know that it can never be > reset to false anymore. > > Does this make sense to everyone? > > Stefan Anything wrong with a separate device? whoever opens it decides whether netns will work ...
On Tue, Jan 21, 2020 at 06:14:48AM -0500, Michael S. Tsirkin wrote: > On Tue, Jan 21, 2020 at 10:07:06AM +0100, Stefano Garzarella wrote: > > On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > > > where these netns changes could break things. > > > > > > > > > > > > > > > > I forgot to mention the use case. > > > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > > > processes involved: > > > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > > > passes it to qemu > > > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > > > different netns, so the communication is not allowed > > > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > > > I just reported a broken example that can be fixed with a different > > > > > > design (due to the fact that before this series, vsock devices were > > > > > > accessible to all netns). > > > > > > > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > > > module parameter isn't that. > > > > > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > > > a real case to come up. > > > > > > > > > > > > I'll try to see better if there's any particular case where we need > > > > > > to disable netns in vsock. > > > > > > > > > > > > Thanks, > > > > > > Stefano > > > > > > > > > > Me neither. so what did you have in mind when you wrote: > > > > > "could break existing applications"? > > > > > > > > I had in mind: > > > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > > > older versions will not work with newer Linux. > > > > > > meaning they will keep not working, right? > > > > Right, I mean without this series they work, with this series they work > > only if the netns support is disabled or with a patch proposed but not > > merged in kata. > > > > > > > > > 2. a single process running on init_netns that wants to communicate with > > > > VMs handled by VMMs running in different netns, but this case can be > > > > solved opening the /dev/vhost-vsock in the same netns of the process > > > > that wants to communicate with the VMs (init_netns in this case), and > > > > passig it to the VMM. > > > > > > again right now they just don't work, right? > > > > Right, as above. > > > > What do you recommend I do? > > > > Thanks, > > Stefano > > If this breaks userspace, then we need to maintain compatibility. > For example, have two devices, /dev/vhost-vsock and /dev/vhost-vsock-netns? /dev/vhost-vsock-netns is cleaner and simpler than my suggestion. I like it! This is nice for containers (say you want to run QEMU inside a container on the host) because you can allow only /dev/vhost-vsock-netns inside containers. This prevents them from opening /dev/vhost-vsock to get access to the initial network namespace. Stefan
On Tue, Jan 21, 2020 at 09:31:42AM -0500, Michael S. Tsirkin wrote: > On Tue, Jan 21, 2020 at 01:59:07PM +0000, Stefan Hajnoczi wrote: > > On Tue, Jan 21, 2020 at 10:07:06AM +0100, Stefano Garzarella wrote: > > > On Mon, Jan 20, 2020 at 11:02 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > On Mon, Jan 20, 2020 at 05:53:39PM +0100, Stefano Garzarella wrote: > > > > > On Mon, Jan 20, 2020 at 5:04 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > On Mon, Jan 20, 2020 at 02:58:01PM +0100, Stefano Garzarella wrote: > > > > > > > On Mon, Jan 20, 2020 at 1:03 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > > > On Mon, Jan 20, 2020 at 11:17:35AM +0100, Stefano Garzarella wrote: > > > > > > > > > On Mon, Jan 20, 2020 at 10:06:10AM +0100, David Miller wrote: > > > > > > > > > > From: Stefano Garzarella <sgarzare@redhat.com> > > > > > > > > > > Date: Thu, 16 Jan 2020 18:24:26 +0100 > > > > > > > > > > > > > > > > > > > > > This patch adds 'netns' module param to enable this new feature > > > > > > > > > > > (disabled by default), because it changes vsock's behavior with > > > > > > > > > > > network namespaces and could break existing applications. > > > > > > > > > > > > > > > > > > > > Sorry, no. > > > > > > > > > > > > > > > > > > > > I wonder if you can even design a legitimate, reasonable, use case > > > > > > > > > > where these netns changes could break things. > > > > > > > > > > > > > > > > > > I forgot to mention the use case. > > > > > > > > > I tried the RFC with Kata containers and we found that Kata shim-v1 > > > > > > > > > doesn't work (Kata shim-v2 works as is) because there are the following > > > > > > > > > processes involved: > > > > > > > > > - kata-runtime (runs in the init_netns) opens /dev/vhost-vsock and > > > > > > > > > passes it to qemu > > > > > > > > > - kata-shim (runs in a container) wants to talk with the guest but the > > > > > > > > > vsock device is assigned to the init_netns and kata-shim runs in a > > > > > > > > > different netns, so the communication is not allowed > > > > > > > > > But, as you said, this could be a wrong design, indeed they already > > > > > > > > > found a fix, but I was not sure if others could have the same issue. > > > > > > > > > > > > > > > > > > In this case, do you think it is acceptable to make this change in > > > > > > > > > the vsock's behavior with netns and ask the user to change the design? > > > > > > > > > > > > > > > > David's question is what would be a usecase that's broken > > > > > > > > (as opposed to fixed) by enabling this by default. > > > > > > > > > > > > > > Yes, I got that. Thanks for clarifying. > > > > > > > I just reported a broken example that can be fixed with a different > > > > > > > design (due to the fact that before this series, vsock devices were > > > > > > > accessible to all netns). > > > > > > > > > > > > > > > > > > > > > > > If it does exist, you need a way for userspace to opt-in, > > > > > > > > module parameter isn't that. > > > > > > > > > > > > > > Okay, but I honestly can't find a case that can't be solved. > > > > > > > So I don't know whether to add an option (ioctl, sysfs ?) or wait for > > > > > > > a real case to come up. > > > > > > > > > > > > > > I'll try to see better if there's any particular case where we need > > > > > > > to disable netns in vsock. > > > > > > > > > > > > > > Thanks, > > > > > > > Stefano > > > > > > > > > > > > Me neither. so what did you have in mind when you wrote: > > > > > > "could break existing applications"? > > > > > > > > > > I had in mind: > > > > > 1. the Kata case. It is fixable (the fix is not merged on kata), but > > > > > older versions will not work with newer Linux. > > > > > > > > meaning they will keep not working, right? > > > > > > Right, I mean without this series they work, with this series they work > > > only if the netns support is disabled or with a patch proposed but not > > > merged in kata. > > > > > > > > > > > > 2. a single process running on init_netns that wants to communicate with > > > > > VMs handled by VMMs running in different netns, but this case can be > > > > > solved opening the /dev/vhost-vsock in the same netns of the process > > > > > that wants to communicate with the VMs (init_netns in this case), and > > > > > passig it to the VMM. > > > > > > > > again right now they just don't work, right? > > > > > > Right, as above. > > > > > > What do you recommend I do? > > > > Existing userspace applications must continue to work. > > > > Guests are fine because G2H transports are always in the initial network > > namespace. > > > > On the host side we have a real case where Kata Containers and other > > vsock users break. Existing applications run in other network > > namespaces and assume they can communicate over vsock (it's only > > available in the initial network namespace by default). > > > > It seems we cannot isolate new network namespaces from the initial > > network namespace by default because it will break existing > > applications. That's a bummer. > > > > There is one solution that maintains compatibility: > > > > Introduce a per-namespace vsock isolation flag that can only transition > > from false to true. Once it becomes true it cannot be reset to false > > anymore (for security). > > > > When vsock isolation is false the initial network namespace is used for > > <CID, port> addressing. > > > > When vsock isolation is true the current namespace is used for <CID, > > port> addressing. > > > > I guess the vsock isolation flag would be set via a rtnetlink message, > > but I haven't checked. > > > > The upshot is: existing software doesn't benefit from namespaces for > > vsock isolation but it continues to work! New software makes 1 special > > call after creating the namespace to opt in to vsock isolation. > > > > This approach is secure because whoever sets up namespaces can > > transition the flag from false to true and know that it can never be > > reset to false anymore. > > > > Does this make sense to everyone? > > > > Stefan > > Anything wrong with a separate device? whoever opens it decides > whether netns will work ... Your idea is better. I think a separate device is the way to go. Stefan
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index b1c717286993..015913601fad 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -193,13 +193,16 @@ void vsock_enqueue_accept(struct sock *listener, struct sock *connected); void vsock_insert_connected(struct vsock_sock *vsk); void vsock_remove_bound(struct vsock_sock *vsk); void vsock_remove_connected(struct vsock_sock *vsk); -struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr); +struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr, struct net *net); struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, - struct sockaddr_vm *dst); + struct sockaddr_vm *dst, + struct net *net); void vsock_remove_sock(struct vsock_sock *vsk); void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)); int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk); bool vsock_find_cid(unsigned int cid); +bool vsock_net_eq(const struct net *net1, const struct net *net2); +struct net *vsock_default_net(void); /**** TAP ****/ diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 9c5b2a91baad..457ccd677756 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -140,6 +140,10 @@ static const struct vsock_transport *transport_dgram; static const struct vsock_transport *transport_local; static DEFINE_MUTEX(vsock_register_mutex); +static bool netns; +module_param(netns, bool, 0644); +MODULE_PARM_DESC(netns, "Enable network namespace support"); + /**** UTILS ****/ /* Each bound VSocket is stored in the bind hash table and each connected @@ -226,15 +230,18 @@ static void __vsock_remove_connected(struct vsock_sock *vsk) sock_put(&vsk->sk); } -static struct sock *__vsock_find_bound_socket(struct sockaddr_vm *addr) +static struct sock *__vsock_find_bound_socket(struct sockaddr_vm *addr, + struct net *net) { struct vsock_sock *vsk; list_for_each_entry(vsk, vsock_bound_sockets(addr), bound_table) { - if (vsock_addr_equals_addr(addr, &vsk->local_addr)) + if (vsock_addr_equals_addr(addr, &vsk->local_addr) && + vsock_net_eq(net, sock_net(sk_vsock(vsk)))) return sk_vsock(vsk); if (addr->svm_port == vsk->local_addr.svm_port && + vsock_net_eq(net, sock_net(sk_vsock(vsk))) && (vsk->local_addr.svm_cid == VMADDR_CID_ANY || addr->svm_cid == VMADDR_CID_ANY)) return sk_vsock(vsk); @@ -244,13 +251,15 @@ static struct sock *__vsock_find_bound_socket(struct sockaddr_vm *addr) } static struct sock *__vsock_find_connected_socket(struct sockaddr_vm *src, - struct sockaddr_vm *dst) + struct sockaddr_vm *dst, + struct net *net) { struct vsock_sock *vsk; list_for_each_entry(vsk, vsock_connected_sockets(src, dst), connected_table) { if (vsock_addr_equals_addr(src, &vsk->remote_addr) && + vsock_net_eq(net, sock_net(sk_vsock(vsk))) && dst->svm_port == vsk->local_addr.svm_port) { return sk_vsock(vsk); } @@ -295,12 +304,12 @@ void vsock_remove_connected(struct vsock_sock *vsk) } EXPORT_SYMBOL_GPL(vsock_remove_connected); -struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr) +struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr, struct net *net) { struct sock *sk; spin_lock_bh(&vsock_table_lock); - sk = __vsock_find_bound_socket(addr); + sk = __vsock_find_bound_socket(addr, net); if (sk) sock_hold(sk); @@ -311,12 +320,13 @@ struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr) EXPORT_SYMBOL_GPL(vsock_find_bound_socket); struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, - struct sockaddr_vm *dst) + struct sockaddr_vm *dst, + struct net *net) { struct sock *sk; spin_lock_bh(&vsock_table_lock); - sk = __vsock_find_connected_socket(src, dst); + sk = __vsock_find_connected_socket(src, dst, net); if (sk) sock_hold(sk); @@ -488,6 +498,18 @@ bool vsock_find_cid(unsigned int cid) } EXPORT_SYMBOL_GPL(vsock_find_cid); +bool vsock_net_eq(const struct net *net1, const struct net *net2) +{ + return !netns || net_eq(net1, net2); +} +EXPORT_SYMBOL_GPL(vsock_net_eq); + +struct net *vsock_default_net(void) +{ + return &init_net; +} +EXPORT_SYMBOL_GPL(vsock_default_net); + static struct sock *vsock_dequeue_accept(struct sock *listener) { struct vsock_sock *vlistener; @@ -586,6 +608,7 @@ static int __vsock_bind_stream(struct vsock_sock *vsk, { static u32 port; struct sockaddr_vm new_addr; + struct net *net = sock_net(sk_vsock(vsk)); if (!port) port = LAST_RESERVED_PORT + 1 + @@ -603,7 +626,7 @@ static int __vsock_bind_stream(struct vsock_sock *vsk, new_addr.svm_port = port++; - if (!__vsock_find_bound_socket(&new_addr)) { + if (!__vsock_find_bound_socket(&new_addr, net)) { found = true; break; } @@ -620,7 +643,7 @@ static int __vsock_bind_stream(struct vsock_sock *vsk, return -EACCES; } - if (__vsock_find_bound_socket(&new_addr)) + if (__vsock_find_bound_socket(&new_addr, net)) return -EADDRINUSE; } diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c index b3bdae74c243..237c53316d70 100644 --- a/net/vmw_vsock/hyperv_transport.c +++ b/net/vmw_vsock/hyperv_transport.c @@ -201,7 +201,8 @@ static void hvs_remote_addr_init(struct sockaddr_vm *remote, remote->svm_port = host_ephemeral_port++; - sk = vsock_find_connected_socket(remote, local); + sk = vsock_find_connected_socket(remote, local, + vsock_default_net()); if (!sk) { /* Found an available ephemeral port */ return; @@ -350,7 +351,7 @@ static void hvs_open_connection(struct vmbus_channel *chan) return; hvs_addr_init(&addr, conn_from_host ? if_type : if_instance); - sk = vsock_find_bound_socket(&addr); + sk = vsock_find_bound_socket(&addr, vsock_default_net()); if (!sk) return; diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index d9f0c9c5425a..cecdfd91ed00 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1088,6 +1088,7 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt, void virtio_transport_recv_pkt(struct virtio_transport *t, struct virtio_vsock_pkt *pkt) { + struct net *net = vsock_default_net(); struct sockaddr_vm src, dst; struct vsock_sock *vsk; struct sock *sk; @@ -1115,9 +1116,9 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, /* The socket must be in connected or bound table * otherwise send reset back */ - sk = vsock_find_connected_socket(&src, &dst); + sk = vsock_find_connected_socket(&src, &dst, net); if (!sk) { - sk = vsock_find_bound_socket(&dst); + sk = vsock_find_bound_socket(&dst, net); if (!sk) { (void)virtio_transport_reset_no_sock(t, pkt); goto free_pkt; diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 4b8b1150a738..3ad15d51b30b 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -669,6 +669,7 @@ static bool vmci_transport_stream_allow(u32 cid, u32 port) static int vmci_transport_recv_stream_cb(void *data, struct vmci_datagram *dg) { + struct net *net = vsock_default_net(); struct sock *sk; struct sockaddr_vm dst; struct sockaddr_vm src; @@ -702,9 +703,9 @@ static int vmci_transport_recv_stream_cb(void *data, struct vmci_datagram *dg) vsock_addr_init(&src, pkt->dg.src.context, pkt->src_port); vsock_addr_init(&dst, pkt->dg.dst.context, pkt->dst_port); - sk = vsock_find_connected_socket(&src, &dst); + sk = vsock_find_connected_socket(&src, &dst, net); if (!sk) { - sk = vsock_find_bound_socket(&dst); + sk = vsock_find_bound_socket(&dst, net); if (!sk) { /* We could not find a socket for this specified * address. If this packet is a RST, we just drop it.
This patch adds a check of the "net" assigned to a socket during the vsock_find_bound_socket() and vsock_find_connected_socket() to support network namespace, allowing to share the same address (cid, port) across different network namespaces. This patch adds 'netns' module param to enable this new feature (disabled by default), because it changes vsock's behavior with network namespaces and could break existing applications. G2H transports will use the default network namepsace (init_net). H2G transports can use different network namespace for different VMs. This patch uses default network namepsace (init_net) in all transports. Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- RFC -> v1 * added 'netns' module param * added 'vsock_net_eq()' to check the "net" assigned to a socket only when 'netns' support is enabled --- include/net/af_vsock.h | 7 +++-- net/vmw_vsock/af_vsock.c | 41 +++++++++++++++++++------ net/vmw_vsock/hyperv_transport.c | 5 +-- net/vmw_vsock/virtio_transport_common.c | 5 +-- net/vmw_vsock/vmci_transport.c | 5 +-- 5 files changed, 46 insertions(+), 17 deletions(-)