* [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-06-03 11:10 ` Richard Sailer
0 siblings, 0 replies; 6+ messages in thread
From: Richard Sailer @ 2020-06-03 11:10 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>
---
v3: whitespace fixes
---
Documentation/networking/dccp.txt | 2 ++
net/dccp/proto.c | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt
index 55c575fcaf17d..682ecf8288827 100644
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
@@ -185,6 +185,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 4af8a98fe7846..148de5ec585b2 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.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-06-03 11:10 ` Richard Sailer
0 siblings, 0 replies; 6+ messages in thread
From: Richard Sailer @ 2020-06-03 11:10 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>
---
v3: whitespace fixes
---
Documentation/networking/dccp.txt | 2 ++
net/dccp/proto.c | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt
index 55c575fcaf17d..682ecf8288827 100644
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
@@ -185,6 +185,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 4af8a98fe7846..148de5ec585b2 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.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
2020-06-03 11:10 ` Richard Sailer
@ 2020-06-03 17:47 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-06-03 17:47 UTC (permalink / raw)
To: richard_siegfried; +Cc: gerrit, dccp, netdev
From: Richard Sailer <richard_siegfried@systemli.org>
Date: Wed, 3 Jun 2020 13:10:51 +0200
> 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>
> ---
> v3: whitespace fixes
net-next is CLOSED
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-06-03 17:47 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2020-06-03 17:47 UTC (permalink / raw)
To: dccp
From: Richard Sailer <richard_siegfried@systemli.org>
Date: Wed, 3 Jun 2020 13:10:51 +0200
> 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>
> ---
> v3: whitespace fixes
net-next is CLOSED
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
2020-06-03 11:10 ` Richard Sailer
@ 2020-06-03 17:56 ` Richard Siegfried
-1 siblings, 0 replies; 6+ messages in thread
From: Richard Siegfried @ 2020-06-03 17:56 UTC (permalink / raw)
To: David Miller; +Cc: gerrit, dccp, netdev
[-- Attachment #1.1: Type: text/plain, Size: 74 bytes --]
>
> net-next is CLOSED
>
Okay, I will resend in next merge window
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)
@ 2020-06-03 17:56 ` Richard Siegfried
0 siblings, 0 replies; 6+ messages in thread
From: Richard Siegfried @ 2020-06-03 17:56 UTC (permalink / raw)
To: dccp
[-- Attachment #1.1: Type: text/plain, Size: 74 bytes --]
>
> net-next is CLOSED
>
Okay, I will resend in next merge window
[-- 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-06-03 17:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-03 11:10 [PATCH v3] net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill) Richard Sailer
2020-06-03 11:10 ` Richard Sailer
2020-06-03 17:47 ` David Miller
2020-06-03 17:47 ` David Miller
2020-06-03 17:56 ` Richard Siegfried
2020-06-03 17:56 ` Richard Siegfried
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.