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 26046428F8 for ; Sun, 9 Apr 2023 17:35:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 207FA42D16; Sun, 9 Apr 2023 17:35:25 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2044.outbound.protection.outlook.com [40.107.220.44]) by mails.dpdk.org (Postfix) with ESMTP id 6FBB6427EE for ; Sun, 9 Apr 2023 17:35:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DXHkqCATj3JRRB9bX5viNq52zX4a4y/p5MwisnyuynGBjfAZkoIa/UIq204TB3TCHda+1xOnEEFbqZAG+qC32ofzTYlLbeL6OBI9n+Jc69OZstJbP6jA63q7izN8Nfaay/FbYy7zzsvtBlD8/8IB7wJ6mUmtbyaIMRRNSnZ6FLnQBceQE2sYnnqp1m/XBfVk9+eUURb5FRp1wmSNGvScWtiqSuXu5IOCeoX+jF86WKTctmDG0QLrh3/6YMglN4PUww1NP93nhwesoKofZvKMgu4OvaGUIZS0YoVTnPu3XgPIVdWZT1JiF8kQXwKRVGNsumwWYCzj35NjdM+8KqbvFg== 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=0lHbik7OpXqHNVSn4RlvRdSrGsC2pIMDkgd/EZLR2M8=; b=Zk6P56Rc5iq4/xfHyfNnXwheJOgxW3NZBYy1Lycw1nWbDyufV7EvLq1DWO1NU7OBo2hnfTs95qLcrypqaluNyFR4kXbI0O7WSYihRtCz9mwGaLKR0KebP6ta5lc9NEow973pDyZY89bit32UlcmOC0jDOClYqG3pms5c7oJ87KWbWQp/0JVyOsR0ptW0WDip1uHr7HgCmJQA6xYGfGID1FijazOaYAvDZqVtI+2QgwIrPIOFpXuAGa1i7ElLzTsZqtyXIzbfN7+oUsK3/ErRXqa8Pi00qJbsxSouJrOAZJunhbbGcPFLVgdvfN1wwqG+uPhZQvziHl3U4iFZraS7MA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=0lHbik7OpXqHNVSn4RlvRdSrGsC2pIMDkgd/EZLR2M8=; b=g2vpJ0zAVlVmArZrHlxwZkcNGHYBd2IF6C6GJUxso3G2lfKmlSXWlON6mt5sH3rE4m0UXgw1TdZWjATGb/oZZ0pLksEL1X2ibRWTAlQF/UuSrCY5i6dNesqMJ9Rsj6KAz93Rh2FTnErPf6UFD05cLA48kt6JEvN88DXpHLhVUVf20QT8ASD2m8yD3588SQVWQmT0eXNuyf0/Cr2EKaZHpxRbBPV/i0qU2WUf66GAZH2y0PAEeBPhN4b8ya1/hVb3wwkDRYZWo4+PXNG7PjaArmFNLeTVZbxDZ8kbN1IBp3/RRE6Yaa/yowJ9ZwSB4x9SjbZpPdfDCSmZduYxPv5cMw== Received: from MW4PR04CA0243.namprd04.prod.outlook.com (2603:10b6:303:88::8) by DM4PR12MB5277.namprd12.prod.outlook.com (2603:10b6:5:390::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Sun, 9 Apr 2023 15:35:21 +0000 Received: from CO1NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::ff) by MW4PR04CA0243.outlook.office365.com (2603:10b6:303:88::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:35:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT033.mail.protection.outlook.com (10.13.174.247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:35:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:35:12 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:35:10 -0700 From: Xueming Li To: David Marchand CC: Maxime Coquelin , Andy Pei , Chenbo Xia , dpdk stable Subject: patch 'net/virtio: remove address width limit for modern devices' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:00 +0800 Message-ID: <20230409152529.5308-113-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT033:EE_|DM4PR12MB5277:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f23f9c4-2965-4abb-d433-08db391007c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LPnsTy+ms6ppO46zlAVH3/nc05tu6Kj2o6Cd0lyWLzlGoBLAaLPRWCvCItOQ2QsqKfFRTsYwnS8FLhf3TLhXBTM4z0z3tKY4qhyk7RovzNF8TKYvwTg86R4+XdMKvjefrX3yAM280c43pjPFf92NkvcXeJKk6XC06ZWiBQn9ZfYBEX2rpUvItiVcos8j7w3JJxUIYTBFvk/QGis5VW1tnijoTLoGOTujfxd9rzxlcAx3y0GpwOxxn0E/XNab7q8F+7Mbqphp6IpxnEVkWyI3YSyegzTFzf9pkpe6Mg/W9PS9BEVdNzvPUwqsRx23JiUmZcrSIDCatS7TDXqJjaOGz0RexaY3Qfdj7YJ2cb1vzadcEdzhneDVDZHcLTj7Cqpu6c6nMMTqVvjvMa5Wkswj6VBJonKNhCVwI4NNrjEle5DrIJwUWdNsHmfUGhTOjpIGsnbp0Yie1llD56CSucXE1L0uwYzQr00lNJhXu7mq7zRVu1QTZ4k9KCG/+LDEh7LugwfjfyDSU25qcPlmg7oZlVagEzbqYd2jCWVJYXgTwtgZGKsAysgYyBdLAHcVaUVKM6OO8mQzfRzQTspbCY9s14Z1mxXg2s7xOtExsMg9ximRGfi62sQiGmcoBjFBaMGURKkSgGemLVwFxCRgjxK2bj+KPLUb3PxaxC+uXV32VHPSqbsnY1YniHP0BaKwOUjya0cRFTk0WNJqSqqO7yXENpSt3973GWQry302XfbczhJn8rqpG/3zr3+rDnOkeg8VDyP40jCiXdeRX222NRdWI+ljEyWbBjzkGdwmL6ApLFnBMFqUBhQJK29CoKdXSaoDYcC3AsAqIWjafOpdKet7Iw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(39860400002)(396003)(376002)(346002)(451199021)(46966006)(40470700004)(36840700001)(86362001)(36756003)(40460700003)(40480700001)(55016003)(6286002)(16526019)(1076003)(26005)(186003)(53546011)(47076005)(6666004)(2906002)(83380400001)(336012)(426003)(2616005)(478600001)(6916009)(4326008)(8676002)(70206006)(316002)(70586007)(54906003)(5660300002)(7696005)(966005)(41300700001)(8936002)(82310400005)(36860700001)(82740400003)(356005)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:35:21.4785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f23f9c4-2965-4abb-d433-08db391007c5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5277 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 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/d59d4fbffa9c3da60b4c2838ac386c9132c77170 Thanks. Xueming Li --- >From d59d4fbffa9c3da60b4c2838ac386c9132c77170 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 14 Mar 2023 09:53:34 +0100 Subject: [PATCH] net/virtio: remove address width limit for modern devices Cc: Xueming Li [ upstream commit 8b76b3a0d327f6bedc1343149e03619337ab0408 ] Modern devices don't have the same limitation as legacy devices, because vring addresses are not configured using a 32-bit register. Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin Acked-by: Andy Pei Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_pci.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index 9cf4d760b4..29eb739b04 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -33,22 +33,6 @@ struct virtio_pci_internal virtio_pci_internal[RTE_MAX_ETHPORTS]; -static inline int -check_vq_phys_addr_ok(struct virtqueue *vq) -{ - /* Virtio PCI device VIRTIO_PCI_QUEUE_PF register is 32bit, - * and only accepts 32 bit page frame number. - * Check if the allocated physical memory exceeds 16TB. - */ - if ((vq->vq_ring_mem + vq->vq_ring_size - 1) >> - (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32)) { - PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!"); - return 0; - } - - return 1; -} - #define PCI_MSIX_ENABLE 0x8000 static enum virtio_msix_status @@ -273,8 +257,15 @@ legacy_setup_queue(struct virtio_hw *hw, struct virtqueue *vq) { uint32_t src; - if (!check_vq_phys_addr_ok(vq)) + /* Virtio PCI device VIRTIO_PCI_QUEUE_PFN register is 32bit, + * and only accepts 32 bit page frame number. + * Check if the allocated physical memory exceeds 16TB. + */ + if ((vq->vq_ring_mem + vq->vq_ring_size - 1) >> + (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32)) { + PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!"); return -1; + } rte_pci_ioport_write(VTPCI_IO(hw), &vq->vq_queue_index, 2, VIRTIO_PCI_QUEUE_SEL); @@ -476,9 +467,6 @@ modern_setup_queue(struct virtio_hw *hw, struct virtqueue *vq) uint64_t desc_addr, avail_addr, used_addr; uint16_t notify_off; - if (!check_vq_phys_addr_ok(vq)) - return -1; - desc_addr = vq->vq_ring_mem; avail_addr = desc_addr + vq->vq_nentries * sizeof(struct vring_desc); used_addr = RTE_ALIGN_CEIL(avail_addr + offsetof(struct vring_avail, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.642343800 +0800 +++ 0112-net-virtio-remove-address-width-limit-for-modern-dev.patch 2023-04-09 21:45:38.769042200 +0800 @@ -1 +1 @@ -From 8b76b3a0d327f6bedc1343149e03619337ab0408 Mon Sep 17 00:00:00 2001 +From d59d4fbffa9c3da60b4c2838ac386c9132c77170 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8b76b3a0d327f6bedc1343149e03619337ab0408 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org