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 AEDCAA034F for ; Wed, 10 Nov 2021 07:52:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C2E1410E0; Wed, 10 Nov 2021 07:52:51 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2059.outbound.protection.outlook.com [40.107.244.59]) by mails.dpdk.org (Postfix) with ESMTP id 3551A410E0 for ; Wed, 10 Nov 2021 07:52:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kO+hyinzlF5XXpSBtlWJ5ow81q1AkGf4x3FVG58wBV8wXuvadYX8sDa2NQv9OQjtMjE5vD19wBfML7DKpex3O/9zy6bItYBLFiSsBcyCECL14XBUBSJMQgfVxYCHi4cKsBfNVlGH/FYgpYx6vxglP0pYwv1L/NZBDIDd2AsNsUP3U9BFYuHhKFy6Bi5CHP2Q1Tss4c7926lziOH6tt2j2H0jmzy2L4BA75cUjwkBVJvbYZcr1GytjDGlw8dG9ubOtEt7mqV499ShwDZ/ygXotxu6I1RO4ZKFaLuZtHCAn2S18o9z08u26hiJMyxWowdwd/nXu+LpIuHAAEjl7y1DnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KaZFe1epFNAPS8F7jEQZFuBx20GUdvfrontQbMXMmHU=; b=drrodacCFjfaIsD9lwFBgd+m6KKRaiiFnqRGK/3u2xks/Im8vtLsrqwjmOQJdtE5BWIIyvTrdRyt8Evt8uOkVyVRc5vB7a6r0zs0YJ6T7loM5QfHzlNKPG8oaqNAPhcfu7z85JxPdnDyrLPsrwIs8nFyfUe5G25C7SSuMcTuDzjV43fgbE/+LKqcsMAVii9PQY3vu91WIigiWE2O+8VradT2324gSPzeeDQahw0huKHjoQxYU4QhOkTTN7NL84FPa6bcL7JBjh9hwSPS6X0cBTTIdT+SlVW8VDWgcF13dpUSCYY4qIvmqrkBAgTw+w363YQa3bv/uMYWuklWO0nkmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KaZFe1epFNAPS8F7jEQZFuBx20GUdvfrontQbMXMmHU=; b=Hy/kxxisYMIZeSpBEFr52zwo+5o1f2G4wzUcuwf+VieSXjztrw/Gq/u9pwoeHHu3FxSTGj7kI9AiinB8T+X/NCXVbOXJn+R7mAUSiwfFUlNYQu2h/14xRXpjdPMrme1UFu4k1rT72tm0s8sFpuqApF/eWwUeZtQMfzdbxqkgd/RsYH3uZyAs/NePQPXqA4TJMN3w4l+WmwsAR4XD2WniNDGPxY89eBGI4itv/3GbIvb++WKaDfv1+u+tPdrEULq7SIS3erp8sCz+uLnF7HrDbsB2/LDuF/fmfOhc+kvShN5GNS/89eplLslehkVcfuKJf+ZVSYO1WhMJOvOAk6J/Gw== Received: from BN9PR03CA0799.namprd03.prod.outlook.com (2603:10b6:408:13f::24) by BN6PR12MB1409.namprd12.prod.outlook.com (2603:10b6:404:1e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:52:48 +0000 Received: from BN8NAM11FT016.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13f:cafe::7e) by BN9PR03CA0799.outlook.office365.com (2603:10b6:408:13f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:52:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT016.mail.protection.outlook.com (10.13.176.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:52:47 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:52:44 +0000 From: Xueming Li To: Xuan Ding CC: Luca Boccassi , Yong Liu , Miao Li , Maxime Coquelin , dpdk stable Date: Wed, 10 Nov 2021 14:31:06 +0800 Message-ID: <20211110063216.2744012-183-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03369997-ef60-4f2b-13ee-08d9a416b4d3 X-MS-TrafficTypeDiagnostic: BN6PR12MB1409: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 45/jxswEw0OmHh2PjBMyabJxgLh0Xl1sMViQJsu8TBaWvwD0PGV3S02Gi4rAoOA/tg9MriEPsVydAxffzklwG3juczGBD5fHfBueINtKqKmx+VR+gL2coRxtw42ePlXvtqN3toOYjwM+r/KjG91/NMI95T7sngyiBZ7lE2uYBQsyxabMAD+1JAvcRCAF2WmwNVSUKwXHLKR1TArMqarMjG2QP5d59AtHrcALTbgseJvE3eru4CkK6BnITVJMum+JNufcF6BfMSYda41KzyJmK/yNeJpilJ1w4OXIoo3YJE4LR984a3MtduL/BQ26Qc8PJXzGWcMRom8Hycymppi4rfVQn3VrwMSQYgkCQEGodLwKT8JM3GIz90oUq2sIKSI2wvJWmdVq4iBJz1D5LUO5tgk4WncfpduU8V/BarR5uhrZCnNY0lOdr2ZyaFCQQ+RZpzH4mJOuZFD8uwORsDeiHOtwDOZozukLZAML1NUs9Yo4iyNUT6hAaeZECi5E2FD/JK12rHUxSvxF5zCY4wQkuaR/uRPtKqrh+/Y1TEY5ks7w/3ojsafH5LTA9q1Wtg02v/9LYJ3JWvut/2CVft7AetRPWdCKc03cQo+unmML7TExx7lmYXxMqYU9gXgQaXorZsttW2BBuoTiPY7/VKO7+1auTjhtL0T5ncqrWMpQVg6l0VRJI3cm2PBrooGlvgWYp1k8OfpoJvBNOtTr4fvfjGmKvMgvNUgtlJn6GyHV+kDTlcf+P+eUcV3BptSIgbJ6HT1QU53qKxqEN/mMeT8zUjmiihT1XfhRFt+cujypU5MX1K80jVsJZe1n7hU+csH86Eq+KblVXNt35fInmHIK6Q== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(53546011)(55016002)(86362001)(186003)(16526019)(7696005)(5660300002)(36756003)(1076003)(4001150100001)(4326008)(356005)(36860700001)(6286002)(8936002)(336012)(26005)(83380400001)(82310400003)(36906005)(54906003)(6666004)(47076005)(316002)(7636003)(6916009)(508600001)(70206006)(426003)(966005)(2906002)(2616005)(70586007)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:52:47.4236 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03369997-ef60-4f2b-13ee-08d9a416b4d3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT016.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1409 Subject: [dpdk-stable] patch 'net/virtio: fix avail descriptor ID' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/96a4bd11ebd659a4ba78a3b724fa8793b59d679c Thanks. Xueming Li --- >From 96a4bd11ebd659a4ba78a3b724fa8793b59d679c Mon Sep 17 00:00:00 2001 From: Xuan Ding Date: Thu, 21 Oct 2021 14:25:40 +0000 Subject: [PATCH] net/virtio: fix avail descriptor ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit ad6f01945a75dbdcacf26579d1bdf07d1f4b1e3d ] Vhost will update desc’s Buffer ID advance to next used descriptor when VIRTIO_F_IN_ORDER feature negotiated. When virtio reuses the descriptor, the Buffer ID should be restored even VIRTQ_DESC_F_INDIRECT feature negotiated. Fixes: b473061b0e1d ("net/virtio: fix indirect descriptors in packed datapaths") Signed-off-by: Xuan Ding Signed-off-by: Yong Liu Signed-off-by: Miao Li Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtqueue.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index c169518ec8..b812c28829 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -735,6 +735,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, RTE_PTR_DIFF(&txr[idx].tx_packed_indir, txr); start_dp[idx].len = (seg_num + 1) * sizeof(struct vring_packed_desc); + /* Packed descriptor id needs to be restored when inorder. */ + if (in_order) + start_dp[idx].id = idx; /* reset flags for indirect desc */ head_flags = VRING_DESC_F_INDIRECT; head_flags |= vq->vq_packed.cached_flags; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:10.006482310 +0800 +++ 0182-net-virtio-fix-avail-descriptor-ID.patch 2021-11-10 14:17:01.990745109 +0800 @@ -1 +1 @@ -From ad6f01945a75dbdcacf26579d1bdf07d1f4b1e3d Mon Sep 17 00:00:00 2001 +From 96a4bd11ebd659a4ba78a3b724fa8793b59d679c Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit ad6f01945a75dbdcacf26579d1bdf07d1f4b1e3d ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 4182939272..4f3dd31c10 100644 +index c169518ec8..b812c28829 100644 @@ -29 +31 @@ -@@ -732,6 +732,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, +@@ -735,6 +735,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,