| Message ID | 20250324074228.3139088-1-praan@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fd87b7783802b45cdd261b273e6b2b792823064d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] net: Fix the devmem sock opts and msgs for parisc | expand |
On Mon, 24 Mar 2025 07:42:27 +0000 Pranjal Shrivastava wrote: > The UAPI change seems safe as there are currently no drivers that > declare support for devmem TCP RX via PP_FLAG_ALLOW_UNREADABLE_NETMEM. ... that could possibly work on parisc.
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 24 Mar 2025 07:42:27 +0000 you 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. > > [...] Here is the summary with links: - [net,v2] net: Fix the devmem sock opts and msgs for parisc https://git.kernel.org/netdev/net/c/fd87b7783802 You are awesome, thank you!
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> Reviewed-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Jason Xing <kerneljasonxing@gmail.com> Reviewed-by: Mina Almasry <almasrymina@google.com> --- arch/parisc/include/uapi/asm/socket.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)