From: Thomas Graf <tgraf@suug.ch>
To: jamal <hadi@cyberus.ca>
Cc: Meelis Roos <mroos@linux.ee>, netdev <netdev@oss.sgi.com>
Subject: Re: cls_u32 compile failure in current 2.6.12-rc1+BK tree
Date: Tue, 29 Mar 2005 03:10:58 +0200 [thread overview]
Message-ID: <20050329011058.GJ3086@postel.suug.ch> (raw)
In-Reply-To: <20050328223310.GH3086@postel.suug.ch>
* Thomas Graf <20050328223310.GH3086@postel.suug.ch> 2005-03-29 00:33
> We dump TCA_ACT_STATS in tcf_exts_dump and handle all the backward
> compibility including dumping policer stats in tcf_exts_dump_stats.
> This means we have to adapt gnet_stats a bit to allow for this.
Attached patches is what I meant. Untested but you should get
the idea.
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/29 02:45:52+02:00 tgraf@suug.ch
# Cset exclude: hadi@cyberus.ca|ChangeSet|20050325173452|50562
#
# net/sched/cls_u32.c
# 2005/03/29 02:45:46+02:00 tgraf@suug.ch +0 -0
# Exclude
#
# net/sched/cls_tcindex.c
# 2005/03/29 02:45:46+02:00 tgraf@suug.ch +0 -0
# Exclude
#
# net/sched/cls_route.c
# 2005/03/29 02:45:46+02:00 tgraf@suug.ch +0 -0
# Exclude
#
# net/sched/cls_fw.c
# 2005/03/29 02:45:46+02:00 tgraf@suug.ch +0 -0
# Exclude
#
diff -Nru a/net/sched/cls_fw.c b/net/sched/cls_fw.c
--- a/net/sched/cls_fw.c 2005-03-29 03:07:44 +02:00
+++ b/net/sched/cls_fw.c 2005-03-29 03:07:44 +02:00
@@ -338,9 +338,8 @@
rta->rta_len = skb->tail - b;
- if (f->exts.action && f->exts.action->type == TCA_OLD_COMPAT)
- if (tcf_exts_dump_stats(skb, &f->exts, &fw_ext_map) < 0)
- goto rtattr_failure;
+ if (tcf_exts_dump_stats(skb, &f->exts, &fw_ext_map) < 0)
+ goto rtattr_failure;
return skb->len;
diff -Nru a/net/sched/cls_route.c b/net/sched/cls_route.c
--- a/net/sched/cls_route.c 2005-03-29 03:07:44 +02:00
+++ b/net/sched/cls_route.c 2005-03-29 03:07:44 +02:00
@@ -599,9 +599,8 @@
rta->rta_len = skb->tail - b;
- if (f->exts.action && f->exts.action->type == TCA_OLD_COMPAT)
- if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0)
- goto rtattr_failure;
+ if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0)
+ goto rtattr_failure;
return skb->len;
diff -Nru a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
--- a/net/sched/cls_tcindex.c 2005-03-29 03:07:44 +02:00
+++ b/net/sched/cls_tcindex.c 2005-03-29 03:07:44 +02:00
@@ -496,9 +496,8 @@
goto rtattr_failure;
rta->rta_len = skb->tail-b;
- if (r->exts.action && r->exts.action->type == TCA_OLD_COMPAT)
- if (tcf_exts_dump_stats(skb, &r->exts, &tcindex_ext_map) < 0)
- goto rtattr_failure;
+ if (tcf_exts_dump_stats(skb, &r->exts, &tcindex_ext_map) < 0)
+ goto rtattr_failure;
}
return skb->len;
diff -Nru a/net/sched/cls_u32.c b/net/sched/cls_u32.c
--- a/net/sched/cls_u32.c 2005-03-29 03:07:44 +02:00
+++ b/net/sched/cls_u32.c 2005-03-29 03:07:44 +02:00
@@ -775,7 +775,7 @@
}
rta->rta_len = skb->tail - b;
- if (TC_U32_KEY(n->handle) && n->exts.action && n->exts.action->type == TCA_OLD_COMPAT)
+ if (TC_U32_KEY(n->handle))
if (tcf_exts_dump_stats(skb, &n->exts, &u32_ext_map) < 0)
goto rtattr_failure;
return skb->len;
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/29 02:55:11+02:00 tgraf@suug.ch
# [NET]: Make primary TLV type optional
#
# Allows the use of the gnet_stats API for backward compatiblity
# cases where no "modern" TLV structure is needed.
#
# Signed-off-by: Thomas Graf <tgraf@suug.ch>
# Signed-off-by: David S. Miller <davem@davemloft.net>
#
# net/core/gen_stats.c
# 2005/03/29 02:54:56+02:00 tgraf@suug.ch +7 -3
# [NET]: Make primary TLV type optional
#
diff -Nru a/net/core/gen_stats.c b/net/core/gen_stats.c
--- a/net/core/gen_stats.c 2005-03-29 03:07:59 +02:00
+++ b/net/core/gen_stats.c 2005-03-29 03:07:59 +02:00
@@ -26,7 +26,9 @@
static inline int
gnet_stats_copy(struct gnet_dump *d, int type, void *buf, int size)
{
- RTA_PUT(d->skb, type, size, buf);
+ if (type)
+ RTA_PUT(d->skb, type, size, buf);
+
return 0;
rtattr_failure:
@@ -58,7 +60,8 @@
{
spin_lock_bh(lock);
d->lock = lock;
- d->tail = (struct rtattr *) skb->tail;
+ if (type)
+ d->tail = (struct rtattr *) skb->tail;
d->skb = skb;
d->compat_tc_stats = tc_stats_type;
d->compat_xstats = xstats_type;
@@ -194,7 +197,8 @@
int
gnet_stats_finish_copy(struct gnet_dump *d)
{
- d->tail->rta_len = d->skb->tail - (u8 *) d->tail;
+ if (d->tail)
+ d->tail->rta_len = d->skb->tail - (u8 *) d->tail;
if (d->compat_tc_stats)
if (gnet_stats_copy(d, d->compat_tc_stats, &d->tc_stats,
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/29 02:59:25+02:00 tgraf@suug.ch
# [PKT_SCHED]: Fix action statistics dumping in compatibility mode
#
# Extends the action dumping function by a parameter to differ between
# regular calls and the one supposed to add the backward compatiblity
# bits for old userspace applications.
#
# Signed-off-by: Thomas Graf <tgraf@suug.ch>
# Signed-off-by: David S. Miller <davem@davemloft.net>
#
# net/sched/cls_api.c
# 2005/03/29 02:59:11+02:00 tgraf@suug.ch +1 -1
# [PKT_SCHED]: Fix action statistics dumping in compatibility mode
#
# net/sched/act_api.c
# 2005/03/29 02:59:11+02:00 tgraf@suug.ch +8 -4
# [PKT_SCHED]: Fix action statistics dumping in compatibility mode
#
# include/net/act_api.h
# 2005/03/29 02:59:11+02:00 tgraf@suug.ch +1 -1
# [PKT_SCHED]: Fix action statistics dumping in compatibility mode
#
diff -Nru a/include/net/act_api.h b/include/net/act_api.h
--- a/include/net/act_api.h 2005-03-29 03:08:12 +02:00
+++ b/include/net/act_api.h 2005-03-29 03:08:12 +02:00
@@ -81,7 +81,7 @@
extern int tcf_action_dump(struct sk_buff *skb, struct tc_action *a, int, int);
extern int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
extern int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);
-extern int tcf_action_copy_stats (struct sk_buff *,struct tc_action *);
+extern int tcf_action_copy_stats (struct sk_buff *,struct tc_action *, int);
#endif /* CONFIG_NET_CLS_ACT */
extern int tcf_police(struct sk_buff *skb, struct tcf_police *p);
diff -Nru a/net/sched/act_api.c b/net/sched/act_api.c
--- a/net/sched/act_api.c 2005-03-29 03:08:12 +02:00
+++ b/net/sched/act_api.c 2005-03-29 03:08:12 +02:00
@@ -228,7 +228,7 @@
return err;
RTA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind);
- if (tcf_action_copy_stats(skb, a))
+ if (tcf_action_copy_stats(skb, a, 0))
goto rtattr_failure;
r = (struct rtattr*) skb->tail;
RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
@@ -380,7 +380,8 @@
return NULL;
}
-int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a)
+int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
+ int compat_mode)
{
int err;
struct gnet_dump d;
@@ -389,8 +390,11 @@
if (h == NULL)
goto errout;
- if (a->type == TCA_OLD_COMPAT)
- err = gnet_stats_start_copy_compat(skb, TCA_ACT_STATS,
+ /* compat_mode being true specifies a call that is supposed
+ * to add additional backward compatiblity statistic TLVs.
+ */
+ if (compat_mode && a->type == TCA_OLD_COMPAT)
+ err = gnet_stats_start_copy_compat(skb, 0,
TCA_STATS, TCA_XSTATS, h->stats_lock, &d);
else
err = gnet_stats_start_copy(skb, TCA_ACT_STATS,
diff -Nru a/net/sched/cls_api.c b/net/sched/cls_api.c
--- a/net/sched/cls_api.c 2005-03-29 03:08:12 +02:00
+++ b/net/sched/cls_api.c 2005-03-29 03:08:12 +02:00
@@ -602,7 +602,7 @@
{
#ifdef CONFIG_NET_CLS_ACT
if (exts->action)
- if (tcf_action_copy_stats(skb, exts->action) < 0)
+ if (tcf_action_copy_stats(skb, exts->action, 1) < 0)
goto rtattr_failure;
#elif defined CONFIG_NET_CLS_POLICE
if (exts->police)
next prev parent reply other threads:[~2005-03-29 1:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-27 19:49 cls_u32 compile failure in current 2.6.12-rc1+BK tree Meelis Roos
2005-03-28 1:07 ` jamal
2005-03-28 7:18 ` Meelis Roos
2005-03-28 12:24 ` jamal
2005-03-28 12:38 ` Thomas Graf
2005-03-28 12:51 ` jamal
2005-03-28 12:58 ` Thomas Graf
2005-03-28 13:15 ` jamal
2005-03-28 15:55 ` Thomas Graf
2005-03-28 19:28 ` jamal
2005-03-28 19:53 ` Thomas Graf
2005-03-28 22:33 ` Thomas Graf
2005-03-29 1:10 ` Thomas Graf [this message]
2005-03-29 20:51 ` jamal
2005-03-30 1:02 ` Thomas Graf
2005-03-30 11:55 ` jamal
2005-03-31 0:58 ` David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050329011058.GJ3086@postel.suug.ch \
--to=tgraf@suug.ch \
--cc=hadi@cyberus.ca \
--cc=mroos@linux.ee \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).