From patchwork Tue May 24 13:48:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1635021 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=ZoHw4Ovu; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L6wb10Wqhz9sGH for ; Tue, 24 May 2022 23:51:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2208A41A47; Tue, 24 May 2022 13:51:07 +0000 (UTC) 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 NqDcf1eWM4tK; Tue, 24 May 2022 13:51:05 +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 D3ADC41A32; Tue, 24 May 2022 13:51:04 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A1619C0039; Tue, 24 May 2022 13:51:04 +0000 (UTC) X-Original-To: ovs-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 269E1C0039 for ; Tue, 24 May 2022 13:51:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 10DD941A5D for ; Tue, 24 May 2022 13:50:56 +0000 (UTC) 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 N8ppyTzd5MD6 for ; Tue, 24 May 2022 13:50:55 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-SY4-obe.outbound.protection.outlook.com (mail-sy4aus01olkn2081d.outbound.protection.outlook.com [IPv6:2a01:111:f403:7005::81d]) by smtp4.osuosl.org (Postfix) with ESMTPS id 169BB41A59 for ; Tue, 24 May 2022 13:50:55 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HbARJXzQ8U7RbRE/cVKTPzkMbI4ybtVRLc7GgSEuiJ5MlIsLP2sI1/NHpjpqRJmYaEj+SYx4RNu2qoWOd5aKO75sHu8Ya7fivJH6R2DPX3VLKU2/Z5Nh2fjWHualDlEFXlqRjh3jBFMWBYeh8DPDZd8waVb++FBiCjdOhbPX/r2yCWm6EK8p1//g6A+zYTD+y6x2n0OATCJiyntRka4CVVDMIrPWiwVuEaT+ON4onXZ/5rXNmm16YZmC4fuOZAs4R3nOjFFGpMzuc8NOaOiBhg31N86kd4i9NgDM4cmGFHMhW1NFThXe9LtXVagmIzZduDpC0eQYmIvw3Csul9eG/A== 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=tPZvWk2aSJDbvZq9ZTGqz73mPVD950XVYqG27nExVto=; b=XXi1dbaQGq6HxN8c6Dj8SUfRozmlY7LbHOFaDAXgXl1LS3QOJjRg/DPYKNZ4rWTNC6EGUAFcAnoSm47heQoNAmpnVP8A7ghCDIXUcUwZB2Q9dLz+XWDSqNMvOrq7k2uVYZuUF7rqIJnl85S7nttEM9zywhv9jMdCA7v1VotkeNg/PGqlxHNUdct2tPAFihozk2MHCboutqcjPNS7maMra8v7QvjuspbjfnCwyNY+RnS2KbrwpqKohDagKNo2xAbfxurhomQ9ZNRJtBYgDimMOuMiteUIr3pqjuQraTr2fsvdDie5CAk/VyXT3rwP6WcvBG59SAc4XOT/YcdlDxG+7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tPZvWk2aSJDbvZq9ZTGqz73mPVD950XVYqG27nExVto=; b=ZoHw4Ovuw913v/U+YuYzAepU2JbnpFDgcB7ivot+Olvoq9tPVYkcgoPmMjLo1ZeHiF4Ql2maA//AqI6qOqTyIevkfIWnCBbWwLxkRQtGIPUb40SetGBsee45AbmfS93Dwx/ihZinG4MKLLeCQYr3fiyxrCSZeFydNf1pJ421rbJvSL0OFPb7wGmwOmmJXIBC6ygh6JmmJMzewjmdXmu2CNtDgTQkw9GCOBYM9hug3kxo4upE+ESEUJq5CB9yz5VTTIzOkYh6QGddH0B1winWp+4y92/at/XbNxCBPgyU7QyPKhCDKEdwTJ3iL8j49/spOlDlfWIsisn9NDHxK0EIjQ== Received: from MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) by SYBP282MB2682.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:12b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Tue, 24 May 2022 13:50:52 +0000 Received: from MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM ([fe80::e0b3:74fc:779a:9a8]) by MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM ([fe80::e0b3:74fc:779a:9a8%3]) with mapi id 15.20.5273.018; Tue, 24 May 2022 13:50:52 +0000 From: miterv@outlook.com To: ovs-dev@openvswitch.org Date: Tue, 24 May 2022 21:48:23 +0800 Message-ID: X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: <20220524134824.748-1-miterv@outlook.com> References: <20220524134824.748-1-miterv@outlook.com> X-TMN: [lsTOVfU4kvX7GC8Odha5FQnm2gL7Z0P1] X-ClientProxiedBy: TYBP286CA0035.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::23) To MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) X-Microsoft-Original-Message-ID: <20220524134824.748-2-miterv@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f714bd0-817d-4921-0a57-08da3d8c6ad1 X-MS-TrafficTypeDiagnostic: SYBP282MB2682:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IfNVsFpPAzGpCJ48LTaItjb4OSXPqP/QR4pjq46er7kDYhN2FK0gQ5DWz43ngLoYJd4a0m6zWDbQBvkE4E63oeOnAkQ4PgZixuvrK8smdUQVr9g6Ej5Jxd5J8BbRVYMqSj+Tf4shbO8dNpMnEUbPH7pjFVbij3Zqe5EI/Kx19QhBJXb87NXWW8muu1ou8RXPlwr2yMMpO7pIm0KBPvDFcPvTm3bsiP8sDTnxtFRseOuCu6G2jQMN05rpAdL+oYkwDuaFjwf3CFtqGNLjlTsmzh/GW5hXvd5h8UfeiFZkm8Vq0POgm3IJ9KPW5LoFE+wfX366WDXlx5h6LwXS4hnEMJLRwfc6UlSjsokYG2GqbZK4VIwbVHxZ1jX2M3QZwK2adxivtrqtVS2iRo2qm1SZjsG1quF8h//oncVNiuvefySkPFSiZdZND4xB+afw/vuN7zas/KK87jdEzQ6u7ubF+nQDj1GixvY9MvPQ+NuOwnNN3zKwpp4nF1r3FJrZJTsc1rvINHA8sXhDfOKJXm9BHMRiN1NJIU2pECyDXjxigSKixhfsRa1PQyLlWzQ0Lqf3RBbSlnXh8CTncyGv1PJd6Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 79h48MwOYc+hNcpRGT3kxwWdipPwXjwLV8ZOrk+qTQ3WK68CJKZUWMm8ZCbNcyaDH4l1nkIYbKHIvCwgRaZHZvoNqensHT60q++tMntDVhIa308FbBRSEWYK6qFGuj7bO3hrwm6TwhlhfsCX+zPPybprx65qPbaoY34KQTOEgL2756GQuaU+c/Sz6L2kMOe/B2KIQSHP5OnGEHs0TIy8/9BnhNT1oceVTjwqn5OFK/nOkIBHNM4oit428pghRfdx6qdP8Da7Qi+sg6CKBNUE82+eW7C1tCesRWleSsTyC4LXEljt2i7I6j54ajo+a5CN8fLxrNku+TCGF+CWLTjJfJOlRyx0UxMsDk3D/U6+NdfT7PPWbEkgJURbSFel/QaXYjhohA13LjviaUtSBe2X5pgXU+IRl5XNsIKy7e67f/4DEiVJoMizq0nd0Ga8kD+yrfW9PTYkCfYUohp0cqoF5yGbYysV81MiJ2OWgsd17IRTApLfqogdO3HkF13NnGz9aJHyGP7WGwCkvsRSbcZbqt3DDq75/1j9YKdJvYII8ZHbFTJJShK/jfcGDqcbB5JZuj99bBrxAv1aTr7fQ502WTycpllBhEFZZoduOHXs6CQ1PO71U89PzgUqj6O1V1qqQhs/AjXHxhl0LxqqiW1+mamVufs0IlREmOZ0N5C3De0IvMr/puUVagnVOIZ4JQmb5cMZquYUaCj8T9qetZk+g+fH0/Ya9f0f7CMTmXrgGwmKSkFqsTT2tw1v5Tuk7WvMyifRrrXDIXcL900DxsxcxfugRF5vdVrJ6naIBHezvFwpjetxwfOfzUEVPtncwjNycdHZ9AXWZV+KTvv/oz8Gct9hn19ErDcHjO8wD287x7QirjxRvwbEN09ntDlUHowVvyl3B6CvD9Jqn4N5V9ZVOM66jsdBpdeJXlOLhI+/qnglY1cR/w9THxpXH0II0bj2t1CqbpylX17SyxGLk0JVXQx3Dn69FJW0WW1O7QUwoebJOGNunveBux28ADOnu4Rk7WerIB/6mWgtt66vqCxJOfpBrEogi4E13agu5fr3AW9ZhTXTWR5pEKdprixolLyWg49qRPG/Xa6LIBD3PFH+beVnaLQBld1Ili54jky9VkohUJ242aHbB4cck2ZjHXc7U021OdVfherA31zKPcWNazFgppMF3kS/IdjbiEIawXqEyscgY08YAMjbo2L8Ag/csy+aeDHAI66p6kfsTUnSrlPL3FqZ4+AFRUt6Z7jJRwxPtSbET776ZcJDqFWAFnIUj+btYvrIi30uYvdRuiuj5+ek/ICsB1MRuac5PqfzCLXZ7ZGTbcBeYr/xvtzCWwRCFxsImoUPRJ1fwesJ1Cz1F9UZl/IIje/bdiBnH4kyKmUgGvQ/QNVUbi7VGDFK82s/IiLxJClgRdU62HxGBuXOJqo90RnrzJANtctJ5v8yFDg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f714bd0-817d-4921-0a57-08da3d8c6ad1 X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2022 13:50:52.5491 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SYBP282MB2682 Cc: Lin Huang Subject: [ovs-dev] [PATCH 1/2] dpif-netdev: Fix ALB parameters type mismatch. 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: Lin Huang The ALB parameters should never be negative. So it's to use unsigned smap_get versions to get it properly, and update VLOG formatting. Fixes: 5bf84282482a ("Adding support for PMD auto load balancing") Signed-off-by: Lin Huang Acked-by: Kevin Traynor --- lib/dpif-netdev.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 21277b236..95b154185 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -4778,8 +4778,8 @@ dpif_netdev_set_config(struct dpif *dpif, const struct smap *other_config) uint32_t insert_min, cur_min; uint32_t tx_flush_interval, cur_tx_flush_interval; uint64_t rebalance_intvl; - uint8_t rebalance_load, cur_rebalance_load; - uint8_t rebalance_improve; + uint8_t cur_rebalance_load; + uint32_t rebalance_load, rebalance_improve; bool log_autolb = false; enum sched_assignment_type pmd_rxq_assign_type; @@ -4880,8 +4880,9 @@ dpif_netdev_set_config(struct dpif *dpif, const struct smap *other_config) struct pmd_auto_lb *pmd_alb = &dp->pmd_alb; - rebalance_intvl = smap_get_int(other_config, "pmd-auto-lb-rebal-interval", - ALB_REBALANCE_INTERVAL); + rebalance_intvl = smap_get_ullong(other_config, + "pmd-auto-lb-rebal-interval", + ALB_REBALANCE_INTERVAL); /* Input is in min, convert it to msec. */ rebalance_intvl = @@ -4894,21 +4895,21 @@ dpif_netdev_set_config(struct dpif *dpif, const struct smap *other_config) log_autolb = true; } - rebalance_improve = smap_get_int(other_config, - "pmd-auto-lb-improvement-threshold", - ALB_IMPROVEMENT_THRESHOLD); + rebalance_improve = smap_get_uint(other_config, + "pmd-auto-lb-improvement-threshold", + ALB_IMPROVEMENT_THRESHOLD); if (rebalance_improve > 100) { rebalance_improve = ALB_IMPROVEMENT_THRESHOLD; } if (rebalance_improve != pmd_alb->rebalance_improve_thresh) { pmd_alb->rebalance_improve_thresh = rebalance_improve; VLOG_INFO("PMD auto load balance improvement threshold set to " - "%"PRIu8"%%", rebalance_improve); + "%"PRIu32"%%", rebalance_improve); log_autolb = true; } - rebalance_load = smap_get_int(other_config, "pmd-auto-lb-load-threshold", - ALB_LOAD_THRESHOLD); + rebalance_load = smap_get_uint(other_config, "pmd-auto-lb-load-threshold", + ALB_LOAD_THRESHOLD); if (rebalance_load > 100) { rebalance_load = ALB_LOAD_THRESHOLD; } @@ -4916,7 +4917,7 @@ dpif_netdev_set_config(struct dpif *dpif, const struct smap *other_config) if (rebalance_load != cur_rebalance_load) { atomic_store_relaxed(&pmd_alb->rebalance_load_thresh, rebalance_load); - VLOG_INFO("PMD auto load balance load threshold set to %"PRIu8"%%", + VLOG_INFO("PMD auto load balance load threshold set to %"PRIu32"%%", rebalance_load); log_autolb = true; } From patchwork Tue May 24 13:48:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1635022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=qABlR+Qh; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L6wbk4CJhz9sGH for ; Tue, 24 May 2022 23:51:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E1C6661176; Tue, 24 May 2022 13:51:44 +0000 (UTC) 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 9PIExJXsUSEV; Tue, 24 May 2022 13:51:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 17CB860F12; Tue, 24 May 2022 13:51:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CB816C007E; Tue, 24 May 2022 13:51:42 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4C7D2C002D for ; Tue, 24 May 2022 13:51:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3B03460B2F for ; Tue, 24 May 2022 13:51:41 +0000 (UTC) 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 fcAEcXh23mZI for ; Tue, 24 May 2022 13:51:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-SY4-obe.outbound.protection.outlook.com (mail-sy4aus01acsn2080b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7005::80b]) by smtp3.osuosl.org (Postfix) with ESMTPS id 813E360BA1 for ; Tue, 24 May 2022 13:51:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J8hGtKYuu5a8jiJeF2dezKI39snACa4i1PVx1hG4hB90JA3QGSbdzb3Kuh5PdKdFkm7clZo2x5shuzyB3nH9Twae4o8z34QZB3Dpvps/sEVtcj4YNloXBGJMnqSZY4HfqbwoR8GaiXkidzXm2LxmA18fvaLKNPhv8g7Ym7+r/5qTXy+XCanqgANOtWhKGJB/gUDTy+fnUvfJeo8+RSnGfdmmgB4RGe6p2pWTNSP0i9bUqYVWMA137K2Rp2V0Vx8UNISQUmQg8jhY178N8/0rh5cT3MkidOJ+h4BG3bZwZYloVxIrybVoidRw+uGyiwGUfO/wtkcX/0393HgKIrwP/Q== 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=YaFCz/yP3j3nY8FLarKZW1AQLxP5qbHJuUs/t7bexWg=; b=a3sEzQJVGjoE/PxKwWeJB5MsLR8rW6msPhNNSgwsYr79yGyELoHNx5BMSMjBy3FYSRjtXM8RnzCKMuPcRzlpP11yKnXE9tiWq8r87YrBd6IbNZ1/kQlMaQosfPjHklZGvMNSzJFN9ljYZe5AVMx2XgTBHdiinaokIAEqpBgEeA4kGBATFsHUShAga/3IppGB0CSGlrWCYfQAz/rmNNeWGQcUqdwyND3nnqwxY2oPgodRvURYxioJf/9iw/zlRKHn3KMmWAToQS6Ur7yW9yoLRD86kFuLNQKBCdE63xQCZkGYc77uKO6steW2DAzNcpTwONjaRgGv9xQTjDIuVJTfdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YaFCz/yP3j3nY8FLarKZW1AQLxP5qbHJuUs/t7bexWg=; b=qABlR+Qh5zTf5dOM9aNHdeXdQ5Od/0gb0483gSiYNMOTa8zYBaSufq79D+lJChWDKeNBIYdMWu3cYXc9VjhuftsIdGvj5HIYYJLpPbfbWscFSIXTum3xk2696xndT7xn5B2gWGQwEKKuWN555rC3rfT0HN4aglkJq2xvHPV2EPKwOdZCileXRIWA7Q0RiN0e6t30Y+wOzS9sxWLJv6SxcBR/4772VrBlpsL8nKkSlw51z0UTjmXHWGQ7Vw3nvOb27OCV8plKaABI07vSILEBVAMSjOTA3Rc6Crka+OVRgsmobGxobNfTEHrDWCVwyufFELadklvM6f+7F5DvOvFvAg== Received: from MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) by SYBP282MB2682.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:12b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Tue, 24 May 2022 13:51:35 +0000 Received: from MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM ([fe80::e0b3:74fc:779a:9a8]) by MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM ([fe80::e0b3:74fc:779a:9a8%3]) with mapi id 15.20.5273.018; Tue, 24 May 2022 13:51:35 +0000 From: miterv@outlook.com To: ovs-dev@openvswitch.org Date: Tue, 24 May 2022 21:48:24 +0800 Message-ID: X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: <20220524134824.748-1-miterv@outlook.com> References: <20220524134824.748-1-miterv@outlook.com> X-TMN: [eKjbwc1KYMGhOXa/OJO1wglfoElNekGu] X-ClientProxiedBy: TYBP286CA0035.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::23) To MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) X-Microsoft-Original-Message-ID: <20220524134824.748-3-miterv@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69f36219-4563-4508-8356-08da3d8c848f X-MS-TrafficTypeDiagnostic: SYBP282MB2682:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+kHCT/0KKpHmiAlL/A7AvgLcJSsOFygMYLDROSDEHpNxGKjWQLRciRU0zq9gO+6ZCO6PHKin+eDBnbi9snuJVb5VWW/eBXHdbalFefbIWeDdag0mxdgdlUr/nQLZzj3gqvtpccjcJEqn+OqXnqfaiAR0LYcmQP5fxAKYTEv+nYnZEhMRNvciZd6up0CLmIHuaD+mz+BDrlDx+fWM9rlkNMPmaj8DWgdI0491+1DHCZtYkorHZ49N4NMtppzJ+J3gr0MMWCHNkZuTdhvwwP0+Sru6ghTQv7GNxNUf23yHVjEsRbTJgzDpztE1ed9xtHjDtJ4w5htVYH4d9NQQsrLC1Gu6nLPd+Uerf5nPC0UYxVaDcDcSdqUmvJEXiarEkpnRZnQYKCdoVG+ozMcxIMxg0NqkD7IlB/EVwr+g0kdlZKrjjuMg7nYmC3vXY079JquoNGSi7OBkl6DusWTWh0xCO48PPBR9/WzrzZt/KC0Lgu4W37Iw4hN9WdNVz3+bEK7jdWlY4zq2VUToCjTKTsYi2WjfAD417kugb1j34Zxe7B3IiMWyxe6b0/QWThhkw9HyP3ESzS8yTINclHTSc9mfA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ct+ZoWShcwfmZpAbJdAMCeSP+7jKr1xv4aRsXG4pZsvPyCe3xXgEDQR0sBVlAGvxM2YyYmjgvoLpPBttukedooHGZlPqts/6EOKL+0gypwYoBC/W2yHTTX28XC8rSj25PErHiDQ7xMA0dkJfEGUu9GFpZZUZ1xKarqceic6SCNg3e6f2XE7yBkPbPgEhvWTbIrIEtLIFJSW4ajMccC6GDKKyHDFAXj2nu+bFjQr+7/N4mxU8/BDeDIp2CxKTldmV4t+JJJP9th3cZeDjOsXNMFmi2RdVHhuD0yhV0PuhKxoIDOtjLp6I0YTUWR6xR0yhg29iamAyrNTqJLMbsZLn+ld2fi/tDYQpqW/11xWomePOPNPkPfQfxdxVajO/71gpKV9HfYgkUsszKOvaJfGWKUY/F2ilc8Y/RIDJGi9+iBKFsPgIzfbl6TAvjo51F5cv+ZUaMGRUwUPVKjHPpw5aWS44xmEGe5eoXot3gOT8cK18vSgPunftw5N8rw/6nFOvzpvcBqk8SoaU+ezHWDnRwr976HTtSbDcMQ0muebZMugmEX5OwKHYChy5o5e+Eow8+xv2LEFbf2cyoUjmL6v3bR6BzdI4H6ptYMzpFnxv32B/qbnV8v1F/5OXCF4IAQyO/W3dkBJR5+xxHp4WBbLeefWM7qqndLNszQY2bTyC0lRfua/UlHeQy/4OouabX2ecozUIh431fdMETVppjLbsuo7YqEcgtGOgCZ4nEfO7vhzEcTdd+oFFYv4rzSoKpDRWa8I4TBB/Jzu3ZjGwFZv+r4GXzqSMP/Ir1cu8Sa6TY++gDn3YB4iQWJ7zT3vIhyYMa5zNQV78ShRcA1aa7jSyIV801p/N3qTEItVAVJ7bYmP5IzWOyncS1EW9ZhCE/VCSrjZZErDXCnU0qwcH73xcGL6Ri4kWLZ5Z1sfg6LZAxyyppNvKcQoUUpvh/8yxGZlLRaHpBfH2+Djq7nFuUR4rYvcD9J6gyoHcEyL3AErzYzE68ICZm+hg7ulyBXXZr6PVuL02aHFezJVnm+R/wvn080j9uQQ0N64Unz/2304wIH1HHoEFBeMMualEoa75uZScbGaqhUwn+vjFv5m6rGvF5On4MFtpi92F9LxDeHsioYZwUku6Sc09ona2GfbQeqmW/iGS6qgI0GuH28tf7nHR4w/G7QloxEbHQ00McY2P1gw7a/JsLyctgvStmtLPL+Be21i89ZC1Z8/O7Rdyrx5tB1eXoCoXtX7HNN5mA1kJfuO1UU8rTtItQ7/5sMo6Is5HyxyBoIu5bkJRJuI3yogWVDmSHjACZ28iABHq25s/mdlyHqoQUarZbN89QBd3oeQeExz0O6tEaB1KTrzkvIyaoGW+YQSuBYqZ9lagrOPaW2ZTA9Jq1r1CUw09T+b+JFZvsZisKRLnAKJj/KqL2vzaJd6pCHMNp8z5OOlmROXZwtM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69f36219-4563-4508-8356-08da3d8c848f X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2022 13:51:35.7559 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SYBP282MB2682 Cc: Lin Huang Subject: [ovs-dev] [PATCH 2/2] dpif-netdev: Fix ALB 'rebalance_intvl' max hard limit. 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: Lin Huang Currently the pmd-auto-lb-rebal-interval's value was not been checked properly. It maybe a negative, or too big value (>2 weeks between rebalances), which will be lead to a big unsigned value. So reset it to default if the value exceeds the max permitted as described in vswitchd.xml. Fixes: 5bf84282482a ("Adding support for PMD auto load balancing") Signed-off-by: Lin Huang Acked-by: Kevin Traynor --- lib/dpif-netdev.c | 6 +++++- tests/alb.at | 20 +++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 95b154185..a69b570f6 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -93,7 +93,8 @@ VLOG_DEFINE_THIS_MODULE(dpif_netdev); /* Auto Load Balancing Defaults */ #define ALB_IMPROVEMENT_THRESHOLD 25 #define ALB_LOAD_THRESHOLD 95 -#define ALB_REBALANCE_INTERVAL 1 /* 1 Min */ +#define ALB_REBALANCE_INTERVAL 1 /* 1 Min */ +#define MAX_ALB_REBALANCE_INTERVAL 20000 /* 20000 Min */ #define MIN_TO_MSEC 60000 #define FLOW_DUMP_MAX_BATCH 50 @@ -4883,6 +4884,9 @@ dpif_netdev_set_config(struct dpif *dpif, const struct smap *other_config) rebalance_intvl = smap_get_ullong(other_config, "pmd-auto-lb-rebal-interval", ALB_REBALANCE_INTERVAL); + if (rebalance_intvl > MAX_ALB_REBALANCE_INTERVAL) { + rebalance_intvl = ALB_REBALANCE_INTERVAL; + } /* Input is in min, convert it to msec. */ rebalance_intvl = diff --git a/tests/alb.at b/tests/alb.at index 0036bd1f2..922185d61 100644 --- a/tests/alb.at +++ b/tests/alb.at @@ -243,7 +243,25 @@ get_log_next_line_num AT_CHECK([ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-rebal-interval="0"]) CHECK_ALB_PARAM([interval], [1 mins], [+$LINENUM]) -# No check for above max as it is only a documented max value and not a hard limit +# Set new value +get_log_next_line_num +AT_CHECK([ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-rebal-interval="100"]) +CHECK_ALB_PARAM([interval], [100 mins], [+$LINENUM]) + +# Set above max value +get_log_next_line_num +AT_CHECK([ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-rebal-interval="20001"]) +CHECK_ALB_PARAM([interval], [1 mins], [+$LINENUM]) + +# Set new value +get_log_next_line_num +AT_CHECK([ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-rebal-interval="1000"]) +CHECK_ALB_PARAM([interval], [1000 mins], [+$LINENUM]) + +# Set Negative value +get_log_next_line_num +AT_CHECK([ovs-vsctl set open_vswitch . other_config:pmd-auto-lb-rebal-interval="-1"]) +CHECK_ALB_PARAM([interval], [1 mins], [+$LINENUM]) OVS_VSWITCHD_STOP AT_CLEANUP