From patchwork Thu Mar 30 19:36:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 745392 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 3vvFPc6JZVz9s3w for ; Fri, 31 Mar 2017 06:41:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RGqddNfc"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934749AbdC3Tl3 (ORCPT ); Thu, 30 Mar 2017 15:41:29 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34458 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934091AbdC3Tl1 (ORCPT ); Thu, 30 Mar 2017 15:41:27 -0400 Received: by mail-pg0-f68.google.com with SMTP id o123so12058448pga.1; Thu, 30 Mar 2017 12:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SQxCSSMNxJQVTXKbwU8SRxrDD/oM4gx330ro0uMYr3I=; b=RGqddNfcntbfFTexh+a5lEgHxavvwEtZGTOnF4T1GXnNKpjjFnZJZ57wMs9IV5c6QL DipaKjbe8nI3mUyCrQ0AIe486UEpm6ccNEOe5hMKGvjv+fJJjR3QYnjEjSYR4Ox7OyF3 LHMaMEaornvGMH5gRFU68WXWQHrOYc9W/pJ+UDw0ll7H0aIyZRKB0QRXxZyeVHkHyAh1 Sn44yLAS+a4H4ONEQLd/BZ4Uz+KN+RZ8t327blFXIIH2YurLy7avcN4OwHu9z508339k mMbAgICU1QvYtp6koV/LcGZjQY98FHEt3Wi2H96p9JUFmSh1mr8C+lrd1q79wY9ru60c S58g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SQxCSSMNxJQVTXKbwU8SRxrDD/oM4gx330ro0uMYr3I=; b=lcSAOBaRBeri7paZetPb8noTCP6gI2gex67XSqLbOPjqYigwmmNO/xZ6NBwOWMIYYe Zw+ZOZgtM7oj9eltzNh5/YnFX1HdHGL8KAQBb3ZPekD50DadpUH53w6isfbcnZpE/Loi TPj4frlm18JYM0ONc9kXFue05n2Fouj5R0xXTE6/HCUnM+QVJxAdWdZW2sfZlCxmJBYK kf5UPe8qokxwBAru4Lllcb2lUAEzriVkNs43L6yUZ73oxc0CMKMJGJ+bTiDE8V08Fl9e tUzVOjd87VNmECKawBBcO1xF6hQ0V5bQN2XzvOAzpcuP3b/LWDSGV+TEZYf5dPbklhvt GQGg== X-Gm-Message-State: AFeK/H181OvqgZA8lO8zJGFnU9wu/RjViN+KsmA0JUbtDnp2PqQKHS3A1wW1EBu9YNqUiw== X-Received: by 10.98.35.146 with SMTP id q18mr923675pfj.59.1490902885817; Thu, 30 Mar 2017 12:41:25 -0700 (PDT) Received: from Precision-T3600.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id v11sm6024422pfk.32.2017.03.30.12.41.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 12:41:25 -0700 (PDT) From: Yi-Hung Wei To: jbenc@redhat.com, joe@ovn.org, netdev@vger.kernel.org Cc: Yi-Hung Wei , linux-kernel@vger.kernel.org Subject: [PATCH net v2] openvswitch: Fix ovs_flow_key_update() Date: Thu, 30 Mar 2017 12:36:03 -0700 Message-Id: <1490902563-19288-1-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ovs_flow_key_update() is called when the flow key is invalid, and it is used to update and revalidate the flow key. Commit 329f45bc4f19 ("openvswitch: add mac_proto field to the flow key") introduces mac_proto field to flow key and use it to determine whether the flow key is valid. However, the commit does not update the code path in ovs_flow_key_update() to revalidate the flow key which may cause BUG_ON() on execute_recirc(). This patch addresses the aforementioned issue. Fixes: 329f45bc4f19 ("openvswitch: add mac_proto field to the flow key") Signed-off-by: Yi-Hung Wei Acked-by: Jiri Benc --- net/openvswitch/flow.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 9d4bb8eb63f2..3f76cb765e5b 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -527,7 +527,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) /* Link layer. */ clear_vlan(key); - if (key->mac_proto == MAC_PROTO_NONE) { + if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) { if (unlikely(eth_type_vlan(skb->protocol))) return -EINVAL; @@ -745,7 +745,13 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key) { - return key_extract(skb, key); + int res; + + res = key_extract(skb, key); + if (!res) + key->mac_proto &= ~SW_FLOW_KEY_INVALID; + + return res; } static int key_extract_mac_proto(struct sk_buff *skb)