From patchwork Fri Oct 14 11:38:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1690017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=S0r653sM; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mpktr11zdz23jc for ; Fri, 14 Oct 2022 22:39:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0F6FF8402B; Fri, 14 Oct 2022 11:39:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0F6FF8402B Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=S0r653sM X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uVBzZzyP614Q; Fri, 14 Oct 2022 11:39:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4A85783DEF; Fri, 14 Oct 2022 11:39:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4A85783DEF Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F2AE8C0033; Fri, 14 Oct 2022 11:39:11 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5CCCAC002D for ; Fri, 14 Oct 2022 11:39:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 34EF44225C for ; Fri, 14 Oct 2022 11:39:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 34EF44225C Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=S0r653sM X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id awo4a8SnKO-w for ; Fri, 14 Oct 2022 11:39:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org ACE774222B Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2131.outbound.protection.outlook.com [40.107.243.131]) by smtp4.osuosl.org (Postfix) with ESMTPS id ACE774222B for ; Fri, 14 Oct 2022 11:39:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZKKq9U4j4Tqrp67FVbc3ZegIUcZvNwzNgClO7IxCef3vZTxWIlnp8KKe60L2kTIhc++ii4JxwXoFkGMMbvXFw9k48y5Yjkii5gOxaVa6aS3In5aCXrOnGG8m7Ab12fHX5jsCjMpmVObkJ/O/qTEq6pY0JMsOASTQeILec2ivBIzSAyHOxzf1gthrBtjzAHJizd+dOLci3B0RKmkKPT/0Mg0rxeL3Nz7qmDUfnKOnUFEyiRpqJaxz2Y5ez4KK5chH6h67Hx8CY11AvX+OJuQYQqr+JRP2bmy3WgPog0tpdQjrGZYi4faafZMOetOALM1rkmw6ahPFL5uDmK+Q7lgHog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2F6M2+blMLwmV5x/iAYDZfnz2Ae8C+PMATtlu8mrGIM=; b=H4jW3RUjsspNUiWlDGV/m8vD08rNlt1R1ABwQevOEtO2e7gUKIxwcPTIWgu1cMuZ3I9KGFpEY0bjavQ5pvF3M0nVHkDXp/W+Ryj/K6rrJGeAQu+NPptIPluKpTbCozaBi03x8NhR3qc37P1iCP9ANvx4RAugD3NyCZ3zeD1Cxp/xFhgPdUvzKkT6TnpwQ5Genki7ECBKZhK19BPrDQdWnZWi/xz7a2SP7RcHSp96dc43Nq8mcJuJIZUO37PUB/4AIzZVIPnA5nKe+gXRMY4k2DdVZKVT0uc+B8Xhe0A6upn4BqRS0eVfywt/Nv+nN6yR+1iAbqEKupv7B6gQkiZV+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2F6M2+blMLwmV5x/iAYDZfnz2Ae8C+PMATtlu8mrGIM=; b=S0r653sMr+S2eEmnxXIaj00Xt8jEDONQJo0KyHdaQqVjD154nfXL2up2qfA4poa3Y84FFMrR6lx68jOF5fVXKtjqjuSyP+PFvGtIvDjjyZEUuYXuJWZRBq2eMryabAfG82YsGmKuFKhnOJP9bGx5sxxGkXWuoPIPnKLYXvvcCjs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by BY5PR13MB3681.namprd13.prod.outlook.com (2603:10b6:a03:22d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Fri, 14 Oct 2022 11:39:04 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::b332:10af:929b:f19a]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::b332:10af:929b:f19a%5]) with mapi id 15.20.5723.018; Fri, 14 Oct 2022 11:39:04 +0000 From: Simon Horman To: dev@openvswitch.org Date: Fri, 14 Oct 2022 13:38:50 +0200 Message-Id: <20221014113850.239348-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM3PR07CA0119.eurprd07.prod.outlook.com (2603:10a6:207:7::29) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|BY5PR13MB3681:EE_ X-MS-Office365-Filtering-Correlation-Id: 589edb19-77af-47fc-b395-08daadd8b237 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gWRVZtRIwxPOAojorGROG2gnZwhZ4Zr6P4N//3gN9QERpn8vhfG0GChvwqKxUl0PVarnyLT6RozDYsEmdsNPjStLR50zvgQK1NJqBXX8PUYXFHQ2hQYhKkbizDMp+J6ReGm5t0DMGBJ6U01ULGe/iStYOllQNaZ/mXRL9CgfhPH1HUMuBHwB0OA4yY0Ztop+YlkJj2UoM35UCMbZXqNNV1choWJLlTr8lCmbEnPO1Ew0RoNSwr0WofH1Mbws4IMzlpR6C/tAO4yTy5LWRCCzx4OWPER6LHGSmA/WPbWMSlOVdl4ROyb5U3TF3mZjjRs5R4WWPVTE/BaylGV5UnesWF5t2MzXMq20upYNzOYTvaA4nYCpqTkjdDHYzIR3CVd3ueadumP+fbJ61mA4kHIseiPhKd2D0pibhdSWhwbtdtq26Z3IdmuCUM6qBsYYq6e1OA/Cu34BsCTOINTBWJ1abqgbHy/5gN9Ygj/zyVQoZm9kWIAkVSAJZaa9U4qhMg9tXXMadq2XhsRr8T8N+Qmbe34nCmRrSpQK9Bj5hqkIklds1xk6+FuBUuwrZoNOY67UPagLN8tsvBVM2J64MH0VzDVpeFH1Z+fEL2oKPGk6tF53tsllFYzwAvf812yKSNBAOxnJZlaknC9vKRmw8HYCVR6hUm2tHTVg1tisYs/iwm0ZNfjYQvYXiigtFzCy5sony1pIY7sy1W3CGbXbjeiVBA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB4842.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(136003)(366004)(39830400003)(396003)(451199015)(2906002)(86362001)(38100700002)(66556008)(478600001)(6486002)(6506007)(4326008)(52116002)(41300700001)(316002)(6666004)(107886003)(6916009)(54906003)(66946007)(8676002)(66476007)(83380400001)(44832011)(6512007)(2616005)(5660300002)(1076003)(8936002)(186003)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jnH9PveP/G7uBVc8fFqBc/L4Va3D03570NFujoACuguQgkK4WoxAbodMUl1tg4MvCQqESTpcKgEZaSM/Lalx0sN30/95/ApMp0pNTGhLwEKBhwLhHzII/J45gtFoBoV1FdTjX2hyEht1wretXrsEj3edutVubINyxZM65JeQ+Qmc2e1f+IpL+L0uJ8IVHV+xAg2Ta3InbujAHHMm0HiW0L5yW+CTOhPeOdHnr0gdIy8CSfpcgHml3unCvKhAEwoakODxRk0gAuQWk76RnLhZ3j3fsQgRGjn6jumClRGxf4jjopAp7b+eMpX9SgVwaX+rHEaAwAJc3Q50F4w1j7JKmSLbZvXalEEDNlwtwuFxFrkwKZ5FkegcpNcIa81jVBIcqLYO4YXo9auiE8xwYLImd2Fl5bQneQ9Lz1uicu9rtCNK4A0btRHs0ng85FPJ2BmwFjupcjEOJqAcZFAyAdUxxeiu3b7xbRKhTdexzGMW/rlmKhELxHB8uERezHr24ygmG6A54TLJKt4yjcfp7DzU/0TMK2a6shNabWboJ4n2FDAvYg9aDsMX0RtOzj7agu+imeHcFF8XWXQJnfaIidSNXJNHOkFmggBWY3DLSsQuzUyFkglhj76roOsrPK16+LhngJXXrhuR40qXHXhcZgEYdu6+kBqsOsB5kEC3fAOrB/SWab4oVEiv96Zg5gRgUEhWLEL688mHvPy2NMg3t0xgivMTcAzrdL5msCr4fczHbZZKqMLZ2qo4pmFlSB5+vQiw0486knJGhDkSCTxzRlrRardTkXRKoE4/2elT7kpfR1bUVEk/mn5T9U7Rd3LyUTKypk5gRrRfkpze40Z8IFs8bykGYWAFeXoe/79vrGfS+eb2G3bw2MJ6EbQ0RXtu1X94QwpFdEtbSO7C9CTvz6oMK34GgPrB2TToLS18tLvXaupZLqX/SZVbaRTvTzUNCPJ0GJajkgjPlXhie7v3+Po5NoFZMcz4KaPnosT1m3o4ZsPbeMofKJq4nJVGoPqXn8ChdsmgH9I8987bAEGrX29IbLUrZQ5uD3Y98n8scMPKhB6GqpBENvm4u/Pl71oX75/YFS2Cij93WZNxlE95/TG9jUC3RcZRXdoy73heKGvTghpZZn2AHkv34Qk7AtgUpd4rUVeRT4TiW9/TiiLe9ZQFulVg1B5SwJHMH3Z+XKnN624rFbCkcKHmR+RI926VsfTZBtjEgwYgUzqC2EtFytl8IEPM2SZwUUOLJLP1VByOYZKIKfCnVcya/BCtGfwYxtVigVjknZvBb2I5JN8Bhr4nFLqWNr8/oCmKpGQ3HiRQx6oHpGy6hKRNfpT6dLRPYQoT0C5Za9/3Wut4mhFQGDNwD0ynuxeqsTx/RxohvzeVtKUwVcbWBU3fFaQbX7L8U1ipaiY93l/p0LIjArQxBRiPvpyWO/NDcifUM8tcHFpYWGN1Fx5fr+OlpoDOK2Maqq7uhgSdeCdCaMwCPUz5Ht1j9ig345Q2hC8K5wBu+ghIzGWwTE0nXmFjrHymt6r1mpMR4fijCPVWGF9ZnTmrwK4ZUMEGlMY2LKkoBHdFKEycuV9yBBJ1sfNVXYDvCcGUkdvNqVYZoDMtu/1QAriXeoIETB/hLn636WSe08Xt7KBIBRIvmfKpH4/hLqZ+gpKJD4LPF7IUPEEzKQGq5DE2goN3cg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 589edb19-77af-47fc-b395-08daadd8b237 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2022 11:39:04.2444 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6FDuS8b6WvoNo8amv/I+rqmLOzHBZlGtnS8RFxO883ZubbiunUecJVs4F9GK2JLiUx3twqfG5YKqWzBm+yrJ00ph1RNmjjydPwgwfPiKuhU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR13MB3681 Cc: Tianyu Yuan , oss-drivers@corigine.com, Ilya Maximets Subject: [ovs-dev] [PATCH] Revert "tc: Fix stats dump when using same meter table" X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tianyu Yuan This reverts commit dd9881ed55e6 ('tc: Fix stats dump when using same meter table') This patch doesn't solve the tc flow stats update issue and will lead to failure of system-offloads-traffic testsuite, it only counts packets surviving after the tc filter, rather than hitting the filter A following patch will come up to solve this flow stats update issue Signed-off-by: Tianyu Yuan Signed-off-by: Simon Horman Acked-by: Ilya Maximets --- lib/tc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/tc.c b/lib/tc.c index 94044cde6060..f8fbe44bf244 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -1904,8 +1904,6 @@ nl_parse_single_action(struct nlattr *action, struct tc_flower *flower, struct nlattr *act_cookie; const char *act_kind; struct nlattr *action_attrs[ARRAY_SIZE(act_policy)]; - int act_index = flower->action_count; - bool is_meter = false; int err = 0; if (!nl_parse_nested(action, act_policy, action_attrs, @@ -1943,7 +1941,6 @@ nl_parse_single_action(struct nlattr *action, struct tc_flower *flower, nl_parse_act_ct(act_options, flower); } else if (!strcmp(act_kind, "police")) { nl_parse_act_police(act_options, flower); - is_meter = tc_is_meter_index(flower->actions[act_index].police.index); } else { VLOG_ERR_RL(&error_rl, "unknown tc action kind: %s", act_kind); err = EINVAL; @@ -1958,14 +1955,6 @@ nl_parse_single_action(struct nlattr *action, struct tc_flower *flower, flower->act_cookie.len = nl_attr_get_size(act_cookie); } - /* Skip the stats update when act_police is meter since there are always - * some other actions following meter. For other potential kinds of - * act_police actions, whose stats could not be skipped (e.g. filter has - * only one police action), update the action stats to the flow rule. */ - if (is_meter) { - return 0; - } - return nl_parse_action_stats(action_attrs[TCA_ACT_STATS], &flower->stats_sw, &flower->stats_hw, NULL); }