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 5BC0AA0351 for ; Thu, 6 Aug 2020 11:59:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 523901C137; Thu, 6 Aug 2020 11:59:35 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id BB2CF1C137 for ; Thu, 6 Aug 2020 11:59:34 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id r2so38304699wrs.8 for ; Thu, 06 Aug 2020 02:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dqrUhBrOcI5ZgUpIbZFpXwPt4bR5+UuDhbNJIQMxuUw=; b=DUKXbqPdsYoX6pNOEyhaBocbTuB8XGrKZ8vpUDAxzmwm02e5XeGi+TYft7iPBvi9dN qiT15JCk5gqVPnqk7RUoLNSQULvZWY5aATQ8PHiJbWBC8q4fVSIeJry7q+NebV9CEmNk F/tezyoXSYqCfX2pSUNiT/mjeb5vLPzntGIn3AYIURbRiciwzdp3VWNEvmXTcpsPxvHH 7EDkYdGH48fkO1fGnMvfOn2Pcrkbvfs03Hcuy1rxib8ZlIFy/EXoDxq5wdEfOzTnYBUJ hWCKvdY9lyDEy8EAOtn8fKcm5uFuqrdGsX1NQcwkvtoli2ypR985WKzdRcYOby4GJDX4 3TjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dqrUhBrOcI5ZgUpIbZFpXwPt4bR5+UuDhbNJIQMxuUw=; b=qUW0b1ma/8dgi6pileIf1vdk6TcyekUCYupAWcmjDXQRrzAtxCIVwn36+QQFdT/x+m GukBIGs+uAzg/Swxa7bC/Y6fc2ZDxtPEsVJz8bqIXVF5ZBXpH/E+RvdGVmM9RCGDxReR eFISaE3rzvtlfK/XaxS6H1q838+ZaWcpqbt1QqSXULUrQitSNDO3OGcL8KlZDlT+MoOr 6dQvimFPQNkG0wEaBEV0+tchR1hhNFr/bGqg7oEGwHzDkCgJmqmVrmIGvwZlFffn5LJD t6MefSa4pcQKY+Ue22uP51ERqr3vlFYOq1OgaVtzFOiKgYVBCrkLUrlADIfI0/eAurtX lCow== X-Gm-Message-State: AOAM530bb3qfBeKH3AFolwI4oHQFz8lxCK8OpL83YFjtlyKPmSm1TF5T 1AoOyb/Vdp7jp/ejfwW35S0= X-Google-Smtp-Source: ABdhPJySKHp83IXGTtjLiEIUMwcAdTWqSrM7zVxV+3ioZjwPBKbXH7rzBmtp3XTVlE85Slyf9ZFZ5g== X-Received: by 2002:adf:a3d0:: with SMTP id m16mr6318521wrb.232.1596707974454; Thu, 06 Aug 2020 02:59:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 69sm6264610wmb.8.2020.08.06.02.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Chas Williams <3chas3@gmail.com> Cc: Stephen Hemminger , dpdk stable Date: Thu, 6 Aug 2020 10:54:05 +0100 Message-Id: <20200806095411.774624-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: fix crash during Tx' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/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. Thanks. Luca Boccassi --- >From fceb65eb9572514b4734ab079ab488a6e5f82918 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 53681721d..d1f8dfa50 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1332,11 +1332,12 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, hn_rndis_dump(txd->rndis_pkt); /* 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; sg[0].ofs = addr & PAGE_MASK; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:17.226695750 +0100 +++ 0037-net-netvsc-fix-crash-during-Tx.patch 2020-08-06 10:53:15.832598035 +0100 @@ -1,8 +1,10 @@ -From aee76bb79b91e2f8bce0e9356bee23f6e52d0513 Mon Sep 17 00:00:00 2001 +From fceb65eb9572514b4734ab079ab488a6e5f82918 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 @@ -10,7 +12,6 @@ to calculate the offset from the base of the pool. Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") -Cc: stable@dpdk.org Signed-off-by: Chas Williams <3chas3@gmail.com> Acked-by: Stephen Hemminger @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c -index 86a4c0d74..0428c586a 100644 +index 53681721d..d1f8dfa50 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c -@@ -1421,11 +1421,12 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, +@@ -1332,11 +1332,12 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, hn_rndis_dump(txd->rndis_pkt); /* pass IOVA of rndis header in first segment */