From patchwork Thu Mar 9 13:02:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1754627 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::136; helo=smtp3.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=lNd0P02B; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4PXTrs3s4qz246H for ; Fri, 10 Mar 2023 00:03:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BD67F612DC; Thu, 9 Mar 2023 13:03:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BD67F612DC Authentication-Results: smtp3.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=lNd0P02B 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 SKnzeGi7aiDW; Thu, 9 Mar 2023 13:03:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 761DE612D1; Thu, 9 Mar 2023 13:03:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 761DE612D1 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C869CC009D; Thu, 9 Mar 2023 13:03:31 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9F7ABC0095 for ; Thu, 9 Mar 2023 13:03:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6DB6C415F6 for ; Thu, 9 Mar 2023 13:03:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6DB6C415F6 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=lNd0P02B 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 Izer88QEHyPn for ; Thu, 9 Mar 2023 13:03:24 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 98B2240650 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on20725.outbound.protection.outlook.com [IPv6:2a01:111:f400:7ea9::725]) by smtp4.osuosl.org (Postfix) with ESMTPS id 98B2240650 for ; Thu, 9 Mar 2023 13:03:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Klk0ydyujT1ru0LOfsz6Q+bWBET3yPdBc5XsopD/xTUHwLUvxvA1/QOcJssRats/UE56j36gi0iyC3GI2uoqQYTH96Zvr2F4/gH0rxpV2GaH5ZNkQQWcR+JvvrusUS8ZhBuLoCu0HUQUwIS1VTzi8rCfaNxfAQ4lherNPYKrlDZYD4PzWdA4vD2EegonvqXuM5eNcuXuFjzQZ6hS2Gs1aTo/XSfj0FY/GmOX9eqEmnjx5uZM78C76AwKQlYUaK1KZH1x8/2FcwUcPpzmiG1j/Ipvd5Yagm35cGqp6LS4tjTotvBLyCM0Ep4mbj0Yndrf1AqvL6SGJc78YMbyPe1B7w== 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=3H6su9txy3W54CQBKIA7NZa0jK0AXNN7e5k4WiWibJg=; b=CK8BTzDKKOx5kdWVkCR2Pn+oC+etSWurrkiDyoJLQZuQLnmb9cqxxHvRuTx9GeSLu2iEYqVNUuptbqpqT7MD4C84MI6ilo5ijuC+ekF7sT/2alEbJaFiZ5YsISCkI+ViiOitBxzCEC17dq8v3y96qMtochFA46ewP/rNXVizvgw0s8Z7Dj1jvMsRkhCgGEAhCF7x9xmL1lqRryWXplMAKy+pSGpEOErwRszMB3eozJo009jguc+5XVAWiqGCVBS9mKmdgWTWsmDBVovuUFWN+SmnADnUiQDnmsQiJl3TRs7D7el+U80K6xPy08V6plIgay7hWq2iVWTDv/LcZZ83dA== 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=3H6su9txy3W54CQBKIA7NZa0jK0AXNN7e5k4WiWibJg=; b=lNd0P02BXhfuBEl4M8c48STUcTjvsjXN8evBy54hUAhd0f9yp+cnqTvve0EBrGrSiay+Nq0LfULYPJmFXHhrlPt85SvyBaIghIY1BFPCUaqXJH84FBvY9JeIqWrCYJQLpXCBntFl1hqS0Bcz/zE1FJtRr1UKnzyzt+6MWZC0bg0= 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 MW3PR13MB4156.namprd13.prod.outlook.com (2603:10b6:303:2d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.17; Thu, 9 Mar 2023 13:03:22 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::85f5:bdb:fb9e:294c]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::85f5:bdb:fb9e:294c%2]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023 13:03:22 +0000 From: Simon Horman To: dev@openvswitch.org Date: Thu, 9 Mar 2023 14:02:49 +0100 Message-Id: <20230309130252.356289-4-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309130252.356289-1-simon.horman@corigine.com> References: <20230309130252.356289-1-simon.horman@corigine.com> X-ClientProxiedBy: AM9P250CA0028.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::33) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|MW3PR13MB4156:EE_ X-MS-Office365-Filtering-Correlation-Id: ce472446-22e2-42d4-1e0c-08db209ea93a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h5cbSC0/+JshgXWOWyL1vrMbSJkKvWPXKncWyyBJBVaPk6v8vFjVTRUSSEZZdouym9GA0Qb7PkCIZHILtHkred2IS+Rbofkox5ftfWfcpFTAopFeQHiJNyTASjCbRtdQq9mbrMJN9gcCWe6I/kU6d2epoh1AvEMZFV5xPgVJAW86xwkEK41ybswbNq19CvpBj+nxs5u/c5IFYwznX0KnT76eKrYU6/W+Nfg7PxczASGYMLtTd7rOsfsL7vU7lC6I4hvbpjPGGfW5nroqbU5EseGt5eQQPW8/cyP+uXbw5ZHNODNYvU1FuN8/XW5igbardINiysBdEyOBiZEo9uUhNl/zVlDZeRBz3YQQFtInX2Emr3BI/3vHTu1sdbMJU4aDHJ8c/DTM8gvZ34Ej4U2GjLV67/sAWxDJSOjcTdgzm3yAri1eiGrPobt8iXuZoagxVqBbBAvPeo8jmO/VJPBY4mM2iPnpJb0SVzbZLlcyTy2X1zsjeaQZWP/SLDYnH7V3Ka/FYEct6Z/RZwro1zveEPqJyfOFDXdWPbwhE9qwDVpiRupe5aTDyb6k7G+EJT3KbmhdBueWkfZvl4no8QidsR8m5h/JOX6jOnaMcE7BxFCoCtKVJ+bf0WDL4OhyhdvPhV2s2NrF06TXjxwvIpdT5A== 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:(13230025)(4636009)(136003)(376002)(396003)(366004)(39840400004)(346002)(451199018)(8676002)(41300700001)(66476007)(66556008)(66946007)(6916009)(4326008)(52116002)(2906002)(54906003)(316002)(8936002)(38100700002)(5660300002)(186003)(44832011)(478600001)(6506007)(36756003)(6486002)(1076003)(107886003)(6512007)(6666004)(83380400001)(2616005)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m9rK09dJxOf1v3vcgaDkSFQukHvLLKSHlbbbZ3i3aD6voBk9/PQ+IFigeEcy4N93e2SsvbidgzxKLtqc97uqj9dBFQL5ujN3anWK7NmYxcfcqsIJnaIA14mv8tosQYVYzzduYwQRZqn22Lp6oZFZvI6Opf/tAACMw8YrBQbjs6QQH1xkiWCpFy65NulqjWkbgquJZa3DZBUQ9Z2hIouxDyTUKaQPlEVHbD5mN6RNdSJZYzBoJqLd4/1fJh/TUMBSumMWHnKnEz5lDdV2G8qsRHSSjAGpnv1PTuU30CpjbattIEA5a4OYaQI9lm6/bVEzrJRjDio6Kl8ivI4Gpzp+5vDoy0nIW31c4VBTBipOvIQ1tXnFwBSXUlHOzn4TDYWRvPDPkfxiubz/KHziNqbfxBoNFFihUKi+BAipF9v73+n6q5yMenpQxwDnEIt3THk+5+LQWwYTDl4YVMgDEn7O0yOtd0u7VN7QFqXPS3L/J4D+Ll4eFW6WUQqU2nrrC4wRrzObjMmN6f+kR4QMo9n+yKhGkLKI1W/8mX+BGmR26W6HPQspYBRS2AGUadwfWvkNdKUab4C6qruQvTxMAfbvi+XUkRF3xfG75Bkk4xGEcwMUo/0mkXGCtBSzC9yK+hZ968372v//v0pUuYcDRV+kAKIyvMeC2EdA5Io64HPPVSdk/7TF0UQhp3EvDls0YnQSo/AoSgngIHDDYARQ8zByf2YUUlexfd3Qlgqol8BrKbT1o3IT/ZediCwZAna8i4o9OtssBrkGCy3lQ3zgQ3/YoCjzwDRh/Fx7Z+icExP3jsxWRbOYLRUP1JhuMgNpmK4YTAC/lFJwdHKfmGZY8h3mi/ctoEFT9fnBrqlSqYkTQtFOmoJENnXA73E9IYgQ+Je7wiONV1PqDdy1GVWpzJ5DBCosn86MmSBquKUeokLkMewEIg42Itg7v9/0HkKxmisNao6/abTNAWBOLnqM+GmV3JGuKvIUnH1KXO1n7Csf2V4g47geE/CpZnjAl4t6t/lM5eYOZEvn+rnyuy8jczBwUb9Q4MUbC0i3PGmLb7EYRk0xnq0eO5A1MFq1rqrlOmrKxX1o2PtdvSr3HkV6OqOxo1aA79yLmca2Ltl9wHL5y9x7lZKoMeGp87ZaIWOgiGA+/vr77XAbBF4Lt00A1sqCeQGI53LhKrW+xAJki3aWKeiYUtADkGnBx+iIQUHRvnPiq4AEPiLPCcsASl5UZS9phzMVSwslVavXjBs/UnJVXjAchftRIEXhS/rmLRprVo2thw3klKCnLlwUNNcWBhQmpAv7HjkuCM+NNJK2lPtOJup1RSqxdZMSACAWZtAebGHYa1M5iw7fsWF0SMt5sYrGljwP4SoUxZUzL62AymkB6CpoSj++qdNX0dSRFFPex9+cjbKhxq4BTjuJQSXr7CZXNWr5qGQWn//mokif1zDUmRaSsxs6WMuOxdci1PFLgWT2x8tV7QBG8ton2oOykt409EEM8GXHdgtt6G9S6Tha9HJ59xQziulax4bmOuHcOvO6+PpBGH5VNfFS6Bds9yj2nWVKs0O6ZFwXkvlDC+2aJepY8ZFmgfuVO/yWdIK2E9OLqzFsXouQ97LAVRMSepQJ65Re+2Qdfr3oEWUMaZLo2ighH1/fPqThwBu+Q7R+HPVIB7oR52VnW4F6AcXcyjvHhQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce472446-22e2-42d4-1e0c-08db209ea93a X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 13:03:22.1168 (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: NcPFf/7Fb60EIEghusFUBwJa4UOd1aVItaLgByvzQ41zU77jlhLLdupuOa2RwpO5S2AttWevVyDXTKzkw9teC4AOr0sLhlP22a4/L3MPxbI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR13MB4156 Cc: Eli Britstein , Jin Liu , Simon Horman , Chaoyong He , oss-drivers@corigine.com, Ilya Maximets , Peng Zhang Subject: [ovs-dev] [PATCH v2 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 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);