From patchwork Tue Jul 15 17:15:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 370082 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 74526140096 for ; Wed, 16 Jul 2014 03:18:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757122AbaGORSO (ORCPT ); Tue, 15 Jul 2014 13:18:14 -0400 Received: from na3sys009aog106.obsmtp.com ([74.125.149.77]:33289 "HELO na3sys009aog106.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756066AbaGORPN (ORCPT ); Tue, 15 Jul 2014 13:15:13 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]) (using TLSv1) by na3sys009aob106.postini.com ([74.125.148.12]) with SMTP ID DSNKU8VhoNlizDPEwGB549GoWYF5Y0xtmieQ@postini.com; Tue, 15 Jul 2014 10:15:13 PDT Received: by mail-pa0-f53.google.com with SMTP id kq14so4769264pab.12 for ; Tue, 15 Jul 2014 10:15:12 -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; bh=4RcgLdbSZjGIEx2+FbRKZvDjAvdOKlQxTWqkECKDHQk=; b=mypOB5SmUZpGOkkYebDIOzONtHvjP4Y/kqwagHD6eQpotTT7K2Ck6JLiFYOgx+0HaK EsFfqZRIwmxpycBc/bXiDudXRQgcKcUyf13N6Lead2aRIbr138WG+9NRdKLwLFO3o0YS E5xD4FmK5whVoynUHaZOF2tXeNk/EuqbbgRuzXp5skjz6NmfSQZM4i3XMxVLyNG0MWxK FcZ7mozWo379tYOtKHkFxYoMfOvhgRnlkI219Amdwc0AQwxaahHM0zCfl0Np0fNhvbIQ 9zdaxdiQYjMrs1/32CyNX1wQsdmnPIvRaS/lx0ief6r2iCVPh322Vt5tely9R6FNhycy uOyQ== X-Gm-Message-State: ALoCoQnAmPDvAOdtUEOtYS1IVqKSXVcMgEy9mpy3tC8DXwK9UR6/QNBW4MPIE3oNldJNl1U/rebZdReOnmDz4EUtDxIWdzRWlBoR+DQmNq4eecJbJDi691N8pjk/VYN9cYLsuZ86zQlG X-Received: by 10.66.119.136 with SMTP id ku8mr4954801pab.121.1405444512901; Tue, 15 Jul 2014 10:15:12 -0700 (PDT) X-Received: by 10.66.119.136 with SMTP id ku8mr4954795pab.121.1405444512851; Tue, 15 Jul 2014 10:15:12 -0700 (PDT) Received: from localhost (c-50-185-1-43.hsd1.ca.comcast.net. [50.185.1.43]) by mx.google.com with ESMTPSA id oz1sm19327979pdb.89.2014.07.15.10.15.11 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 15 Jul 2014 10:15:12 -0700 (PDT) From: Pravin B Shelar To: davem@davemloft.net Cc: netdev@vger.kernel.org, Andy Zhou , Pravin B Shelar Subject: [PATCH net-next v2 06/11] openvswitch: Fix key size computation in key_attr_size() Date: Tue, 15 Jul 2014 10:15:09 -0700 Message-Id: <1405444509-17029-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andy Zhou The key_attr_size() was not updated when RECIRC_ID and DP_HASH key fields are added to support recircualtion. This patch fixes it. Reported-by: Ben Pfaff Signed-off-by: Andy Zhou Signed-off-by: Pravin B Shelar --- net/openvswitch/datapath.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 911f192..995dfa1 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -376,6 +376,11 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, static size_t key_attr_size(void) { + /* Whenever adding new OVS_KEY_ FIELDS, we should consider + * updating this function. + */ + BUILD_BUG_ON(OVS_KEY_ATTR_IPV4_TUNNEL != 21); + return nla_total_size(4) /* OVS_KEY_ATTR_PRIORITY */ + nla_total_size(0) /* OVS_KEY_ATTR_TUNNEL */ + nla_total_size(8) /* OVS_TUNNEL_KEY_ATTR_ID */ @@ -387,6 +392,8 @@ static size_t key_attr_size(void) + nla_total_size(0) /* OVS_TUNNEL_KEY_ATTR_CSUM */ + nla_total_size(4) /* OVS_KEY_ATTR_IN_PORT */ + nla_total_size(4) /* OVS_KEY_ATTR_SKB_MARK */ + + nla_total_size(4) /* OVS_KEY_ATTR_DP_HASH */ + + nla_total_size(4) /* OVS_KEY_ATTR_RECIRC_ID */ + nla_total_size(12) /* OVS_KEY_ATTR_ETHERNET */ + nla_total_size(2) /* OVS_KEY_ATTR_ETHERTYPE */ + nla_total_size(4) /* OVS_KEY_ATTR_8021Q */