From patchwork Sun May 15 07:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1631158 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=OL25ryUN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4L1D726Tt6z9s5V for ; Sun, 15 May 2022 17:10:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2F55783FBA; Sun, 15 May 2022 07:10:36 +0000 (UTC) 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 HswsxIMRrGXi; Sun, 15 May 2022 07:10:34 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9636783FAA; Sun, 15 May 2022 07:10:33 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6CDA9C0032; Sun, 15 May 2022 07:10:33 +0000 (UTC) X-Original-To: ovs-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 11417C002D for ; Sun, 15 May 2022 07:10:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6B5DE418F5 for ; Sun, 15 May 2022 07:10:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com 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 Mqog5THckeqc for ; Sun, 15 May 2022 07:10:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-SY4-obe.outbound.protection.outlook.com (mail-sy4aus01olkn20827.outbound.protection.outlook.com [IPv6:2a01:111:f403:7005::827]) by smtp4.osuosl.org (Postfix) with ESMTPS id 7E1DD41929 for ; Sun, 15 May 2022 07:10:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WGE4VKkMz+NQf21e7QklredDzZGtotrtJDIiTGAcysaNi9w9lhlJxqrATF6iTJukqZc0ZNeg53JVPCgaxuE9+FRW/tkTJ0Xg2Pmlbw45pDADMX/5PYYIEB++gdTPvJHjiEZslh+XgzmPn6e/BZRP6n+9liqzXLsWuSwG2hx27X9HeJJUI6wVlzJ4qu3c/kqtQnOrZPjS3Hy4c0ImlTnUNkVChIBRDIW9aVOTngTfh/QtQFuvICnJmGdgvP/If4QXTYpug4NYH+MKHPFwrQNBO1LOWsVMgcu8xOymDwPwKCDt9hzRtPnSFWihmQlBerwaiCC44G/acOr7K6sxpyomfw== 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=fUt15s7LwfY19etz6NFp3vanEnWnafjLBsMZuyQUSjY=; b=avg7GOvcnS47W/1q6l4dD2sLNi9fWKlqUBpalhzU3z0T8wAEmhq/GS2OMMX7IntwFFWOsGaIVrqPyvLzn1nYoiOnps8SMtuYfYhZzzY1BvDx3PMBvHejkTvlgFGxmw1wovuOgf/Hoc5+/DnSPuo5a/stfIvB83Gek9/PAqcGkcImfEHf3Z645gMO6/EjEskjOP+4OvIOl2mODP6dShko6dkLe2mCfHD2QW8nRGsrt18McQiO5Tc1xJrnWR5gsSAaB0Kl+4fIB+Z2QA0vXP3kGMf14qQRcP+lBW4YLableQF6LlhVIl9g+gmIS5P3rFSmnZ08nH/OOotAXekzCZM1Ug== 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=fUt15s7LwfY19etz6NFp3vanEnWnafjLBsMZuyQUSjY=; b=OL25ryUNpAHqL2/L4ADchhLqb4rCMPopJv/994ThnxCJKAulWE0Z4ZFtOcBTdxxKp0Oe3WxDvIjF51HmR9xNEjqSff+8Kkb8QEKIyN0FIxNPOJy7vLPdx3QZP9CPAhxQ9kCUzIGvUKOol3msBf9tCnmpF+lNFmxpLxIHzpLf6+oW+StWtfTn72RJ+XjXp2TCmkZflrc00gyUY80vv8vmuWla0vsfgtZ8sOwCYb93mF3Q+ggBmynbxqY7/AqOkpuC7476LxEG6CY4bjNutr6r2ZDd8QYf+9vkuHW8m3Ln+yd6TTvvFaBM0bbAJpvPmP/dw6lTUPV/EUeL9YKPytxekQ== Received: from MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) by SY7P282MB3948.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:1ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.16; Sun, 15 May 2022 07:10:20 +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.5250.018; Sun, 15 May 2022 07:10:20 +0000 From: miterv@outlook.com To: ovs-dev@openvswitch.org Date: Sun, 15 May 2022 15:09:27 +0800 Message-ID: X-Mailer: git-send-email 2.36.0.windows.1 In-Reply-To: <20220515070928.862-1-miterv@outlook.com> References: <20220515070928.862-1-miterv@outlook.com> X-TMN: [XQH2EvV6TuYf6DFipowUDp3n8updg4qf] X-ClientProxiedBy: TYWP286CA0004.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::6) To MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) X-Microsoft-Original-Message-ID: <20220515070928.862-2-miterv@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab805975-7b02-4682-ac89-08da3641f792 X-MS-TrafficTypeDiagnostic: SY7P282MB3948:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H7d2ghf5sGuIjElFEE3AioYWOWY/H/GUwJJYM3kEReYAzOF3w0AhCdAcJhZtzAow51IuL+B4ZfzFocYTsH8y+/duUlk8NnuEDw1Ucn+8YeKg9FRhq44a2miXNM3vKRfXuKoj0abOvSNBkqoeD3HAV5uoR3NlJC/yjq8qLLn1PqNU5ZaFzonisMmtZaaCn8kOFuVbUzJroGW1RrQduCb2508VMJZ2H/kPeAMr+PIOVkW2+mkOtQ/5ie+R3gr+ajL0QPRGVXM6dGdMnGdR7YDmVC4v5s3/4vS0JTgHHe2OWvx3vFI7OGSTcN1VIk+c6CZd8oi+9qHCmbbD3bPeginGR0GFtWUU0s6uZc2Mb15Vs0F4AAbaK4gdPUA8EYP/OjtFUxVZTIf9LaBmlg22ygQWGfy7/f5AakMaATj7wKEAGz4TXANuEhClhn5fAlNoXPhNUj8lmbb8DPy0aFyB8ieQ1PzNqo+e/KJDw+DSpyPznZktzod+FEzjvvieapKiQdGroppZgmVj1/kYO4gh/rrisTrUX5e56XoS5AUt8APYeG5UhMDeCCd8CUNtx7OdKOjgpg6kVRhDjpjfORGQ3tadug== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qH/v13MgrO6Tlm4LwFZtfeoq/Hjdhp9llM7U0Rntm96NKfEv+LTK7RCQQpyPV7vVERvCMtCiOA5sb6bKkh4CziXL60id9E05uZlDtLnn4hp+NyFzq8UbfZDBy+E12Ex+98P2uJAx8iDoWOTFIfiRTFEu3jkuookZXneYKQdRzp5yO5BVSj1D1tCt2VkbxgwdFwugDy0+xccXQO43CerY9/YhM0ca4y8ThuXKnD5qkcBQ8Mae4TqGqGkwkZCgtCx1XN1+Fhfqw1KrQSkicfWXmgZpnWOK08iaS/7ao3ULt8/JLI7MTuZJNQ8rwd5wAlfWn/frChPT4+2K8CTTviwaySzO1HB2UuMCyg1XWYV9gVXPPPSDbtR4CkFwx0kdPtpGaSj0hm4H9lPCeL8A24giq/mRnuMMbqM1JTcUpmkSXQaktoHhAi/kgcgFIdLXOpyAFiQrJdq7kgqVmk+H1w+kEKXTGmXNTJcIf/tp/SM3HG1pIXJmZSl/8Yf7yWwTe7F+OS0miS1vFVUH5AtZPlvKXa2GX+YNTqZTyz9n0r3eAOHVmG9Y5KugJp+439+G/5Ecc+7b+FO0kw5RDXNRFuoeCl9ylSTl78xj4/94aVsrMKj4O2hSPDoaDHpsUBS9W8+OxTSAMKSoYr5KboymvMxiV9Nqd1sLyoRk9R49SaR73sbheY7XEThhZlaeeZDa0LsSkl5S6wl6rAVqD8RIguy7zScv0gX1MSDX+FxxL1n2A9Ah39OgD8mQeAmCm0lnFrs+NnzdjU1nRwHrnjuOtrNnQ1/1oEyGH6zIzC3KwQnEefwdxP2/dBJ0CJ7PQg7ZOxeTY10rYe5LPI5OY7PvW9rEzBAdFNy+USP0uNjB9z3sGxWBI4tfAjhWiWBvD2rRHXVFttpQARtg4YFzdzHbfIucXlxsruTTTjgv7w1vJG5SYDUUNOYd9wKWRHBs/5dk3/Z5M5E+ypV51s44AKJX9YEd6hf2GaaBMKR1WG0TiffxcfGIj5Zw1554+NyqGj+f4GOiFZfYCFtrEsQkFcTT44j+jjUHSBZ+MOtojH99znOYy34bZuXyfg/4baZFHI6rxKjsDYpi9G/Ih9hHMuVV6YioyL6H4uSWzOCTaIJb9KtsULNDWn7e11gZb0eQc6cMTx8egTeTR6ABiKwhOeFnzZcZCMuK0c0IJWBIelu+XffSPSkRgHVGE7Mr2TtfSCe8A2R47xu7Tl2pSq3aplpQ+B150ksYu/KUDKdkLHx+DfizkC0eEinlmCa2t+HRp72iANsH8M5/IceZ0wb4rnUzrmdqo7t6zchxj8amAK0yUGgqoomyF//Gddk1qr0yMYZrimmbRaQSuXo0yXkZ8e53cE3aC7ALs0rrG0yQtXVfXt5fmZ59z2hQN/P6r9lbsSm/EYX1q0H8MKQ0QemBq8KqsPBYdHkrJOCKYpHD14SgTFIzvOY= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab805975-7b02-4682-ac89-08da3641f792 X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2022 07:10:20.1494 (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: SY7P282MB3948 Cc: linhuang Subject: [ovs-dev] [PATCH v3 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: linhuang 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 --- lib/dpif-netdev.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 61929049c..904f4ec92 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -4777,8 +4777,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; @@ -4879,8 +4879,8 @@ 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 = @@ -4893,21 +4893,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; } @@ -4915,7 +4915,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 Sun May 15 07:09:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1631159 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=LaP3Kgxy; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L1D7P1k0Cz9s5V for ; Sun, 15 May 2022 17:10:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 32A3661112; Sun, 15 May 2022 07:10:55 +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 6Rqot_Q83FdC; Sun, 15 May 2022 07:10:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 46CF760F01; Sun, 15 May 2022 07:10:53 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1BE41C0032; Sun, 15 May 2022 07:10:53 +0000 (UTC) X-Original-To: ovs-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 B686AC002D for ; Sun, 15 May 2022 07:10:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 649404192F for ; Sun, 15 May 2022 07:10:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com 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 WNMfVjTC_471 for ; Sun, 15 May 2022 07:10:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-SY4-obe.outbound.protection.outlook.com (mail-sy4aus01olkn2081a.outbound.protection.outlook.com [IPv6:2a01:111:f403:7005::81a]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3865D407D7 for ; Sun, 15 May 2022 07:10:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z8z+A06CRY1sm5h6AmdsNdBByoqa6q4TZjVk0UznMhRJLLDVG2kd66ytvTD7n7HMYZoFzHyOBDxou4dR2WzeTlVK2m5Kld/8ZjWU0FN7aHJE/TnbpIpN18LLvvK289N6ypQTf0yhfsK7MJgUtSdWMOnpY+ipXqZUdrNhzYmE07U+6qTry9SnLL005nebvMlgITwNB2nXLOPXmKdtmyXvmJR+vY4kYfspmLTFzQ+Qu+mVNsBYu93+l/Eruga43f4vpFVZMZjZcsHoBcLmx0ZJGEJoWQpgAtPZA/nYe8D7K0Vg+L9N+ZjLu6+ExAjgwoonXL4zEt+lIGxbhLn43xZCtQ== 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=ske78+eow5VSC1lpLAV1NEFSaGOgNeooGmTz/tVKbN8=; b=PKrxCHlPMw2ekRG/f5o1V5Xb2PByQlTuKEHfIgWQ9aTSx9bk2AtIPX+VxyaEzgRwstfp6K5HB604zoTRz7yfgmUkmVADwPpI3vKXdKRi7XCmS4R2E1J9r5Qu1VHJTASul7s1p13OClozee8Kex5m7272y8qKdjsk7IjNxAJS8Fl143IC6z1NJr1BbjJEiUGlC3W+mhZ7FzYmlm6xnZCHLM+9yyr+gMlVCccA6RiQybu8y9CFh3L5xv0D2WncAvTfT9tnyr9RjVY+qH9VQWY9WQn0RUP+aXpKlggt48L0GUzFXpWt9AwkkVr6SE5KIT1I6ueloFBXNTTt8Q6SZPXAzg== 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=ske78+eow5VSC1lpLAV1NEFSaGOgNeooGmTz/tVKbN8=; b=LaP3KgxyTIyCiu+pMkvYW95nEEkjhDbjVlYMSjQUQj4dPxJP264JMOTda3mYR/suyRtQHjzF90pYg413vrgZmhikhcg0XWQoDzgK+T6QDh6ZmOqVjNJCscy+0ZnXmTeb6c6l8J14JNQ88sg2MAZU/PTC+3Cj+tQYVbxUYJOrmuDEZY4GlF/1dvoL++GwxMjG6b9vcDCu3ncHdvy9RAZVqExR7Na5hA8FEYfRXXS/Sy9nFVO25XsbaDYplTNu9BOGZ2kEmCVDbxxh5UNfD4SMzIAnePMnyoOWozKNuZwTe2Kx84jHdGtqop7Db5v1A+amuJnWLZ+CW5D3XlfrwFpQqw== Received: from MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) by SY7P282MB3948.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:1ec::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.16; Sun, 15 May 2022 07:10: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.5250.018; Sun, 15 May 2022 07:10:35 +0000 From: miterv@outlook.com To: ovs-dev@openvswitch.org Date: Sun, 15 May 2022 15:09:28 +0800 Message-ID: X-Mailer: git-send-email 2.36.0.windows.1 In-Reply-To: <20220515070928.862-1-miterv@outlook.com> References: <20220515070928.862-1-miterv@outlook.com> X-TMN: [gU7MHwHtsqxxhfnTUwK23+TpmdlILgRZ] X-ClientProxiedBy: TYWP286CA0004.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::6) To MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17d::5) X-Microsoft-Original-Message-ID: <20220515070928.862-3-miterv@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0a10f08-161c-4ad2-68d0-08da364201a0 X-MS-TrafficTypeDiagnostic: SY7P282MB3948:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uCsR7QUr8MR1YYK31rHGd5YX2ysd2j85HFqnOhkV4uzI72ETF5iRZMxebVIO2KUraRrelob41RzN5TRh60defKIKGMY6NJLZEdvbq0pxlOl4OKHlkJb/QH8Prui1cdUfXMQPRnCKA8E4Yf9cfrXs55uRkRE9mrpJhc1aGFCktwMkITROqD0XkxLHu4jH1HIp+MoUgGtmUzydZ7F6wwKfT5fOFtU/cvafCcYLaC3rsLKvjRJeXcaZN5EwUPpFwPXQczhU0AitKTkAo0+xRzcLw8+oCyb+FIEgXDF8AWlsNO4urbHWU3lZEn8OMO0aPqXcgCNiXfuyk1ZNV8CCuYYxknlFRdX1ZuB6jPYBwe0iMAaNP53TpzEMo5Rp0piYmaDG/NKq5Ur+zCkjG0ozHoarVbupAp84BvIQh8XqVtzciL6PPgTM0/qblDak6Dc8jW3ncF5LHg8ZGzq0shKec/RuxEupiRmN4IcOqKhaws5ud5bS2SpgKfVr5f5xMDwqVfnMgi7Tky1WVTx34QsMfscKP1h6UjjcyHtzwcWSJxhoX+qiAbFIjazL353ttcr/ot34KDBN/NPfgZJOpd79XcraQQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h2k+TwmG64DwrP4/0br/PzJdO/mcz2LGqiqDVF47rUus3WviOWIoBmRXSI9bPEhRL0GjUcsTwIWeWCJAI8sXDiaUmHGUHfRpqERZkyZ63B3yz245Vngoe0VnAOHvSLkG/BLCncDieHSQe/m76ahOv7BMmx1tCvEYnybvIeXXlUVwQtBdmAGgG62HcJVXIkHoDLA96u4P17lN9b2GZPcmIYHDUaB5E/BTIzI4QXRwkf/1nV6yGCwB+qOoijvVA/5RNaudNnhZWoQkGc82+evmXWQKIzxkgDVv9KjwyOboQd9W/QdRVZB9M1W6Fo+r19OuKYChzXWMQ8NHNgI6ILl5goNp927GknzB44FWXiMHTFN54FCydZo4GWgwC1G3LSXS+4zCYLgifV2U5TvUpQ2zjGJ3PNLyYInbL3NitbVIzjJ33Zk2afPg1KIMc6ImzFzRI+c2vvubJIeWBjdtddSg9KslqNhOQdC1sBc3JdBzZdJ0CNoL4QApOAtbLUsUo1z3m/SFrRXf6pfvArO5UmQd4+lnHqyrbjvQosfYML4Cx589PZVI+ysfvyZsqr59qrjUln2aEtGYyQO2Jp1bWRUioSQSARc62is+kM2BWdri8nSlckhlaqleGthMT+U+hVceWd7/sCRfv8t+f0yRdrhrgi32Z3svpO+4Hindg2JLFSrYp+Xfg3Nz1BiDr9SqbapXiCjzP2zzdqLafjgL87ew+MZnVgV0cAcozwzgHpv/ni/z8RUSSnLVH1AVaE2XUNn/lzvYre+4tper4jfQKEb+K+1IV2kByVquHjuuuF0RRmC7Liq+Me+x3mSI6Ltv35dOEi67EoNByvKuW4fNrszQYHhqSoF8rn3DY8B8nmd9qHE3zGSdWTUMkiEkBGYIqPovCQreIqqeU5fQHLM8TD9VauYczYIKbBZOlWdUinEg9zMg48yUZOO3hQSAyvBRXU+M6jC5ptruT3vupPt8P9O7we7YGiIYBT1wzl/6XF+qgJB6LYPXH+3+1Ln2uMInPGwkZibtnch6KYNVZbcbiXS7cTM1ahzlZF0WNFsNEUf2EXiKt0vypZLCTRYkO5dET4+JlvQZf9Ga2VVQtq7uiWOxJ+Q6jgtLHjnZI8TsbyYG+DDPGd6n9/iwMfbmyT+EghZgoaLiu29uSQc8x5WBHniaongYEOE/Lv1tfvlIRc8yclwl+dCbibwEOpSAEuZal19uT4P/9P0I16CJlqiik4cogBs0yk5xldRlZ90OkOK5PRTun3YRzS88ASv2zHKhUXszrkYsMwKuznGUKfdqgMI+y9wPhF2VHMp5X9BET61hGpVonhP2b9m6Yc8e38lOneEEKt/IcYDmA45tKkVcUsXkJqViN2FVQh+LUUWxOOoijnuSsWULo0LYqglCokmuI0+00Ul1xoW/vjJ/5nZjCL1cIZWiu6VB5WHjOYZEDm7Gd0E= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0a10f08-161c-4ad2-68d0-08da364201a0 X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3499.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2022 07:10:35.2033 (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: SY7P282MB3948 Cc: linhuang Subject: [ovs-dev] [PATCH v3 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: linhuang 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 linhuang@ruijie.com.cn --- 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 904f4ec92..503539841 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 @@ -4881,6 +4882,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