UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfrm: optimize ipv4 selector matching 

Current addr_match() is errh, under-optimized.

Compiler doesn't know that memcmp() branch doesn't trigger for IPv4.
Also, pass addresses by value -- they fit into register.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2011-11-22 06:46:02 +00:00 committed by David S. Miller
parent 3ee32fee65
commit 26bff940dd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/xfrm.h
View File

@ -827,6 +827,14 @@ static inline bool addr_match(const void *token1, const void *token2,
return true; return true;
} }
static inline bool addr4_match(__be32 a1, __be32 a2, u8 prefixlen)
{
/* C99 6.5.7 (3): u32 << 32 is undefined behaviour */
if (prefixlen == 0)
return true;
return !((a1 ^ a2) & htonl(0xFFFFFFFFu << (32 - prefixlen)));
}
static __inline__ static __inline__
__be16 xfrm_flowi_sport(const struct flowi *fl, const union flowi_uli *uli) __be16 xfrm_flowi_sport(const struct flowi *fl, const union flowi_uli *uli)
{ {

4
net/xfrm/xfrm_policy.c
View File

@ -61,8 +61,8 @@ __xfrm4_selector_match(const struct xfrm_selector *sel, const struct flowi *fl)
{ {
const struct flowi4 *fl4 = &fl->u.ip4; const struct flowi4 *fl4 = &fl->u.ip4;
return addr_match(&fl4->daddr, &sel->daddr, sel->prefixlen_d) && return addr4_match(fl4->daddr, sel->daddr.a4, sel->prefixlen_d) &&
addr_match(&fl4->saddr, &sel->saddr, sel->prefixlen_s) && addr4_match(fl4->saddr, sel->saddr.a4, sel->prefixlen_s) &&
!((xfrm_flowi_dport(fl, &fl4->uli) ^ sel->dport) & sel->dport_mask) && !((xfrm_flowi_dport(fl, &fl4->uli) ^ sel->dport) & sel->dport_mask) &&
!((xfrm_flowi_sport(fl, &fl4->uli) ^ sel->sport) & sel->sport_mask) && !((xfrm_flowi_sport(fl, &fl4->uli) ^ sel->sport) & sel->sport_mask) &&
(fl4->flowi4_proto == sel->proto || !sel->proto) && (fl4->flowi4_proto == sel->proto || !sel->proto) &&