From patchwork Wed Apr 4 11:26:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Scheurich X-Patchwork-Id: 894934 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="AVmlYkvz"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ericsson.com header.i=@ericsson.com header.b="L10XRZ6N"; 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 40GNwV0SWQz9s0b for ; Wed, 4 Apr 2018 21:27:21 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1F9308A6; Wed, 4 Apr 2018 11:27:18 +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 CC54D88D for ; Wed, 4 Apr 2018 11:27:16 +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 B6A9F615 for ; Wed, 4 Apr 2018 11:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1522841233; 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=DI+NnmMuhdmIbPT0Czgn5sJqZq17yAU4wfS/CXCm+0E=; b=AVmlYkvzPr9f7T7PR+WatZIpjlO8yhdNyCZ9iQVSYrwG0FOIzY41/8L0+66CsK/W yf/Lpc36RDHHbBhNxzIngzABmQi6tcc2fYck6xsDT44BzoSE27NGDbCP2+CnEl93 91259h1yvHZFGNXNXFayEeRYM5mfYkSho36qaF/mWog=; X-AuditID: c1b4fb25-5a75a9c00000522b-70-5ac4b691700a Received: from ESESSHC003.ericsson.se (Unknown_Domain [153.88.183.27]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id DF.67.21035.196B4CA5; Wed, 4 Apr 2018 13:27:13 +0200 (CEST) Received: from ESESBMB504.ericsson.se (153.88.183.171) by ESESSHC003.ericsson.se (153.88.183.27) with Microsoft SMTP Server (TLS) id 14.3.382.0; Wed, 4 Apr 2018 13:26:18 +0200 Received: from ESESBMB504.ericsson.se (153.88.183.171) by ESESBMB504.ericsson.se (153.88.183.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Wed, 4 Apr 2018 13:26:18 +0200 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB504.ericsson.se (153.88.183.171) 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; Wed, 4 Apr 2018 13:26:18 +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=G+JeZhZW7BHHnB0jMESLI2j00vTMrGQ8wlZkCQiLkq0=; b=L10XRZ6N3nITVu0p4oCL/JK79Wcc4BT1jPE1wE48iuIxII5yKspI4ajM3kvpuaawImnXmpzdTMxdmmewFfXETnq1hyARX09sF6/qa/Z5Vv6OcqyvD3y69TKAty+uXE6PuFjSpe+C5ohWRW8HVHSpFIyRSx7q1mJkDT6gkocbklo= Received: from ubuntu.eed.ericsson.se (129.192.10.2) by DB4PR07MB0654.eurprd07.prod.outlook.com (2a01:111:e400:984c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.653.5; Wed, 4 Apr 2018 11:26:15 +0000 From: Jan Scheurich To: Date: Wed, 4 Apr 2018 13:26:02 +0200 Message-ID: <1522841162-5066-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: DB6P190CA0020.EURP190.PROD.OUTLOOK.COM (2603:10a6:6:2f::33) To DB4PR07MB0654.eurprd07.prod.outlook.com (2a01:111:e400:984c::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4c78e16-7616-46cf-5aee-08d59a1ee153 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB4PR07MB0654; X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0654; 3:LvkAAq/VH9jwkGZL9nni0nBQNS3UHtXYeGQc5tY11uqemhyXOCvHN9rk954XlVxwodIQIwVTleskmSOwMTsNUyMxnmK8LaFEnkhW7zmLXM/U+qLiQ3OlsaqUiNOaQEIOQlgisKvKB/3Ld3alq7E8L4rCZvnuQSkwn33SS1I7xF/oLLbd/JJXl9HcMgyyQNnNaKw3qX+PilmF4V6eb4UdvHROhuo2lyHhNCHBg8dHiRtr8F9ls/ODl/JJqvwd5kUK; 25:WZCmCVBZg7KnWAkm7pX5pb5lhzH0gSpqbgInUPXlirjb6LS8cl3BtHtwqQt38VwFrWXt+yfzMeTnhmyF/k4SKwtdn6pmUI7S6z4vxM42h1HHbyuFKw7UHm9NkJXI14B4SxBMLv+SG94SNM6UpVPz0lJZExMYEcLDbYP6S4t5Cw3OkywoyQbrB53ysH6EaxRrWhiO2IR7DP0Qo02vwHzA0OkrZASNHmjAiycy57If7uf/Akx6Y4o0sXCelywcTJj/p7wpDVpHwGG8A+Wf0Un+goK48p3ERcQJYedCmUgtDu4CJJe63B7H9PJ2GNR33pPaXDexgjv7V3Cfzne72Vlbhg==; 31:sVKIUjdWmQZ78MJK/1wiw6rtyunb3Qti1fGOoBaaXHKjliMB54KJGj0hhg8sYJex8y9WCoM2hWVcSjHU9Z+AneI47mUaYjP8geMDCAF0gVK4eK3bhvBEFI6L6x6LU6WFWe44C2kJNm0/Xk0rgAorC8TAOlVrBc94JwmetIrwNTnhJHjVzzzj0ohbnjSL9bTmGX8KHyJQxXc2qShSeeRTW1+bVz8udE5pMyc7s6RkJnc= X-MS-TrafficTypeDiagnostic: DB4PR07MB0654: X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0654; 20:5BSoG2ulKS7qO8iQsSDiAnjSfPZr3PuZRWDFsZSSP6TBiSlig5gbJZoMw5JRFuy3xs8rMB12eZzNXii0eMvx6Mbx5IuFcRakc3f9wH3W/sIXt19dQGlQkgNMeX2D0xLQRKBJSNbhyLnbeP/Uc2dljxiFfWihHdm1Ri9V+NK4xldE7R8rNak5Z7xNGTZb+dchRiskRbuJHjGx5ll6VF4yud1zrQU3LqAveOSmdCPiNLCbvhmJGIcrreRvQxBMATQXVH20gQ+6mvjOLRqkmOA75ovW+YehamcnqnVyhUsi+9ktpcVunpMCybFdU9aIKzWJXXDXjQ2zSKQQT6VHcxMqEqYJAPtn7CfWhb1sGGuXnK0R0KqyuUMmUPicdFnp250+SuHIczhcwCQvnysvqAXUD0aNFeUv7uypD0c8sHLjReYvfEB7XoCmYV4/IJopsrDD/+Ry6yItAIXOeRsH6VzBMOgiv06YFepz6VSNQreEiziEO91BEHIpHogf+rxdyHEP; 4:9UQgZVhp1+FbBiGLjYCDXa8z/8FwHi+jEOu8uKZdW5YszCAKpSIqSpfm1sdqzOxdQE2o1RFG8om+Pt59PH2DV/E+Mn3lNd4a6v9Iv/J7Z7nLE2N6xbHF7A1Bw8Y3sVqRvJryyyjsCSMycEdtV8rMpi2ZCqVIBUhk1TTQa3fREwoTyC+lFTDNvyg3TCJBRMMcY6tmADTyzPTlW7yNLKEuxp3FW5ApIKHDg+xzD4d+wOW1KNbgpuX4dgPYYDwafslIPsbGuZNAkgoS3hYB5XM6A01AVCAta/CarEfAdaoTxOKTNufebVeEAHN3GEvPqxoy 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)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DB4PR07MB0654; BCL:0; PCL:0; RULEID:; SRVR:DB4PR07MB0654; X-Forefront-PRVS: 0632519F33 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(376002)(346002)(39380400002)(199004)(189003)(107886003)(478600001)(105586002)(36756003)(186003)(16526019)(59450400001)(66066001)(1857600001)(47776003)(50466002)(48376002)(6506007)(2351001)(2361001)(4326008)(51416003)(25786009)(386003)(6666003)(2906002)(97736004)(6486002)(86362001)(50226002)(53936002)(6512007)(7736002)(8936002)(8676002)(305945005)(81166006)(81156014)(956004)(5660300001)(6116002)(316002)(106356001)(6346003)(16586007)(52116002)(476003)(3846002)(26005)(486006)(6916009)(2616005)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR07MB0654; H:ubuntu.eed.ericsson.se; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jan.scheurich@ericsson.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR07MB0654; 23:dv2AV43sit0vPF5OetAjAa6iR/52uy6MUt9LAzCwr?= GlzYuYkBU/Un1wufiMKPqocZP0OxqiYCUSJBBtrUThXAkQ54fCWTyggjeRchK0gPMEyOPAbp5ElYT8e0P8DirY2h+wt8ZUBJ51GP31/gDe3BJaGJg9YdXPhtvGwXCOWTsSXCrP+5me5F1WJrT6fcLcorUonkdDjLz6F8SC2sNdUsqYfLm3GM9RSn/AUVBfmbwzwwckSmz3iuoEZEZSmK/nIgI+/AET8BQidaGrSa8ulrqH5q64T8BcE+9VJ8jPOjeVbzgKpKRobznqKNbQy5scdwkmUHtFwO2GtEI/7eypWLMKf585SLmARj33tGNnNXrmVrWlQUeFQGDwsVElK452Mb6Y3bxQO9y7gquuVbSNoHajZH4M0I7mDb1SKMm5VdJA79g9YyRYz3P5zCh01qDS7/lXuVaey6L3mcu58uKG/UxHa7KIysafRyidmL09XpFGfiMWdUoD8GDcZmGLpGtmMLIWMA1U8D79CKhkywqR1SUjK3rmJQ3JTxJkHUx7ue4a0gq8/8hiLyGXLMoqrdfm7L8zbSEALiIKFzq6hbu6aLftcX5DhjEhhLGkZfclapVqef1N2ua9Cyl0qRkyLGamHXVLboP1nABtXekYDxnmYe5kWrfLlwh10mb3CcUQn9Qf4wh7uI83IHb5woy+uWhsmKociIc4hYZKk9CcIIId+SSVFwTleTSkSTYGXajPMzALyB0MjdYXgMiZDQSXCNvj05Bd65g2ikB5AxFcE65ZMyY8OqbLaJyJeVQCYYPMVHcioNrbElV8faKkCdBlMiMyOLbz7mlKGJw6xzjGVHZAXThzo1ch31wqbkyFPx1N+s8tjkE6rORLyr2K3J/0W/JD++DaKJcXvwgHk/WSrgOXjblE2k2dxPg238/LekXhXR+LztXaIMf6412gtu/5ul7IouEHkwF/Jl+3q0JKWBLAuOga/EnyK5c0tCBLX7MVgWOw9P/BWKGwOdZjvmLMJ3gp2bzTpr11X5cjLSbnKt1IZ52yBgKOBDcLEnnMkdQK1GHblS/1s3Ro/nfY2OkWLuFoPFp/LGUBT6DKXP1JGYbakYn7Ocqs9E58SgrHxhLINHbVIKrF0NFhjR3/rnEPbaNu4cZYl1DFox5yBlOgSmZjWxF704UMjrGEU6WKhT7z8qe4RzSrD16uq/ZhmC9p1w+jAvM1P5adfkkF6Y9vkQhPt88gLuVrGk89Brykfdh6Wy84= X-Microsoft-Antispam-Message-Info: XHY53/lM9SVHEWo9dFmjPlScejP6uQ+mGnj3UpIW9iktgzt/TmQwc7mT9/3Nem4cn8+6z7GzbJGxICE5iqPZS+e07ImMD/9nDncKyEuv3a9A5DYyNp0pFUqF56z64c/PbOfdiCBSxqsjZdKlo/GsTvre+UUWlGwFEM4mECe8+JBos8NEsTV+SjLNngPBbbOm X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0654; 6:IBTlaEViDsd8dgQ6AzaIFzwtqniQIqKN1TvasX3oE4gALXSLFcM/N+b/PKoidhVNFfgSlL2yCblNTj0v7d0CTAkXTXG/f3oA7oNEZVAY9rwtMz9zMKCdC8DJ+4GF+wgn162MtN/gMf+hsElrH/w1q4b3EiHSrAQKzD+Lr/hM68Zeie60Rs+LexqqlFEKtdFbEcDoBOWY07kJPm1D3SxV7LuBmDRgwqP/x70/JQbTmizWKYGWqY4eTjZEkhN/kMrvXyQ6WfdC9cWsi++Q+EIA226e2NzHvdCVBRENDdLi8lmbeJL2s+WJmOV+IQxcEBPmBizilrXZW2Nck/0HK2+NCSg4FuPfIu9iPhEVavLrJcueXpL5zwbi/VS+xDSOBUT68TRDlIUbS0U4S8ZAUczWApLq8tvJLqCw19kqqPigeHtJLQzk2FKnFszNERqfGKbTpdknQFit+Azl2L4w7RWe9Q==; 5:kXshSSk4WinKS3bJEQznpQ+4tyXmiqUrKTheSqYzy27Fl8b78DM2lvXhXhIeX75WmXgqmd2rPhYbnVihVzu2TNaTBp92u+o7PHi3mHgnS0kNy3h1jJYxgRDA5fF8jcsZgkPXrc6ZuAzd303CWMdJBAVvDc1adCFzCAIyrpvj/Dk=; 24:FIWirb1qot3HCrEsayIpz0w9A49jJFpx04ZsQwbcmsEOHlnY7Hp81JNzYUwGW6edynZ9SBCo0XIHk9fX3CHzQGCBZY3omv0LA/u3RRPcU8k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB4PR07MB0654; 7:pMavMnFDlKDICSSpuoe37UF8/TPhzRAvhx1tVYrlXVIXiCFyOBryUW7113ZPjGQFatwjpLAfWf836T8tQTyEfySh6jHLH1NNH63Fnxj2YdsGpHZjg1v1QQseRu3Cnv/0Bsi3SocGhqDx+9BXsbPJEf9L65qK5EE4kO8IXSzKgfXRXnjv4VET465Q9F6oXnUfWfLCzL8Hzo6QYuiwQuvZ6X1fEcfwHtM0a70TLz94wrvFpHBoXIniqk4o3CZQIyvQ X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2018 11:26:15.8652 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4c78e16-7616-46cf-5aee-08d59a1ee153 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB0654 X-OriginatorOrg: ericsson.com X-Brightmail-Tracker: H4sIAAAAAAAAA02SbUhTYRTHee69266jxW0ZHrW0lhKK6bKgoRIKfZiBZAglA6mZNx3OKffq 0L40yoIk1DGLpmaCbygUqfOlNkvnS2jqByVRQcIXpqSuEqeiuHJ7DPz2O+f/P+f5H3hoUuqi AmiNLp/ldGqtTCimzKldgReNnQMq+dBErOKnyYAUg99spMJUsSiIJ5WOmb9IuTz1gkomVOK4 DFar0bNc1LV74qxm5zaZ5wouLLO2EQbU6FeCaBqYK1BqfFSCxLSUGUAwVrMpwEU7gj+zblSC fA6KLQTTzwAL9QR8GK1CnoJiNghondsgsfKcgCpHOeXZK2TkUGWN90z7Mv7grrMIPUwyHNgm N718komB2bddIg9TTAi8dzm8LGESYXn8qZeBCYLhIZMA90/AsHmJwnsA+lZWSOw5C60WM+XJ AEwFAvdGmxDHvgD7dheFTWdgcKz6kJNgxzwiwANfEDQaRklcGEQwVfOawK5wWGpwibCwI4SP S4OH72XDcI/9kGNgdXcbYVMDCXv9iwIsnIbt+m4hFnoFsLawIMKhWLBMF3sDIiYNijteEuUo ovLIgZVHDqxFRAs6xbN8ek5m9OVIltPc5/lcXaSOzW9DB5+hz7IX2o0m1xLsiKGR7Jiks2NA JRWo9XxRjh0BTcp8Jd2yg5YkQ130kOVy73IFWpa3o0CakvlJ5q+2q6RMpjqfzWbZPJb7rxK0 T4ABca/mbgY76pN+VJc1HxfPB9nkIeX7KZu/TatNoVZz3JOZXvnt0d2EzDrbnX1dgrMwdHyM jVrXnnemGT813KgdT7QoFiaa7MXO1LmO+bRz6/3TAY/1+rAef0HELYfiestXjXskTLVCJUcr HxhTfr17kz6UVGD9XPo9dksZXSOXySg+S30pnOR49T/HazUbCAMAAA== 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 Cc: zoltan.balogh@ericsson.com Subject: [ovs-dev] [PATCH] ofproto-dpif: Init ukey->dump_seq to zero 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 In the current implementation the dump_seq of a new datapath flow ukey is set to seq_read(udpif->dump_seq). This implies that any revalidation during the current dump_seq period (up to 500 ms) is skipped. This can trigger incorrect behavior, for example when the the creation of datapath flow triggers a PACKET_IN to the controller, which which course the controller installs a new flow entry that should invalidate the original datapath flow. Initializing ukey->dump_seq to zero implies that the first dump of the flow, be it for revalidation or dumping statistics, will always be executed as zero is not a valid value of the ovs_seq. Signed-off-by: Jan Scheurich --- ofproto/ofproto-dpif-upcall.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c index 7bfeedd..00160e1 100644 --- a/ofproto/ofproto-dpif-upcall.c +++ b/ofproto/ofproto-dpif-upcall.c @@ -231,7 +231,6 @@ struct upcall { bool ukey_persists; /* Set true to keep 'ukey' beyond the lifetime of this upcall. */ - uint64_t dump_seq; /* udpif->dump_seq at translation time. */ uint64_t reval_seq; /* udpif->reval_seq at translation time. */ /* Not used by the upcall callback interface. */ @@ -1159,7 +1158,6 @@ upcall_xlate(struct udpif *udpif, struct upcall *upcall, * with pushing its stats eventually. */ } - upcall->dump_seq = seq_read(udpif->dump_seq); upcall->reval_seq = seq_read(udpif->reval_seq); xerr = xlate_actions(&xin, &upcall->xout); @@ -1633,7 +1631,7 @@ ukey_create__(const struct nlattr *key, size_t key_len, const struct nlattr *mask, size_t mask_len, bool ufid_present, const ovs_u128 *ufid, const unsigned pmd_id, const struct ofpbuf *actions, - uint64_t dump_seq, uint64_t reval_seq, long long int used, + uint64_t reval_seq, long long int used, uint32_t key_recirc_id, struct xlate_out *xout) OVS_NO_THREAD_SAFETY_ANALYSIS { @@ -1654,7 +1652,7 @@ ukey_create__(const struct nlattr *key, size_t key_len, ukey_set_actions(ukey, actions); ovs_mutex_init(&ukey->mutex); - ukey->dump_seq = dump_seq; + ukey->dump_seq = 0; /* Not yet dumped */ ukey->reval_seq = reval_seq; ukey->state = UKEY_CREATED; ukey->state_thread = ovsthread_id_self(); @@ -1704,8 +1702,7 @@ ukey_create_from_upcall(struct upcall *upcall, struct flow_wildcards *wc) return ukey_create__(keybuf.data, keybuf.size, maskbuf.data, maskbuf.size, true, upcall->ufid, upcall->pmd_id, - &upcall->put_actions, upcall->dump_seq, - upcall->reval_seq, 0, + &upcall->put_actions, upcall->reval_seq, 0, upcall->have_recirc_ref ? upcall->recirc->id : 0, &upcall->xout); } @@ -1717,7 +1714,7 @@ ukey_create_from_dpif_flow(const struct udpif *udpif, { struct dpif_flow full_flow; struct ofpbuf actions; - uint64_t dump_seq, reval_seq; + uint64_t reval_seq; uint64_t stub[DPIF_FLOW_BUFSIZE / 8]; const struct nlattr *a; unsigned int left; @@ -1754,12 +1751,11 @@ ukey_create_from_dpif_flow(const struct udpif *udpif, } } - dump_seq = seq_read(udpif->dump_seq); reval_seq = seq_read(udpif->reval_seq) - 1; /* Ensure revalidation. */ ofpbuf_use_const(&actions, &flow->actions, flow->actions_len); *ukey = ukey_create__(flow->key, flow->key_len, flow->mask, flow->mask_len, flow->ufid_present, - &flow->ufid, flow->pmd_id, &actions, dump_seq, + &flow->ufid, flow->pmd_id, &actions, reval_seq, flow->stats.used, 0, NULL); return 0;