* [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-07-12 22:55 ` Richard Sailer
0 siblings, 0 replies; 6+ messages in thread
From: Richard Sailer @ 2020-07-12 22:55 UTC (permalink / raw)
To: gerrit, davem, dccp; +Cc: netdev
This adds support for the SIOCOUTQ IOCTL to get the send buffer fill
of a DCCP socket, like UDP and TCP sockets already have.
Regarding the used data field: DCCP uses per packet sequence numbers,
not per byte, so sequence numbers can't be used like in TCP. sk_wmem_queued
is not used by DCCP and always 0, even in test on highly congested paths.
Therefore this uses sk_wmem_alloc like in UDP.
Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
---
v4: Update to apply to .rst doc file
---
Documentation/networking/dccp.rst | 2 ++
net/dccp/proto.c | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/Documentation/networking/dccp.rst b/Documentation/networking/dccp.rst
index dde16be044562..74659da107f6b 100644
--- a/Documentation/networking/dccp.rst
+++ b/Documentation/networking/dccp.rst
@@ -192,6 +192,8 @@ FIONREAD
Works as in udp(7): returns in the ``int`` argument pointer the size of
the next pending datagram in bytes, or 0 when no datagram is pending.
+SIOCOUTQ
+ Returns the number of data bytes in the local send queue.
Other tunables
==============
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index c13b6609474b6..dab74e8a8a69b 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -375,6 +375,14 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
goto out;
switch (cmd) {
+ case SIOCOUTQ: {
+ /* Using sk_wmem_alloc here because sk_wmem_queued is not used by DCCP and
+ * always 0, comparably to UDP.
+ */
+ int amount = sk_wmem_alloc_get(sk);
+ rc = put_user(amount, (int __user *)arg);
+ }
+ break;
case SIOCINQ: {
struct sk_buff *skb;
unsigned long amount = 0;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-07-12 22:55 ` Richard Sailer
0 siblings, 0 replies; 6+ messages in thread
From: Richard Sailer @ 2020-07-12 22:55 UTC (permalink / raw)
To: dccp
This adds support for the SIOCOUTQ IOCTL to get the send buffer fill
of a DCCP socket, like UDP and TCP sockets already have.
Regarding the used data field: DCCP uses per packet sequence numbers,
not per byte, so sequence numbers can't be used like in TCP. sk_wmem_queued
is not used by DCCP and always 0, even in test on highly congested paths.
Therefore this uses sk_wmem_alloc like in UDP.
Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
---
v4: Update to apply to .rst doc file
---
Documentation/networking/dccp.rst | 2 ++
net/dccp/proto.c | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/Documentation/networking/dccp.rst b/Documentation/networking/dccp.rst
index dde16be044562..74659da107f6b 100644
--- a/Documentation/networking/dccp.rst
+++ b/Documentation/networking/dccp.rst
@@ -192,6 +192,8 @@ FIONREAD
Works as in udp(7): returns in the ``int`` argument pointer the size of
the next pending datagram in bytes, or 0 when no datagram is pending.
+SIOCOUTQ
+ Returns the number of data bytes in the local send queue.
Other tunables
=======
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index c13b6609474b6..dab74e8a8a69b 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -375,6 +375,14 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
goto out;
switch (cmd) {
+ case SIOCOUTQ: {
+ /* Using sk_wmem_alloc here because sk_wmem_queued is not used by DCCP and
+ * always 0, comparably to UDP.
+ */
+ int amount = sk_wmem_alloc_get(sk);
+ rc = put_user(amount, (int __user *)arg);
+ }
+ break;
case SIOCINQ: {
struct sk_buff *skb;
unsigned long amount = 0;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
2020-07-12 22:55 ` Richard Sailer
@ 2020-07-16 19:56 ` Jakub Kicinski
-1 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2020-07-16 19:56 UTC (permalink / raw)
To: Richard Sailer; +Cc: gerrit, davem, dccp, netdev
On Mon, 13 Jul 2020 00:55:20 +0200 Richard Sailer wrote:
> This adds support for the SIOCOUTQ IOCTL to get the send buffer fill
> of a DCCP socket, like UDP and TCP sockets already have.
>
> Regarding the used data field: DCCP uses per packet sequence numbers,
> not per byte, so sequence numbers can't be used like in TCP. sk_wmem_queued
> is not used by DCCP and always 0, even in test on highly congested paths.
> Therefore this uses sk_wmem_alloc like in UDP.
>
> Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
Sorry for the late review
> diff --git a/Documentation/networking/dccp.rst b/Documentation/networking/dccp.rst
> index dde16be044562..74659da107f6b 100644
> --- a/Documentation/networking/dccp.rst
> +++ b/Documentation/networking/dccp.rst
> @@ -192,6 +192,8 @@ FIONREAD
> Works as in udp(7): returns in the ``int`` argument pointer the size of
> the next pending datagram in bytes, or 0 when no datagram is pending.
>
> +SIOCOUTQ
> + Returns the number of data bytes in the local send queue.
FIONREAD uses tabs for indentation, it seems like a good idea to
document the size of the argument (i.e. "returns in the ``int`` ...").
> Other tunables
> ==============
> diff --git a/net/dccp/proto.c b/net/dccp/proto.c
> index c13b6609474b6..dab74e8a8a69b 100644
> --- a/net/dccp/proto.c
> +++ b/net/dccp/proto.c
> @@ -375,6 +375,14 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
> goto out;
>
> switch (cmd) {
> + case SIOCOUTQ: {
> + /* Using sk_wmem_alloc here because sk_wmem_queued is not used by DCCP and
> + * always 0, comparably to UDP.
> + */
> + int amount = sk_wmem_alloc_get(sk);
> + rc = put_user(amount, (int __user *)arg);
checkpatch warns:
WARNING: Missing a blank line after declarations
#48: FILE: net/dccp/proto.c:383:
+ int amount = sk_wmem_alloc_get(sk);
+ rc = put_user(amount, (int __user *)arg);
Could you please address that, and better still move the declaration of
"int amount" up to the function level and avoid the funky bracket around
the case statement altogether?
> + }
> + break;
> case SIOCINQ: {
> struct sk_buff *skb;
> unsigned long amount = 0;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-07-16 19:56 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2020-07-16 19:56 UTC (permalink / raw)
To: dccp
On Mon, 13 Jul 2020 00:55:20 +0200 Richard Sailer wrote:
> This adds support for the SIOCOUTQ IOCTL to get the send buffer fill
> of a DCCP socket, like UDP and TCP sockets already have.
>
> Regarding the used data field: DCCP uses per packet sequence numbers,
> not per byte, so sequence numbers can't be used like in TCP. sk_wmem_queued
> is not used by DCCP and always 0, even in test on highly congested paths.
> Therefore this uses sk_wmem_alloc like in UDP.
>
> Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
Sorry for the late review
> diff --git a/Documentation/networking/dccp.rst b/Documentation/networking/dccp.rst
> index dde16be044562..74659da107f6b 100644
> --- a/Documentation/networking/dccp.rst
> +++ b/Documentation/networking/dccp.rst
> @@ -192,6 +192,8 @@ FIONREAD
> Works as in udp(7): returns in the ``int`` argument pointer the size of
> the next pending datagram in bytes, or 0 when no datagram is pending.
>
> +SIOCOUTQ
> + Returns the number of data bytes in the local send queue.
FIONREAD uses tabs for indentation, it seems like a good idea to
document the size of the argument (i.e. "returns in the ``int`` ...").
> Other tunables
> =======
> diff --git a/net/dccp/proto.c b/net/dccp/proto.c
> index c13b6609474b6..dab74e8a8a69b 100644
> --- a/net/dccp/proto.c
> +++ b/net/dccp/proto.c
> @@ -375,6 +375,14 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
> goto out;
>
> switch (cmd) {
> + case SIOCOUTQ: {
> + /* Using sk_wmem_alloc here because sk_wmem_queued is not used by DCCP and
> + * always 0, comparably to UDP.
> + */
> + int amount = sk_wmem_alloc_get(sk);
> + rc = put_user(amount, (int __user *)arg);
checkpatch warns:
WARNING: Missing a blank line after declarations
#48: FILE: net/dccp/proto.c:383:
+ int amount = sk_wmem_alloc_get(sk);
+ rc = put_user(amount, (int __user *)arg);
Could you please address that, and better still move the declaration of
"int amount" up to the function level and avoid the funky bracket around
the case statement altogether?
> + }
> + break;
> case SIOCINQ: {
> struct sk_buff *skb;
> unsigned long amount = 0;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
2020-07-12 22:55 ` Richard Sailer
@ 2020-07-17 0:56 ` Richard Sailer
-1 siblings, 0 replies; 6+ messages in thread
From: Richard Sailer @ 2020-07-17 0:56 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: gerrit, davem, dccp, netdev
[-- Attachment #1.1: Type: text/plain, Size: 2766 bytes --]
On 16/07/2020 21:56, Jakub Kicinski wrote:
> On Mon, 13 Jul 2020 00:55:20 +0200 Richard Sailer wrote:
>> This adds support for the SIOCOUTQ IOCTL to get the send buffer fill
>> of a DCCP socket, like UDP and TCP sockets already have.
>>
>> Regarding the used data field: DCCP uses per packet sequence numbers,
>> not per byte, so sequence numbers can't be used like in TCP. sk_wmem_queued
>> is not used by DCCP and always 0, even in test on highly congested paths.
>> Therefore this uses sk_wmem_alloc like in UDP.
>>
>> Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
>
> Sorry for the late review
No problem, nothing compared to the information delays at university^^
>
>> diff --git a/Documentation/networking/dccp.rst b/Documentation/networking/dccp.rst
>> index dde16be044562..74659da107f6b 100644
>> --- a/Documentation/networking/dccp.rst
>> +++ b/Documentation/networking/dccp.rst
>> @@ -192,6 +192,8 @@ FIONREAD
>> Works as in udp(7): returns in the ``int`` argument pointer the size of
>> the next pending datagram in bytes, or 0 when no datagram is pending.
>>
>> +SIOCOUTQ
>> + Returns the number of data bytes in the local send queue.
>
> FIONREAD uses tabs for indentation, it seems like a good idea to
> document the size of the argument (i.e. "returns in the ``int`` ...").
Agreed
>
>> Other tunables
>> ==============
>> diff --git a/net/dccp/proto.c b/net/dccp/proto.c
>> index c13b6609474b6..dab74e8a8a69b 100644
>> --- a/net/dccp/proto.c
>> +++ b/net/dccp/proto.c
>> @@ -375,6 +375,14 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
>> goto out;
>>
>> switch (cmd) {
>> + case SIOCOUTQ: {
>> + /* Using sk_wmem_alloc here because sk_wmem_queued is not used by DCCP and
>> + * always 0, comparably to UDP.
>> + */
>> + int amount = sk_wmem_alloc_get(sk);
>> + rc = put_user(amount, (int __user *)arg);
>
> checkpatch warns:
>
> WARNING: Missing a blank line after declarations
> #48: FILE: net/dccp/proto.c:383:
> + int amount = sk_wmem_alloc_get(sk);
> + rc = put_user(amount, (int __user *)arg);
>
> Could you please address that, and better still move the declaration of
> "int amount" up to the function level and avoid the funky bracket around
> the case statement altogether?
I found the funky braces disturbing too, but thought they were
convention, so happy to delete them.
Regarding "putting int amount at function level": well the problem is in
the other case statement is a unsigned long (and the pointer in
put_user() is (int __user *) ). I don't yet know if I can make that all
a simple int without losing correctness/security. I will send a v5 when
I figured that out.
Thanks,
-- Richard
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-07-17 0:56 ` Richard Sailer
0 siblings, 0 replies; 6+ messages in thread
From: Richard Sailer @ 2020-07-17 0:56 UTC (permalink / raw)
To: dccp
[-- Attachment #1.1: Type: text/plain, Size: 2766 bytes --]
On 16/07/2020 21:56, Jakub Kicinski wrote:
> On Mon, 13 Jul 2020 00:55:20 +0200 Richard Sailer wrote:
>> This adds support for the SIOCOUTQ IOCTL to get the send buffer fill
>> of a DCCP socket, like UDP and TCP sockets already have.
>>
>> Regarding the used data field: DCCP uses per packet sequence numbers,
>> not per byte, so sequence numbers can't be used like in TCP. sk_wmem_queued
>> is not used by DCCP and always 0, even in test on highly congested paths.
>> Therefore this uses sk_wmem_alloc like in UDP.
>>
>> Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
>
> Sorry for the late review
No problem, nothing compared to the information delays at university^^
>
>> diff --git a/Documentation/networking/dccp.rst b/Documentation/networking/dccp.rst
>> index dde16be044562..74659da107f6b 100644
>> --- a/Documentation/networking/dccp.rst
>> +++ b/Documentation/networking/dccp.rst
>> @@ -192,6 +192,8 @@ FIONREAD
>> Works as in udp(7): returns in the ``int`` argument pointer the size of
>> the next pending datagram in bytes, or 0 when no datagram is pending.
>>
>> +SIOCOUTQ
>> + Returns the number of data bytes in the local send queue.
>
> FIONREAD uses tabs for indentation, it seems like a good idea to
> document the size of the argument (i.e. "returns in the ``int`` ...").
Agreed
>
>> Other tunables
>> ==============
>> diff --git a/net/dccp/proto.c b/net/dccp/proto.c
>> index c13b6609474b6..dab74e8a8a69b 100644
>> --- a/net/dccp/proto.c
>> +++ b/net/dccp/proto.c
>> @@ -375,6 +375,14 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
>> goto out;
>>
>> switch (cmd) {
>> + case SIOCOUTQ: {
>> + /* Using sk_wmem_alloc here because sk_wmem_queued is not used by DCCP and
>> + * always 0, comparably to UDP.
>> + */
>> + int amount = sk_wmem_alloc_get(sk);
>> + rc = put_user(amount, (int __user *)arg);
>
> checkpatch warns:
>
> WARNING: Missing a blank line after declarations
> #48: FILE: net/dccp/proto.c:383:
> + int amount = sk_wmem_alloc_get(sk);
> + rc = put_user(amount, (int __user *)arg);
>
> Could you please address that, and better still move the declaration of
> "int amount" up to the function level and avoid the funky bracket around
> the case statement altogether?
I found the funky braces disturbing too, but thought they were
convention, so happy to delete them.
Regarding "putting int amount at function level": well the problem is in
the other case statement is a unsigned long (and the pointer in
put_user() is (int __user *) ). I don't yet know if I can make that all
a simple int without losing correctness/security. I will send a v5 when
I figured that out.
Thanks,
-- Richard
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-17 0:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-12 22:55 [PATCH net-next v4] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill) Richard Sailer
2020-07-12 22:55 ` Richard Sailer
2020-07-16 19:56 ` Jakub Kicinski
2020-07-16 19:56 ` Jakub Kicinski
2020-07-17 0:56 ` Richard Sailer
2020-07-17 0:56 ` Richard Sailer
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.