From patchwork Wed Oct 30 00:22:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gross X-Patchwork-Id: 287088 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B4A292C0337 for ; Wed, 30 Oct 2013 11:22:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752964Ab3J3AWt (ORCPT ); Tue, 29 Oct 2013 20:22:49 -0400 Received: from na3sys009aog110.obsmtp.com ([74.125.149.203]:59841 "HELO na3sys009aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752807Ab3J3AWp (ORCPT ); Tue, 29 Oct 2013 20:22:45 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]) (using TLSv1) by na3sys009aob110.postini.com ([74.125.148.12]) with SMTP ID DSNKUnBRVUOTAcl6k2C4N70Ex/3TwB4qXxLt@postini.com; Tue, 29 Oct 2013 17:22:45 PDT Received: by mail-pb0-f44.google.com with SMTP id rp16so581454pbb.17 for ; Tue, 29 Oct 2013 17:22:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WIMg16+s+MtZDZu8uAemqRczox6dNmYSLVe2LsAxgaQ=; b=c7RnLgGtWp8AEwGiFmpztZSS8OZwNPGkCIOc55yJ+4UP5bumiQum7muBifiz47+zo/ h3e9Au7sAkNHU84IQLIs7k4EyvL1rpK5GIjnm4zRkbp5RRLxLpM6D+0qbJxDjXITil/f P5jxN6oZ4+xwFVBgX1f9eWlbXeaWM3Vr4dKxzhXG2oowAky62W28PlC5hTZgH/5SHNOi Wz3eQolS60xvmiylzP/t7MdBwwDTwgWATrs9JcnLPgziyjQm3SM0HWLncYVNoHZUbFP1 yFy/Oq76ZI3U5CH2EBLkFn+uW6t4NJjA+QHjamaCzy1qH/P54bfPKIcSpDbBSN+zT12D SZgw== X-Gm-Message-State: ALoCoQkzc7YFzRBpWM5ysmYFZ8lJGF45gNzJg38PXB1tZ0c8rah5lVaei7S7mK1IEtv906bHywpGThVtAHsrH4MttKi0awGU2V7KRywfpRrPmg7x3mHXYnWFLv57Z12HPo56mYJg4TKPzDp4YexUSrSbb4FDTup+sVR8clUzyBG/tb88uHfFUaQ= X-Received: by 10.68.130.169 with SMTP id of9mr2178677pbb.79.1383092565142; Tue, 29 Oct 2013 17:22:45 -0700 (PDT) X-Received: by 10.68.130.169 with SMTP id of9mr2178666pbb.79.1383092565049; Tue, 29 Oct 2013 17:22:45 -0700 (PDT) Received: from localhost.localdomain ([71.202.123.143]) by mx.google.com with ESMTPSA id j9sm455217paj.18.2013.10.29.17.22.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Oct 2013 17:22:44 -0700 (PDT) From: Jesse Gross To: David Miller Cc: netdev@vger.kernel.org, dev@openvswitch.org, Jarno Rajahalme , Jesse Gross Subject: [PATCH net-next 10/11] openvswitch: Widen TCP flags handling. Date: Tue, 29 Oct 2013 17:22:23 -0700 Message-Id: <1383092544-50599-11-git-send-email-jesse@nicira.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1383092544-50599-1-git-send-email-jesse@nicira.com> References: <1383092544-50599-1-git-send-email-jesse@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jarno Rajahalme 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: Jarno Rajahalme Signed-off-by: Jesse Gross --- net/openvswitch/datapath.c | 5 +++-- net/openvswitch/flow.c | 8 +++----- net/openvswitch/flow.h | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 8c8875b..376b2ad 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -673,8 +673,9 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp, goto nla_put_failure; } - if (flow_stats.tcp_flags && - nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, flow_stats.tcp_flags)) + if ((u8)ntohs(flow_stats.tcp_flags) && + nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, + (u8)ntohs(flow_stats.tcp_flags))) goto nla_put_failure; /* If OVS_FLOW_ATTR_ACTIONS doesn't fit, skip dumping the actions if diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 2d82995..6ee7a41 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -59,20 +59,18 @@ 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_stats_update(struct sw_flow *flow, struct sk_buff *skb) { struct sw_flow_stats *stats = &flow->stats[smp_processor_id()]; - 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(&stats->lock); diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index b844252..a5504de 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -150,7 +150,7 @@ struct sw_flow_stats { u64 byte_count; /* Number of bytes matched. */ unsigned long used; /* Last used time (in jiffies). */ spinlock_t lock; /* Lock for atomic stats update. */ - u8 tcp_flags; /* Union of seen TCP flags. */ + __be16 tcp_flags; /* Union of seen TCP flags. */ } ____cacheline_aligned_in_smp; struct sw_flow {