Eric Dumazet wrote:
> Hi David
>
> Could you add the following patch, because it apparently was lost
> during the battle :)
>
> Thank you
>
> [PATCH] use SK_MEM_QUANTUM_SHIFT in __sk_mem_reclaim()
>
> Avoid an expensive divide (as done in commit
> 18030477e70a826b91608aee40a987bbd368fec6 but l
David Miller wrote:
> From: Hideo AOKI <[EMAIL PROTECTED]>
> Date: Sun, 30 Dec 2007 04:01:46 -0500
>
>> diff -pruN net-2.6.25-t12t19m-p4/net/ipv4/proc.c
>> net-2.6.25-t12t19m-p5/net/ipv4/proc.c
>> --- net-2.6.25-t12t19m-p4/net/ipv4/proc.c2007-12-27 10:19:
David Miller wrote:
> This patch would not apply, because is contained changes
> present in the first patch, specifically:
> And now I see exactly what you did, and it is quite careless.
>
> You wrote one big patch then tried to split it up by hand. This
> proves to me that you did not test the
Hello David,
David Miller wrote:
> From: Hideo AOKI <[EMAIL PROTECTED]>
> Date: Sun, 30 Dec 2007 03:47:33 -0500
>
>> The patch set consists of the following 4 patches.
>>
>> [1/4] introducing new memory accounting interface
>> [2/4] adding memory accountin
Eric Dumazet wrote:
> Hideo AOKI a écrit :
>> This patch adds UDP memory usage accounting in IPv4. Currently,
>> receiving buffer accounting is only supported.
>>
>> This patch is also introduced memory_allocated variable for UDP protocol.
>
> OK, but sockstat_seq
kahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
udp.c | 32
1 file changed, 28 insertions(+), 4 deletions(-)
diff -pruN net-2.6.25-t12t19m-p6/net/ipv6/udp.c
net-2.6.25-t12t19m-p7/net/ipv6/udp.c
--- net-2.6.25-t
kahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/udp.h |2 ++
net/ipv4/af_inet.c |2 ++
net/ipv4/udp.c | 26 --
3 files changed, 28 insertions(+), 2 deletions(-)
diff -pruN net-2.6.25-t12t19m-p5/inclu
of pages for socket buffer is
beyond udp_mem and the socket already consumes minimum buffer.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
Cc: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Takahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
This patch replaces present memory accounting calls with new interface
in TCP.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
Cc: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Takahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
incl
al memory accounting functions with spin lock
* changed detagram receive functions to be able to customize
destructor
* fixed accounting bugs in previous takes
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
--
To unsubscribe from this list: send the line "unsubscr
kahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/sock.h |3 ++-
net/core/datagram.c |2 ++
net/core/sock.c |7 +++
net/core/stream.c |2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff -pruN net-2.6.2
consolidation, updating sk_wmem_queued is
removed from sk_mem_charge().
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
Cc: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Takahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAI
This patch replaces present memory accounting calls with new interface
in SCTP.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
Cc: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Takahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
includ
patches.
[1/4] introducing new memory accounting interface
[2/4] adding memory accounting points to consolidate functions
[3/4] updating TCP to use new interface
[4/4] updating SCTP to use new interface
The patch set was tested on net-2.6.25 tree.
Best regards,
Hideo Aoki
--
Hitachi Computer
David Miller wrote:
> From: Hideo AOKI <[EMAIL PROTECTED]>
> Date: Thu, 20 Dec 2007 23:18:54 -0500
>
>>> Also, the memory accounting is done at different parts in
>>> the socket code paths for stream vs. datagram. This is why
>>> everything is inconsiste
Hello,
Thank you so much for your comments.
David Miller wrote:
> All of these other functions are identical copies of the stream
> counterparts, they should all be consolidated.
>
> I still see a lot of special casing, instead of large pieces of common
> code.
>
> There should be one core set
David Miller wrote:
> From: Hideo AOKI <[EMAIL PROTECTED]>
> Date: Mon, 17 Dec 2007 21:38:47 -0500
>
>> This patch adds UDP memory usage accounting in IPv4.
>>
> We can't accept these changes, even once the other issues
> are fixed, until IPV6 is supported a
Hello,
David Miller wrote:
>> diff -pruN net-2.6/net/ipv4/ip_output.c
>> net-2.6-udp-take11a1-p1/net/ipv4/ip_output.c
>> --- net-2.6/net/ipv4/ip_output.c 2007-12-11 10:54:55.0 -0500
>> +++ net-2.6-udp-take11a1-p1/net/ipv4/ip_output.c 2007-12-17
>> 14:42:31.0 -0500
>> @@
lt;[EMAIL PROTECTED]>
signed-off-by: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/sock.h | 78 +++
net/core/datagram.c | 85 ++
Hello,
I really apologize for not replying to this mail sooner.
Herbert Xu wrote:
> On Mon, Dec 03, 2007 at 07:10:45PM -0500, Hideo AOKI wrote:
>> Because we have to call wmem_schedule function in ip_append_data()
>> which is used by several protocols both stream and datagram.
&g
of pages for socket buffer is
beyond udp_mem and the socket already consumes minimum buffer.
This patch is also introduced memory_allocated variable for UDP protocol.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
Documentation/networking/i
AIL PROTECTED]>
signed-off-by: Takahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
ip_output.c | 46 +++
a receive buffer detractor for datagram
protocols which are capable of protocol specific memory accounting.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Takahiro Yasui <[EMAIL PROTECTED]>
signed-off-by: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki
This patch introduces sndbuf size check before memory allocation for
send buffer.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
ip_output.c |5 +
1 file changed, 5 insertions(+)
diff -pruN net-2.6/net/ipv4/ip_output.c
tagram_pages(): avoided using divide instruction
* udp_recvmsg(): fixed referring released truesize in accounting
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to
David Miller wrote:
> From: Hideo AOKI <[EMAIL PROTECTED]>
> Date: Sat, 15 Dec 2007 00:07:44 -0500
>
>> Changelog take 9 -> take 10:
>> * supported using sk_forward_alloc
>> * introduced several memory accounting functions with spin lock
>> * change
Hello,
Thank you for your quick comments.
Herbert Xu wrote:
>> +spin_lock_irqsave(&sk->sk_lock.slock, flags);
>
> Please use bh_lock_sock since this must never be used from an
> IRQ handler.
I'll try to re-implement this locking mechanism as David suggested.
>> +static inline void sk_mem_r
PROTECTED]>
signed-off-by: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
af_inet.c |2 ++
ip_output.c | 46 --
udp.c | 16 +++-
3 files changed, 61 insertions(+), 3 deletions(-)
of pages for socket buffer is
beyond udp_mem and the socket already consumes minimum buffer.
This patch is also introduced memory_allocated variable for UDP protocol.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
Documentation/networking/i
sui <[EMAIL PROTECTED]>
signed-off-by: Masami Hiramatsu <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/sock.h | 117 +---
net/core/datagram.c | 72
net/core/soc
This patch introduces sndbuf size check before memory allocation for
send buffer.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
ip_output.c |5 +
1 file changed, 5 insertions(+)
diff -pruN net-2.6/net/ipv4/ip_output.c
t regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Herbert Xu wrote:
> On Wed, Dec 05, 2007 at 11:28:34PM -0500, Hideo AOKI wrote:
>> 1. Using sk_forward_alloc and adding socket lock
>>
>>UDP already uses a socket lock to send message. However, it doesn't
>>use the lock to receive message. I wonder if we
Herbert Xu wrote:
> On Mon, Dec 03, 2007 at 07:14:26PM -0500, Hideo AOKI wrote:
>> Let me try to use sk_forward_alloc at first, while percpu storage
>> is an interesting idea.
>
> Actually I don't think sk_forward_alloc would work for UDP because
> it runs lockless (
Eric Dumazet wrote:
> Herbert Xu a écrit :
>> However, I'm still a little concerned about the effect of two more
>> atomic op's per packet that we're adding here. Hang on a sec, that
>> should've been Dave's line since atomic ops are cheap on x86 :)
>>
>> But seriously, it's not so much that we ha
Herbert Xu wrote:
> On Wed, Nov 28, 2007 at 01:52:59PM -0500, Hideo AOKI wrote:
>> +static inline int sk_wmem_schedule(struct sock *sk, int size)
>> +{
>> +if (sk->sk_type == SOCK_STREAM)
>> +return sk_stream_wmem_schedule(sk, size);
>> +
This patch adds UDP memory usage accounting in IPv4.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
af_inet.c | 30 +-
ip_output.c | 49 ++---
udp.c
This patch introduces datagram memory accounting functions. Owing to
call memory schedule functions from IP layer, sk_wmem_schedule() is
also added.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/so
of pages for socket buffer is
beyond udp_mem and the socket already consumes minimum buffer.
This patch is also introduced memory_allocated variable for UDP protocol.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
Documentation/networking/i
This patch introduces sndbuf size check before memory allocation for
send buffer.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
ip_output.c |5 +
1 file changed, 5 insertions(+)
diff -pruN net-2.6/net/ipv4/ip_output.c
bugfix of UDP limit affecting protocol other than UDP
* introducing __ip_check_max_skb_pages()
* using CTL_UNNUMBERED
* adding udp_mem usage to Documentation/networking/ip_sysctl.txt
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
-
To unsubscribe from this list: send the line
David Miller wrote:
> From: Hideo AOKI <[EMAIL PROTECTED]>
> Date: Thu, 15 Nov 2007 16:50:14 -0500
>
>> +static inline int __ip_check_max_skb_pages(struct sock *sk, int size)
>> +{
>> +switch(sk->sk_protocol) {
>> +case IPPROTO_UDP:
&
Herbert Xu wrote:
> On Thu, Nov 15, 2007 at 03:23:53PM -0800, David Miller wrote:
>> We don't have tests all over the place to see if a socket is TCP or
>> DCCP or SCTP in order to implement memory accounting there, because we
>> did it for connection oriented protocols cleanly, seperating things
>
This patch introduces sndbuf size check before memory allocation for
send buffer.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
ip_output.c |5 +
1 file changed, 5 insertions(+)
diff -pruN net-2.6/net/ipv4/ip_output.c ne
This patch added /proc/sys/net/ipv4/udp_rmem_min and
/proc/sys/net/ipv4/udp_rmem_min. Each UDP packet is drooped when the
number of pages for socket buffer is beyond the limit and the socket
already consumes minimum buffer.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki &
This patch introduces global variable for UDP memory accounting.
The unit is page.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/sock.h |8
include/net/udp.h |2 ++
net/ipv4/proc.c|3 ++-
ne
This patch adds UDP memory usage accounting in IPv4.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
af_inet.c | 30 +-
ip_output.c | 25 ++---
udp.c | 10 +++
This patch introduces memory limitation for UDP.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
Documentation/networking/ip-sysctl.txt |6
include/net/udp.h |3 ++
net/ip
* adding minimal limit of /proc/sys/net/ipv4/udp_mem
* bugfix of UDP limit affecting protocol other than UDP
* introducing __ip_check_max_skb_pages()
* using CTL_UNNUMBERED
* adding udp_mem usage to Documentation/networking/ip_sysctl.txt
Best regards,
Hideo Aoki
--
Hitachi Computer Products (A
Herbert Xu wrote:
> On Wed, Nov 14, 2007 at 06:30:51PM -0500, Hideo AOKI wrote:
>> +#define SK_DATAGRAM_MEM_QUANTUM ((unsigned int)PAGE_SIZE)
>> +
>> +static inline int sk_datagram_pages(int amt)
>> +{
>> +/* Cast to unsigned as an optimization,
Hideo AOKI wrote:
David Miller wrote:
From: Hideo AOKI <[EMAIL PROTECTED]>
Date: Tue, 13 Nov 2007 22:27:13 -0500
Herbert Xu wrote:
On Mon, Oct 29, 2007 at 05:23:10PM -0400, Hideo AOKI wrote:
+#define SK_DATAGRAM_MEM_QUANTUM ((int)PAGE_SIZE)
+
+static inline int sk_datagram_pages(i
David Miller wrote:
From: Hideo AOKI <[EMAIL PROTECTED]>
Date: Tue, 13 Nov 2007 22:27:13 -0500
Herbert Xu wrote:
On Mon, Oct 29, 2007 at 05:23:10PM -0400, Hideo AOKI wrote:
+#define SK_DATAGRAM_MEM_QUANTUM ((int)PAGE_SIZE)
+
+static inline int sk_datagram_pages(int amt)
+{
+
Hello,
Herbert Xu wrote:
On Mon, Oct 29, 2007 at 05:23:10PM -0400, Hideo AOKI wrote:
+#define SK_DATAGRAM_MEM_QUANTUM ((int)PAGE_SIZE)
+
+static inline int sk_datagram_pages(int amt)
+{
+ return DIV_ROUND_UP(amt, SK_DATAGRAM_MEM_QUANTUM);
+}
Does this really have to be int? Unsigned
Hello,
I'm sorry that my response is always late.
Herbert Xu wrote:
On Mon, Oct 29, 2007 at 05:22:53PM -0400, Hideo AOKI wrote:
This patch introduces sndbuf size check before memory allocation for
send buffer.
Looks good, what about IPv6?
I'm going to develop IPv6 part if IPv4
This patch introduces memory limitation for UDP.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
Documentation/networking/ip-sysctl.txt |6
include/net/udp.h |3 ++
net/ip
This patch added /proc/sys/net/ipv4/udp_rmem_min and
/proc/sys/net/ipv4/udp_rmem_min. Each UDP packet is drooped when the
number of pages for socket buffer is beyond the limit and the socket
already consumes minimum buffer.
Cc: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki &
This patch introduces global variable for UDP memory accounting.
The unit is page.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
include/net/sock.h |7 +++
include/net/udp.h |2 ++
net/ipv4/proc.c|3 ++-
ne
This patch adds UDP memory usage accounting in IPv4.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
af_inet.c | 30 +-
ip_output.c | 25 ++---
udp.c |9 ++
This patch introduces sndbuf size check before memory allocation for
send buffer.
signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
---
ip_output.c |5 +
1 file changed, 5 insertions(+)
diff -pruN net-2.6/net/ipv4/ip_output.c
UDP limit affecting protocol other than UDP
* introducing __ip_check_max_skb_pages()
* using CTL_UNNUMBERED
* adding udp_mem usage to Documentation/networking/ip_sysctl.txt
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
-
To unsubscribe from this list: send the line "unsu
Hello,
I'm sorry to not respond quickly.
Bill Fink wrote:
On Mon, 29 Oct 2007, Hideo AOKI wrote:
This patch added /proc/sys/net/udp_rmem and /proc/sys/net/udp_rmem.
Each UDP packet is drooped when the number of pages for socket buffer
is beyond the limit and the socket already con
This patch adds UDP memory usage accounting in IPv4.
--
Hideo Aoki
Hitachi Computer Products (America) Inc.
Signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
Signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
af_inet.c | 30 +-
ip_out
This patch added /proc/sys/net/udp_rmem and /proc/sys/net/udp_rmem.
Each UDP packet is drooped when the number of pages for socket buffer
is beyond the limit and the socket already consumes minimum buffer.
--
Hideo Aoki
Hitachi Computer Products (America) Inc.
Cc: Satoshi Oshima <[EM
This patch introduces global variable for UDP memory accounting.
The unit is page.
--
Hideo Aoki
Hitachi Computer Products (America) Inc.
Signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
Signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
include/net/sock.h |7 +++
inclu
This patch introduces memory limitation for UDP.
--
Hideo Aoki
Hitachi Computer Products (America) Inc.
Signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
Signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
Documentation/networking/ip-sysctl.txt |6
inclu
This patch introduces sndbuf size check before memory allocation for
send buffer.
--
Hideo Aoki
Hitachi Computer Products (America) Inc.
Signed-off-by: Satoshi Oshima <[EMAIL PROTECTED]>
Signed-off-by: Hideo Aoki <[EMAIL PROTECTED]>
ip_output.c |5 +
1 file changed,
using CTL_UNNUMBERED
* adding udp_mem usage to Documentation/networking/ip_sysctl.txt
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordo
Herbert Xu wrote:
On Fri, Oct 12, 2007 at 09:11:27PM +0900, Satoshi OSHIMA wrote:
+static inline int __ip_check_max_skb_pages(struct sock *sk, int size)
+{
+ switch(sk->sk_protocol) {
+ case IPPROTO_UDP:
+ if (sk->sk_prot->sysctl_mem[0] > UDP_MIN_SKB_PAGES)
+
entation of the patch basically followed implementation of
tcp_memory_allocated. However, I should agree that the patch introduces
atomic operations too much. Then, I'll try to use the batching to reduce
the number of atomic operations.
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America)
roper accounting
if you need that, but not hacks in generic ip code.
As far as I know, Satoshi is improving this part right now. Please wait his
response.
Many thanks for your comments.
Best regards,
Hideo Aoki
--
Hitachi Computer Products (America) Inc.
-
To unsubscribe from this list: send the
70 matches
Mail list logo
