diff mbox series

[ovs-dev,net-next,v5,06/10] net: openvswitch: simplify the flow_hash

Message ID 1571472524-73832-7-git-send-email-xiangxia.m.yue@gmail.com
State Changes Requested
Headers show
Series optimize openvswitch flow looking up | expand

Commit Message

Tonghao Zhang Oct. 19, 2019, 8:08 a.m. UTC 
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Simplify the code and remove the unnecessary BUILD_BUG_ON.

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Tested-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: William Tu <u9012063@gmail.com>
---
 net/openvswitch/flow_table.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

David Miller Oct. 30, 2019, 9:19 p.m. UTC | #1 
From: xiangxia.m.yue@gmail.com
Date: Sat, 19 Oct 2019 16:08:40 +0800

> @@ -432,13 +432,9 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table)
>  static u32 flow_hash(const struct sw_flow_key *key,
>  		     const struct sw_flow_key_range *range)
>  {
> -	int key_start = range->start;
> -	int key_end = range->end;
> -	const u32 *hash_key = (const u32 *)((const u8 *)key + key_start);
> -	int hash_u32s = (key_end - key_start) >> 2;
> -
> +	const u32 *hash_key = (const u32 *)((const u8 *)key + range->start);
>  	/* Make sure number of hash bytes are multiple of u32. */
> -	BUILD_BUG_ON(sizeof(long) % sizeof(u32));
> +	int hash_u32s = range_n_bytes(range) >> 2;

Please place an empty line between the last local variable declaration and
the start of comments and code in the body of the function.

Thank you.
diff mbox series

Patch

diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index a10d421..3e3d345 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -432,13 +432,9 @@  int ovs_flow_tbl_flush(struct flow_table *flow_table)
 static u32 flow_hash(const struct sw_flow_key *key,
 		     const struct sw_flow_key_range *range)
 {
-	int key_start = range->start;
-	int key_end = range->end;
-	const u32 *hash_key = (const u32 *)((const u8 *)key + key_start);
-	int hash_u32s = (key_end - key_start) >> 2;
-
+	const u32 *hash_key = (const u32 *)((const u8 *)key + range->start);
 	/* Make sure number of hash bytes are multiple of u32. */
-	BUILD_BUG_ON(sizeof(long) % sizeof(u32));
+	int hash_u32s = range_n_bytes(range) >> 2;
 
 	return jhash2(hash_key, hash_u32s, 0);
 }