From patchwork Mon Aug 15 09:49:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1666385 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=p3UW5asA; dkim-atps=neutral Received: from legolas.ozlabs.org (legolas.ozlabs.org [150.107.73.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M5qJG0wQZz9s2R for ; Mon, 15 Aug 2022 19:49:50 +1000 (AEST) Received: by legolas.ozlabs.org (Postfix) id 4M5qJC1mFWz1ygN; Mon, 15 Aug 2022 19:49:47 +1000 (AEST) 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=p3UW5asA; 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 4M5qJB3B34z1yfq for ; Mon, 15 Aug 2022 19:49:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9454741554; Mon, 15 Aug 2022 09:49:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9454741554 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=p3UW5asA 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 YbLrssgyQu5a; Mon, 15 Aug 2022 09:49:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5E2C4409EB; Mon, 15 Aug 2022 09:49:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5E2C4409EB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3C994C0033; Mon, 15 Aug 2022 09:49:42 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 78CC1C002D for ; Mon, 15 Aug 2022 09:49:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4009B60AF7 for ; Mon, 15 Aug 2022 09:49:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4009B60AF7 Authentication-Results: smtp3.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=p3UW5asA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u7ggpaHSTD47 for ; Mon, 15 Aug 2022 09:49:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 483076068D Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2090.outbound.protection.outlook.com [40.107.94.90]) by smtp3.osuosl.org (Postfix) with ESMTPS id 483076068D for ; Mon, 15 Aug 2022 09:49:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gYlwPyRbX6vUsNyzeO0I2VadWTS0kOPwcyPS7CNcyJNNwEW5Q98oek2JKU2apBQcLS0XT7EFedwZWPiEqReJ2TrqiqKETZ5R4ciR6hLygu504OWS4CpTW6AaoA0SFm3EZDXVRrAiKhPvKXguSy55NKQkx/8ur6pbrbElkpniq/wFX+p3LUSTK/cB9rKv//UGnVKr5Wedoqi9HY3aq0dp4WqFc7NuW3MM+YfsNbUNNKgcJZn4whhOisORvrcz+qAIsbb2LAoXbf2f9nj9iVgXUkYWwNs+EWwa0ZKbemqCpfiH42F15uGsuWvxIhasjczWxz5kICAc8Lt1Rto+1+bW0w== 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=zr/4wx32HJpYRqp751Yi2PA1HyHQsmQWaprGMvexJNY=; b=cZjIkkw8A3wXXjflKE9FMt1DD0tTuLeDgBzT5nbjxQzKKJVpL6fTc0o2+Mn1Wcqhq2r9upOxTMIH63bORPuvU9nSwIOfAhCasuNwlWej/ZxsuiDCznG8v7/4dBW1S7mo43OlqA5EvH4PwHlTBuyFeA8ZsgjPsZZOMyMzWzzHT1YNJx1fJN0yKtRHSuqCHjZUAYpIneDZyBRDNNmA9lzQA4gR4/TIwWP0OloeqstyduP2dT6O+Cu17eTAZ6CiFDtzj83ZdjL1H3T1w/hUapls9UetnvaWGwYFiS6/FaxtYXbGA+en1adOxBKAk3PYWw/fJIfwZT3d0z2q4NYzReuilw== 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=zr/4wx32HJpYRqp751Yi2PA1HyHQsmQWaprGMvexJNY=; b=p3UW5asAm12BmziPuVOnJxi+1xDUwZoQyFKfWhzeGhBMq63fZyKuMX+WoGaqN4X3hWg8QiJ6FNbwSMGVmerSAH/Ec7OirvuTWtCgqwGvlTlj1USNoKjtCPJI0sbSXIO8OYEhDBveNQFDb7Dyn35z0NjSqnDvxJNTxSTb5n8iCMo= 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 PH7PR13MB5916.namprd13.prod.outlook.com (2603:10b6:510:15b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Mon, 15 Aug 2022 09:49:36 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a1e6:3e37:b3f3:7576]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a1e6:3e37:b3f3:7576%9]) with mapi id 15.20.5525.007; Mon, 15 Aug 2022 09:49:35 +0000 From: Simon Horman To: dev@openvswitch.org Date: Mon, 15 Aug 2022 10:49:16 +0100 Message-Id: <20220815094916.301466-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM4P190CA0017.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::27) 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: c00032e8-c14b-4b54-27c3-08da7ea37629 X-MS-TrafficTypeDiagnostic: PH7PR13MB5916:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xhkUmCKjN4gfPgo/zvPbUPaCyXovKG8mRpZPcUA6Bw1YZC0Vem06v3W8ilqTowf+nZXBhAc1mMPMvIVSZXqXuis4Z+L0NQ6/3tMHJIIzLJGsq16Ui/Kd81bXXOupGvnGZIsjTwQC/X6UO15jwiDMOXtNvXy+Y8JbA1kUO988o+6dYlufDzcNbkgcjS24DLsi0gkQV5jsg3887TL4JbMhSyQZPdE9a7RiDKRR8PX0VJLOWgpJwmzGBBDo1FSMC1xKQIIFYMHFstFu0OKJzBWhnixzq8/o9+nfPiaWuL4wXC5VWR8AV9adDUBkvGHdFnrlllq9Gzkru73zn/q83WnzD1ZVX+swRn2PudFdgYuhZXVS/uQBdWDLahTIV1KcyB7D7X5qjCe2TfplW1KqDMmbelQCk1ZHedOJDr70vFSvRPkMReRFNNpqwBILyP35igpqxBSDSbrIdRirmUpwd/WovWwERgINwbh6WEHGuD+bx3PA+WX8ygr2xZnHeeST+HafeY/q6Ix/KaLKzCrpGFM61cHTnD0kXkqqnbZnlc3qwIxnWZusWxyra8d6OneSrH/I2P2vqNNKWgeCJsBgYcB1GT9LNQzqYqaafJ5Bd+PP6lXh71gdFCPb1OSu+q7FtP8R2B0Dvxez0KBsCyRV3o+tkeCWayv61iO20cgdcDxihrNNsN49Lq1QYgYbIoAojNlRUZzUpwY1DyTKf+IEK4Pi+hqBHtNCzuurISpL2JbPEcXpCDlFxjaCDZt8fDU//cVZwDXyRa3JSy5jGsBypanben3VWbUppWQTE0aZrpdCWIg= 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)(366004)(136003)(346002)(376002)(39840400004)(396003)(36756003)(2906002)(2616005)(1076003)(107886003)(38100700002)(186003)(44832011)(83380400001)(6506007)(6512007)(41300700001)(86362001)(8936002)(6916009)(5660300002)(54906003)(52116002)(6666004)(8676002)(66476007)(6486002)(66556008)(4326008)(478600001)(66946007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VYxkW/MOjCt2aA/wAEd31IfPpdFCkBDoAJ8mhlRfosKp+6ko93lRlkveiS1bH0Pi45JgLcts3eeoUxxI4lXs1N4TJo+TDAzE1f+uIEXzlRtZLVgDBUeagjpk/xdI0bmNwWNGQyZnAERlIGEC1syT3yAETCH5SHdzhLR2/+k37F5b02U05eUL/N7Df8gt6KcglO51C/dBM7nwqKkmHvTfvRprM1aAP4XlgtqJJM+UTXE7/QsvVHjmUQCE7lKONH/gNGkixc66mhEzdA77aqGjK81nVsp9XUEpAdtEM5nKrFoBK8k7b4OcYEsvxG9VJMihNTf6eowA5cfZZmMwIOUfr71C0DylPLSfjrXhL9lJTswe85w/go+KOwtOZjsrOwqGQYPS6fIuP95ormNiUaaJ7H0iekQlFElooEwC1G/mccLiyyrt4NBryZ+ON5oOUWXk4RldN26GQKEZ1ogkSWGfwOiV2p+oagJVWZOkoVAjyG7RZo9gN3EOjzBt1+CyLz0JN2ca00ijYqnapCktRCTI3VZ7NgujhaOszpyo+VjOMVYcadLUextjtj7bGcWk1zebjEjkzXih6j5uJZpXc8nfaeh6KDq19a7DNsjphON/FJU9+CqYzb1JaWP3vqrZ8TPvb9I5V/0qyKpL40E/u9uXV7Rnn6lViv5o6J3UkjY9G/u7OarrIOl2TNrguZNB92DNcMTeSt1rMkJifvYz6Ghr9714WcJ1REaKoqG4DWQTet/tO/ajjtfEZdOa6RxD715AViQIT6N9xgncHzi4zzsh33oMMDaK0DtNxwheYUjo1G+UAX6z2oJ6jaOWgWK0ZkfgJOit5emQwwGltFWq7cy0T3CpO34YOowPw6AU9OjUhv1FkKD6iIdtWYZwbenUCwSBIsMCClGJZBXXGgjd/UpdW5oVaZmLGysaiolMiAYsnTAsBHG05GXOb/sAm7IwY5/PWCMynUw71Y/a5Xuw5RqSIMnOdLrWzLhtB6NlsAYCmzd5/0qKg0PvF2adwMAP2Wc4jZFlx/BkTVRV+fPDXMxhwMXFU2Glr8oPeoPoR0jzQ6aSV1v4BJS7OxxxttyD3rHR1xRjGJJN7uUPv+fEI80qE5+c9aONxT9i5ogrMaw9xmUKynZkZFYT608U4NpkvqJwjM14P4gEF8aqjGhWsa013CNWGDGDuGe+P2geS2IOQRknybHbNK+R5H2dkX++DI9YS7ehUoxtMf0fEstkjYzM5CuHXXEZgaTHk+fcf5r3la8DO9tJA+vhrU4c9YEm2vsnRyhPDgoyR5I8abiXeqOVa6y3u3fJGqGKQNXlmOy7vmtQ7YNcnaSn5pa64KQkJyXPinmyX3awEVb782yRRnSUEfxnyE83QL5b8xw/hDTj7LXhN8dzmRUZvOKdu4GO7eca3YeEoCIkwz0cetR4TbUSmuykcXHNklPlMKPpbKppgstTmf++pfCHy4li4C8HCMQaR4ySDNvqO9tXd1Cfy4sqWgDarFbS7MgbvP9cN390SvCW7894/oH+ypAN3/Qd4Zt0C743PnNMRtR5ZqGDwWTaEs3PRCDvmNS6edSeSqeT22EUTtUd/EYvz4PLDhp6+Mc2cTGqRFujtUttIf0aEPxnX4BPTtmL6/yGYf5cLB2x7oXrxdmQv4CfDqJnuH1w0YVORPfw4nIWvgWSSU/ZayHMXQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c00032e8-c14b-4b54-27c3-08da7ea37629 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 09:49:35.4617 (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: rhMUwtzOrmQz/7vI4YaL2+di0K+4TIjcWnytk8sSpZ0h2svHvbB0LgJg75S1KKG3qSKBj0DhHPUrupmuhEh+CvZcmXBxFZcRNp2EvEi0Dwk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5916 Cc: oss-drivers@corigine.com, Tianyu Yuan , Jianbo Liu Subject: [ovs-dev] [PATCH] 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 Reviewed-by: Baowen Zheng Signed-off-by: Simon Horman --- lib/tc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/tc.c b/lib/tc.c index aaeb7708cc7b..6c9ca10d48af 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; + int is_meter = 0; 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; @@ -1933,6 +1936,8 @@ nl_parse_single_action(struct nlattr *action, struct tc_flower *flower, flower->act_cookie.data = nl_attr_get(act_cookie); 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);