From patchwork Mon Jul 31 20:35:36 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: 795951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uqEWbm1s"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xLrnz6CGTz9s4q for ; Tue, 1 Aug 2017 06:36:23 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D3B66BC6; Mon, 31 Jul 2017 20:35:53 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 076EEBC3 for ; Mon, 31 Jul 2017 20:35:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 358A0204 for ; Mon, 31 Jul 2017 20:35:52 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id t138so209922wmt.4 for ; Mon, 31 Jul 2017 13:35:52 -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:in-reply-to:references; bh=QNIbpT9M4jZPppu24CZ4c9SHxzdNoFROacWB+0NQ16E=; b=uqEWbm1s1lKORdZWj2xWMGCdFp6v//tq3k/xgD37rfp/5LSTWOimOxNJzmT1Bh6lkK y5shsbsU0iK6GeIhLBLKWpudVUqc8YVgw8TCxrmQdgv4upsEqtu5uBX4SFWGlbQWigvL +otw6gjkfOiQm6F1VeBcEQ5sIaauhtCQO58UJEDZGTchDttad95fRSyFbY0AEMkDMbI6 wwGEGDrBzh0OL9kHDyMdVQdmDN6UYVJiwtDM/LxjkMfEEnqiG+hGWU/4p84fWteXVS62 GQcSx8nq2cMyXIRXc8ygzulZ0JnWHXybm6dcjCOSPExnaDY/fLGZfBiI9dR+aksGnxVZ GfTg== 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:in-reply-to :references; bh=QNIbpT9M4jZPppu24CZ4c9SHxzdNoFROacWB+0NQ16E=; b=QJThxu/19KzQkEBdp1atECvmR7YJbLUS85msjKk+Sg91c+blAbEzXcAo6idi963uZY vqoSGGPrxkJmmNF0LbkG3PuFG/gP9pUxRqfg31Fxk+HgpbVSG+FCmVKj+I2fPKUzgxe7 fA0xJdE4XvbF8abEpxKgBpJa+caXxBKeqDDvf36Iaxv0seWNrFUIvDEeJ0Tu8Cszx2wf 2KREImQ9LmRQZL4PZ868RjPcLeHdS6vB3DnrXjcQp6LoZWFB1KX70acqcLUEOYW4XLEu veZU396+qVqECOXiW9TWEwjtpqQQeTfWL8YWaAgN8xL4VQrXZ60Xq+2dMR3ivYnCS1TE 6Q7A== X-Gm-Message-State: AIVw113GvB5GuV0E7yVsDsF1xQ5lypSidMk/sZ0cjIXr8jvbHnzeifoL zJHeH0Q431jHluhMfuo= X-Received: by 10.80.207.203 with SMTP id i11mr15501218edk.112.1501533350743; Mon, 31 Jul 2017 13:35:50 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id v5sm13709689ede.75.2017.07.31.13.35.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Jul 2017 13:35:50 -0700 (PDT) From: Yi-Hung Wei To: dev@openvswitch.org Date: Mon, 31 Jul 2017 13:35:36 -0700 Message-Id: <1501533339-126553-2-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501533339-126553-1-git-send-email-yihung.wei@gmail.com> References: <1501533339-126553-1-git-send-email-yihung.wei@gmail.com> X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/4] odp-util: Fix generating various ct fields in odp_key_to_dp_packet() X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Previsouly, odp_key_to_dp_packet() may fail to get ct_state, ct_zone, ct_mark, and ct_labels from ODP flow key. This patch fixes the issue. VMWare-BZ: #1920903 Fixes: 07659514c3c1 ("Add support for connection tracking.") Fixes: 8e53fe8cf7a1 ("Add connection tracking mark support.") Fixes: 9daf23484fb1 ("Add connection tracking label support.") Suggested-by: Joe Stringer Signed-off-by: Yi-Hung Wei --- lib/odp-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/odp-util.c b/lib/odp-util.c index 1c6fb38e12ac..cf0d39d9ec16 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -4788,7 +4788,9 @@ odp_key_to_dp_packet(const struct nlattr *key, size_t key_len, uint32_t wanted_attrs = 1u << OVS_KEY_ATTR_PRIORITY | 1u << OVS_KEY_ATTR_SKB_MARK | 1u << OVS_KEY_ATTR_TUNNEL | 1u << OVS_KEY_ATTR_IN_PORT | 1u << OVS_KEY_ATTR_ETHERTYPE | - 1u << OVS_KEY_ATTR_ETHERNET; + 1u << OVS_KEY_ATTR_ETHERNET | 1u << OVS_KEY_ATTR_CT_STATE | + 1u << OVS_KEY_ATTR_CT_ZONE | 1u << OVS_KEY_ATTR_CT_MARK | + 1u << OVS_KEY_ATTR_CT_LABELS; pkt_metadata_init(md, ODPP_NONE);