From patchwork Fri Nov 2 17:53:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 47761 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CFD1D1B207; Fri, 2 Nov 2018 18:53:35 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50063.outbound.protection.outlook.com [40.107.5.63]) by dpdk.org (Postfix) with ESMTP id 872416833 for ; Fri, 2 Nov 2018 18:53:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vnMnKYIalKEUTLY0aHRm5tMBTwLVCzN3Nm6AvjZ449E=; b=cSwP+QJRnuckVCnhJv23A35zfZfm4dWRRABBQi8B6BEaZr3JVOG4aBbsu1BgWQdD9r5/v57AtaonmvNF9XQYb/6Qhin4/99Tiy6EgsYKv3S4dXWcxEKukqnqILhZLQBkKJ0pK1/iFs14/tADCgx9eAN+tXbP+7EtTAHWY6o42Xw= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.186.150) by AM4PR05MB3203.eurprd05.prod.outlook.com (10.171.186.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.20; Fri, 2 Nov 2018 17:53:22 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::544b:a68d:e6a5:ba6e]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::544b:a68d:e6a5:ba6e%2]) with mapi id 15.20.1294.024; Fri, 2 Nov 2018 17:53:22 +0000 From: Slava Ovsiienko To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , Slava Ovsiienko , Mordechay Haimovsky Thread-Topic: [PATCH v4 10/13] net/mlx5: fix E-Switch Flow counter deletion Thread-Index: AQHUctTyjq4M1Af9c0ydlaf17DfqPA== Date: Fri, 2 Nov 2018 17:53:22 +0000 Message-ID: <1541181152-15788-11-git-send-email-viacheslavo@mellanox.com> References: <1541074741-41368-1-git-send-email-viacheslavo@mellanox.com> <1541181152-15788-1-git-send-email-viacheslavo@mellanox.com> In-Reply-To: <1541181152-15788-1-git-send-email-viacheslavo@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0112.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::28) To AM4PR05MB3265.eurprd05.prod.outlook.com (2603:10a6:205:4::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM4PR05MB3203; 6:Bdm7PFXGINlgofjPbY6Gc9gLwRnbpWzbfRJzBGQbUm+pVeXHgmkYBiZzSqwMKWw/0yrF7m9p2zYiTWWl5+epFt1ZWAKJaP1gXQQ4Npm72ol09r4LIsSvz/jHUXNCrRj8hxkoxvla5Mc77oMEZY69kH5hhUJ0rqh6n+VzSZSh3bVD6/ETNyl+2x4+vt5UQWdi7Ks/5Ss8vbdY6ScgftMWS9Qcd5inz/byeTRDf1imChRvGDx6E6PlkbC28WiV1uU5+JNMYNYYGw/1J0aBFIbyXcT3ZlId3lXn9shNnlCkfb8g3N9xzxzqYVrczx//p0xQzeUovKhK6UcpLGh/eEzmXX3vK8qIxIAw4V7KWAfQhYvU4hyVl4Iz282iF3BcYaQbKY7t5C/Ys2lHZWQny/blv2fpiGPPwBCZ+ZQdrOWg/9SYtzTBlFmORkrjHlsSj3jv3XdRk7qaUaER7s4Mqx0frg==; 5:1XrlGayBBddwQc2jLi6MEEcdfEAeWB0Hm8fxDN3z1899QdpxwjcgFY1o4AKb0vpxWS3PeVnO89HsldN8ZCIUHnv5J61Z7Vvke4k4Gxe3fYBkXhQ34yVGCg0zu4onoGJP/WinSo11RgRBe67FbJ/Gwq66VPqQ4V6+aEYzBZUyTnY=; 7:jBWedqJt0AtVlfEohyKew/7eNYH2o2XveG+zcBqMa1KELh1nPHEgqMQWCgl3u8N99uxxejwWKVGMr0SLy7nzluJIKu1HH8ItGxxHBzkMXxP3QtOWNGyO+Vs0DLnCietJCSLE3CvRvU5PLuS7UtZYKQ== x-ms-office365-filtering-correlation-id: 43220003-f46c-4f8d-6728-08d640ec14bd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM4PR05MB3203; x-ms-traffictypediagnostic: AM4PR05MB3203: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231382)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:AM4PR05MB3203; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3203; x-forefront-prvs: 08444C7C87 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39860400002)(136003)(366004)(396003)(199004)(189003)(6636002)(11346002)(478600001)(446003)(2616005)(476003)(486006)(256004)(14444005)(386003)(6506007)(102836004)(26005)(99286004)(86362001)(3846002)(6116002)(14454004)(6512007)(316002)(25786009)(53936002)(97736004)(71190400001)(37006003)(4326008)(6862004)(71200400001)(186003)(107886003)(6436002)(54906003)(6486002)(5660300001)(2906002)(106356001)(36756003)(66066001)(105586002)(2900100001)(8936002)(52116002)(76176011)(81166006)(305945005)(81156014)(8676002)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3203; H:AM4PR05MB3265.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: cduXt6SF/px3HJPQ3YKSCIjEau9uddoX4ergu5zeaAl+1nTEZxZl0iDyLcG4C3XnqFGsA9ur5GSAqUlL+cyNYezRSlAo2RCvoIyFRbniIZI3tKqt28dfXUs70VkChBoz5nyjQysPviqCvg6prDMyxdLHoBr5JDHYYyhOmA4mBDHFQlJeFoz8VWSPBDv5HksOgH5SQewf/XXfRLpCKm0yO+BDWSwbQ99jIeEpFu7dCQ3ez4NVmuiGtvSlWWWqy+nuRlSVMO0tymhMioLHvEWIKjWgvFFb1ohSc73V01MGZzRAAIhBVzw7bAgjXsTVKTsk3BJbRzH6TJpKbPYy/+FV+t8Yl8ETXz4/pH8H3nQo99o= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43220003-f46c-4f8d-6728-08d640ec14bd X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2018 17:53:22.6262 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3203 Subject: [dpdk-dev] [PATCH v4 10/13] net/mlx5: fix E-Switch Flow counter deletion X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The counters for E-Switch rules were erroneously deleted in flow_tcf_remove() routine. The counters deletion is moved to flow_tcf_destroy() routine. Fixes: e1114ff6a5ab ("net/mlx5: support e-switch flow count action") Cc: Moti Haimovsky Suggested-by: Adrien Mazarguil Signed-off-by: Viacheslav Ovsiienko Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_flow_tcf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c index b1d2d6b..e27665a 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -3848,12 +3848,6 @@ struct pedit_parser { if (!flow) return; - if (flow->counter) { - if (--flow->counter->ref_cnt == 0) { - rte_free(flow->counter); - flow->counter = NULL; - } - } dev_flow = LIST_FIRST(&flow->dev_flows); if (!dev_flow) return; @@ -3881,6 +3875,12 @@ struct pedit_parser { if (!flow) return; flow_tcf_remove(dev, flow); + if (flow->counter) { + if (--flow->counter->ref_cnt == 0) { + rte_free(flow->counter); + flow->counter = NULL; + } + } dev_flow = LIST_FIRST(&flow->dev_flows); if (!dev_flow) return;