From patchwork Sat Jun 16 23:50:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Deep Ajmera X-Patchwork-Id: 930371 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="J9pVv3zf"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ericsson.com header.i=@ericsson.com header.b="Bml8Vqgj"; 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 417MJ24T9Cz9ry1 for ; Sun, 17 Jun 2018 01:50:10 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D5A58A7B; Sat, 16 Jun 2018 15:50:08 +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 7F967907 for ; Sat, 16 Jun 2018 15:50:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from sessmg22.ericsson.net (sessmg22.ericsson.net [193.180.251.58]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BC2C6680 for ; Sat, 16 Jun 2018 15:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1529164205; 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=A+yIGLPbND3TtVmS0q7tYg+v0iNIBW+1/ZopjJqY7Z4=; b=J9pVv3zfELXyRxIeyHSMbCI2Liquv4J8RbWyam7tBYr8EzbswZc2C7kvH6wsahPh fXz3YD1bGcGHbgnxOtRwBxxvVOV8FCsgocEuxCG/ejlSiZf//BaDZZgFcA4baZBx dIckqG5jotD2Fegx5U6NzB6Y/1Jd3/CuW/F3j9sj1nc=; X-AuditID: c1b4fb3a-dcb6e9c0000079c1-d8-5b2531ade606 Received: from ESESSMB503.ericsson.se (Unknown_Domain [153.88.183.121]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id F8.F4.31169.DA1352B5; Sat, 16 Jun 2018 17:50:05 +0200 (CEST) Received: from ESESSMB503.ericsson.se (153.88.183.164) by ESESSMB503.ericsson.se (153.88.183.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Sat, 16 Jun 2018 17:49:46 +0200 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESSMB503.ericsson.se (153.88.183.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Sat, 16 Jun 2018 17:49:45 +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:X-MS-Exchange-SenderADCheck; bh=zn5f1rsoQ3XSu/xv2lGeVdDRIAYH11cxyKTa1iyVzH8=; b=Bml8Vqgj2/WOgvhtyKEUecXH8+ooH7q165XORKKarG/NhKWFiZJ5xtwyi4q9AI8X/XqbBtdlP+PxCFa9Hshzr2o6G2AzCZmmz82Rrmyty7vl7Lg9Tvo+H54srf7e4T9bG/bgBl9L13bTXnKYKlT2K3A7odh6RKYhYxwrnua1820= Received: from localhost.localdomain (125.16.128.122) by DB6PR0701MB2693.eurprd07.prod.outlook.com (2603:10a6:4:23::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.12; Sat, 16 Jun 2018 15:49:43 +0000 From: Vishal Deep Ajmera To: Date: Sun, 17 Jun 2018 05:20:30 +0530 Message-Id: <1529193030-3870-1-git-send-email-vishal.deep.ajmera@ericsson.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [125.16.128.122] X-ClientProxiedBy: BM1PR01CA0094.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::34) To DB6PR0701MB2693.eurprd07.prod.outlook.com (2603:10a6:4:23::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ce94313-b5e8-4273-5fae-08d5d3a0c7d6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DB6PR0701MB2693; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2693; 3:2BjZB3tEL2mvhIwGUu4NIQkC2tJvwXfk9VXZZOaDlbNZhuD6uQbXYvAdHUbzx3/p23tscvdFp0358WhWcgar5o9Q/xWyNufBEa3d4K5ajieG5aH+yq4X3uzJ5NsHFQI3ki/SoP/pvt74IiT2lP6kQuxc4Gah6GmmJ8c0rEG5Tx6mCtwlGlHdw9zM/iw+V0JbMiGHv62uj8h72dG3lUQvG4ssBEV0asffR1kI/eS/cmw9VkN0FkGDPmpwxqmYJIuz; 25:27VY0B4JGI1V9AudOR06JpXuSFEJgUgs9WebaxW6JqIGOdEovK1x2z2mnKUIfFSoQ//9djqTZZaKGGjsU7NdUkdHZeQ3nlAy09pQY/SdkysVBlWsLbPvmEyonBTDCB8xQgbUjDosi5CgoxQN8sm17KaunOPBjoorM3waXgOWwYFwx4b7QQWp0MFPawrp2F+8mamV+prSj+xOMjKZilvXjFSZqt6evXCCNhgL3igcg/n3YPHjLH09EXicvwM2kmCXdNmR0XDXmypa1Hd9tnEkWz/ETeIEdXoIMud6riX4c9pXS+dQ7nUAmJlDw4Xku+QXH/Rt5ZgXb+lVWXnKTWDPdw==; 31:ph0YcgSp6fe1ZhBesbDvhE8Enz3liT1JKdxZ73ndbZqGzhddcs98YSRqEMA8+3KM8Zojmfila9Okf8D6+6TVEl4VK1lkyY3qz7xWly2bb/Rer7EsFHJd+yI/p5ynuwaEk2EnJVrGbj5jEhaUnlf51SpJciHrit9gbWyO0J9Xb6oS+hYMW+lhbFWUNxdcXzcyRihyjKTwbH23Im4RqPchUDO+pDYM0g02JMfoJTktECY= X-MS-TrafficTypeDiagnostic: DB6PR0701MB2693: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vishal.deep.ajmera@ericsson.com; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2693; 20:FSpKAAAsUnLIUniZBPC0HMdNyVVzwVFenEagMndeBK9eGfOiRzXzDdED9g97KmnkMD4syJB5mRtrT60beZVHGyaLyY9G0W6FUM0TVEhyWn71pisVSiIuh3JPQ/gAY9ml8FQV1RqSSBJj1WttnIqzQal2IexnudODcchgspVmPkL0cNmhyjZNlbsg7wm1mz4h8t2YgGETQFvwIIuWh/1/ijlJ6pgmhoqOz49FP3x9S/MyD/f2XEX7m6XKXNEP6xCqX7JCw24+YQUtdY2UjP7kpef0zB9lLlwYJ/vGTXYyqEjGXvlqgR8QQ4ZHog2SSokctNNe5DSjTBVz6ODCOnSESn/EhTvDe87bbhxnijGiBaIIq0ic7mjzmTqtIJrk9E1Fy3L379qx7mg/NOp0QP27pEjafZZUqXZ75cUb5u1oLRlYdMmW4O9Pwi5SChl22S2A/G+GWSWZG7IEalmHXOpzsO/ckrnwRxl+LNaWfd2Fq4fkd8283cmrRpeZGAC+0DY+; 4:rs3g5eJLS0+K2xMecdebUnlc6rk8hgbELo0zHPq8jpecRHQh/IpjktBszEZ6JzG7OoiQ/kHSYZE7+ava5dPTJN9dFHnXRiCpGtg9bblBaUMX3ruAPEKqiHpnZujIO2ADGB3epDT7b6QX/5G1/+aPvxJRYvRYDd8zGmwbIrQPXjngaYuA08k/gUUG9JwpFrga4nCrhZj0rOmkLkCzrqGe2KugE885NysM4k83r1HFFkiSnJWWQq7VrOW6bRg9CuRigxbnG+qr0nQJcmspMbskjSuDttfheQHr/u+PONpIXIT/SuvZjzKn0nlxDPYD4pG/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB6PR0701MB2693; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB2693; X-Forefront-PRVS: 0705EB1700 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(39380400002)(376002)(396003)(366004)(346002)(189003)(199004)(486006)(50466002)(6512007)(476003)(6916009)(7736002)(305945005)(8676002)(105586002)(16586007)(1857600001)(2351001)(8936002)(6116002)(51416003)(316002)(52116002)(3846002)(50226002)(2616005)(86362001)(6486002)(36756003)(5660300001)(59450400001)(186003)(6506007)(16526019)(386003)(26005)(6666003)(68736007)(48376002)(55236004)(2906002)(81166006)(956004)(81156014)(66066001)(47776003)(478600001)(4326008)(107886003)(106356001)(97736004)(25786009)(2361001)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0701MB2693; H:localhost.localdomain; 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; DB6PR0701MB2693; 23:3HawvWKp1mSK1xm6QPBPl88gT6lRDNZPkwLUlmI?= SpY3xHVbu47yiChMx+COlcABRSGlRT2LfM1xEqkb9oXCtWUAdkUcF4TBHoEjsq0UzOzRRIXpyK+WLFvj3wFMa745SAzVUYescU6xyskaP2NqM0eh6HRq3n0GESxJezvxI8Er5STzTp6P233UU96Jla5kIMtu3YEuagyLDbiqFYGrXKoTNoP6/98QiVeefabudxIOm2GlEBQif+tqvl6AS0xGMm/gbOWTKhab8MNzKKH3iJbMsB+4g+O3AmBTz57VNxCrF14Da2n3+eQXoFVqff5ZVPIizEDK+BHu4MFE2v9wfKtl0QR5P3M1/xomj9UTmOnctGDPUZ8/mGqbhvB5wH1evVHdEiSSMmYr6cG+HIXfKxE74H7wr9aRAsVkoQoEl7d855RAveADSa6Iji62iWzeJbW1ev6ubGjPGX0BGxkVVkTykxC8iUJDGoZkat4uWFdmWEjK/tQXZW4WHiAc1Kjk7d0C31Bxdj79LaX1KQfOstwcgwNnOJKHZIC+le7ffI5WCFfVk/7eIBFROpx3HdVkeyfkbPHC4UjE5i3rts52Z6cDGb7iMCXQ3t3o4j+p28yB3J7qf5hiXVVbPUectkjGK1K+s6/82Ge3IrPTn7EAqtNFvJNypldZixyvW8XrEH3dNRQUJXBitS/ZgRnokYMMd/B8zo+L8aOyUOn2U82lLy+v7vWv+SyvB/29c7vxNGQk6zG86c2pVmyMU6il9Esnv/4T8zQ8NuCyQdf/pK3DiAweKR4KttyfwScv9/OEECSQwwWaHO1IwIzqujwsFf+P+RmAkYShnMxLBLYBF+NglHhVmu/Gq2rAPgm5cn8Gwr2wmS229doxLc9WWgjsV8Xegti/kd+mex8ekPSmWcF4rK6eDXS6Cm66oDs2foHc+ZPVmvHQXKJcrmzl8xkI5ja95X9zdxmYDbISFBtE/PTz8C7bmAWYpfR3Cl5binwhVTO+hfubS4/E9tJCrEK7dov+JaWxbwZiWjLkTkj+uy0sHpcCuCP649LdDapMLBmxeYvlqSPQd2plJEveSCI1v9iHsZRrlM8D/QCXONylKJro3t4nZbJ10XhT4amuvzYJl8PnZFhEkRyCXJbR0N7m3hXYp5nnpEbAZRnBkUdCR5EToWn7NpjHwRk4MwiokAlHlITUJn8xkcdSt8vsdT8eOUObIq+w3TQA3ZJO931xsXL/rAGDIPY0xmy5d2mvz7k4vTcRUWZjbGLcJwCeaxPmsoscr X-Microsoft-Antispam-Message-Info: T0naDHuYE2cT7TYcHqqNpLFzXmO4edbWJmObSo3xnhTbHYXcXT586yvo6mxgzeMMTRc9K5kbvUfLRkrL+po6K4yC+yPF1RRSVsCl+ofq/900ARoCOZeMSTFXS5tXKEL7iCtwop2UAt7s2IIeEENeUD4ZB0h111JEWFB2s6ObleIC17JrDquzQUWMAPhwx2fZ X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2693; 6:ZHaJ9mF6XxVWVR8R9nWK3RQSHOneo80cDKJOD98o/n9ve5b7VkoL0FRQzL8V7T7YvpKcwmIoniljYM4m0g8QdN6CH9RCPivlNmNK5ej41Ib2TnC3TE/jxUEUSuHkyfLOll10RgrQQ73tasQzEesMO3FgsPN3qyWbkmFdPhhRddWOL+z0VGUBIJDTV3/2LDlqvNWCBuQPAGXK5/SMSP2mtof0YgdgTdLiKOWEQ7w7fyhCdBOZrUiXllSwxUcRAO8BEnSLQx42QOn/TPqmBsLOTE/h1gzFCWR53tL5ju9uJdQVylXv3odLfqGYpNruDb+5iR0R+pmQpzAX+H73FjwdEGerZnybty+VcwGIxh5vZIS1h/QLtcjknmHqqMyzStWGWWCI5+ZbrI+Fv3Rv5FVt1UXjpnhqR0ojkFgrDKBl9zQBsmyuBwKODA6oUw87Bx3qPj7TI8GAoaVMHfsbGz+kPg==; 5:aL58Az9TdQHIcVG7xbQeVAzbSeIJV+geiwdCHrZOXxTmfNkh4KvYW/H/2c1XaI5slHFVycobG10M5OK3F/wbHrKATNec2dY88WlfnfQcSK2HdI59rSG9XSE9HzulVssj+gLVmLF2tMYxZJEwkkvrU0WxDUZfJS/7g8lepAHIqak=; 24:yjtHeZ3kbzok0HfRdasczkaOepMGhnQnZR7Fl7ucoWFrvnIBPtDfm1WTrwqJHTv6YBL+LDHw/PsHlnP8xZAsLjhtoGhC14gOLzaT42Ogx+E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2693; 7:KIc9XtkgV/KddlrzC5j3v+XNpNKGSmG9I9v5XNU9KN95atwtg0xlZLw9UMf6ZAGdvjuyiEbhGbUq9fMMP2dsybFn4nNbrA8H7GpuL8mtH1AgdzMfshVEIUO5R/SvJEGNsq83ju/I/R/W1guJX/9sDRDNol6yqLX2o8D9IvZZ3i+y3RHhT9CyFYDnrri+wb02gKmCERsVishAMu8ukgLHTy9cPiQ1oVUItDFCIvrC2dfFX1iwPO0wGBV/XyGaU9iI X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2018 15:49:43.7642 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ce94313-b5e8-4273-5fae-08d5d3a0c7d6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2693 X-OriginatorOrg: ericsson.com X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGIsWRmVeSWpSXmKPExsUyM2J7pe5aQ9Vog9WX2CyOnt7D7MDo8ezm f8YAxigum5TUnMyy1CJ9uwSujH0b57AXvOau+L+6ka2B8SxnFyMnh4SAicTZ352sXYxcHEIC Rxkl7r37wwLhfGOUmHX6MDNIlZDAEiaJC78yQRIsAhOYJVY9XQnV0sEk8bunCayKTcBK4teU fhYQW0RAUuLf4i1sIDazgIXEzfs7GUFsYYFAiT1/toDZLAKqEiff3mMHsXkF/CQePZ3GBHGT nMTJY5NZIeKCEidnPmGBmCMhcfDFC2aIGiWJXZvvM4McISEwjVHi7r92VohTdSROPb/OClEk K3H07BwWCNtXYvHiDVANJxklHn3YBeU0sUu0tN6EWq0jsX/5YSCbg4NRIEniwUsLiJpfbBKH nh+AmpovceH5DkYI20ri9a/vjDBnn+o9xwTRcIhZ4tfXK1C3ykg0f+mG2naaVeLrmqmMELem Smy50cI2gVFnFpJfZyH5dQEj0ypG0eLU4uLcdCMjvdSizOTi4vw8vbzUkk2MwNg/uOW31Q7G g88dDzEKcDAq8fDG6qlGC7EmlhVX5h5ilOBgVhLhLS5TiRbiTUmsrEotyo8vKs1JLT7EKM3B oiTO65RmESUkkJ5YkpqdmlqQWgSTZeLglGpgdKzYeCzxXIH+jIjXGtuuyi8MNjZlXr5f8f7x A35MhZqHHI8W/n6aIrbkPPsnj3Kne13BixkY88T2/VfRVEnJ3JVVPl/sldiqjQWO9Y9u3lj2 gLWy9rTflaCLEhzpFw9WNwrfEQ2YKrqaJc1lep7NXFP+psNnhcLbPzxwXSEZ9T71aFvGh+B4 JZbijERDLeai4kQA/NjGOfkCAAA= X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, 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] ofproto: Fix OVS crash when reverting old flows in bundle commit 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 During bundle commit flows which are added in bundle are applied to ofproto in-order. In case if a flow cannot be added (e.g. flow action is go-to group id which does not exist), OVS tries to revert back all previous flows which were successfully applied from the same bundle. This is possible since OVS maintains list of old flows which were replaced by flows from the bundle. While reinserting old flows ovs asserts due to check on rule state != RULE_INITIALIZED. This will work only for new flows, but for old flow the rule state will be RULE_REMOVED. This is causing an assert and OVS crash. The ovs assert check should be modified to != RULE_INSERTED to prevent any existing rule being re-inserted and allow new rules and old rules (in case of revert) to get inserted. Signed-off-by: Vishal Deep Ajmera --- ofproto/ofproto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 829ccd8..f946e27 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -8648,7 +8648,7 @@ ofproto_rule_insert__(struct ofproto *ofproto, struct rule *rule) const struct rule_actions *actions = rule_get_actions(rule); /* A rule may not be reinserted. */ - ovs_assert(rule->state == RULE_INITIALIZED); + ovs_assert(rule->state != RULE_INSERTED); if (rule->hard_timeout || rule->idle_timeout) { ovs_list_insert(&ofproto->expirable, &rule->expirable);