From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966053AbbLPQa3 (ORCPT ); Wed, 16 Dec 2015 11:30:29 -0500 Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:34519 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966034AbbLPQa1 (ORCPT ); Wed, 16 Dec 2015 11:30:27 -0500 x-originating-ip: 72.167.245.219 From: Haiyang Zhang To: davem@davemloft.net, netdev@vger.kernel.org Cc: haiyangz@microsoft.com, kys@microsoft.com, olaf@aepfle.de, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org Subject: [PATCH net-next] hv_netvsc: Use simple parser for IPv4 and v6 headers Date: Wed, 16 Dec 2015 10:03:42 -0800 Message-Id: <1450289022-9958-1-git-send-email-haiyangz@microsoft.com> X-Mailer: git-send-email 1.7.4.1 X-CMAE-Envelope: MS4wfCpVwDnBjDn3Fd63PvCnTQbI8jli5G6MQsuiga8+9f7PJxVxU869am0OJhWAve9YUSk8rS6nlGrh9oe+xaTpksDDvv1DCjzjnVnxmncE+J7XMevpQ6cn SBpwQ11SNy3wAYPu9V4gQUhFyeA4i8enLUUIJD82NhVIWlpnv3yP5h3cu5pOmek/wakvMq1BubVh61qb4ERkWuv8DsxNbWMOUMGIz6+zw4Jo/onmXV7MqPe3 AfSvccTyph/YX+3tpMkkVavPKaHdS51bJTBL4cvGCTmcVkytDcbuR2pVLb2+OAtrujg+fVMzF3pdGDX89cBv9iuIMJWfTzL1lDT7YL0zlBSBP8rJjTsExRQI JPxu2kuIBR2JKZDhlIdHzJV4UrfI5vCuUq6km/dEcg8eY6IqaFU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid performance overhead when using skb_flow_dissect_flow_keys(), we switch to the simple parsers to get the IP and port numbers. Performance comparison: throughput (Gbps): Number of connections, before patch, after patch 1 8.56 10.18 4 11.17 14.07 16 12.21 21.78 64 18.71 32.08 256 15.92 26.32 1024 8.41 15.49 3000 7.82 11.58 Signed-off-by: Haiyang Zhang Tested-by: Simon Xiao Reviewed-by: K. Y. Srinivasan --- drivers/net/hyperv/netvsc_drv.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 1c8db9a..e28951f 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -237,20 +237,40 @@ static u32 comp_hash(u8 *key, int klen, void *data, int dlen) static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb) { - struct flow_keys flow; + struct iphdr *iphdr; + struct ipv6hdr *ipv6hdr; + __be32 dbuf[9]; int data_len; - if (!skb_flow_dissect_flow_keys(skb, &flow, 0) || - !(flow.basic.n_proto == htons(ETH_P_IP) || - flow.basic.n_proto == htons(ETH_P_IPV6))) + if (eth_hdr(skb)->h_proto != htons(ETH_P_IP) && + eth_hdr(skb)->h_proto != htons(ETH_P_IPV6)) return false; - if (flow.basic.ip_proto == IPPROTO_TCP) - data_len = 12; - else - data_len = 8; + iphdr = ip_hdr(skb); + ipv6hdr = ipv6_hdr(skb); + + if (iphdr->version == 4) { + dbuf[0] = iphdr->saddr; + dbuf[1] = iphdr->daddr; + if (iphdr->protocol == IPPROTO_TCP) { + dbuf[2] = *(__be32 *)&tcp_hdr(skb)->source; + data_len = 12; + } else { + data_len = 8; + } + } else if (ipv6hdr->version == 6) { + memcpy(dbuf, &ipv6hdr->saddr, 32); + if (ipv6hdr->nexthdr == IPPROTO_TCP) { + dbuf[8] = *(__be32 *)&tcp_hdr(skb)->source; + data_len = 36; + } else { + data_len = 32; + } + } else { + return false; + } - *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, &flow, data_len); + *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, dbuf, data_len); return true; } -- 1.7.4.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haiyang Zhang Subject: [PATCH net-next] hv_netvsc: Use simple parser for IPv4 and v6 headers Date: Wed, 16 Dec 2015 10:03:42 -0800 Message-ID: <1450289022-9958-1-git-send-email-haiyangz@microsoft.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: driverdev-devel@linuxdriverproject.org, haiyangz@microsoft.com, olaf@aepfle.de, linux-kernel@vger.kernel.org To: davem@davemloft.net, netdev@vger.kernel.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" List-Id: netdev.vger.kernel.org To avoid performance overhead when using skb_flow_dissect_flow_keys(), we switch to the simple parsers to get the IP and port numbers. Performance comparison: throughput (Gbps): Number of connections, before patch, after patch 1 8.56 10.18 4 11.17 14.07 16 12.21 21.78 64 18.71 32.08 256 15.92 26.32 1024 8.41 15.49 3000 7.82 11.58 Signed-off-by: Haiyang Zhang Tested-by: Simon Xiao Reviewed-by: K. Y. Srinivasan --- drivers/net/hyperv/netvsc_drv.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 1c8db9a..e28951f 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -237,20 +237,40 @@ static u32 comp_hash(u8 *key, int klen, void *data, int dlen) static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb) { - struct flow_keys flow; + struct iphdr *iphdr; + struct ipv6hdr *ipv6hdr; + __be32 dbuf[9]; int data_len; - if (!skb_flow_dissect_flow_keys(skb, &flow, 0) || - !(flow.basic.n_proto == htons(ETH_P_IP) || - flow.basic.n_proto == htons(ETH_P_IPV6))) + if (eth_hdr(skb)->h_proto != htons(ETH_P_IP) && + eth_hdr(skb)->h_proto != htons(ETH_P_IPV6)) return false; - if (flow.basic.ip_proto == IPPROTO_TCP) - data_len = 12; - else - data_len = 8; + iphdr = ip_hdr(skb); + ipv6hdr = ipv6_hdr(skb); + + if (iphdr->version == 4) { + dbuf[0] = iphdr->saddr; + dbuf[1] = iphdr->daddr; + if (iphdr->protocol == IPPROTO_TCP) { + dbuf[2] = *(__be32 *)&tcp_hdr(skb)->source; + data_len = 12; + } else { + data_len = 8; + } + } else if (ipv6hdr->version == 6) { + memcpy(dbuf, &ipv6hdr->saddr, 32); + if (ipv6hdr->nexthdr == IPPROTO_TCP) { + dbuf[8] = *(__be32 *)&tcp_hdr(skb)->source; + data_len = 36; + } else { + data_len = 32; + } + } else { + return false; + } - *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, &flow, data_len); + *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, dbuf, data_len); return true; } -- 1.7.4.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D1C401C0E66 for ; Wed, 16 Dec 2015 16:30:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CD7EAA6118 for ; Wed, 16 Dec 2015 16:30:27 +0000 (UTC) Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l2cXY94XCvAk for ; Wed, 16 Dec 2015 16:30:27 +0000 (UTC) Received: from p3plsmtps2ded04.prod.phx3.secureserver.net (p3plsmtps2ded04.prod.phx3.secureserver.net [208.109.80.198]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4E465A610F for ; Wed, 16 Dec 2015 16:30:27 +0000 (UTC) From: Haiyang Zhang Subject: [PATCH net-next] hv_netvsc: Use simple parser for IPv4 and v6 headers Date: Wed, 16 Dec 2015 10:03:42 -0800 Message-Id: <1450289022-9958-1-git-send-email-haiyangz@microsoft.com> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: davem@davemloft.net, netdev@vger.kernel.org Cc: driverdev-devel@linuxdriverproject.org, haiyangz@microsoft.com, olaf@aepfle.de, linux-kernel@vger.kernel.org To avoid performance overhead when using skb_flow_dissect_flow_keys(), we switch to the simple parsers to get the IP and port numbers. Performance comparison: throughput (Gbps): Number of connections, before patch, after patch 1 8.56 10.18 4 11.17 14.07 16 12.21 21.78 64 18.71 32.08 256 15.92 26.32 1024 8.41 15.49 3000 7.82 11.58 Signed-off-by: Haiyang Zhang Tested-by: Simon Xiao Reviewed-by: K. Y. Srinivasan --- drivers/net/hyperv/netvsc_drv.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 1c8db9a..e28951f 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -237,20 +237,40 @@ static u32 comp_hash(u8 *key, int klen, void *data, int dlen) static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb) { - struct flow_keys flow; + struct iphdr *iphdr; + struct ipv6hdr *ipv6hdr; + __be32 dbuf[9]; int data_len; - if (!skb_flow_dissect_flow_keys(skb, &flow, 0) || - !(flow.basic.n_proto == htons(ETH_P_IP) || - flow.basic.n_proto == htons(ETH_P_IPV6))) + if (eth_hdr(skb)->h_proto != htons(ETH_P_IP) && + eth_hdr(skb)->h_proto != htons(ETH_P_IPV6)) return false; - if (flow.basic.ip_proto == IPPROTO_TCP) - data_len = 12; - else - data_len = 8; + iphdr = ip_hdr(skb); + ipv6hdr = ipv6_hdr(skb); + + if (iphdr->version == 4) { + dbuf[0] = iphdr->saddr; + dbuf[1] = iphdr->daddr; + if (iphdr->protocol == IPPROTO_TCP) { + dbuf[2] = *(__be32 *)&tcp_hdr(skb)->source; + data_len = 12; + } else { + data_len = 8; + } + } else if (ipv6hdr->version == 6) { + memcpy(dbuf, &ipv6hdr->saddr, 32); + if (ipv6hdr->nexthdr == IPPROTO_TCP) { + dbuf[8] = *(__be32 *)&tcp_hdr(skb)->source; + data_len = 36; + } else { + data_len = 32; + } + } else { + return false; + } - *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, &flow, data_len); + *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN, dbuf, data_len); return true; } -- 1.7.4.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel