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 A477FA0555 for ; Thu, 9 Jun 2022 13:38:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9276A40220; Thu, 9 Jun 2022 13:38:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id AEBB6427F9 for ; Thu, 9 Jun 2022 13:38:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SBilZimKS6LoRVQ3peS1Q0bPWsL0xbTdN4KbCKPp2Kk=; b=QShfWoPr3W+rMEtUXIfLkuPmEwiH8hO6I543VWr8IeMak1HCnDg9aTdlktd5EXY2VQxz5H i24TJb1IhdzUu/9gdk6oUUJ+vNBhSMR1VXRbWJAXa1kSnP8q4MQaJDVk8eFm732RXbo38J emAaK3IA5mSBIEjgycz49VzfmTtPcpg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-kblm6tfkN_6Y8zaMrEY1zw-1; Thu, 09 Jun 2022 07:38:21 -0400 X-MC-Unique: kblm6tfkN_6Y8zaMrEY1zw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE11A85A581; Thu, 9 Jun 2022 11:38:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB2C51730C; Thu, 9 Jun 2022 11:38:19 +0000 (UTC) From: Kevin Traynor To: Yuan Wang Cc: Chenbo Xia , dpdk stable Subject: patch 'examples/vhost: fix crash when no VMDq' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:38 +0100 Message-Id: <20220609113701.386938-51-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d512315deffeb5f0496c865fe02c981a067a92b2 Thanks. Kevin --- >From d512315deffeb5f0496c865fe02c981a067a92b2 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 6c3bd9e4b0..84844da68f 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -265,4 +265,8 @@ 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; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.944888468 +0100 +++ 0051-examples-vhost-fix-crash-when-no-VMDq.patch 2022-06-09 12:34:29.767980678 +0100 @@ -1 +1 @@ -From 6f3d83c7f207d435d960ad881f127e9971a81069 Mon Sep 17 00:00:00 2001 +From d512315deffeb5f0496c865fe02c981a067a92b2 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 6c3bd9e4b0..84844da68f 100644 @@ -23 +24 @@ -@@ -432,4 +432,8 @@ port_init(uint16_t port) +@@ -265,4 +265,8 @@ port_init(uint16_t port)