| Message ID | 20250321103848.550689-1-praan@google.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | net: Fix the devmem sock opts and msgs for parisc | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Pranjal Shrivastava wrote: > The devmem socket options and socket control message definitions > introduced in the TCP devmem series[1] incorrectly continued the socket > definitions for arch/parisc. > > The UAPI change seems safe as there are currently no drivers that > declare support for devmem TCP RX via PP_FLAG_ALLOW_UNREADABLE_NETMEM. > Hence, fixing this UAPI should be safe. > > Fix the devmem socket options and socket control message definitions to > reflect the series followed by arch/parisc. > > [1] > https://lore.kernel.org/lkml/20240910171458.219195-10-almasrymina@google.com/ > > Fixes: 8f0b3cc9a4c10 ("tcp: RX path for devmem TCP") > Signed-off-by: Pranjal Shrivastava <praan@google.com> This patch is already marked in patchwork as not applicable. Because it is not correctly marked as [PATCH net]? Patchwork interpreted it as not a local patch. It affects parisc, but the patch referenced in Fixes also went in through net-next. So I think this should go through net.
On Fri, Mar 21, 2025 at 5:39 PM Pranjal Shrivastava <praan@google.com> wrote: > > The devmem socket options and socket control message definitions > introduced in the TCP devmem series[1] incorrectly continued the socket > definitions for arch/parisc. > > The UAPI change seems safe as there are currently no drivers that > declare support for devmem TCP RX via PP_FLAG_ALLOW_UNREADABLE_NETMEM. > Hence, fixing this UAPI should be safe. > > Fix the devmem socket options and socket control message definitions to > reflect the series followed by arch/parisc. > > [1] > https://lore.kernel.org/lkml/20240910171458.219195-10-almasrymina@google.com/ > > Fixes: 8f0b3cc9a4c10 ("tcp: RX path for devmem TCP") > Signed-off-by: Pranjal Shrivastava <praan@google.com> When I did the review for [1], I noticed that. Regarding to the patch itself, feel free to add my tag in the next revision: Reviewed-by: Jason Xing <kerneljasonxing@gmail.com> [1]: https://web.git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=23b763302ce0 Thanks, Jason > --- > arch/parisc/include/uapi/asm/socket.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h > index aa9cd4b951fe..96831c988606 100644 > --- a/arch/parisc/include/uapi/asm/socket.h > +++ b/arch/parisc/include/uapi/asm/socket.h > @@ -132,16 +132,16 @@ > #define SO_PASSPIDFD 0x404A > #define SO_PEERPIDFD 0x404B > > -#define SO_DEVMEM_LINEAR 78 > -#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR > -#define SO_DEVMEM_DMABUF 79 > -#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF > -#define SO_DEVMEM_DONTNEED 80 > - > #define SCM_TS_OPT_ID 0x404C > > #define SO_RCVPRIORITY 0x404D > > +#define SO_DEVMEM_LINEAR 0x404E > +#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR > +#define SO_DEVMEM_DMABUF 0x404F > +#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF > +#define SO_DEVMEM_DONTNEED 0x4050 > + > #if !defined(__KERNEL__) > > #if __BITS_PER_LONG == 64 > -- > 2.49.0.395.g12beb8f557-goog > >
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h index aa9cd4b951fe..96831c988606 100644 --- a/arch/parisc/include/uapi/asm/socket.h +++ b/arch/parisc/include/uapi/asm/socket.h @@ -132,16 +132,16 @@ #define SO_PASSPIDFD 0x404A #define SO_PEERPIDFD 0x404B -#define SO_DEVMEM_LINEAR 78 -#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR -#define SO_DEVMEM_DMABUF 79 -#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF -#define SO_DEVMEM_DONTNEED 80 - #define SCM_TS_OPT_ID 0x404C #define SO_RCVPRIORITY 0x404D +#define SO_DEVMEM_LINEAR 0x404E +#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR +#define SO_DEVMEM_DMABUF 0x404F +#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF +#define SO_DEVMEM_DONTNEED 0x4050 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64
The devmem socket options and socket control message definitions introduced in the TCP devmem series[1] incorrectly continued the socket definitions for arch/parisc. The UAPI change seems safe as there are currently no drivers that declare support for devmem TCP RX via PP_FLAG_ALLOW_UNREADABLE_NETMEM. Hence, fixing this UAPI should be safe. Fix the devmem socket options and socket control message definitions to reflect the series followed by arch/parisc. [1] https://lore.kernel.org/lkml/20240910171458.219195-10-almasrymina@google.com/ Fixes: 8f0b3cc9a4c10 ("tcp: RX path for devmem TCP") Signed-off-by: Pranjal Shrivastava <praan@google.com> --- arch/parisc/include/uapi/asm/socket.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)