Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 136047
b: refs/heads/master
c: b8dfe49
h: refs/heads/master
i:
  136045: df79a77
  136043: 3718b19
  136039: 884f5f8
  136031: a83b560
v: v3
  • Loading branch information
Eric Dumazet authored and Patrick McHardy committed Mar 25, 2009
1 parent 9d0ac74 commit e78b8b5
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 75 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 78f3648601fdc7a8166748bbd6d0555a88efa24a
refs/heads/master: b8dfe498775de912116f275680ddb57c8799d9ef
23 changes: 23 additions & 0 deletions trunk/include/linux/netfilter/x_tables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,29 @@ extern void xt_free_table_info(struct xt_table_info *info);
extern void xt_table_entry_swap_rcu(struct xt_table_info *old,
struct xt_table_info *new);

/*
* This helper is performance critical and must be inlined
*/
static inline unsigned long ifname_compare_aligned(const char *_a,
const char *_b,
const char *_mask)
{
const unsigned long *a = (const unsigned long *)_a;
const unsigned long *b = (const unsigned long *)_b;
const unsigned long *mask = (const unsigned long *)_mask;
unsigned long ret;

ret = (a[0] ^ b[0]) & mask[0];
if (IFNAMSIZ > sizeof(unsigned long))
ret |= (a[1] ^ b[1]) & mask[1];
if (IFNAMSIZ > 2 * sizeof(unsigned long))
ret |= (a[2] ^ b[2]) & mask[2];
if (IFNAMSIZ > 3 * sizeof(unsigned long))
ret |= (a[3] ^ b[3]) & mask[3];
BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
return ret;
}

#ifdef CONFIG_COMPAT
#include <net/compat.h>

Expand Down
14 changes: 1 addition & 13 deletions trunk/net/ipv4/netfilter/arp_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,7 @@ static inline int arp_devaddr_compare(const struct arpt_devaddr_info *ap,
static unsigned long ifname_compare(const char *_a, const char *_b, const char *_mask)
{
#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
const unsigned long *a = (const unsigned long *)_a;
const unsigned long *b = (const unsigned long *)_b;
const unsigned long *mask = (const unsigned long *)_mask;
unsigned long ret;

ret = (a[0] ^ b[0]) & mask[0];
if (IFNAMSIZ > sizeof(unsigned long))
ret |= (a[1] ^ b[1]) & mask[1];
if (IFNAMSIZ > 2 * sizeof(unsigned long))
ret |= (a[2] ^ b[2]) & mask[2];
if (IFNAMSIZ > 3 * sizeof(unsigned long))
ret |= (a[3] ^ b[3]) & mask[3];
BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
unsigned long ret = ifname_compare_aligned(_a, _b, _mask);
#else
unsigned long ret = 0;
int i;
Expand Down
23 changes: 2 additions & 21 deletions trunk/net/ipv4/netfilter/ip_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,6 @@ do { \
Hence the start of any table is given by get_table() below. */

static unsigned long ifname_compare(const char *_a, const char *_b,
const unsigned char *_mask)
{
const unsigned long *a = (const unsigned long *)_a;
const unsigned long *b = (const unsigned long *)_b;
const unsigned long *mask = (const unsigned long *)_mask;
unsigned long ret;

ret = (a[0] ^ b[0]) & mask[0];
if (IFNAMSIZ > sizeof(unsigned long))
ret |= (a[1] ^ b[1]) & mask[1];
if (IFNAMSIZ > 2 * sizeof(unsigned long))
ret |= (a[2] ^ b[2]) & mask[2];
if (IFNAMSIZ > 3 * sizeof(unsigned long))
ret |= (a[3] ^ b[3]) & mask[3];
BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
return ret;
}

/* Returns whether matches rule or not. */
/* Performance critical - called for every packet */
static inline bool
Expand Down Expand Up @@ -121,7 +102,7 @@ ip_packet_match(const struct iphdr *ip,
return false;
}

ret = ifname_compare(indev, ipinfo->iniface, ipinfo->iniface_mask);
ret = ifname_compare_aligned(indev, ipinfo->iniface, ipinfo->iniface_mask);

if (FWINV(ret != 0, IPT_INV_VIA_IN)) {
dprintf("VIA in mismatch (%s vs %s).%s\n",
Expand All @@ -130,7 +111,7 @@ ip_packet_match(const struct iphdr *ip,
return false;
}

ret = ifname_compare(outdev, ipinfo->outiface, ipinfo->outiface_mask);
ret = ifname_compare_aligned(outdev, ipinfo->outiface, ipinfo->outiface_mask);

if (FWINV(ret != 0, IPT_INV_VIA_OUT)) {
dprintf("VIA out mismatch (%s vs %s).%s\n",
Expand Down
23 changes: 2 additions & 21 deletions trunk/net/ipv6/netfilter/ip6_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,6 @@ ip6t_ext_hdr(u8 nexthdr)
(nexthdr == IPPROTO_DSTOPTS) );
}

static unsigned long ifname_compare(const char *_a, const char *_b,
const unsigned char *_mask)
{
const unsigned long *a = (const unsigned long *)_a;
const unsigned long *b = (const unsigned long *)_b;
const unsigned long *mask = (const unsigned long *)_mask;
unsigned long ret;

ret = (a[0] ^ b[0]) & mask[0];
if (IFNAMSIZ > sizeof(unsigned long))
ret |= (a[1] ^ b[1]) & mask[1];
if (IFNAMSIZ > 2 * sizeof(unsigned long))
ret |= (a[2] ^ b[2]) & mask[2];
if (IFNAMSIZ > 3 * sizeof(unsigned long))
ret |= (a[3] ^ b[3]) & mask[3];
BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
return ret;
}

/* Returns whether matches rule or not. */
/* Performance critical - called for every packet */
static inline bool
Expand Down Expand Up @@ -138,7 +119,7 @@ ip6_packet_match(const struct sk_buff *skb,
return false;
}

ret = ifname_compare(indev, ip6info->iniface, ip6info->iniface_mask);
ret = ifname_compare_aligned(indev, ip6info->iniface, ip6info->iniface_mask);

if (FWINV(ret != 0, IP6T_INV_VIA_IN)) {
dprintf("VIA in mismatch (%s vs %s).%s\n",
Expand All @@ -147,7 +128,7 @@ ip6_packet_match(const struct sk_buff *skb,
return false;
}

ret = ifname_compare(outdev, ip6info->outiface, ip6info->outiface_mask);
ret = ifname_compare_aligned(outdev, ip6info->outiface, ip6info->outiface_mask);

if (FWINV(ret != 0, IP6T_INV_VIA_OUT)) {
dprintf("VIA out mismatch (%s vs %s).%s\n",
Expand Down
21 changes: 2 additions & 19 deletions trunk/net/netfilter/xt_physdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,6 @@ MODULE_DESCRIPTION("Xtables: Bridge physical device match");
MODULE_ALIAS("ipt_physdev");
MODULE_ALIAS("ip6t_physdev");

static unsigned long ifname_compare(const char *_a, const char *_b, const char *_mask)
{
const unsigned long *a = (const unsigned long *)_a;
const unsigned long *b = (const unsigned long *)_b;
const unsigned long *mask = (const unsigned long *)_mask;
unsigned long ret;

ret = (a[0] ^ b[0]) & mask[0];
if (IFNAMSIZ > sizeof(unsigned long))
ret |= (a[1] ^ b[1]) & mask[1];
if (IFNAMSIZ > 2 * sizeof(unsigned long))
ret |= (a[2] ^ b[2]) & mask[2];
if (IFNAMSIZ > 3 * sizeof(unsigned long))
ret |= (a[3] ^ b[3]) & mask[3];
BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
return ret;
}

static bool
physdev_mt(const struct sk_buff *skb, const struct xt_match_param *par)
Expand Down Expand Up @@ -85,7 +68,7 @@ physdev_mt(const struct sk_buff *skb, const struct xt_match_param *par)
if (!(info->bitmask & XT_PHYSDEV_OP_IN))
goto match_outdev;
indev = nf_bridge->physindev ? nf_bridge->physindev->name : nulldevname;
ret = ifname_compare(indev, info->physindev, info->in_mask);
ret = ifname_compare_aligned(indev, info->physindev, info->in_mask);

if (!ret ^ !(info->invert & XT_PHYSDEV_OP_IN))
return false;
Expand All @@ -95,7 +78,7 @@ physdev_mt(const struct sk_buff *skb, const struct xt_match_param *par)
return true;
outdev = nf_bridge->physoutdev ?
nf_bridge->physoutdev->name : nulldevname;
ret = ifname_compare(outdev, info->physoutdev, info->out_mask);
ret = ifname_compare_aligned(outdev, info->physoutdev, info->out_mask);

return (!!ret ^ !(info->invert & XT_PHYSDEV_OP_OUT));
}
Expand Down

0 comments on commit e78b8b5

Please sign in to comment.