From patchwork Mon Mar 26 07:36:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Scheurich X-Patchwork-Id: 890790 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; dmarc=fail (p=none dis=none) header.from=ericsson.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ericsson.com header.i=@ericsson.com header.b="X3WdxCDx"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ericsson.com header.i=@ericsson.com header.b="VASuNYRg"; 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 408mDX6JjGz9s1B for ; Mon, 26 Mar 2018 18:36:44 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id CC97ED1C; Mon, 26 Mar 2018 07:36:42 +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 E8586D35 for ; Mon, 26 Mar 2018 07:36:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from sesbmg23.ericsson.net (sesbmg23.ericsson.net [193.180.251.37]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1B3B15D6 for ; Mon, 26 Mar 2018 07:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1522049799; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=CB/wWah3qa/Wf368VQ/M40YfJScyb2Mv/tJbx0f/GWs=; b=X3WdxCDxW7soaWHXfHsasBCiv1hjtA1cc0NmIFtjTfamWYsSMKzQqwCQ3uf1Ob/j k4oqNdhp9yMqo+5jgxmZzkyhtfHBVuCvQ5w4vhfUXJ87aJSZjPz2VkaSbm2GxzdN H82IV7jXgyvXzT9wjhAwQRCGSdIEIMibR0ThDMstq8k=; X-AuditID: c1b4fb25-b37ff70000000e6d-bd-5ab8a307f566 Received: from ESESSHC006.ericsson.se (Unknown_Domain [153.88.183.36]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id C6.05.03693.703A8BA5; Mon, 26 Mar 2018 09:36:39 +0200 (CEST) Received: from ESESBMR504.ericsson.se (153.88.183.139) by ESESSHC006.ericsson.se (153.88.183.36) with Microsoft SMTP Server (TLS) id 14.3.382.0; Mon, 26 Mar 2018 09:36:38 +0200 Received: from ESESSMB505.ericsson.se (153.88.183.166) by ESESBMR504.ericsson.se (153.88.183.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Mon, 26 Mar 2018 09:36:38 +0200 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB505.ericsson.se (153.88.183.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Mon, 26 Mar 2018 09:36:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=C660Dryyv+q+t8QZPFBEDqTiv6Dyfhxgg+DuJ/UwbT0=; b=VASuNYRgxIG4GGkFhYyuhHATWFlwxGFZfkMMfq1GYIoSEWM88PbEm5RK4WC8JAmp2EXqDOh9Pe1Vx5ZrmC6OJCgxHv+cMuNOZFKCysVD/S7vo5plpvmZcJSzIHpuXPEThyURjnkRZq5rIS+8J4HX3Mjfhf/vFjWgH2kxqWtfx5g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jan.scheurich@ericsson.com; Received: from ubuntu.eed.ericsson.se (129.192.10.2) by DB4PR07MB0656.eurprd07.prod.outlook.com (2a01:111:e400:984c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.5; Mon, 26 Mar 2018 07:36:37 +0000 From: Jan Scheurich To: Date: Mon, 26 Mar 2018 09:36:27 +0200 Message-ID: <1522049787-24486-1-git-send-email-jan.scheurich@ericsson.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [129.192.10.2] X-ClientProxiedBy: LO2P265CA0038.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::26) To DB4PR07MB0656.eurprd07.prod.outlook.com (2a01:111:e400:984c::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec2cfca1-40ed-4a3a-13d6-08d592ec4ec0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR07MB0656; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0656; 3:FeyFcBupwUFOat6ENHG+/SUiQpXqPtaQo2mMt3xdoqIvtuFkE5ogHkWl+ppPAXGyw2PSfdSKqTIBadHEUmcTXlEHZGuwIdeXvu4foTzqSF+zLmthpFNFM+cvm6nOconAdTWelLKpK5WFzmpYPJ+Q1bwSu09GrWjGaReBzhlHMrucJMVVMHTL2lRPAyB1me0e4J5THg8ObTGT8egG6dFM9FMmU56IxpNnVgsleIgjOdead9yE/OXBRB+aqDGEaB/i; 25:uziNyM1SIDEM9P90YCJ7VwtkZpVJPkxVnhnw28V0nfPX4/MxjgodV0w993OWxKlMsPHEGlhF8yPvIbbtTgD8VPA+nAoU9I76KKVQkD9E+8BSJVZlZW/SteJOpYRyVr4VUVl19WL+8ZJy8SQ9Db0rG7pouzNsOYmr4kcdCcHqEOpm3mtnUP8yVAm5QKmUdr/jr2VraKRb8dLb4oA0yGWAhS6lF7TqVxP8Uded0omtdNCc1Jpg4J8X4ACfk3tx7IZ6X6VCw0evDhSu2BBzUAN7SCF8oHx7iwDAVI7e/XIAtG5T8TtTcQNIutEXofPVnDeYT4Ekna+b8fO71Oz7XoUI6w==; 31:GP7+bNw3CLIUNIu1uZ6mkxxlJKvoG3Y9/oGcIrCLiLVFCMxlVHymuMpgiG2TTUiAMYCQiG7FRACqii8NLMrvX5nnWYYUysWSvNpwR08+uMkbTGTZ3niuHqnoi/7ArDDnYlPHNlmS8j+PFIX+zwHKUlzY804CoIhnxol0KKfQk+NwIYUcurR8X5o2iUwZThlyX1GxR+6RMBjpNSC2ejpcaeSVagKXcM92UhZekHYD0z0= X-MS-TrafficTypeDiagnostic: DB4PR07MB0656: X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0656; 20:kGDoJ58tc42Vfws/JNLuFae17ckpeOKsW1jmBtTgubjWobT0MsIxzV5pGGRitD43OIiRaLZH8AVYrpHRlLR9XIjUjLg2DYQ4BGrrHc/fRIRMoPLyaG2qO43SgjQoWbP00lWrtneMgYTaA3pyvRy2pyV5w8hg4gou+rd6x09fIAtDfWGY+Gm4PmNmZnmqrE/SKuEI5BEmdTvCPpTj5JB85ONPDA38MNP7pW/8pEoZmuU58mHlqpJr67k/4eqQ6zCs4qxW5s38rPmDzkORw5ErT4AESiJyS6RvIh/0sC0jjkWrvg9Y6/gpAHLpVvRS868II35tTAQn1HLZTfyebHxROSuBpJZhLytD1AiZK84WTEIO0P7aGPJz17+V8nkPjqDsZO6Z8vC4sW6JoNsShF3iPC4geQjD2eYFiDfvWN3YjeaatChX+k8QiLQO/2TRnOWAbYMUOBkYTS9VEF+cEtPD8lv0KFaxnhkWBdwxh3b3Ecr5mstjb1DTCBJmFZ2JBL6W; 4:odgVXhfHtiZfE8aoprBqGmDO6m2dBDRH+vTueEQvJ70Ohpdaq+B9L+8xyn9vjFPAkIf/s/HHMG91o98vM93LQpVMxutvuwrGmsU9F3oKA5zOsa+uPRc5QCVcTlrvVP2zXAhiION6RRTyxiEh/zSREUIasj5S6QSYRzB/oA+W+2v0z6FaBtyvYz2iMtIhHTkiy9H75hU1k3OghP8vPZserWJwsyZjE7zNGfczYT/ANI6VCOzlCQU2AqjYW4opv8npBc+vMOEZ46E/J8d64K7Zvjx9UuxjUgqedpxXFTcBlGcINiZVs31RgiqPiFo1upAO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231221)(944501327)(52105095)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB4PR07MB0656; BCL:0; PCL:0; RULEID:; SRVR:DB4PR07MB0656; X-Forefront-PRVS: 06237E4555 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39380400002)(396003)(39860400002)(189003)(199004)(48376002)(47776003)(8676002)(26005)(52116002)(6512007)(8936002)(97736004)(53936002)(16526019)(50466002)(186003)(6916009)(1857600001)(81166006)(81156014)(16586007)(6506007)(386003)(36756003)(316002)(305945005)(2616005)(3846002)(6116002)(956004)(50226002)(106356001)(51416003)(25786009)(66066001)(2361001)(2351001)(68736007)(5660300001)(2906002)(7736002)(86362001)(4326008)(6486002)(478600001)(107886003)(105586002)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB0656; H:ubuntu.eed.ericsson.se; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR07MB0656; 23:aUqLxrhD4eom2uDWtiOQjq/b43Zb312RHSu5dqXDE?= vHoHi/r1J3rVYo2oZaLveadbPCWye18hPuu0e1SVN2KLO10K8fw+t542PxLz4Wm0H8a8nZRgnx/UIK42GwZFtOTryG7MrCIVocM+VIt5QVFUPNNxLZSaoEJxkvsu99XQRGaFToW8OGVGulp6BkzYHiCdHsksgIaCt5u04ltGXnJ+wK6YWTnLvuHs2udr7qJu7FskUduteiYRo7bFBFq5l/zZsalzmwaTQOp7wXXyv5e/qERjbTulDOzY3sAoIpSOR/KhENd8gIfh7az3v0eN53/DEJ7ieptp79ZtwriF1o3kXrjeMu//ACjbBdIEZCwGYYLWC/bHlHHr1IHifFAbucc/Njp6RgoUOc3c2vcnDebUrXbUn+HPmkx0MU75aJyd0ELE/yphQoAe5H96qiHq0uWFvZ8qst7oiLB6z7uTXtJ9aI1xQlDbxJ++sni/mx0TKqS41WFuW0/3LmjTKH9CRJu9TD6WFCsNTjHo6bTfZrJZfJ4kp368iprtzvOodGGkHpzfnDEkRWDu7ONcCV6YwKInntDgHCS0sV9IifHy9QwagiS3P3xRJQ7dy5uI6QpGpvn9PGQbYPXnyA+NYZKqtg/lmOjB6HwkZ7KwEowsAolLQOyPtELB9/iwyrpq72F+aqCQelwNdOqIYgM+LWixtjcGZ0VLRi+odzLHr/tRMDKpWKOQbVl282AFX1uIb32/MliVEjcdIy7JBBA5ca3MCDi6pOhEQeowPw4ME07/RPsI/mdKiHJiSWoy9BV1gQ/kXqIOW4UT7knwvFTK2530bSbiqRHvyaiA+lOPAMcLJDd30CBQ0AcCmsh3McrHMAft5A9UbA0y/T4ZRraqYX7SFCUP6ublqowGP302Q265swpAN7hcnJ1zgUGiTJuf8bo+88RkfSTeEshMpIJUjbug+EXifTWZVauNgw2RxQjEB92KrLoPXwvKwmVAaUQtilwKqajIdc/SLWFK3x59QwfqH+rpxtJbU2151OTU7Q3omU6Cbhv/AE/uSFE23OHIkPu3m5JR7bQZ8bTLOZMbmk50tJGtnhQf9HWaCyz3oBAFZJM3WOQR2R9JjFCIp8O6k+rCPmO07hNDJk5Us1qErQO/rtQBB4g9aKByvBcKK3dEOwfhg== X-Microsoft-Antispam-Message-Info: sKeGiJ7ke4QBPr0NovnyyVqQdQDyJivI1AGSLSz8uizZwHEUk0x0yJJ99iqetmXodTZuygN8omvOOx43g2bt5ot6SZmGFAnBwC4crR5uELPkc2nCpU2gjv5mz1bwCx2b/kU1QQj7dV/IQG849G4B5zC/ComYKiqg333s9XAl7rVHDWIm22IPPSBNi+/xoVRr X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0656; 6:0Eu3TzbMohGS+V8SsfljbPat9bKm4iRQdardZH0KuK7amwXaYrVyeOH5gI0IZCCAgF/E0ndwSROMXZHRYaYAeWOh0yARwFU5DM+VIjA9OvnaQdnAEpGfd+Oar72+woRYVfC9AZEwnIJYTPUhfNLQP+buGE83xvZswvYcgXtWzFK1gCKxpQvL+0zXdZoguAYyZ/BPGmMQQqRqBSPqpmNKdRXlK9YNxIRcntsLsx2eXIooVUOwJPn5SVxIoaacXUr84fU6ddVgzN6cQY1OT7+age+b+2yfPbO+t2jnQO2ZgcHEeUNHISNC8ujvrBCHTDOTCOqP3iBSyGa41A/upX05S2nZ3HRGbw0l7WdcHpFZYGWZhpygNO1eM+erP/VkfXN279/0hl9Qff22XbZTI+rlWh1STVv7BBIe5cx7qL0e35GmEVUXpnjszTOmNIck2ahjf973TKGuEJ6Bn+8Fslk4Nw==; 5:v9toGgKiIjZ+CFS1Z50zMNzuRzI/98OZJhjaJqbUEbyWm6zLasBysG0gZBCBABllyXWg9jk2ZsCnm6m/qKLCCDo2q0im2AhQCZmIR8n+VppuwKA01uwUjXEdiPSoEJqD58l3BtOou6pW/oL5gjXXX4wF7t37ciRi6r47iPbrbg0=; 24:9G4Lb9oYlYg4PCwwK484BqETzjkpWp88oVpohD0GWNFu1RfJ3qD9lgs3JwExljF9zDyPaxFxBBmQlydZlEMeN1CgdDZVnc0BNtzRaHxdNDY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0656; 7:BRSk/n1dbeiXMSH4uWtTGpHX3U4Ntvxe8mjOiRqcUC+IOCaMF4BN4rIMwaCGITmv4Ahs8hxsnSJdRX/rVseGZ/IWo2/+UPcE4tJlzwmF9IUM2F2vUek6Bw0YfDzIOdaluc3FM14xC9qunCcRrj2kakjsgxunETVqC3lPJGCNO2d4Rp2dVkpSeiBYauT9dx25MW3H1f3dop69BwUdHK+8LF09R6VGwtXbsbXPWAr7FpvGzUF7RN0/vIYt7dqO00EP X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2018 07:36:37.1128 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec2cfca1-40ed-4a3a-13d6-08d592ec4ec0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB0656 X-OriginatorOrg: ericsson.com X-Brightmail-Tracker: H4sIAAAAAAAAA01SfUgTYRzmvbud53TyNpV+aUnMpJTmRxaJRGhYmCL0R9AYhZ3t0uWccrdE hWB/TCIlsHT4kczV0MRISpcJOszpElPBMNOkCPEDQ0GxxK/SPG9B/z3P+3zw/OBlSOUyFcLo jSaON7IGFS2najVvj6l9HJ3a2Omt4ATPUDeZsL3WQSQRqY7uH0Tq/JdddIXQys/pOIO+kONj zt+U53wbm5YVzPsV/R5fIczohW8Z8mUAn4YHHXM+ZUjOKHE/gmHrZ0IiTgTPd1q8ZB1Bk6UH SaSRgLmK5n2FwqsETA1XE2IZwjfA8sbqjZQRsOVY2oswDI1j4UlXkugJwodgx+GkRUzii/Bu 5xcScSC+ChMDVkrEFI6Aj6szpBhV4DR49kojbQ2DwfeVMhEr8AEYrJ2lpBqA3oUFUvIchdfO WkqcALgGwcv2D/uCEh+HP+41SjIdAc9IPSX2A86AsZE4yd+D4OkjFykRsw94XHZvIApcox5a EjZoWDUPEZKQCzUb5TIJJ8Li1jqSTI0kdFt2aUk4DF22+959dTJos6dLkzhwTlroCnSy7r+T 6v47yY6IFhQscEJWXvap+GiO198ShHxjtJEztaG9b9Dr3I7oRGNLyW6EGaTyV6RXdWqVMrZQ KM5zI2BIVZAioGHvSaFji0s4Pj+Tv2vgBDcKZSjVQcX02XatEmezJi6X4wo4/p9KML4hZhSQ eufM9fHS1sHmFYUtY0K/XV11orr88oWYSn/TZlFu32P/FOdy8vfbhkjSPjeZkJOptqVlsc2B 1OzDRRORshi7FukeJ0uSw5byi7lPfeEua0Elrw5XDeg0Adf6Wx3qzHuexIb00HpN6SXdVNPk 19E+S9ZPmW2G8YtPiaE2VZSQw8ZFkbzA/gXZ3delAgMAAA== X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] ofp-actions: Correct execution of encap/decap actions in action set 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The actions encap, decap and dec_nsh_ttl were wrongly flagged as set_field actions in ofpact_is_set_or_move_action(). This caused them to be executed twice in the action set or a group bucket, once explicitly in ofpacts_execute_action_set() and once again as part of the list of set_field or move actions. Fixes: f839892a ("OF support and translation of generic encap and decap") Fixes: 491e05c2 ("nsh: add dec_nsh_ttl action") Signed-off-by: Jan Scheurich Signed-off-by: Jan Scheurich --- The fix should be backported to OVS 2.9 and OVS 2.8 (without the case for OFPACT_DEC_NSH_TTL introduced in 2.9). lib/ofp-actions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index db85716..87797bc 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -6985,9 +6985,6 @@ ofpact_is_set_or_move_action(const struct ofpact *a) case OFPACT_SET_TUNNEL: case OFPACT_SET_VLAN_PCP: case OFPACT_SET_VLAN_VID: - case OFPACT_ENCAP: - case OFPACT_DECAP: - case OFPACT_DEC_NSH_TTL: return true; case OFPACT_BUNDLE: case OFPACT_CLEAR_ACTIONS: @@ -7025,6 +7022,9 @@ ofpact_is_set_or_move_action(const struct ofpact *a) case OFPACT_WRITE_METADATA: case OFPACT_DEBUG_RECIRC: case OFPACT_DEBUG_SLOW: + case OFPACT_ENCAP: + case OFPACT_DECAP: + case OFPACT_DEC_NSH_TTL: return false; default: OVS_NOT_REACHED();