From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5A761A04B1 for ; Fri, 28 Aug 2020 12:14:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5208D1C11E; Fri, 28 Aug 2020 12:14:39 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id B4EA71C11B for ; Fri, 28 Aug 2020 12:14:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609677; 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=7Z8XReROBK3iTmo0fGV/VRxE2lKGogCzD5vc3VVThsQ=; b=MVm7Tik9Ptnzm7/JuVPDyX8hVS2P5T7N6HVLtjayQkFZoqgwrlXC4bwZRvMJ6OlZS8v00Z 4ffT0dZ8vvxQUSHSeNSTFNheXLhjqie1DR5BHobNJ2wskFoQb/7IxwQIt1jmE9i2BxP+rA VRR6TKbH0JGQj6F+VdfuBXLX7NooPtQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303-bFaJfio5OBuOX6H5fuLDPg-1; Fri, 28 Aug 2020 06:14:34 -0400 X-MC-Unique: bFaJfio5OBuOX6H5fuLDPg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B3CB10066FB; Fri, 28 Aug 2020 10:14:33 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C64319D7C; Fri, 28 Aug 2020 10:14:32 +0000 (UTC) From: Kevin Traynor To: Chas Williams <3chas3@gmail.com> Cc: Stephen Hemminger , dpdk stable Date: Fri, 28 Aug 2020 11:13:03 +0100 Message-Id: <20200828101308.223767-37-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: fix crash during Tx' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/5b3a3277091dcf4869111fcc0835d7f553ee28ae Thanks. Kevin. --- >From 5b3a3277091dcf4869111fcc0835d7f553ee28ae Mon Sep 17 00:00:00 2001 From: Chas Williams <3chas3@gmail.com> Date: Wed, 29 Jul 2020 09:58:44 -0400 Subject: [PATCH] net/netvsc: fix crash during Tx [ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ] Commit cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") changed the way that transmit descriptors are allocated. They come from a single pool instead of being individually attached to each mbuf. To find the IOVA, you need to calculate the offset from the base of the pool. Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") Signed-off-by: Chas Williams <3chas3@gmail.com> Acked-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index d7940b8119..cdd44a76c3 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1317,9 +1317,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, /* pass IOVA of rndis header in first segment */ - addr = rte_malloc_virt2iova(txd->rndis_pkt); + addr = rte_malloc_virt2iova(txq->tx_rndis); if (unlikely(addr == RTE_BAD_IOVA)) { PMD_DRV_LOG(ERR, "RNDIS transmit can not get iova"); return -EINVAL; } + addr = addr + ((char *)txd->rndis_pkt - (char *)txq->tx_rndis); sg[0].page = addr / PAGE_SIZE; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.798811284 +0100 +++ 0037-net-netvsc-fix-crash-during-Tx.patch 2020-08-28 11:03:25.988955951 +0100 @@ -1 +1 @@ -From aee76bb79b91e2f8bce0e9356bee23f6e52d0513 Mon Sep 17 00:00:00 2001 +From 5b3a3277091dcf4869111fcc0835d7f553ee28ae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aee76bb79b91e2f8bce0e9356bee23f6e52d0513 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 86a4c0d741..0428c586a8 100644 +index d7940b8119..cdd44a76c3 100644 @@ -25 +26 @@ -@@ -1422,9 +1422,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, +@@ -1317,9 +1317,10 @@ static int hn_xmit_sg(struct hn_tx_queue *txq,