* [PATCH v2 net-next] net: socket: use BIT() for MSG_*
@ 2021-02-07 4:32 menglong8.dong
2021-02-07 11:52 ` Andy Shevchenko
0 siblings, 1 reply; 5+ messages in thread
From: menglong8.dong @ 2021-02-07 4:32 UTC (permalink / raw)
To: axboe, andy.shevchenko; +Cc: davem, herbert, dong.menglong, viro, linux-kernel
From: Menglong Dong <dong.menglong@zte.com.cn>
The bit mask for MSG_* seems a little confused here. Replace it
with BIT() to make it clear to understand.
Changes since v1:
- use BIT() instead of BIT_MASK()
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
include/linux/socket.h | 71 ++++++++++++++++++++++--------------------
1 file changed, 37 insertions(+), 34 deletions(-)
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 385894b4a8bb..e88859f38cd0 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -283,42 +283,45 @@ struct ucred {
Added those for 1003.1g not all are supported yet
*/
-#define MSG_OOB 1
-#define MSG_PEEK 2
-#define MSG_DONTROUTE 4
-#define MSG_TRYHARD 4 /* Synonym for MSG_DONTROUTE for DECnet */
-#define MSG_CTRUNC 8
-#define MSG_PROBE 0x10 /* Do not send. Only probe path f.e. for MTU */
-#define MSG_TRUNC 0x20
-#define MSG_DONTWAIT 0x40 /* Nonblocking io */
-#define MSG_EOR 0x80 /* End of record */
-#define MSG_WAITALL 0x100 /* Wait for a full request */
-#define MSG_FIN 0x200
-#define MSG_SYN 0x400
-#define MSG_CONFIRM 0x800 /* Confirm path validity */
-#define MSG_RST 0x1000
-#define MSG_ERRQUEUE 0x2000 /* Fetch message from error queue */
-#define MSG_NOSIGNAL 0x4000 /* Do not generate SIGPIPE */
-#define MSG_MORE 0x8000 /* Sender will send more */
-#define MSG_WAITFORONE 0x10000 /* recvmmsg(): block until 1+ packets avail */
-#define MSG_SENDPAGE_NOPOLICY 0x10000 /* sendpage() internal : do no apply policy */
-#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */
-#define MSG_BATCH 0x40000 /* sendmmsg(): more messages coming */
-#define MSG_EOF MSG_FIN
-#define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */
-#define MSG_SENDPAGE_DECRYPTED 0x100000 /* sendpage() internal : page may carry
- * plain text and require encryption
- */
-
-#define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */
-#define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */
-#define MSG_CMSG_CLOEXEC 0x40000000 /* Set close_on_exec for file
- descriptor received through
- SCM_RIGHTS */
+#define MSG_OOB BIT(0)
+#define MSG_PEEK BIT(1)
+#define MSG_DONTROUTE BIT(2)
+#define MSG_TRYHARD BIT(2) /* Synonym for MSG_DONTROUTE for DECnet */
+#define MSG_CTRUNC BIT(3)
+#define MSG_PROBE BIT(4) /* Do not send. Only probe path f.e. for MTU */
+#define MSG_TRUNC BIT(5)
+#define MSG_DONTWAIT BIT(6) /* Nonblocking io */
+#define MSG_EOR BIT(7) /* End of record */
+#define MSG_WAITALL BIT(8) /* Wait for a full request */
+#define MSG_FIN BIT(9)
+#define MSG_SYN BIT(10)
+#define MSG_CONFIRM BIT(11) /* Confirm path validity */
+#define MSG_RST BIT(12)
+#define MSG_ERRQUEUE BIT(13) /* Fetch message from error queue */
+#define MSG_NOSIGNAL BIT(14) /* Do not generate SIGPIPE */
+#define MSG_MORE BIT(15) /* Sender will send more */
+#define MSG_WAITFORONE BIT(16) /* recvmmsg(): block until 1+ packets avail */
+#define MSG_SENDPAGE_NOPOLICY BIT(16) /* sendpage() internal : do no apply policy */
+#define MSG_SENDPAGE_NOTLAST BIT(17) /* sendpage() internal : not the last page */
+#define MSG_BATCH BIT(18) /* sendmmsg(): more messages coming */
+#define MSG_EOF MSG_FIN
+#define MSG_NO_SHARED_FRAGS BIT(19) /* sendpage() internal : page frags
+ * are not shared
+ */
+#define MSG_SENDPAGE_DECRYPTED BIT(20) /* sendpage() internal : page may carry
+ * plain text and require encryption
+ */
+
+#define MSG_ZEROCOPY BIT(26) /* Use user data in kernel path */
+#define MSG_FASTOPEN BIT(29) /* Send data in TCP SYN */
+#define MSG_CMSG_CLOEXEC BIT(30) /* Set close_on_exec for file
+ * descriptor received through
+ * SCM_RIGHTS
+ */
#if defined(CONFIG_COMPAT)
-#define MSG_CMSG_COMPAT 0x80000000 /* This message needs 32 bit fixups */
+#define MSG_CMSG_COMPAT BIT(31) /* This message needs 32 bit fixups */
#else
-#define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */
+#define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 net-next] net: socket: use BIT() for MSG_*
2021-02-07 4:32 [PATCH v2 net-next] net: socket: use BIT() for MSG_* menglong8.dong
@ 2021-02-07 11:52 ` Andy Shevchenko
2021-02-07 14:14 ` Menglong Dong
0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2021-02-07 11:52 UTC (permalink / raw)
To: menglong8.dong
Cc: Jens Axboe, David S. Miller, Herbert Xu, dong.menglong,
Alexander Viro, Linux Kernel Mailing List
On Sun, Feb 7, 2021 at 6:32 AM <menglong8.dong@gmail.com> wrote:
>
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> The bit mask for MSG_* seems a little confused here. Replace it
> with BIT() to make it clear to understand.
Now it's confusing which version maintainer should take (you forgot,
it seems twice, to bump the patch version and mention the changes in
the changelog).
> Changes since v1:
> - use BIT() instead of BIT_MASK()
Moreover, this should go...
>
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
> ---
...after this line.
Please, send now a v3 properly.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 net-next] net: socket: use BIT() for MSG_*
2021-02-07 11:52 ` Andy Shevchenko
@ 2021-02-07 14:14 ` Menglong Dong
0 siblings, 0 replies; 5+ messages in thread
From: Menglong Dong @ 2021-02-07 14:14 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Jens Axboe, David S. Miller, Herbert Xu, Menglong Dong,
Alexander Viro, Linux Kernel Mailing List
On Sun, Feb 7, 2021 at 7:52 PM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> On Sun, Feb 7, 2021 at 6:32 AM <menglong8.dong@gmail.com> wrote:
> >
> > From: Menglong Dong <dong.menglong@zte.com.cn>
> >
> > The bit mask for MSG_* seems a little confused here. Replace it
> > with BIT() to make it clear to understand.
>
> Now it's confusing which version maintainer should take (you forgot,
> it seems twice, to bump the patch version and mention the changes in
> the changelog).
Sorry, a 'BIT_MASK()' escaped in the first one, and I just thought that the
second one will override the first one, as long as I send it quick enough
before anyone see it:)
Thanks~
Menglong Dong
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 net-next] net: socket: use BIT() for MSG_*
2021-02-07 3:18 menglong8.dong
@ 2021-02-08 17:04 ` Jakub Kicinski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2021-02-08 17:04 UTC (permalink / raw)
To: menglong8.dong
Cc: axboe, andy.shevchenko, davem, viro, dong.menglong, herbert,
linux-kernel
On Sat, 6 Feb 2021 19:18:16 -0800 menglong8.dong@gmail.com wrote:
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> The bit mask for MSG_* seems a little confused here. Replace it
> with BIT() to make it clear to understand.
>
> Changes since v1:
> - use BIT() instead of BIT_MASK()
>
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
You need to CC netdev.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 net-next] net: socket: use BIT() for MSG_*
@ 2021-02-07 3:18 menglong8.dong
2021-02-08 17:04 ` Jakub Kicinski
0 siblings, 1 reply; 5+ messages in thread
From: menglong8.dong @ 2021-02-07 3:18 UTC (permalink / raw)
To: axboe, andy.shevchenko
Cc: davem, kuba, viro, dong.menglong, herbert, linux-kernel
From: Menglong Dong <dong.menglong@zte.com.cn>
The bit mask for MSG_* seems a little confused here. Replace it
with BIT() to make it clear to understand.
Changes since v1:
- use BIT() instead of BIT_MASK()
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
include/linux/socket.h | 71 ++++++++++++++++++++++--------------------
1 file changed, 37 insertions(+), 34 deletions(-)
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 385894b4a8bb..cc525d66512d 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -283,42 +283,45 @@ struct ucred {
Added those for 1003.1g not all are supported yet
*/
-#define MSG_OOB 1
-#define MSG_PEEK 2
-#define MSG_DONTROUTE 4
-#define MSG_TRYHARD 4 /* Synonym for MSG_DONTROUTE for DECnet */
-#define MSG_CTRUNC 8
-#define MSG_PROBE 0x10 /* Do not send. Only probe path f.e. for MTU */
-#define MSG_TRUNC 0x20
-#define MSG_DONTWAIT 0x40 /* Nonblocking io */
-#define MSG_EOR 0x80 /* End of record */
-#define MSG_WAITALL 0x100 /* Wait for a full request */
-#define MSG_FIN 0x200
-#define MSG_SYN 0x400
-#define MSG_CONFIRM 0x800 /* Confirm path validity */
-#define MSG_RST 0x1000
-#define MSG_ERRQUEUE 0x2000 /* Fetch message from error queue */
-#define MSG_NOSIGNAL 0x4000 /* Do not generate SIGPIPE */
-#define MSG_MORE 0x8000 /* Sender will send more */
-#define MSG_WAITFORONE 0x10000 /* recvmmsg(): block until 1+ packets avail */
-#define MSG_SENDPAGE_NOPOLICY 0x10000 /* sendpage() internal : do no apply policy */
-#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */
-#define MSG_BATCH 0x40000 /* sendmmsg(): more messages coming */
-#define MSG_EOF MSG_FIN
-#define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */
-#define MSG_SENDPAGE_DECRYPTED 0x100000 /* sendpage() internal : page may carry
- * plain text and require encryption
- */
-
-#define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */
-#define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */
-#define MSG_CMSG_CLOEXEC 0x40000000 /* Set close_on_exec for file
- descriptor received through
- SCM_RIGHTS */
+#define MSG_OOB BIT(0)
+#define MSG_PEEK BIT(1)
+#define MSG_DONTROUTE BIT(2)
+#define MSG_TRYHARD BIT(2) /* Synonym for MSG_DONTROUTE for DECnet */
+#define MSG_CTRUNC BIT(3)
+#define MSG_PROBE BIT(4) /* Do not send. Only probe path f.e. for MTU */
+#define MSG_TRUNC BIT(5)
+#define MSG_DONTWAIT BIT(6) /* Nonblocking io */
+#define MSG_EOR BIT(7) /* End of record */
+#define MSG_WAITALL BIT(8) /* Wait for a full request */
+#define MSG_FIN BIT(9)
+#define MSG_SYN BIT(10)
+#define MSG_CONFIRM BIT(11) /* Confirm path validity */
+#define MSG_RST BIT(12)
+#define MSG_ERRQUEUE BIT(13) /* Fetch message from error queue */
+#define MSG_NOSIGNAL BIT(14) /* Do not generate SIGPIPE */
+#define MSG_MORE BIT(15) /* Sender will send more */
+#define MSG_WAITFORONE BIT(16) /* recvmmsg(): block until 1+ packets avail */
+#define MSG_SENDPAGE_NOPOLICY BIT(16) /* sendpage() internal : do no apply policy */
+#define MSG_SENDPAGE_NOTLAST BIT(17) /* sendpage() internal : not the last page */
+#define MSG_BATCH BIT(18) /* sendmmsg(): more messages coming */
+#define MSG_EOF MSG_FIN
+#define MSG_NO_SHARED_FRAGS BIT(19) /* sendpage() internal : page frags
+ * are not shared
+ */
+#define MSG_SENDPAGE_DECRYPTED BIT(20) /* sendpage() internal : page may carry
+ * plain text and require encryption
+ */
+
+#define MSG_ZEROCOPY BIT(26) /* Use user data in kernel path */
+#define MSG_FASTOPEN BIT(29) /* Send data in TCP SYN */
+#define MSG_CMSG_CLOEXEC BIT(30) /* Set close_on_exec for file
+ * descriptor received through
+ * SCM_RIGHTS
+ */
#if defined(CONFIG_COMPAT)
-#define MSG_CMSG_COMPAT 0x80000000 /* This message needs 32 bit fixups */
+#define MSG_CMSG_COMPAT BIT_MASK(31) /* This message needs 32 bit fixups */
#else
-#define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */
+#define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-08 18:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-07 4:32 [PATCH v2 net-next] net: socket: use BIT() for MSG_* menglong8.dong
2021-02-07 11:52 ` Andy Shevchenko
2021-02-07 14:14 ` Menglong Dong
-- strict thread matches above, loose matches on Subject: below --
2021-02-07 3:18 menglong8.dong
2021-02-08 17:04 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.