netfilter: limit, hashlimit: avoid duplicated inline
Subsystems (2)
Florian Westphal
maintainerPATCH 1/3 netfilter: limit, hashlimit: avoid duplicated inline
credit_cap can be set to credit, which avoids inlining user2credits twice. Also, remove inline keyword and let compiler decide.
old:
684 192 0 876 36c net/netfilter/xt_limit.o
4927 344 32 5303 14b7 net/netfilter/xt_hashlimit.o
now:
668 192 0 860 35c net/netfilter/xt_limit.o 4793 344 32 5169 1431 net/netfilter/xt_hashlimit.o
--- net/netfilter/xt_hashlimit.c | 8 +++----- net/netfilter/xt_limit.c | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-)
net/netfilter/xt_hashlimit.c +3 -5
@@ -389,8 +389,7 @@ static void htable_put(struct xt_hashlimit_htable *hinfo)#define CREDITS_PER_JIFFY POW2_BELOW32(MAX_CPJ)/* Precision saver. */ -static inline u_int32_t -user2credits (u_int32_t user) +static u32 user2credits (u32 user) {/* If multiplying would overflow... */ if (user >0xFFFFFFFF / (HZ *CREDITS_PER_JIFFY ))
@@ -400,7 +399,7 @@ user2credits(u_int32_t user)return (user *HZ *CREDITS_PER_JIFFY ) /XT_HASHLIMIT_SCALE ; } -static inline void rateinfo_recalc (struct dsthash_ent *dh,unsigned long now) +static void rateinfo_recalc (struct dsthash_ent *dh,unsigned long now) { dh->rateinfo.credit += (now - dh->rateinfo.prev) *CREDITS_PER_JIFFY ;if (dh->rateinfo.credit > dh->rateinfo.credit_cap)
@@ -535,8 +534,7 @@ hashlimit_mt(const struct sk_buff *skb, struct xt_action_param *par) dh->rateinfo.prev = jiffies; dh->rateinfo.credit =user2credits (hinfo->cfg.avg * hinfo->cfg.burst); - dh->rateinfo.credit_cap =user2credits (hinfo->cfg.avg * - hinfo->cfg.burst); + dh->rateinfo.credit_cap = dh->rateinfo.credit; dh->rateinfo.cost =user2credits (hinfo->cfg.avg); }else {/* update expiration timeout */
net/netfilter/xt_limit.c +2 -3
@@ -88,8 +88,7 @@ limit_mt(const struct sk_buff *skb, struct xt_action_param *par) }/* Precision saver. */ -static u_int32_t -user2credits (u_int32_t user) +static u32 user2credits (u32 user) {/* If multiplying would overflow... */ if (user >0xFFFFFFFF / (HZ *CREDITS_PER_JIFFY ))
@@ -123,7 +122,7 @@ static int limit_mt_check(const struct xt_mtchk_param *par)128. */ priv->prev = jiffies; priv->credit =user2credits (r->avg * r->burst);/* Credits full. */ - r->credit_cap =user2credits (r->avg * r->burst);/* Credits full. */ + r->credit_cap = priv->credit;/* Credits full. */ r->cost =user2credits (r->avg); }return 0 ;
Signature · 1 line
1.7.3.4
Florian Westphal
maintainerPATCH 2/3 netfilter: hashlimit: move rateinfo initialization to helper
followup patch would bloat main match function too much.
--- net/netfilter/xt_hashlimit.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
net/netfilter/xt_hashlimit.c +10 -5
@@ -407,6 +407,15 @@ static void rateinfo_recalc(struct dsthash_ent *dh, unsigned long now) dh->rateinfo.prev = now; } +static void rateinfo_init (struct dsthash_ent *dh, +struct xt_hashlimit_htable *hinfo) +{ + dh->rateinfo.prev = jiffies; + dh->rateinfo.credit =user2credits (hinfo->cfg.avg * hinfo->cfg.burst); + dh->rateinfo.cost =user2credits (hinfo->cfg.avg); + dh->rateinfo.credit_cap = dh->rateinfo.credit; +} +static inline __be32 maskl (__be32 a,unsigned int l) {return l ?htonl (ntohl (a) & ~0 << (32 - l)) :0 ;
@@ -531,11 +540,7 @@ hashlimit_mt(const struct sk_buff *skb, struct xt_action_param *par) goto hotdrop; } dh->expires = jiffies +msecs_to_jiffies (hinfo->cfg.expire); - dh->rateinfo.prev = jiffies; - dh->rateinfo.credit =user2credits (hinfo->cfg.avg * - hinfo->cfg.burst); - dh->rateinfo.credit_cap = dh->rateinfo.credit; - dh->rateinfo.cost =user2credits (hinfo->cfg.avg); +rateinfo_init (dh, hinfo); }else {/* update expiration timeout */ dh->expires = now +msecs_to_jiffies (hinfo->cfg.expire);
Signature · 1 line
1.7.3.4
Re: [PATCH next 2/3] netfilter: hashlimit: move rateinfo initialization to helper
Quoted 3 lines · Florian Westphal
followup patch would bloat main match function too much.
Signed-off-by Florian Westphal <[email protected]>
Applied, thanks.
Florian Westphal
maintainerPATCH 3/3 netfilter: hashlimit: byte-based limit mode
In reply to Florian Westphalcan be used e.g. for ingress traffic policing or
to detect when a host/port consumes more bandwidth than expected.
This is done by optionally making cost to mean
"cost per 16-byte-chunk-of-data" instead of "cost per packet".
--- include/linux/netfilter/xt_hashlimit.h | 9 ++- net/netfilter/xt_hashlimit.c | 116 ++++++++++++++++++++++++++----- 2 files changed, 105 insertions(+), 20 deletions(-)
include/linux/netfilter/xt_hashlimit.h +8 -1
@@ -6,7 +6,10 @@/* timings are in milliseconds. */ #define XT_HASHLIMIT_SCALE 10000/* 1/10,000 sec period => max of 10,000/sec. Min rate is then 429490 -seconds, or one every 59 hours. */ +seconds, or one packet every 59 hours. */ + +/* packet length accounting is done in 16-byte steps */ +#define XT_HASHLIMIT_BYTE_SHIFT 4/* details of this structure hidden by the implementation */ struct xt_hashlimit_htable ;
@@ -17,6 +20,10 @@ enum {XT_HASHLIMIT_HASH_SIP =1 <<2 ,XT_HASHLIMIT_HASH_SPT =1 <<3 ,XT_HASHLIMIT_INVERT =1 <<4 , +XT_HASHLIMIT_BYTES =1 <<5 , +#ifdef __KERNEL__ + XT_HASHLIMIT_MAX = 1 << 6, +#endif }; struct hashlimit_cfg {
net/netfilter/xt_hashlimit.c +97 -19
178 lines not on this page · raw message
Signature · 1 line
1.7.3.4
Re: [PATCH next 3/3] netfilter: hashlimit: byte-based limit mode
Quoted 7 lines · Florian Westphal
can be used e.g. for ingress traffic policing or
to detect when a host/port consumes more bandwidth than expected.This is done by optionally making cost to mean
"cost per 16-byte-chunk-of-data" instead of "cost per packet".Signed-off-by Florian Westphal <[email protected]>
Applied, thanks.
Quoted 11 lines · Florian Westphal
credit_capcan be set to credit, which avoids inlining user2credits twice. Also, remove inline keyword and let compiler decide.old:
684 192 0 876 36c net/netfilter/xt_limit.o 4927 344 32 5303 14b7 net/netfilter/xt_hashlimit.o now: 668 192 0 860 35c net/netfilter/xt_limit.o4793 344 32 5169 1431
net/netfilter/xt_hashlimit.oSigned-off-by Florian Westphal <[email protected]>
Applied, thanks.