From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E595EA0540 for ; Thu, 7 Jul 2022 09:57:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0762406B4; Thu, 7 Jul 2022 09:57:38 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 5B77A40A7B for ; Thu, 7 Jul 2022 09:57:37 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2AE5440A90 for ; Thu, 7 Jul 2022 07:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180656; bh=D0A/IASbgVWaLcLdHHRPhi9HOAQVur3xeo3WoL48OVg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t5l0Hk/TmUAV3Tf4LGy9yjX/4u7GO3azFfAW/7sYLnTqqxxAVvU8+JFdXLkoyzHoM lm4J8KcQoxDJFI8XMbgwbTTVwHHzoZZ3Igwu3K2bSG1Fy4BjoU2QfH8lKFD38L1Lv0 3FOlvAEtdhGtY0fTjYYcSZH9SIwB1HYDh/56mw8WUbtClKzaVV73LIF+jgbcdexsi3 0kfzpnj2VnsPCyQpWZCunstzqMFP6Q4FVSHRHIq6WpIP1ESDZ9fhqTipWZncqJJ9dO WAsWYA6QNd8igPofBTrkSMCJHYLfHXlN/PDtQPW5rBqTWbsfAK+ehTALRIda1N5BXy Ajx1X4RXtCapg== Received: by mail-ed1-f72.google.com with SMTP id z20-20020a05640240d400b0043a82d9d65fso3886395edb.0 for ; Thu, 07 Jul 2022 00:57:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D0A/IASbgVWaLcLdHHRPhi9HOAQVur3xeo3WoL48OVg=; b=3ReXRKlVTaJICbl9LlDCO+m0n+UTfe033nSDQ+Hw/2xJTTWVFB4bUk3iQsE5+Nojj7 PV9tcUU66Dt7gbYfXc9TJLYIg3Fhp3g6tsqQy37zomQ9bFE2MBW5nbO38ZFC6hWCqu8o rVkD4L+5i8lLG8GBaiyzN9qIGGAoYsqhlTEIguzxSH9tqfv5YSosxy3UyBZkvoikcDHJ ZyETsDnOIN/x+wpDD/6XsdrqAFeJRcOyW+Yp+7HxqSBw7eqPHJDwwzOv6V8Yuaf0AWW/ rIBXY3NvfSGbYN8/RMqM+nMW6qzuoiaBUTV94tPdu6nQ8wk12t7K64Y/lQJpHmDssAXa WpaA== X-Gm-Message-State: AJIora/W5DKa8ApnE/YRXk6t+amyHk57AD8S1JSxzKmAPTeRD9basjVu +R9yDsM5eCSIaL4ln81K98lTZm6E9PCNdW+rOmi6UoQpW8YROIAIV53pI337ExaunYoEyouEMs1 2dguSGTbLJamQYOdlMcAlbfRz X-Received: by 2002:a17:906:478e:b0:722:fc31:aa13 with SMTP id cw14-20020a170906478e00b00722fc31aa13mr44056473ejc.84.1657180655801; Thu, 07 Jul 2022 00:57:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ui8Ib+AXvvgp49/qFshsswFpCBN6eJg+9u3eNmwuB9++yGVj5D/unXaR7ULFgxQPrbeOmzTg== X-Received: by 2002:a17:906:478e:b0:722:fc31:aa13 with SMTP id cw14-20020a170906478e00b00722fc31aa13mr44056460ejc.84.1657180655605; Thu, 07 Jul 2022 00:57:35 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id g15-20020a056402320f00b0043a85d7d15esm3756357eda.12.2022.07.07.00.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:34 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Yuan Wang Cc: Chenbo Xia , dpdk stable Subject: patch 'examples/vhost: fix crash when no VMDq' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:39 +0200 Message-Id: <20220707075522.194223-44-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ac099749a9140b7aa93a22bcf2a6b21470c4a5a9 Thanks. Christian Ehrhardt --- >From ac099749a9140b7aa93a22bcf2a6b21470c4a5a9 Mon Sep 17 00:00:00 2001 From: Yuan Wang Date: Wed, 18 May 2022 21:36:33 +0800 Subject: [PATCH] examples/vhost: fix crash when no VMDq [ upstream commit 6f3d83c7f207d435d960ad881f127e9971a81069 ] If the VMDq limits is 0, a divide-by-zero error occurs. This patch replaces throwing a floating point exception with a normal error message. Fixes: d19533e86f ("examples/vhost: copy old vhost example") Signed-off-by: Yuan Wang Reviewed-by: Chenbo Xia --- examples/vhost/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 135aafa5b4..073668022b 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -236,6 +236,10 @@ port_init(uint16_t port) return retval; } + if (dev_info.max_vmdq_pools == 0) { + RTE_LOG(ERR, VHOST_PORT, "Failed to get VMDq info.\n"); + return -1; + } rxconf = &dev_info.default_rxconf; txconf = &dev_info.default_txconf; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.039296130 +0200 +++ 0044-examples-vhost-fix-crash-when-no-VMDq.patch 2022-07-07 09:54:10.921824345 +0200 @@ -1 +1 @@ -From 6f3d83c7f207d435d960ad881f127e9971a81069 Mon Sep 17 00:00:00 2001 +From ac099749a9140b7aa93a22bcf2a6b21470c4a5a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6f3d83c7f207d435d960ad881f127e9971a81069 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 5bc34b0c52..e7fee5aa1b 100644 +index 135aafa5b4..073668022b 100644 @@ -23 +24 @@ -@@ -431,6 +431,10 @@ port_init(uint16_t port) +@@ -236,6 +236,10 @@ port_init(uint16_t port)