Cornelia Huck
2021-Mar-16 08:11 UTC
[MASSMAIL KLMS] [virtio-comment] Re: [RFC PATCH v1] virtio-vsock: use enums instead of hardcoded constants
On Tue, 16 Mar 2021 06:35:11 +0300 Arseny Krasnov <arseny.krasnov at kaspersky.com> wrote:> On 15.03.2021 18:53, Cornelia Huck wrote: > > On Mon, 15 Mar 2021 11:35:41 +0300 > > Arseny Krasnov <arseny.krasnov at kaspersky.com> wrote: > > > >> This replaces constants defined in "bit X set to Y" manner > >> with enums from Linux kernel uapi headers. > >> --- > >> virtio-vsock.tex | 29 ++++++++++++++++++++++------- > >> 1 file changed, 22 insertions(+), 7 deletions(-) > >> > >> diff --git a/virtio-vsock.tex b/virtio-vsock.tex > >> index da7e641..a97a81e 100644 > >> --- a/virtio-vsock.tex > >> +++ b/virtio-vsock.tex > >> @@ -140,8 +140,14 @@ \subsubsection{Addressing}\label{sec:Device Types / Socket Device / Device Opera > >> consists of a (cid, port number) tuple. The header fields used for this are > >> \field{src_cid}, \field{src_port}, \field{dst_cid}, and \field{dst_port}. > >> > >> -Currently only stream sockets are supported. \field{type} is 1 for stream > >> -socket types. > >> +Currently only stream sockets are supported. \field{type} is one of the > >> +following constants: > >> + > >> +\begin{lstlisting} > >> +enum virtio_vsock_type { > >> + VIRTIO_VSOCK_TYPE_STREAM = 1, > >> +}; > >> +\end{lstlisting} > >> > >> Stream sockets provide in-order, guaranteed, connection-oriented delivery > >> without message boundaries. > >> @@ -221,11 +227,20 @@ \subsubsection{Stream Sockets}\label{sec:Device Types / Socket Device / Device O > >> a listening socket does not exist on the destination or the destination has > >> insufficient resources to establish the connection. > >> > >> -When a connected socket receives VIRTIO_VSOCK_OP_SHUTDOWN the header > >> -\field{flags} field bit 0 indicates that the peer will not receive any more > >> -data and bit 1 indicates that the peer will not send any more data. These > >> -hints are permanent once sent and successive packets with bits clear do not > >> -reset them. > >> +When a connected socket receives VIRTIO_VSOCK_OP_SHUTDOWN, header \field{flags} > >> +field is one of the following constants: > > I don't think these two are required to be mutually exclusive (i.e. > > both can be indicated at the same time?) > > I'm not sure, in Linux driver there are several cases when these constants are used > > independently from each over, but I think, this is question to implementation of virtio > > vsock protocol, while this patch is cosmetic for specification.Yes, even if Linux doesn't use it like that, we allow it in the spec. What about: "When a connected socked receives VIRTIO_VSOCK_OP_SHUTDOWN, the header \field{flags} contains a combination of one or more of the following constants:" ?> > > > >> + > >> +\begin{lstlisting} > >> +enum virtio_vsock_shutdown { > >> + VIRTIO_VSOCK_SHUTDOWN_RCV = 1, > >> + VIRTIO_VSOCK_SHUTDOWN_SEND = 2, > >> +}; > >> +\end{lstlisting} > >> + > >> +VIRTIO_VSOCK_SHUTDOWN_RCV indicates that the peer will not receive any more > >> +data and VIRTIO_VSOCK_SHUTDOWN_SEND indicates that the peer will not send > >> +any more data. These hints are permanent once sent and successive packets > >> +with bits clear do not reset them. > >> > >> The VIRTIO_VSOCK_OP_RST packet aborts the connection process or forcibly > >> disconnects a connected socket.
Michael S. Tsirkin
2021-Mar-16 13:23 UTC
[MASSMAIL KLMS] [virtio-comment] Re: [RFC PATCH v1] virtio-vsock: use enums instead of hardcoded constants
On Tue, Mar 16, 2021 at 09:11:40AM +0100, Cornelia Huck wrote:> On Tue, 16 Mar 2021 06:35:11 +0300 > Arseny Krasnov <arseny.krasnov at kaspersky.com> wrote: > > > On 15.03.2021 18:53, Cornelia Huck wrote: > > > On Mon, 15 Mar 2021 11:35:41 +0300 > > > Arseny Krasnov <arseny.krasnov at kaspersky.com> wrote: > > > > > >> This replaces constants defined in "bit X set to Y" manner > > >> with enums from Linux kernel uapi headers. > > >> --- > > >> virtio-vsock.tex | 29 ++++++++++++++++++++++------- > > >> 1 file changed, 22 insertions(+), 7 deletions(-) > > >> > > >> diff --git a/virtio-vsock.tex b/virtio-vsock.tex > > >> index da7e641..a97a81e 100644 > > >> --- a/virtio-vsock.tex > > >> +++ b/virtio-vsock.tex > > >> @@ -140,8 +140,14 @@ \subsubsection{Addressing}\label{sec:Device Types / Socket Device / Device Opera > > >> consists of a (cid, port number) tuple. The header fields used for this are > > >> \field{src_cid}, \field{src_port}, \field{dst_cid}, and \field{dst_port}. > > >> > > >> -Currently only stream sockets are supported. \field{type} is 1 for stream > > >> -socket types. > > >> +Currently only stream sockets are supported. \field{type} is one of the > > >> +following constants: > > >> + > > >> +\begin{lstlisting} > > >> +enum virtio_vsock_type { > > >> + VIRTIO_VSOCK_TYPE_STREAM = 1, > > >> +}; > > >> +\end{lstlisting}Constants is kind of weird here, and this just makes the reader jump through more hoops to figure out the value for little gain. How about more clarity at cost of a bit of repetition: --- Currently only stream sockets are supported. \field{type} is 1 for stream socket types. \begin{lstlisting} #define VIRTIO_VSOCK_TYPE_STREAM 1 \end{lstlisting} ---> > >> > > >> Stream sockets provide in-order, guaranteed, connection-oriented delivery > > >> without message boundaries.The use of enum seems questionable. Rest of spec except for sound uses #define which while not documented is at least an english word. I'd say it is easier to convert sound for consistency. BTW we should probably document the use of #define in introduction.tex> > >> @@ -221,11 +227,20 @@ \subsubsection{Stream Sockets}\label{sec:Device Types / Socket Device / Device O > > >> a listening socket does not exist on the destination or the destination has > > >> insufficient resources to establish the connection. > > >> > > >> -When a connected socket receives VIRTIO_VSOCK_OP_SHUTDOWN the header > > >> -\field{flags} field bit 0 indicates that the peer will not receive any more > > >> -data and bit 1 indicates that the peer will not send any more data. These > > >> -hints are permanent once sent and successive packets with bits clear do not > > >> -reset them. > > >> +When a connected socket receives VIRTIO_VSOCK_OP_SHUTDOWN, header \field{flags} > > >> +field is one of the following constants: > > > I don't think these two are required to be mutually exclusive (i.e. > > > both can be indicated at the same time?) > > > > I'm not sure, in Linux driver there are several cases when these constants are used > > > > independently from each over, but I think, this is question to implementation of virtio > > > > vsock protocol, while this patch is cosmetic for specification. > > Yes, even if Linux doesn't use it like that, we allow it in the spec. > What about: > > "When a connected socked receives VIRTIO_VSOCK_OP_SHUTDOWN, the header > \field{flags} contains a combination of one or more of the following > constants:" > > ?combination is kind of vague ... Also, bit numbers are generally more useful than masks. Also, let's eschew abbreviation. And again a bit of repetition here will just make things easier to read imho. So how about e.g. \field{flags} field bit 0 indicates that the peer will not receive any more data and bit 1 indicates that the peer will not send any more data. +#define VIRTIO_VSOCK_SHUTDOWN_RECEIVE_BIT 0 +#define VIRTIO_VSOCK_SHUTDOWN_SEND_BIT 1 then teach linux about VIRTIO_VSOCK_SHUTDOWN_RECEIVE_BIT and VIRTIO_VSOCK_SHUTDOWN_SEND_BIT> > > > > > > >> + > > >> +\begin{lstlisting} > > >> +enum virtio_vsock_shutdown { > > >> + VIRTIO_VSOCK_SHUTDOWN_RCV = 1, > > >> + VIRTIO_VSOCK_SHUTDOWN_SEND = 2, > > >> +}; > > >> +\end{lstlisting} > > >> + > > >> +VIRTIO_VSOCK_SHUTDOWN_RCV indicates that the peer will not receive any more > > >> +data and VIRTIO_VSOCK_SHUTDOWN_SEND indicates that the peer will not send > > >> +any more data. These hints are permanent once sent and successive packets > > >> +with bits clear do not reset them. > > >> > > >> The VIRTIO_VSOCK_OP_RST packet aborts the connection process or forcibly > > >> disconnects a connected socket.