Re: cups slow on linux-2.6.24

Previous thread: [PATCH] splice: fix user pointer access in get_iovec_page_array() by Pekka J Enberg on Sunday, February 10, 2008 - 10:47 am. (10 messages)

Next thread: [PATCH] [arch/arm/mach-pnx4008/gpio.c] duplication in if ... else if branches by Roel Kluin on Sunday, February 10, 2008 - 11:11 am. (1 message)
To: Patrick McHardy <kaber@...>
Cc: Jozsef Kadlecsik <kadlec@...>, lkml <linux-kernel@...>, Krzysztof Piotr Oledzki <ole@...>, David S. Miller <davem@...>, cups-bugs <cups-bugs@...>, Netfilter Development Mailinglist <netfilter-devel@...>, Linus Torvalds <torvalds@...>
Date: Sunday, February 10, 2008 - 11:06 am

Please note the lastest git commit is missing one part (which was in
Jozsef's original patch).

commit b2155e7f70b3f058efe94c0c459db023b05057bd
Author: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu Feb 7 17:54:56 2008 -0800

[NETFILTER]: nf_conntrack: TCP conntrack reopening fix

I've tested the following missing patch, and it solves the cups slow
printing problem.

Thanks,
Jeff

--- a/net/netfilter/nf_conntrack_proto_tcp.c.org 2008-02-10 22:45:49 +0800
+++ a/net/netfilter/nf_conntrack_proto_tcp.c 2008-02-10 22:45:56 +0800
@@ -945,7 +945,7 @@

ct->proto.tcp.state = new_state;
if (old_state != new_state
- && new_state == TCP_CONNTRACK_CLOSE)
+ && new_state == TCP_CONNTRACK_FIN_WAIT)
ct->proto.tcp.seen[dir].flags |= IP_CT_TCP_FLAG_CLOSE_INIT;
timeout = ct->proto.tcp.retrans >= nf_ct_tcp_max_retrans
&& tcp_timeouts[new_state] > nf_ct_tcp_timeout_max_retrans
--

To: Jeff Chua <jeff.chua.linux@...>
Cc: Patrick McHardy <kaber@...>, lkml <linux-kernel@...>, Krzysztof Piotr Oledzki <ole@...>, David S. Miller <davem@...>, cups-bugs <cups-bugs@...>, Netfilter Development Mailinglist <netfilter-devel@...>, Linus Torvalds <torvalds@...>
Date: Thursday, February 14, 2008 - 11:02 am

Hi,

Sorry everyone, that's my fault: the patch I sent for the stable branch
was correct, however I mistyped a state in the patch for the newest
git tree - Jeff spotted it, thanks! So here follows the patch against the
newest git tree which corrects the mistake. Please review and commit.

commit 1177898d185f382f491afaee3cdc752729c74bd2
Author: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu Feb 14 15:51:21 2008 +0100

Mistyped state corrected.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 202d7fa..6256795 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -945,7 +945,7 @@ static int tcp_packet(struct nf_conn *ct,

ct->proto.tcp.state = new_state;
if (old_state != new_state
- && new_state == TCP_CONNTRACK_CLOSE)
+ && new_state == TCP_CONNTRACK_FIN_WAIT)
ct->proto.tcp.seen[dir].flags |= IP_CT_TCP_FLAG_CLOSE_INIT;
timeout = ct->proto.tcp.retrans >= nf_ct_tcp_max_retrans
&& tcp_timeouts[new_state] > nf_ct_tcp_timeout_max_retrans

Best regards,
Jozsef
-
E-mail : kadlec@blackhole.kfki.hu, kadlec@sunserv.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
H-1525 Budapest 114, POB. 49, Hungary
--

To: <kadlec@...>
Cc: <jeff.chua.linux@...>, <kaber@...>, <linux-kernel@...>, <ole@...>, <cups-bugs@...>, <netfilter-devel@...>, <torvalds@...>
Date: Thursday, February 14, 2008 - 6:50 pm

From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

I'll apply this since Patrick still isn't feeling well.

Thanks!
--

To: David Miller <davem@...>
Cc: <kadlec@...>, <jeff.chua.linux@...>, <linux-kernel@...>, <ole@...>, <cups-bugs@...>, <netfilter-devel@...>, <torvalds@...>
Date: Thursday, February 14, 2008 - 9:44 pm

Thanks Dave. I'm almost feeling healthy again, so I'll go through
my backlog over the next days and will push everything important
early next week.

--

Previous thread: [PATCH] splice: fix user pointer access in get_iovec_page_array() by Pekka J Enberg on Sunday, February 10, 2008 - 10:47 am. (10 messages)

Next thread: [PATCH] [arch/arm/mach-pnx4008/gpio.c] duplication in if ... else if branches by Roel Kluin on Sunday, February 10, 2008 - 11:11 am. (1 message)