]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: Fix the devmem sock opts and msgs for parisc
authorPranjal Shrivastava <praan@google.com>
Mon, 24 Mar 2025 07:42:27 +0000 (07:42 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 25 Mar 2025 19:25:37 +0000 (12:25 -0700)
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>
Link: https://patch.msgid.link/20250324074228.3139088-1-praan@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
arch/parisc/include/uapi/asm/socket.h

index aa9cd4b951fe534048e79a4e7c88ac9de689f1f6..96831c98860658bb134e75c51f4d533525e0b0d0 100644 (file)
 #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