From: Julian Anastasov <ja@ssi.bg>
To: Simon Horman <horms@verge.net.au>
Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCHv2 net-next 14/15] ipvs: reorder keys in connection structure
Date: Sat, 9 Mar 2013 23:16:54 +0200 [thread overview]
Message-ID: <1362863815-5898-15-git-send-email-ja@ssi.bg> (raw)
In-Reply-To: <1362863815-5898-1-git-send-email-ja@ssi.bg>
__ip_vs_conn_in_get and ip_vs_conn_out_get are
hot places. Optimize them, so that ports are matched first.
By moving net and fwmark below, on 32-bit arch we can fit
caddr in 32-byte cache line and all addresses in 64-byte
cache line.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
include/net/ip_vs.h | 12 ++++++------
net/netfilter/ipvs/ip_vs_conn.c | 19 ++++++++++---------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 9059360..2bc30e6 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -566,20 +566,19 @@ struct ip_vs_conn_param {
*/
struct ip_vs_conn {
struct hlist_node c_list; /* hashed list heads */
-#ifdef CONFIG_NET_NS
- struct net *net; /* Name space */
-#endif
/* Protocol, addresses and port numbers */
- u16 af; /* address family */
__be16 cport;
- __be16 vport;
__be16 dport;
- __u32 fwmark; /* Fire wall mark from skb */
+ __be16 vport;
+ u16 af; /* address family */
union nf_inet_addr caddr; /* client address */
union nf_inet_addr vaddr; /* virtual address */
union nf_inet_addr daddr; /* destination address */
volatile __u32 flags; /* status flags */
__u16 protocol; /* Which protocol (TCP/UDP) */
+#ifdef CONFIG_NET_NS
+ struct net *net; /* Name space */
+#endif
/* counter and timer */
atomic_t refcnt; /* reference count */
@@ -593,6 +592,7 @@ struct ip_vs_conn {
* state transition triggerd
* synchronization
*/
+ __u32 fwmark; /* Fire wall mark from skb */
unsigned long sync_endtime; /* jiffies + sent_retries */
/* Control members */
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index b0cd2be..416015b 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -265,8 +265,8 @@ __ip_vs_conn_in_get(const struct ip_vs_conn_param *p)
rcu_read_lock();
hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[hash], c_list) {
- if (cp->af == p->af &&
- p->cport == cp->cport && p->vport == cp->vport &&
+ if (p->cport == cp->cport && p->vport == cp->vport &&
+ cp->af == p->af &&
ip_vs_addr_equal(p->af, p->caddr, &cp->caddr) &&
ip_vs_addr_equal(p->af, p->vaddr, &cp->vaddr) &&
((!p->cport) ^ (!(cp->flags & IP_VS_CONN_F_NO_CPORT))) &&
@@ -350,9 +350,9 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p)
rcu_read_lock();
hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[hash], c_list) {
- if (!ip_vs_conn_net_eq(cp, p->net))
- continue;
- if (p->pe_data && p->pe->ct_match) {
+ if (unlikely(p->pe_data && p->pe->ct_match)) {
+ if (!ip_vs_conn_net_eq(cp, p->net))
+ continue;
if (p->pe == cp->pe && p->pe->ct_match(p, cp)) {
if (__ip_vs_conn_get(cp))
goto out;
@@ -366,9 +366,10 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p)
* p->vaddr is a fwmark */
ip_vs_addr_equal(p->protocol == IPPROTO_IP ? AF_UNSPEC :
p->af, p->vaddr, &cp->vaddr) &&
- p->cport == cp->cport && p->vport == cp->vport &&
+ p->vport == cp->vport && p->cport == cp->cport &&
cp->flags & IP_VS_CONN_F_TEMPLATE &&
- p->protocol == cp->protocol) {
+ p->protocol == cp->protocol &&
+ ip_vs_conn_net_eq(cp, p->net)) {
if (__ip_vs_conn_get(cp))
goto out;
}
@@ -404,8 +405,8 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p)
rcu_read_lock();
hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[hash], c_list) {
- if (cp->af == p->af &&
- p->vport == cp->cport && p->cport == cp->dport &&
+ if (p->vport == cp->cport && p->cport == cp->dport &&
+ cp->af == p->af &&
ip_vs_addr_equal(p->af, p->vaddr, &cp->caddr) &&
ip_vs_addr_equal(p->af, p->caddr, &cp->daddr) &&
p->protocol == cp->protocol &&
--
1.7.3.4
next prev parent reply other threads:[~2013-03-09 21:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-09 21:16 [PATCHv2 net-next 00/15] IPVS optimizations Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 01/15] net: add skb_dst_set_unref Julian Anastasov
2013-03-10 9:17 ` David Miller
2013-03-10 13:37 ` Julian Anastasov
2013-03-10 21:00 ` David Miller
2013-03-10 22:05 ` Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 02/15] ipvs: avoid routing by TOS for real server Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 03/15] ipvs: prefer NETDEV_DOWN event to free cached dsts Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 04/15] ipvs: convert the IP_VS_XMIT macros to functions Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 05/15] ipvs: rename functions related to dst_cache reset Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 06/15] ipvs: no need to reroute anymore on DNAT over loopback Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 07/15] ipvs: do not use skb_share_check Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 08/15] ipvs: consolidate all dst checks on transmit in one place Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 09/15] ipvs: optimize dst usage for real server Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 10/15] ipvs: convert app locks Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 11/15] ipvs: remove rs_lock by using RCU Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 12/15] ipvs: convert locks used in persistence engines Julian Anastasov
2013-03-09 21:16 ` [PATCHv2 net-next 13/15] ipvs: convert connection locking Julian Anastasov
2013-03-09 21:16 ` Julian Anastasov [this message]
2013-03-09 21:16 ` [PATCHv2 net-next 15/15] ipvs: avoid kmem_cache_zalloc in ip_vs_conn_new Julian Anastasov
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=1362863815-5898-15-git-send-email-ja@ssi.bg \
--to=ja@ssi.bg \
--cc=horms@verge.net.au \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).