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 86AEDA04DD for ; Wed, 28 Oct 2020 11:48:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F5E7C9D6; Wed, 28 Oct 2020 11:48:57 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 80108C9D6 for ; Wed, 28 Oct 2020 11:48:56 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id i1so5184853wro.1 for ; Wed, 28 Oct 2020 03:48:56 -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=R7c08VqSddEKkHm13lTkqLXqLWSFxpH8HkNJHsy7fUo=; b=GZRY19cIlQCSMWQB6Glvmvuijyscc5th1pDek5P8X6VZRIJgjA0hMA74QnBt0/Jinz S0FIsX4bQR0KL2HwVyJWz8JH/ZLpBn0j1YrNUZypHhCc1OywVgeViodvilGHRNdJLbCG phjz1vzFANVyCqH+EKb0fyHLF/FnBDqXqye0CTunaetl1lp0XLhsSwCtJYGsCmkEwwSO QCFAJ6WRtxpkQwqBppBguNWIDUxr8LZUbMj8bmgEVpDF2b1qcviz3f5LjcvaRuIA1eKz /ON3sf6PaEtOs9GjuiY5WlK4C1TvSPpmtbq3bVy57vnEi9jGMPfyhFIZsPlh8eA32fVX V/7g== 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=R7c08VqSddEKkHm13lTkqLXqLWSFxpH8HkNJHsy7fUo=; b=IPAo12VBvna9RztQya1cYK1kM8Ok2hZO6fdxhN5n/CxvAGUGTM+ZXsjvP3rdxx1QkN gzrN4IU6MNqCXlz0ZdwzdUrJoC4tZXjOdrhumXa4jwqAkAyIS2yowjXUPdZvO4XEOQJL LYzLznxk5zlNNnTOBiZDoaNh17YCbLdzupAO/YwKZxZL8mFK0PU/Fi8NmgylMdHb7s39 7tZRahCPAderegh9aq+a8wLBm8s3G2PedstWQJ79so7QPd3yLqNGlHi/YmkXzxbJj4i9 LtA8Y2R5y2APPdmvM36n4wqyVJQ20AaO5EKIRv60gOysCkQVbVoiSQ6zbiEmqLphq06v eYZw== X-Gm-Message-State: AOAM5338YjlpacXeOQDcLI2/foK/Zhctw7vjVrWUuhsgU3nScSYMtXk+ ydRmGxTAPZf8C/QWLpqrces= X-Google-Smtp-Source: ABdhPJz7Bih+6VrLSDOnMtNGyVNxw9L2shIfy7m37fxa4DnGCqeigX3cdbqCKc9rMvqBPqKsHABG7w== X-Received: by 2002:a5d:6a0d:: with SMTP id m13mr7906560wru.161.1603882135256; Wed, 28 Oct 2020 03:48:55 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 30sm6384382wrs.84.2020.10.28.03.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Long Li Cc: Souvik Dey , dpdk stable Date: Wed, 28 Oct 2020 10:43:32 +0000 Message-Id: <20201028104606.3504127-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: fix rndis packet addresses' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 03dae29c5d4bdb737c211750e29fa43ace42557a Mon Sep 17 00:00:00 2001 From: Long Li Date: Fri, 18 Sep 2020 11:53:47 -0700 Subject: [PATCH] net/netvsc: fix rndis packet addresses [ upstream commit d9fecbe97ba7c1ad0dedf33910d8b4e4e444979a ] The address should be calculated before type cast, not after. Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") Reported-by: Souvik Dey Signed-off-by: Long Li --- drivers/net/netvsc/hn_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index df15e56120..90ec8d7d57 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -160,8 +160,8 @@ static void hn_txd_init(struct rte_mempool *mp __rte_unused, txd->queue_id = txq->queue_id; txd->chim_index = NVS_CHIM_IDX_INVALID; - txd->rndis_pkt = (struct rndis_packet_msg *)(char *)txq->tx_rndis - + idx * HN_RNDIS_PKT_ALIGNED; + txd->rndis_pkt = (struct rndis_packet_msg *)((char *)txq->tx_rndis + + idx * HN_RNDIS_PKT_ALIGNED); } int -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.431507667 +0000 +++ 0053-net-netvsc-fix-rndis-packet-addresses.patch 2020-10-28 10:35:11.516830200 +0000 @@ -1,12 +1,13 @@ -From d9fecbe97ba7c1ad0dedf33910d8b4e4e444979a Mon Sep 17 00:00:00 2001 +From 03dae29c5d4bdb737c211750e29fa43ace42557a Mon Sep 17 00:00:00 2001 From: Long Li Date: Fri, 18 Sep 2020 11:53:47 -0700 Subject: [PATCH] net/netvsc: fix rndis packet addresses +[ upstream commit d9fecbe97ba7c1ad0dedf33910d8b4e4e444979a ] + The address should be calculated before type cast, not after. Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") -Cc: stable@dpdk.org Reported-by: Souvik Dey Signed-off-by: Long Li @@ -15,7 +16,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c -index 3e8d3b407d..65f1abae51 100644 +index df15e56120..90ec8d7d57 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -160,8 +160,8 @@ static void hn_txd_init(struct rte_mempool *mp __rte_unused,