From patchwork Thu Mar 30 11:20:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1763199 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=a5ZU8udW; 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 4PnLbP4XNfz1yXv for ; Thu, 30 Mar 2023 22:21:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0A26D42000; Thu, 30 Mar 2023 11:21:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0A26D42000 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=a5ZU8udW 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 LUJmCUViusxw; Thu, 30 Mar 2023 11:21:33 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id EF45341FE2; Thu, 30 Mar 2023 11:21:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EF45341FE2 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 031C6C0096; Thu, 30 Mar 2023 11:21:29 +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 C9F6EC008D for ; Thu, 30 Mar 2023 11:21:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AFFF241FB9 for ; Thu, 30 Mar 2023 11:21:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org AFFF241FB9 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 gIqm2sw2lXru for ; Thu, 30 Mar 2023 11:21:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B467B41FB2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20731.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::731]) by smtp4.osuosl.org (Postfix) with ESMTPS id B467B41FB2 for ; Thu, 30 Mar 2023 11:21:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b0buM6fE2ksIjmHXEUMxs1KmZ4bNxO3N21sQlcndYTx83GVzO9gLkZdU/SfCyoFa2zfZIc6F1URN/mI8GNBIPiABY2xrgK9zpoSpe+c26FhNY3LHeln72ESuP2/+SefwOHu2dEuAPV06uX2RFycqwJf4LpNVLkXsv3UrPVhQdZFcQNSVnFLo4FipuPk4SJ4eyW81k0xSKooAMe7o5vLiDwj1rMOuEgwziEUREbXclmZp9aMyBTkdHLKTo3YfDg6IqHi+Uuh2ABHLOlch9CdrKHwtIfJd92V+7gd59tFcQVJtjMl6Pmt7w4nh5576LGshlnsjuEnrBsdZKXu+nhzNug== 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=PASp/iu+k9qNj59ADUdHH/j9l+3qvpKj9/covHgqCUw=; b=JTdnPoIx87Lu8nxuT5v0rXrYXRGeSe+WWnhGC50whlIpECYTxsUr8Rf+tC/Ahmy4bKIMeS/QINIDsSWaKTw0pnYXt/vfEZUr1X+DDV6YDuqOPLmClgO+JTKxVCvAZLNvNpoujevnz7RdRegtWMoTrq9w9LhixSJfbtgbCfVnqTh29nFpRky+kFAqaXX2yaSJtEb4KPW7kUttUeRdhNwccvbBJL4aG7Nvc0Z+W7Jc0yekONteof5i4h/LHXt461MLINpFjJwrmLBX5G5YNMkvhZo2utbg/yDALDC6bH0eR0qmhlYK6uMsaTO99NOgtE2tmKWp9EghSQ3mWDy8KZRTUA== 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=PASp/iu+k9qNj59ADUdHH/j9l+3qvpKj9/covHgqCUw=; b=a5ZU8udWxwFCMhxnEFITNAzSaiBXBDZyeA4LVBAe0+V0QfWeB52I2FGmERBtW5HjXj5hplj/DYqD7x3agi9/vfBMJlSLEV459ad2PZ7el79tFvRTO/8NxvfqKy6D9zKSrg3+XYXnjWTWd1I3s50PkWsOSya4Povc9IbIcGsOVys= 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 SA0PR13MB3999.namprd13.prod.outlook.com (2603:10b6:806:70::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.22; Thu, 30 Mar 2023 11:21:24 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::c506:5243:557e:82cb]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::c506:5243:557e:82cb%5]) with mapi id 15.20.6254.021; Thu, 30 Mar 2023 11:21:24 +0000 From: Simon Horman To: dev@openvswitch.org Date: Thu, 30 Mar 2023 13:20:54 +0200 Message-Id: <20230330112057.14242-4-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230330112057.14242-1-simon.horman@corigine.com> References: <20230330112057.14242-1-simon.horman@corigine.com> X-ClientProxiedBy: AM0PR01CA0111.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::16) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|SA0PR13MB3999:EE_ X-MS-Office365-Filtering-Correlation-Id: 6277b1f3-14d5-473a-29d4-08db3110e59d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rJlo4qTzjYH4UnypHorrhAC2p0nqVYsFAxdnf06yp2EDEdLvWYq/Htn2IcWN1dgjESAvj+Fwm6B+GK7HdiN2TsK5mRq+w8C1DhwT4De1urwM0SF9w5oyjhEYYm117yppaLTEBnay6GnyOaW6R5XS0JsRpYypsAIae2yqZubqTLOHLecxi34TKexIodoGFgxjY3UMXpTtHOPQOhEr91qyH9OUIljvsM+z+Q6RlsW6FTMKZqL2xSKwlMWMIt2DEaAImZeDN0ijpaHCWYZnS9oOJWRm8WLnBhnTkixSBkSoIgQcYGQhfhWdaPh2EGCNmTxiH6/293peXsJWYVObfSDBWVd7KB3k2hSYFfWKT1c5zxNX+A4G1Zm8C4OGgGFiDXZGajZM6gU/7thMJgA6hBwN85b2LsAxsL/aILmJ+GRQvFazLd8LhbkllHIonUlZ+hE0TCRV9OoVqXv3rkKBeMLHN5K7iA08i4DgyUWz/n+tCMgcaOHeCr9WVpZhPYGYJBkDOrkoMjGQ182fov+Su8guTrU4lI5XhGJVUNE8Y+zwyPRe/1R9tzEKw7Ez9OLobLoa 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:(13230028)(4636009)(136003)(376002)(396003)(346002)(366004)(39840400004)(451199021)(38100700002)(36756003)(86362001)(8936002)(6666004)(107886003)(5660300002)(83380400001)(2616005)(1076003)(41300700001)(478600001)(44832011)(52116002)(316002)(186003)(4326008)(8676002)(66556008)(6916009)(66476007)(6512007)(6506007)(54906003)(66946007)(2906002)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +K5KrLY7vROCy2yIXRMW+rYU+AAxd1yVO1XpWfTezzR7olnn7C3Tjb6oX6coEp3C1sX3YIkgian3QOm9MNpqmZuuATRwbkNSnSNQVeomp9I1hJfid2pQF1wVYorgUgxNycMneWQdz+LhMUUpTHACU93v/PSJ/+ga/sGsbYxZMuJdkqPEMO5LtRG3h5ss89YG8hQ1WxA4tWQAV/tgvOAlErH6sDMhVd51E/S1GwEVpQp4rJR/uiEUJnXSkpPuiletj8GmEcFoR5G4hTMbP5hro7ZaWL+1j5YJ9rqaDnrrD64d02FBxHm0g1kp3NCpuT1UPfCqctZhQV51+4btZtDPsKvvT95lZoi5zOkCLVjHfXTfAIInlPyJLKBqVT8ZKD7psZtvaLuUA3YX7VIAzX9DUtaCYwYm2Zk9E5sw53M8UMSXF/vQAWOkjt+IhKwm1bR2of7tL2MiakIwmMVlCks8uzHCHxvnNYJyIV03ebPZ4zzOaNZjd81bGMR07p6wIcS8EZJ2ZMIlvu4zwy518tyHf6wRNW8zrHm71vRxCzUL/MVUpVE3mMrY7wW01YNWA7P/7IMt+cf9ftoLGbl9VHfKUFMYReS0DPN18+ZUObt5ZzNuRKBLvCqQOZh9vUeVhOiHKPhT3zchZcvUNwYMVwo97DW1fHGfxpOyO5CsdWAYoMYbeMeHjmqhJBaoPdFiewwHDAy+Nu7T+muJPKJcZFEHknZbE8LHeY37uwXn2RxetSUAFmS3L7STdv8elvUa6hSKZP9dYZ+X4u4tBrNiAi4w/rsFodAlf75ddBhzX1QaodnjAicsla8sf9KD2GZMiuX3NWGIlxkyl8jw6XbP3lFLiX0v8GwwtXMbLbCRj5qtxd+0XAPVQuF6XCKY9ODMtMEU3N83cxnHTdgda1D8Gmam6TKxf26QmnykdQWsesJyO8j3gDPJlVgFG9HF54/p85FRUQ69PlCUysm02RlhmnbGc9qAkVCAHOz/4erZjUyLEN6W3EfSopuBhEXpraXGTIa/9UnGSSHS1SITTSubftpkT93XqJbwABj1rmgZC0ovi2n+wNaecWcwjJXtLM6TRyrqTcnaQNXwtVQK3v8ZhGRNGKnVlB7mHUQoiNL/G4mPLidXlthDpGSmm3pOIXVZUykHDPh7K7Ltn1SkGLestsJbxc+hycLniFYkqIO8y68q/Jr+/I+L3vkIxticsIKiMWC4hNhD5QtfNfEJPQlvrAheTGdpRTLvpI3gJ/sLmvwFEjFqHm5iKxpwx5mRycho4TQOfJjnKlmG6VMxCBYggXVgz8Zu7EAQDhVB66XLGvc3E7/bYMG2NR5KVb/d+xJcWFvJJc/VMH0sw2OzQxrfF9+IyIG+Be8ylIBCRNHWZ5WFBbA+7DlyoZvRrWCPkpnCwQXp3H2FTP+yWsrH2cREQCT60I9l8SDJVWRZ92Sd7QlbngyQMH/V0qojkK21aIqK+64tYBF9DeLHeGkcbvk9CAZ8bfehKl5P6LM8gGUZ4THf8pJPh+oJJPiJiT8rgFWf2RHLUCSKHQjKzOcN/UCAfeKe6FwU+iRM+jaG1fhKCAVkesW3DXQ7TnTQdlpfInLtB96M4BCfTLkA1OTTSo3hgEx02zSQKgflfmOIAbZKiwN0/nbkwJ8F8tmapRPxrrsW4eYbThD8GQbkCsZ7bn4VogmH4g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6277b1f3-14d5-473a-29d4-08db3110e59d X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 11:21:24.5978 (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: UyTOxsOpgIsnb3l3E4Z4hi5xobyVFivdAwZ1jUqtKXOMQ3vxJTrmSMdMafVB9NvbysNAM70S3AoIpxOwRyfXFpEVpygm3U48fCTOVb3+XUs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB3999 Cc: Eli Britstein , Jin Liu , Chaoyong He , oss-drivers@corigine.com, Ilya Maximets , Peng Zhang Subject: [ovs-dev] [PATCH dpdk-latest v3 3/6] dpif-netdev: Offloading meter with DPDK 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: Peng Zhang OVS-DPDK meters are created in advance and OpenFlow rules refer to them by their unique ID. A new API is used to offload them. By calling the API, meters are created and try to be offload by port in the bridge with the proxy port id. Signed-off-by: Peng Zhang Signed-off-by: Jin Liu Co-authored-by: Jin Liu Signed-off-by: Simon Horman --- lib/dpif-netdev.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 2c08a71c8db2..e8d0ca6606de 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -7277,6 +7277,11 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, ovs_mutex_unlock(&dp->meters_lock); + if (netdev_is_flow_api_enabled()) { + dpdk_meter_offload_set(dpif_normalize_type(dpif_type(dpif)), + meter_id, config); + } + return 0; } @@ -7313,8 +7318,18 @@ dpif_netdev_meter_get(const struct dpif *dpif, ovs_mutex_unlock(&meter->lock); stats->n_bands = i; - } + if (netdev_is_flow_api_enabled()) { + dpdk_meter_offload_get(dpif_normalize_type(dpif_type(dpif)), + meter_id_, stats); + + /* nit: Meter offload currently only supports one band */ + if (meter->n_bands) { + stats->bands[0].packet_count = stats->packet_in_count; + stats->bands[0].byte_count = stats->byte_in_count; + } + } + } return 0; } @@ -7330,6 +7345,11 @@ dpif_netdev_meter_del(struct dpif *dpif, if (!error) { uint32_t meter_id = meter_id_.uint32; + if (netdev_is_flow_api_enabled()) { + dpdk_meter_offload_del(dpif_normalize_type(dpif_type(dpif)), + meter_id_, stats); + } + ovs_mutex_lock(&dp->meters_lock); dp_meter_detach_free(&dp->meters, meter_id); ovs_mutex_unlock(&dp->meters_lock);