From patchwork Wed Aug 17 11:29:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1667217 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=2605:bc80:3010::137; helo=smtp4.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=JmePbS9d; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4M75RL4RjXz1ygJ for ; Wed, 17 Aug 2022 21:30:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 98DD541A40; Wed, 17 Aug 2022 11:30:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 98DD541A40 Authentication-Results: smtp4.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=JmePbS9d 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 OkFHKF1Hqv-o; Wed, 17 Aug 2022 11:30:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 71B1741928; Wed, 17 Aug 2022 11:30:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 71B1741928 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3FE60C0032; Wed, 17 Aug 2022 11:30:18 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id E2D89C002D for ; Wed, 17 Aug 2022 11:30:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CA6AF833A3 for ; Wed, 17 Aug 2022 11:30:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CA6AF833A3 Authentication-Results: smtp1.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=JmePbS9d 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 WaCA_hptHBI4 for ; Wed, 17 Aug 2022 11:30:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CD3C983381 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2120.outbound.protection.outlook.com [40.107.92.120]) by smtp1.osuosl.org (Postfix) with ESMTPS id CD3C983381 for ; Wed, 17 Aug 2022 11:30:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHegkc2AW74iaKdCAKf2CeiSVTKVZfMRVcz0w5hPTAtSly2OY2ZAAZMf/RGF7f38yygXOFVEc1mNVuGU34HlQgdJErcwhI49OxLmzVR9bue6ia1gkjl8SDfrERS8jqgT21HlhBdE7Su2RjzbEFYy+LtJazz6rgxTgen7p5fj/dkcD+tcKgGNm5uKWZ3fo2WQYT1IYuz45rOelUwlaBlxKRk04sqrYs4qLAXEvmLV95IlnzQzu1Ycyb8zCVybKNsbhaYbi43Ero0e9He2ey5tage9DVwxUE1LYklR1BSR+ItOEOtmxYOIgLQvGccJFC+ZJ5hMGUGkrgT0plXsszoI6Q== 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=p35DwaDnu5sWFbr6ZBX+Qg469d/Df1KKK91HIASjJ3M=; b=KH16yjUn/0xAWHsgvDeSs9KZ14WhuUcQYwJ09whBC4wJ5P4b7uJ7O79Cu8Tn8eaK2Liczp0wGt7DWLMs4SlD67XWZm/njdNVV1Vg2s6O6DHlMBZAlyRPw0G/EzjMXuPRZ5xOOgAw+KS0BbW3OqYHK6uYZXFIf9SQzZqqeyGuqHo6hqhxiwqah37OIDckewH90i+pAvGsThvz0w3i+NrLAliPgKWaCrI0ko7ezGTLZRm+yq1F0ysffGm5KzZbzetPyZw9v2scQ12z8Y531bN456PINneb4WWV0hHZN0YzZEdCdpIR6l4X2o9Xa31e6OXS08cxHyErriooCIKq+2KPUA== 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=p35DwaDnu5sWFbr6ZBX+Qg469d/Df1KKK91HIASjJ3M=; b=JmePbS9dL7y/KCFbzZqW33ZzMs2uzmjGWQvIggGwElrZBsAp/kwv5w+8q/ORTO5cUPLtvO0+sb6pYNhiBlTBksE/l7Yt/h6tg0KIgca1JMnnbePyUDnFDOVL0cboUDmCRmqrZv+roHZfARQ+xMree+wC+r6GqTjQuyAed7RJx4k= 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 DM5PR1301MB1948.namprd13.prod.outlook.com (2603:10b6:4:31::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.25; Wed, 17 Aug 2022 11:30:10 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a1e6:3e37:b3f3:7576]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a1e6:3e37:b3f3:7576%8]) with mapi id 15.20.5525.007; Wed, 17 Aug 2022 11:30:10 +0000 From: Simon Horman To: dev@openvswitch.org Date: Wed, 17 Aug 2022 13:29:48 +0200 Message-Id: <20220817112948.59356-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM3PR03CA0065.eurprd03.prod.outlook.com (2603:10a6:207:5::23) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e32ab0d-b9fb-4088-def9-08da8043d850 X-MS-TrafficTypeDiagnostic: DM5PR1301MB1948:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lQKjHjZf5f/lgNZ/ZMRobZ4s6mN3mqc5c76MVDJfBfzA78vr56JLTorSBrfPg0hV6v20DkBWBJxprzIdUSnYw9q6gF5udvWaDxCfJZodH+RbVlAPXvoRZeunQjled2TbAepLxVAhCWuoqMaVcmdOSlfXwTPcyabJlxIo1bJvNkWOg2J5D5iV4pMTFJkjX0xA8oKkjwFzAwe6wq/hZIe6jMErXXDNDrKTyF3f8KrND83pBB/6r7TOjLlwjh0bqhv3AibhvhcpDNSO5U88Ed35kVQO/tUDh7ePO/VDQTKMrEPy1OcjKGvoSjIpAsu3qtbTndEl+zvweOuBJOqzKNE0UyY9e8f7fO+g/5cRKmsv0pcVthm6C2BQ2b0k951XkdWdholVu0ohG+jmc9sPqIhdnePCGV5uS0iK0k6lCb6j5GLx/QDl5y7XaV27VX5aPbEmzQnKhl/9jHD1eOLsmb4o+I76qhv59zRT6bpTfroI7C0/cUKJtbgvxCPMG4xdzHh8KBKJzLi5I+35jvSwQxmVXTeo1JPBNWcCr+mjuDluDALB1fm2+ZxJWnQs2bKYo9YfhaFE2Wbf0DBMFQ+ai4jJ+YCnTfcBGX60Uck9s+RTo6r209VXtTGZJemb+RYt6ySiAnVS3lYgDiTlyFNMAX5zP/FqLu49z90rLdndC6U4OyK3sm5IRA29Q42GxS0iLTk10bSPlPw5uIHEuBwxgzN7HAKr1RsbfB7WeU2SyUdyroybguTP5Gbs1Wa7Lyqf+Naw7sL1AWARlgCMkrE/d7vr/Prs79s65NFID9/JJdgyLtM= 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:(13230016)(4636009)(346002)(376002)(396003)(366004)(136003)(39850400004)(66556008)(66946007)(6916009)(6666004)(6486002)(8676002)(1076003)(186003)(478600001)(5660300002)(44832011)(66476007)(4326008)(83380400001)(2906002)(6506007)(6512007)(2616005)(52116002)(107886003)(86362001)(316002)(8936002)(36756003)(38100700002)(41300700001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r5sP7w2z0aNNjsgbdZ6p1P4asGuRKwTH1IiEg3pY1+YpHW0irvLJoqAjQmjRvAQHEihoE6TGGmhfEK++vXoQW9ECG1jrFpmqyfdYNDv19CZ4Hpo7D6jFbSF23JYtsW9VHYHiOSG/yNcP76nmdeyWurZBvBiQN31Mzxng7Hj4brC548cRiKX5Vp8lg1iWHeBBYVwoyw2+ftRzbrwp2+S+pJoINwcSx3zFC2PFZBC3eY/tq6Mg9Yw8z34h8WWR6+s8p+MEIuUA7UacrGwQH7wsQEcTZuZhtO0mc+GwMv20KRBMgoQgMbqjGYgeB0FllzW6cmkzC0nEgG/hFIP6M8e1hR070okhbwISxGG08GYf/wkJ9p6aK0w2RLcPCMKZUHKS6RGOM8cmcwpIXmqV5/60YAurR+BuMk+96UlT24uf9VvdElCxkoZU+4nq/QgcM3joawzwAS4msjPdhmedKIIdjfPMK4ENeVQySq2u9vDRoVog5inXTpEEagBq83THuZc2PG5+WWLzLE4lqhC9d9UKj2knOSZ6oS60dQOJi4wlQojbTHtOGfuPv8zUPhaxv+VY64FaTWlMoFSrMVs+EJb4v476QtZ0vwoR+5R7wSyR4mIroYRY73uWIqaRlR3poZujHAe+dy+SKXOgZqSJWBVLyMUiSAyIIxgwwi7psY+uL1tAkcx582ESds8W8EYNr9d7sGSjqEh+4JvEF/B3/pAY+/D9UvON5cNwTCI17d6RiQNRwjhICkPWpS0NexVKLt5j1uGGcb5P63RKgjpvc5ZLfT+VZ4HXIRlp9l+annkQRHHu/tOoyCE6Wtd0fjtjoBn7U5XkhFc6RQn3T8Ap6CnmFt96EqnevYhcXzMi4BDP84q7BA7O0VVmTu8SPCAWpzczKvpQxtm7c9XWBtq6okYjZc+DYewcLrWGKYP9ZK4hIqALFfNqC/tNwub6TrqveaEW4ZiEnUkhk6gWJKiLyqG6y5qDHN5nqHhzYZkZ9MqkzPGNagDf9Y4+a7tXvhfHJxtKDDMc5/i7zxkp5p3qE/A061G7otECiN2aeL4TeJC719Mm7rLwPNX2vLHzlt133gyzbIOuoViyIMfCa0mN4fMVxjqmbh/Fu4DCUtLjizi1SL37FPDpOGLkrOiHgHAhah61j5zJUqSZPijnpC7DYuk3meyDjAPLltId3Ak66Fm4DTWLygu5qFFXcmTEKmS61Ly+yS74HhQIeWyQku/OrjdoH0/IXG/T0pytjvbcqMeAQ+EICy0G4tKUq0/FDw7TrPUy//WYmeS/foqmz7lj3YgLD3zL9dt2deZx/lUlmKynXd+LoF8MmvBOyVmXSzeeA+qVA3tyFrP4SflJSf84sxFJMvii/YPwIRxzbDVeJcehpYCStf99/Y+/qxmpNiPbvJzCrIhsrPuO71BklGeQDZUx5AD8JkH5LAlDPakvh8UePMnkkxsk2/gJZrnjDKCqUQekPAj28sI/xWzcCGJYhVNQvFYVdjordUaWCjLzGEnM+nPqoFmiaD0CAtPcsW3J684NbWdliodjKhxmOlrW1fqW2hE67OUyUr9nn7ov4xy3BYBAEbODDvkBD2XtrYaoDi1r61BQhHRla5IeMXdMacBlNE1GbA9MG7isQc2ImWiSFBNr0Vqr+TGLqRR+Xlr3DFuJgKdSQDvc2Q6XzHVN5OYF/w== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e32ab0d-b9fb-4088-def9-08da8043d850 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2022 11:30:10.8095 (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: Ks2WCQai2W48BuwIhDE5xOT1tRczOY/6PwD4JQijfkSbjP2i1YIpg4DScOsSPfVnM/5bGalS6amQnkYwsOb6zNnHvpIlH+Idv6C+7i5h91o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1301MB1948 Cc: oss-drivers@corigine.com Subject: [ovs-dev] [PATCH v2] 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 When we apply meter police on both directions of TCP traffic, the dumped stats is shown same (as shown below). This issue is introduced by modifying the stats update strategy. ...,in_port(6),eth(),eth_type(0x0800),ipv4(frag=no), packets:1488557, bytes:2089059644, used:0.040s, actions:meter(0),9 ...,in_port(9),eth(),eth_type(0x0800),ipv4(frag=no), packets:1488557, bytes:2089059644, used:0.040s, actions:meter(0),6 In previous patch, after parsing police action, the flower stats will be updated by dumped meter table stats, which will result in the issue above. Thus, the stats of meter table should not be used when dumping flow stats. Ignore the stats update when police.index belongs to meter. Fixes: a9b8cdde69de ("tc: Add support parsing tc police action") Signed-off-by: Tianyu Yuan Signed-off-by: Simon Horman --- lib/tc.c | 7 +++++++ 1 file changed, 7 insertions(+) v2 * Address checkpatch warning regarding missing {} for if clause * Initialise bool is_meter as false rather than 0 diff --git a/lib/tc.c b/lib/tc.c index aaeb7708cc7b..70a05def3c5f 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -1883,6 +1883,8 @@ 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, @@ -1920,6 +1922,7 @@ 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; @@ -1934,6 +1937,10 @@ nl_parse_single_action(struct nlattr *action, struct tc_flower *flower, flower->act_cookie.len = nl_attr_get_size(act_cookie); } + if (is_meter) { + return 0; + } + return nl_parse_action_stats(action_attrs[TCA_ACT_STATS], &flower->stats_sw, &flower->stats_hw, NULL); }