From patchwork Sun Jun 2 01:52:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pei Jikui X-Patchwork-Id: 1108890 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=hotmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hotmail.com header.i=@hotmail.com header.b="XGuhPZol"; 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 45Gh6B4Hpzz9s7h for ; Sun, 2 Jun 2019 11:53:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id CAC44E3D; Sun, 2 Jun 2019 01:53:02 +0000 (UTC) X-Original-To: ovs-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 77473E36; Sun, 2 Jun 2019 01:53:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253011.outbound.protection.outlook.com [40.92.253.11]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1BCCB6E0; Sun, 2 Jun 2019 01:53:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lUJU+CnbRVn4UckjJ3g/ya6VcsQ6nwFYI69gUV9W1Ak=; b=XGuhPZolqWOOaBojUYuiueq63pOVKabU2rb5hAeI+hglZ0kEh7JrtlFAg/CRJUgziz5fO0kd2z2Bq+kPuIkNrMkQ6hMx/I7VooLt9pCC2LE08ZYStcTXSVT6aIGVNm4svzOxnOp1x+H9E9/A5gpr3U+emn4XRX7x/TqZHuWWBMQhfAPTrB7jI1PdsU3aGgw3lF2ewd1Mgf/4RQUp0Sa9CjI9PDlQLwFaaAieDqCdcevAMaMABzakOUGoOsFaxU+rDiZMKsAGf/LHd2awOjLppfe3SOlrf/gApS88CjkPQO1Wo2JhntHyergiknMiOIjOF9YYNRpmj/dofVnFGyQtXQ== Received: from HK2APC01FT038.eop-APC01.prod.protection.outlook.com (10.152.248.54) by HK2APC01HT190.eop-APC01.prod.protection.outlook.com (10.152.249.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1943.19; Sun, 2 Jun 2019 01:52:56 +0000 Received: from HK0PR03MB4049.apcprd03.prod.outlook.com (10.152.248.54) by HK2APC01FT038.mail.protection.outlook.com (10.152.248.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1943.19 via Frontend Transport; Sun, 2 Jun 2019 01:52:56 +0000 Received: from HK0PR03MB4049.apcprd03.prod.outlook.com ([fe80::fd0b:e5c0:2e5:88a9]) by HK0PR03MB4049.apcprd03.prod.outlook.com ([fe80::fd0b:e5c0:2e5:88a9%7]) with mapi id 15.20.1965.007; Sun, 2 Jun 2019 01:52:56 +0000 From: pei Jikui To: Ben Pfaff Thread-Topic: =?gb2312?b?u9i4tDogW292cy1kZXZdILvYuLQ6ICBvbmUgaXNzdWUgaW4g?= =?gb2312?b?dnhsYW4gZnVuY3Rpb25hbGl0eSBvZiB0aGUga2VybmVsLWRhdGFw?= =?gb2312?b?YXRoIHR5cGUgb2Ygb3Zz?= Thread-Index: AQHVGOXmrq7VOtNo/Ue6YuXMB104uQ== Date: Sun, 2 Jun 2019 01:52:56 +0000 Message-ID: References: , <20190524183604.GA473@ovn.org>, , In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:9187F7154FD43306A3307065EC69C5B65D04A22AA6C27EF917BAB6B906781A19; UpperCasedChecksum:6D55041BB78FDCFBA589F28D535806F3A0FC3A07247E4032AD59738E1ADB5161; SizeAsReceived:7232; Count:44 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [hH7NRvmUNjvpOS7xIGNNlGsJkv6Lpdjd] x-ms-publictraffictype: Email x-incomingheadercount: 44 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(5050001)(7020095)(20181119110)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1603101475)(1601125500)(1701031045); SRVR:HK2APC01HT190; x-ms-traffictypediagnostic: HK2APC01HT190: x-ms-exchange-purlcount: 2 x-microsoft-antispam-message-info: vVtt/98lDuZviIo6Yc5jnjCFiMjCOPGGg9GBA+aCwvEtPmwBN2xyWDB7Nvu+R6/3Y+VH0Rocp11NApCH2wosaBPObM5uK3rqAvdEc3k4cFOflUylNSs22gddfm2ZXvZsdxClmYYG90QzzuCgPv8+rfA4U4w2d6Q99FW54Q3GVLionEu0/Ky+XTHcY01/laWB MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 80b58c2d-4943-4468-2fd5-08d6e6fd08cb X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jun 2019 01:52:56.7702 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT190 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, HTML_MESSAGE, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org X-Content-Filtered-By: Mailman/MimeDel 2.1.12 Cc: "ovs-dev@openvswitch.org" , "ovs-discuss@openvswitch.org" Subject: [ovs-dev] =?gb2312?b?u9i4tDogILvYuLQ6ICBvbmUgaXNzdWUgaW4gdnhsYW4g?= =?gb2312?b?ZnVuY3Rpb25hbGl0eSBvZiB0aGUga2VybmVsLWRhdGFwYXRoIHR5?= =?gb2312?b?cGUgb2Ygb3Zz?= 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 Attach the diff which I have verified locally. Thanks. [root@localhost ovs]# git diff diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c index dc30824..c5a7de6 100644 --- a/ofproto/ofproto-dpif-upcall.c +++ b/ofproto/ofproto-dpif-upcall.c @@ -2678,9 +2678,12 @@ revalidate(struct revalidator *revalidator) } if (kill_them_all || (used && used < now - max_idle)) { result = UKEY_DELETE; - } else { + /*Only validate the ukey if the flow's action is not drop.Since for the drop flows, there might be not validated.*/ + } else if (f->actions_len > 0) { result = revalidate_ukey(udpif, ukey, &f->stats, &odp_actions, reval_seq, &recircs); + } else { + result = UKEY_KEEP; } ukey->dump_seq = dump_seq;