* Re: [PATCH 2.6.23+] ingress classify to [nf]mark
From: Dzianis Kahanovich @ 2008-01-12 17:56 UTC (permalink / raw)
To: netdev
In-Reply-To: <1200107027.4477.36.camel@localhost>
I in doubts only about "action continue".
To "and/or" behaviour one of best usage are (example):
# set bit 2 of mark to 0 (mark&0xfd|0) and continue
tc filter add ... prio 1 ... flowid fd:0 action continue
# continue
tc filter add ... prio 2 ...
- in current ingress_enqueue() code IMHO "case TC_ACT_OK:" will not reached
for action continue. I use old (mark=...) solution only by this.
I think, "skb->mark = (skb->mark&(res.classid>>16))|TC_H_MIN(res.classid);"
must be in the end of ingress_enqueue() before "return result". And not
depended to "NET_CLS_ACT". But while not test it.
Or this:
---
#ifdef CONFIG_NET_SCH_INGRESS_TC2MARK
#ifdef CONFIG_NET_CLS_ACT
skb->mark = (skb->mark&(res.classid>>16))|TC_H_MIN(res.classid);
#else
skb->mark = res.classid;
#endif
#endif
return result;
}
jamal wrote:
>> While I compose filter, I check flag ($TC_INDEX2MARK), tells me are patch
>> applied or no. If no - I use usual "-j MARK --set-mark", else I use classid to
>> change mark. All in ingress only. For example:
>> tc filter add dev eth0 parent ffff: protocol ip u32 ... action ipt -j MARK 0x10
>> are cname to:
>> tc filter add dev eth0 parent ffff: protocol ip u32 ... flowid :10
>
> I thought you were doing something like this (to achieve your policy):
>
> ----------
> major=1
> minor=12
> mark=`expr $major + $minor`
> #
> tc qdisc add dev XXX ingress
> tc filter add dev XXX parent ffff: protocol ip prio 5 \
> u32 blah bleh \
> flowid $major:$minor action \
> ipt -j mark --set-mark $mark
> ---------------
>
>> - it use less code/modules and, in many cases, may be single/main goal to
>> ingress usage - pre-marking packets.
>
> That is true and you would also have one less line in your policy; as an
> example in above the line "ipt -j mark --set-mark $mark" would be
> unnecessary; however, all the other lines in the policy setting _will be
> necessary_. And this + the fact there are many other values/shapes the
> default policy could take is essentially whats bothering me.
>
> In any case, scanning the current code it seems mark is no longer
> considered a netfilter-only metadatum - so it may not be semantically as
> obscene as i felt earlier; Can you pick something simpler for policy?
> example set the mark to whatever tc_index gets set?
> If you still could write the metadata action, we could use it to
> override mark, tc_index etc in addition.
>
> cheers,
> jamal
>
>
>
--
WBR,
Denis Kaganovich, mahatma@eu.by http://mahatma.bspu.unibel.by
^ permalink raw reply
* Re: [RFC PATCH 8/8] [PKTGEN]: uninline getCurUs
From: Ilpo Järvinen @ 2008-01-12 12:59 UTC (permalink / raw)
To: Herbert Xu; +Cc: David Miller, Netdev
In-Reply-To: <20080112121740.GA4555@gondor.apana.org.au>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1134 bytes --]
On Sat, 12 Jan 2008, Herbert Xu wrote:
> On Sat, Jan 12, 2008 at 09:40:17AM +0000, Ilpo Järvinen wrote:
>
> Your emails are now using UTF-8 encoding but it's still declaring
> ISO-8859-1 as the charset.
Thanks for trying to help but my situation is such that I think it got
also you confused (this kind of mixed encoding is beoynd my skills
really)... :-) Besides, I wouldn't mind of having incorrect characters
in my name, I'm just used to that but somebody else wasn't that happy
about it.
Here's one example...
From: "=?utf-8?q?Ilpo_J=C3=A4rvinen?=" <ilpo.jarvinen@helsinki.fi>
...
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Something still needed besides these to declare email utf-8?
> So you probably want to fix that up or your name may show up as Jävinen
> on the reader's screen.
Did you actually see this? I'd expect to see that as well but no, From is
correctly decoded by my ISO-8859-1'ish MUA, aha, seems that I still have
something to do to deal with the Signed-off line.
...Maybe I just fall-back to changing my last name, it's the only
full-proof solution... ;-)
--
i.
^ permalink raw reply
* Re: [Bugme-new] [Bug 9721] New: wake on lan fails with sky2 module
From: supersud501 @ 2008-01-12 12:24 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stephen Hemminger, Andrew Morton, netdev, linux-acpi,
bugme-daemon
In-Reply-To: <200801120010.22440.rjw@sisk.pl>
Rafael J. Wysocki wrote:
> On Friday, 11 of January 2008, supersud501 wrote:
>> Rafael J. Wysocki wrote:
>>>> http://bugzilla.kernel.org/show_bug.cgi?id=9721
>
>> allright, didn't see that before, sorry, here are the results:
>>
>> kernel 2.6.23.12 acpi=off: when shutting down the system doesn't
>> poweroff (of course), but pressing the powerbutton does the trick. and
>> wake on lan: WORKS
>>
>> kernel 2.6.24-rc7 acpi=off: computer doesn't power off, either (so
>> acpi=off works), but wol still DOESN'T work :(
>>
>> so no acpi-problem?
>
> No, I don't think it's an ACPI problem.
>
> Since it seems to be 100% reproducible, it would be very helpful if you could
> use git-bisect to identify the offending commit.
>
I'll do the git-bisect (just downloading linux-2.6.git), but i forgot to
mention one little thing: i'm using x64 version of kernel - does this
play an important role?
^ permalink raw reply
* Re: [RFC PATCH 8/8] [PKTGEN]: uninline getCurUs
From: Herbert Xu @ 2008-01-12 12:17 UTC (permalink / raw)
To: Ilpo Järvinen; +Cc: David Miller, netdev
In-Reply-To: <12001308174189-git-send-email-ilpo.jarvinen@helsinki.fi>
Hi Ilpo:
On Sat, Jan 12, 2008 at 09:40:17AM +0000, Ilpo Järvinen wrote:
Your emails are now using UTF-8 encoding but it's still declaring
ISO-8859-1 as the charset. So you probably want to fix that up or
your name may show up as Jävinen on the reader's screen.
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: [Bugme-new] [Bug 9719] New: when a system is configured as a bridge, and at the same time configured to have multipath weighted route, with one leg goes thru NAT and another without NAT, the nat path will intermittently get packets leaking out using internal IP without being SNAT-ted
From: Ming-Ching Tiew @ 2008-01-13 1:04 UTC (permalink / raw)
To: Patrick McHardy; +Cc: netdev, Julian Anastasov
In-Reply-To: <47863CA8.1010301@trash.net>
Patrick McHardy wrote:
> Andrew Morton wrote:
>>> Distribution: iptables 1.4.0 was used with kernel 2.6.23 and
>>> iptables 1.3.8
>>> with 2.6.22.15
>>> Hardware Environment: 3 interfaces, 2 interfaces bridged to form
>>> br0, and
>>> another connects to internet using pppoe.
>>> Software Environment: bridge, multipath routing
>>> Problem Description: when a system is configured as a bridge with IP
>>> assigned
>>> to br0 interface, and at the same time it is configured to have
>>> multipath
>>> weighted default route, and one of the default route is NAT-ed and
>>> another of
>>> the default route is not NAT-ed, then it is NAT-ed interface will
>>> occasionally
>>> get packets leaking out to it with packets with private IPs.
>
>
> That is most likely because the route changes over time (when the cache
> is flushed) and the NAT mappings for the connection have been set up on
> a different interface. The way to properly do this is to add routing
> rules based on fwmark and use CONNMARK to bind a connection to one of
> the interfaces after the initial multipath routing decision.
>
First of all, I would like to say a big thank you to all of you takes
interest in replying my post/email. I have altered the distribution
slightly and the kernel bug list is removed.
It seems from your reply, what is implied is that I cannot change route
within a connection, and whatever things I do, I must make sure that the
route remains the same for a particular netfilter connection ?
Regards.
^ permalink raw reply
* [PATCH 1/2] [NET] core/utils.c: digit2bin is dead static inline
From: Ilpo Järvinen @ 2008-01-12 11:53 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
net/core/utils.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/net/core/utils.c b/net/core/utils.c
index 34459c4..8031eb5 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -91,17 +91,6 @@ EXPORT_SYMBOL(in_aton);
#define IN6PTON_NULL 0x20000000 /* first/tail */
#define IN6PTON_UNKNOWN 0x40000000
-static inline int digit2bin(char c, int delim)
-{
- if (c == delim || c == '\0')
- return IN6PTON_DELIM;
- if (c == '.')
- return IN6PTON_DOT;
- if (c >= '0' && c <= '9')
- return (IN6PTON_DIGIT | (c - '0'));
- return IN6PTON_UNKNOWN;
-}
-
static inline int xdigit2bin(char c, int delim)
{
if (c == delim || c == '\0')
--
1.5.0.6
^ permalink raw reply related
* [PATCH 2/2] [HTB]: htb_classid is dead static inline
From: Ilpo Järvinen @ 2008-01-12 11:53 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <1200138816244-git-send-email-ilpo.jarvinen@helsinki.fi>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
net/sched/sch_htb.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 72beb66..6a2352c 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -214,10 +214,6 @@ static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
* then finish and return direct queue.
*/
#define HTB_DIRECT (struct htb_class*)-1
-static inline u32 htb_classid(struct htb_class *cl)
-{
- return (cl && cl != HTB_DIRECT) ? cl->classid : TC_H_UNSPEC;
-}
static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
int *qerr)
--
1.5.0.6
^ permalink raw reply related
* [PATCH net-2.6.25] [XFRM] Remove unused XFRM_STATE_VOID and typos (net/xfrm.h)
From: Rami Rosen @ 2008-01-12 11:37 UTC (permalink / raw)
To: David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 147 bytes --]
Hi,
In net/xfrm.h:
- remove XFRM_STATE_VOID (not in use)
- correct 3 typos
Regards,
Rami Rosen
Signed-off-by: Rami Rosen <ramirose@gmail.com>
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 896 bytes --]
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 860fe4a..432c5c8 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -84,10 +84,10 @@ extern struct mutex xfrm_cfg_mutex;
|---. child .-> dst -. xfrm .-> xfrm_state #3
|---. child .-> NULL
- Bundles are cached at xrfm_policy struct (field ->bundles).
+ Bundles are cached at xfrm_policy struct (field ->bundles).
- Resolution of xrfm_tmpl
+ Resolution of xfrm_tmpl
-----------------------
Template contains:
1. ->mode Mode: transport or tunnel
@@ -133,7 +133,7 @@ struct xfrm_state
u32 genid;
- /* Key manger bits */
+ /* Key manager bits */
struct {
u8 state;
u8 dying;
@@ -217,7 +217,6 @@ struct xfrm_state
#define XFRM_TIME_DEFER 1
enum {
- XFRM_STATE_VOID,
XFRM_STATE_ACQ,
XFRM_STATE_VALID,
XFRM_STATE_ERROR,
^ permalink raw reply related
* net-2.6.25 rebased...
From: David Miller @ 2008-01-12 11:31 UTC (permalink / raw)
To: netdev
I fixed up some utf-8 encoding issues in changelog messages,
got rid of superfluous patches ("X" then "revert X" cases)
and combined bug fixes into the patches which introduced
them.
We are just over 700 patches, keep them coming :-)
^ permalink raw reply
* Re: [PATCH 9/9] fix sparse warnings
From: David Miller @ 2008-01-12 11:28 UTC (permalink / raw)
To: dada1; +Cc: stephen.hemminger, robert.olsson, netdev
In-Reply-To: <4788A17D.5070903@cosmosbay.com>
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sat, 12 Jan 2008 12:16:13 +0100
> We could use a better scheme with an extra indirection.
Unfortunately, indirection will likely have a negative
impact upon performance. We go only as fast as the
number of memory references made by this code.
> 3) 'pos' and 'bits' fields of 'struct tnode' might be converted to
> plain uchar, instead of 5-bits fields, to reduce complexity for
> generated code.
This seems reasonable, I'll likely apply this.
^ permalink raw reply
* Re: [RFC PATCH 8/8] [PKTGEN]: uninline getCurUs
From: David Miller @ 2008-01-12 11:25 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304701901-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:29 +0200
> net/core/pktgen.c:
> pktgen_stop_device | -50
> pktgen_run | -105
> pktgen_if_show | -37
> pktgen_thread_worker | -702
> 4 functions changed, 894 bytes removed, diff: -894
>
> net/core/pktgen.c:
> getCurUs | +36
> 1 function changed, 36 bytes added, diff: +36
>
> net/core/pktgen.o:
> 5 functions changed, 36 bytes added, 894 bytes removed, diff: -858
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
I think this is the right thing to do, applied.
^ permalink raw reply
* Re: [PATCH 7/8] [PKTGEN]: Kill dead static inlines
From: David Miller @ 2008-01-12 11:24 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304701053-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:28 +0200
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
These were leftovers from the ktime_t conversion of pktgen.
Applied, th anks!
^ permalink raw reply
* Re: [PATCH 001/001] ipv4: enable use of 240/4 address space
From: Jan Engelhardt @ 2008-01-12 11:23 UTC (permalink / raw)
To: David Miller; +Cc: vaf, andi, netdev, linux-kernel
In-Reply-To: <20080111.174958.258783771.davem@davemloft.net>
On Jan 11 2008 17:49, David Miller wrote:
>From: Vince Fuller <vaf@cisco.com>
>Date: Fri, 11 Jan 2008 09:29:15 -0800
>
>> I leave it up to you, the developers, to decide if you want to use these
>> patches.
>
>Vince, please just ignore these turkeys who are dismissing
>your patch and respin it against current sources as I asked
>of you.
>
>I'll apply it, immediately, because it is the only correct
>course of action.
I strongly agree. Linux should set standards, or at least help them
become one.
^ permalink raw reply
* Re: [PATCH 6/8] [NETFILTER] xt_policy.c: kill some bloat
From: David Miller @ 2008-01-12 11:23 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev, kaber, netfilter-devel
In-Reply-To: <12001304703789-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:27 +0200
Ilpo, please post netfilter patches to netfilter-devel,
CC:'ing Patrick McHardy.
Patrick, please review, thanks.
> net/netfilter/xt_policy.c:
> policy_mt | -906
> 1 function changed, 906 bytes removed, diff: -906
>
> net/netfilter/xt_policy.c:
> match_xfrm_state | +427
> 1 function changed, 427 bytes added, diff: +427
>
> net/netfilter/xt_policy.o:
> 2 functions changed, 427 bytes added, 906 bytes removed, diff: -479
>
> Alternatively, this could be done by combining identical
> parts of the match_policy_in/out()
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> ---
> net/netfilter/xt_policy.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
> index 46ee7e8..45731ca 100644
> --- a/net/netfilter/xt_policy.c
> +++ b/net/netfilter/xt_policy.c
> @@ -33,7 +33,7 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m,
> return false;
> }
>
> -static inline bool
> +static bool
> match_xfrm_state(const struct xfrm_state *x, const struct xt_policy_elem *e,
> unsigned short family)
> {
> --
> 1.5.0.6
>
^ permalink raw reply
* Re: [PATCH 5/8] [NETLINK] af_netlink: kill some bloat
From: David Miller @ 2008-01-12 11:22 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304703302-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:26 +0200
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Applied.
^ permalink raw reply
* Re: [PATCH 4/8] [IPV6] route: kill some bloat
From: David Miller @ 2008-01-12 11:21 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304703362-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:25 +0200
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Applied.
^ permalink raw reply
* Re: [PATCH 3/8] [XFRM] xfrm_policy: kill some bloat
From: David Miller @ 2008-01-12 11:20 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304693917-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:24 +0200
> net/xfrm/xfrm_policy.c:
> xfrm_audit_policy_delete | -692
> xfrm_audit_policy_add | -692
> 2 functions changed, 1384 bytes removed, diff: -1384
>
> net/xfrm/xfrm_policy.c:
> xfrm_audit_common_policyinfo | +704
> 1 function changed, 704 bytes added, diff: +704
>
> net/xfrm/xfrm_policy.o:
> 3 functions changed, 704 bytes added, 1384 bytes removed, diff: -680
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Applied.
^ permalink raw reply
* Re: [PATCH 2/8] [TCP]: Uninline tcp_is_cwnd_limited
From: David Miller @ 2008-01-12 11:19 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <1200130469783-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:23 +0200
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Applied.
^ permalink raw reply
* Re: [PATCH 1/8] [TCP]: Uninline tcp_set_state
From: David Miller @ 2008-01-12 11:18 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304691978-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:22 +0200
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Applied, thanks.
> +#endif
> +}
> +EXPORT_SYMBOL_GPL(tcp_set_state);
I fixed up the trailing whitespace on the "#endif" line.
^ permalink raw reply
* Re: What is XFRM_POLICY_LOCALOK for?
From: Herbert Xu @ 2008-01-12 11:16 UTC (permalink / raw)
To: Ian Brown; +Cc: netdev
In-Reply-To: <d0383f90801120031r142b2be1taee5efd190768407@mail.gmail.com>
Ian Brown <ianbrn@gmail.com> wrote:
>
> I tried to understand what XFRM_POLICY_LOCALOK is for. (include/linux/xfrm.h)
> It is defined thus:
> #define XFRM_POLICY_LOCALOK 1 /* Allow user to override global policy */
It isn't used anywhere.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: [PATCH 9/9] fix sparse warnings
From: Eric Dumazet @ 2008-01-12 11:16 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, Robert Olsson, netdev
In-Reply-To: <20080112064646.659443238@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 1541 bytes --]
Stephen Hemminger a écrit :
> Make FIB TRIE go through sparse checker without warnings.
>
> Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
Hi Stephen
While reviewing your patches (and fib code) I had some questions :
1) I was wondering isn't trie_collect_stats() a potential cpu hog
(big latency) ?
2) struct tnode layout
If tnode->bits is large enough, we allocate a big area
of memory but roughly use only first half of it.
We could use a better scheme with an extra indirection. For small
nodes, we use space right after tnode, but for big nodes, we allocate
a power of two set of pages, to exactly match the memory need.
3) 'pos' and 'bits' fields of 'struct tnode' might be converted to
plain uchar, instead of 5-bits fields, to reduce complexity for
generated code.
4) full_children & empty_children being 'unsigned short',
we probably are limited to 2^15 elements, but I could not
find this limit enforced somewhere.
[FIB]: Reduce text size of net/ipv4/fib_trie.o
In struct tnode, we use two fields of 5 bits for 'pos' and 'bits'.
Switching to plain 'unsigned char' (8 bits) take the same space
because of compiler alignments, and reduce text size by 435 bytes
on i386.
On i386 :
$ size net/ipv4/fib_trie.o.before_patch net/ipv4/fib_trie.o
text data bss dec hex filename
13714 4 64 13782 35d6 net/ipv4/fib_trie.o.before
13279 4 64 13347 3423 net/ipv4/fib_trie.o
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
[-- Attachment #2: fib_trie.patch --]
[-- Type: text/plain, Size: 605 bytes --]
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 2832610..4e91532 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -119,8 +119,8 @@ struct leaf_info {
struct tnode {
t_key key;
unsigned long parent;
- unsigned short pos:5; /* 2log(KEYLENGTH) bits needed */
- unsigned short bits:5; /* 2log(KEYLENGTH) bits needed */
+ unsigned char pos; /* 2log(KEYLENGTH) bits needed */
+ unsigned char bits; /* 2log(KEYLENGTH) bits needed */
unsigned short full_children; /* KEYLENGTH bits needed */
unsigned short empty_children; /* KEYLENGTH bits needed */
struct rcu_head rcu;
^ permalink raw reply related
* Re: [PATCH net-2.6.25 0/8] [NET]: More uninlining & related
From: David Miller @ 2008-01-12 11:16 UTC (permalink / raw)
To: ilpo.jarvinen; +Cc: netdev
In-Reply-To: <12001304691600-git-send-email-ilpo.jarvinen@helsinki.fi>
From: "Ilpo_Järvinen" <ilpo.jarvinen@helsinki.fi>
Date: Sat, 12 Jan 2008 11:34:21 +0200
> First of all, I changed output encoding of git to utf-8, so I
> guess the encoding should not cause the same trouble for you.
I worked on a rebase of net-2.6.25 today and was able to
use emacs to fixup the encoding for all existing net-2.6.25
commits.
I've also put some things in place to avoid this problem in
the future.
Thanks.
> Here are couple of more to uninline things. Pretty
> straightforward except the EXPORT_SYMBOLs, I've no idea which
> is the right variant (feel free to fix them while applying :-)).
> Also pktgen uninlining is somewhat questionable because it's
> just a testing tool so feel free to drop it if it feels
> unnecessary (I could have asked first but it's just as easy to
> do it this way if not easier)...
>
> There were more dead static inlines found after inlines removed
> (gcc didn't report them otherwise) than in pktgen now included,
> but I'm not sure if I should send "by default" patches removing
> or #if 0'ing them?
Unless there is some pressing reason to keep the code around
it should be removed.
Anyways, I'll take a look.
^ permalink raw reply
* Re: [PATCH 0/3] bonding: 3 fixes for 2.6.24
From: Krzysztof Oledzki @ 2008-01-12 10:53 UTC (permalink / raw)
To: Andy Gospodarek
Cc: Jay Vosburgh, netdev, Jeff Garzik, David Miller, Herbert Xu
In-Reply-To: <20080109201709.GF8728@gospo.usersys.redhat.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 947 bytes --]
On Wed, 9 Jan 2008, Andy Gospodarek wrote:
> On Wed, Jan 09, 2008 at 09:54:56AM -0800, Jay Vosburgh wrote:
<CUT>
>> This should silence the lockdep (if I'm understanding what
>> everybody's saying), and keep the change set to a minimum. This might
>
> The lockdep problem is easy to trigger. The lockdep code does a good
> job of noticing problems quickly regardless of how easy the deadlocks
> are to create.
Exactly. All I need to do is to reboot my server, I have 100% probability
to get the warning.
>> not even be worth pushing for 2.6.24; I'm not exactly sure how difficult
>> the lockdep problem would be to trigger.
>>
>
> I'd like to see it go in there (for correct-ness) and to avoid hearing
> about these lockdep issues for the next few months until it makes it
> into 2.4.25.
Right. So, what is the final patch? I would like to test it if that's
possible. ;)
Best regards,
Krzysztof Olędzki
^ permalink raw reply
* [PATCH 6/8] [NETFILTER] xt_policy.c: kill some bloat
From: Ilpo Järvinen @ 2008-01-12 9:40 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <1200130817405-git-send-email-ilpo.jarvinen@helsinki.fi>
net/netfilter/xt_policy.c:
policy_mt | -906
1 function changed, 906 bytes removed, diff: -906
net/netfilter/xt_policy.c:
match_xfrm_state | +427
1 function changed, 427 bytes added, diff: +427
net/netfilter/xt_policy.o:
2 functions changed, 427 bytes added, 906 bytes removed, diff: -479
Alternatively, this could be done by combining identical
parts of the match_policy_in/out()
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
net/netfilter/xt_policy.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/xt_policy.c b/net/netfilter/xt_policy.c
index 46ee7e8..45731ca 100644
--- a/net/netfilter/xt_policy.c
+++ b/net/netfilter/xt_policy.c
@@ -33,7 +33,7 @@ xt_addr_cmp(const union xt_policy_addr *a1, const union xt_policy_addr *m,
return false;
}
-static inline bool
+static bool
match_xfrm_state(const struct xfrm_state *x, const struct xt_policy_elem *e,
unsigned short family)
{
--
1.5.0.6
^ permalink raw reply related
* [PATCH 3/8] [XFRM] xfrm_policy: kill some bloat
From: Ilpo Järvinen @ 2008-01-12 9:40 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <12001308173014-git-send-email-ilpo.jarvinen@helsinki.fi>
net/xfrm/xfrm_policy.c:
xfrm_audit_policy_delete | -692
xfrm_audit_policy_add | -692
2 functions changed, 1384 bytes removed, diff: -1384
net/xfrm/xfrm_policy.c:
xfrm_audit_common_policyinfo | +704
1 function changed, 704 bytes added, diff: +704
net/xfrm/xfrm_policy.o:
3 functions changed, 704 bytes added, 1384 bytes removed, diff: -680
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
---
net/xfrm/xfrm_policy.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 534b29e..47219f9 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2367,8 +2367,8 @@ void __init xfrm_init(void)
}
#ifdef CONFIG_AUDITSYSCALL
-static inline void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
- struct audit_buffer *audit_buf)
+static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
+ struct audit_buffer *audit_buf)
{
struct xfrm_sec_ctx *ctx = xp->security;
struct xfrm_selector *sel = &xp->selector;
--
1.5.0.6
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox