Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df23e9f6 authored by Jarno Rajahalme's avatar Jarno Rajahalme Committed by Jesse Gross
Browse files

openvswitch: Widen TCP flags handling. 



Widen TCP flags handling from 7 bits (uint8_t) to 12 bits (uint16_t).
The kernel interface remains at 8 bits, which makes no functional
difference now, as none of the higher bits is currently of interest
to the userspace.

Signed-off-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 3cdb35b0

net/openvswitch/datapath.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp, 
	used = flow->used;

	stats.n_packets = flow->packet_count;

	stats.n_bytes = flow->byte_count;

	tcp_flags = flow->tcp_flags;

	tcp_flags = (u8)ntohs(flow->tcp_flags);

	spin_unlock_bh(&flow->lock);



	if (used &&

net/openvswitch/flow.c

+3 −5
Original line number Diff line number Diff line
@@ -58,19 +58,17 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies) 
	return cur_ms - idle_ms;

}



#define TCP_FLAGS_OFFSET 13

#define TCP_FLAG_MASK 0x3f

#define TCP_FLAGS_BE16(tp) (*(__be16 *)&tcp_flag_word(tp) & htons(0x0FFF))



void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb)

{

	u8 tcp_flags = 0;

	__be16 tcp_flags = 0;



	if ((flow->key.eth.type == htons(ETH_P_IP) ||

	     flow->key.eth.type == htons(ETH_P_IPV6)) &&

	    flow->key.ip.proto == IPPROTO_TCP &&

	    likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {

		u8 *tcp = (u8 *)tcp_hdr(skb);

		tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK;

		tcp_flags = TCP_FLAGS_BE16(tcp_hdr(skb));

	}



	spin_lock(&flow->lock);

net/openvswitch/flow.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct sw_flow { 
	unsigned long used;	/* Last used time (in jiffies). */

	u64 packet_count;	/* Number of packets matched. */

	u64 byte_count;		/* Number of bytes matched. */

	u8 tcp_flags;		/* Union of seen TCP flags. */

	__be16 tcp_flags;	/* Union of seen TCP flags. */

};



struct arp_eth_header {