From patchwork Tue Mar 15 02:47:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Wu X-Patchwork-Id: 108715 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C833EA00BE; Tue, 15 Mar 2022 03:48:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3F924067C; Tue, 15 Mar 2022 03:48:30 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2076.outbound.protection.outlook.com [40.107.102.76]) by mails.dpdk.org (Postfix) with ESMTP id 2F21F4014F; Tue, 15 Mar 2022 03:48:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QUk/qB1OIJip562lPVIX1Vzob15UduxrMg6PKbihrtdXeEyOzucBBv/mYdJyn5NTRaZcZxEdVNmEKbmahg8ieVhFHybe39NIWzOsZ1j0BV2RErZcu5WqnldKzeZrYwlNvgawe9mWSYhY58TM7HOxqGEIg0oeYp36aW8Hytzc3EGxV/LLA/znyGlplFymS0AJphHoYCeplnHC6lOddpYqNTU+Lz9n+0/6kfbZkXOfbM/Jm+e39aBnQBVEpxkH2buMbhXuGJZw1iZDS2FXVjoID7NkbtJj0EKkQsLwYSmA3d7dOPSASsSE0BrBBbgAk/novBw1lZa4tDxbAgO7yzYcOw== 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=TpVCF5jj5hWY2UgOhpl1Tj8oUpTjLVT3A1sVI4RruKk=; b=IT3D+2k9yprrf/3TwHFihNb79nnt+fKOmAxG3twL/GmVsPt0xpWJZQCp+iz7MfBb0NpFJG15pboZ2qdCg7TOmLv12m2GJuWkQG2cbAnRwtbDvemjy2A6WsCuEe+BBnDDmKIxJsRU9Q/G7OjYmV1hz8cjQ9A2DecB1PJcLcQ20SEl0+RkQR4R0Bg1TupgEll1FUXeXlBFYe+Oq+MhQIkp52t8iXbJGtBHPlkmd9T5BBGF8bKfSWCyj8v5OOKQAONx8qyErQzMlqwWcT1bcr6g9Mg8xKieuEbLtCSKnv/ENDkJoiyC0UAns4A1uhJtdk5LeiU4vSiKTas+y1NQ9VL4eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=monjalon.net 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=TpVCF5jj5hWY2UgOhpl1Tj8oUpTjLVT3A1sVI4RruKk=; b=X5c4dO/JEQRnQbIdQL043ZSjGsEHL7/p6bISxfWinmZR3XvlfD5EPV9wXKJREAIMZ3ddYEu7a71IarzlXX9Dz+/4MmYDouX/JGYD4ANq1NMBPcFfioLpxBH/G+iBNKOP/3lSo6V52nh34M7OdVhokWNGrgIw0SXSyQz6QoXMZvDiKzlynZ2qHyrbd+JsxTueaBT7UtDZ2suYcMt2r5Ui3RoaawG7Trv/Iha1aWOIXulroQJvb7KTGdA7y9T7ZLJBvl5XNqaVHQ29+q2H/aIdMYD38UACAcSA8j2T7JGKwuSGFlidPKWD3mZxTGDOYSzw+SnNH/VQFccHsIPfxqK+Ew== Received: from BN6PR18CA0019.namprd18.prod.outlook.com (2603:10b6:404:121::29) by MN2PR12MB4654.namprd12.prod.outlook.com (2603:10b6:208:1bf::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.25; Tue, 15 Mar 2022 02:48:27 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:404:121:cafe::53) by BN6PR18CA0019.outlook.office365.com (2603:10b6:404:121::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.28 via Frontend Transport; Tue, 15 Mar 2022 02:48:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) 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 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5061.24 via Frontend Transport; Tue, 15 Mar 2022 02:48:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 15 Mar 2022 02:48:20 +0000 Received: from nvidia.com (10.126.230.35) 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.22; Mon, 14 Mar 2022 19:48:17 -0700 From: Yajun Wu To: , , , , Maxime Coquelin CC: , , , , Subject: [PATCH v2] vdpa/mlx5: workaround var offset within page Date: Tue, 15 Mar 2022 04:47:31 +0200 Message-ID: <20220315024733.507162-1-yajunw@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220314014414.251869-1-yajunw@nvidia.com> References: <20220314014414.251869-1-yajunw@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d069aaa2-670a-40f3-5b35-08da062e47d0 X-MS-TrafficTypeDiagnostic: MN2PR12MB4654:EE_ X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xnm9oYY1hfOiQrWkqJFvCbSRKEYP2zznRF8NQWcje7oI2Oi9bPeLOta5KOzLVolTsIvb99d9l7pRk9nid9z9tM4ojdzDpVokhYuogjKZGVlcP4lbGI+VXxZ/tKe6CKm7IO7w2C1lw1/RXqKuj3jsX5ZReMp5D4RE7eXepyfAB8iloydycntH7jb5jHjhsUGw9a6Sz02C8bxXz1rpyzLczatRwRQ7D2HiVpq/SpNUm9QDe/7tA+ScvazE0wl4JCxR678+9bn+Qsu2mnQ5cG53/EoB23yh/9pKCHtS6wP0duXWId1yz8IF5ytvC8kwKog+I8QyLn6uSfs2XA/shqAVZiG2bvootjQcM49u60tGYmSiKHwrP1WqdMZaEwMxs2woEFK9W9uVQa0vZa4IPymg+8lfYxzh/ZpGbZjwPjtuc5qBJrUhiis8De3vcuS0NwwWlwK9999dq19cc7T2ngr4tJ3nYDggT+JE0hnHBNENzdqS7/FIn8X/bAfKtVHl1Twg4K+d5dLY48enhXzBNbYi67wm2hvCJ50EahxbFM3pMYfH8FGi0+gymqwXMueVjy6rLocUXFVMhZ+rRsC/rl7+iQNUBYEu6r2t1bXUxDNB4Dg4oTu0gY/DqbtorFGaQZ6oAKG+Xdk7u3VzMZ1vAvafztZVyD/tTVZdMceKYezsnXRwB9qexJFCBr7eMz4gz85/SMo6QZ52ro3zumJYheq6Tg== X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(110136005)(55016003)(54906003)(40460700003)(6666004)(36860700001)(36756003)(26005)(2616005)(186003)(316002)(1076003)(16526019)(508600001)(83380400001)(5660300002)(356005)(81166007)(2906002)(8676002)(70206006)(82310400004)(70586007)(7696005)(8936002)(6286002)(426003)(336012)(47076005)(4326008)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 02:48:26.7727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d069aaa2-670a-40f3-5b35-08da062e47d0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4654 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org vDPA driver first uses kernel driver to allocate doorbell(VAR) area for each device. Then uses var->mmap_off and var->length to mmap uverbs device file as doorbell userspace virtual address. Current kernel driver provides var->mmap_off equal to page start of VAR. It's fine with x86 4K page server, because VAR physical address is only 4K aligned thus locate in 4K page start. But with aarch64 64K page server, the actual VAR physical address has offset within page(not locate in 64K page start). So vDPA driver need add this within page offset(caps.doorbell_bar_offset) to get right VAR virtual address. Fixes: 62c813706e4 ("vdpa/mlx5: map doorbell") Cc: stable@dpdk.org Signed-off-by: Yajun Wu Acked-by: Matan Azrad Reviewed-by: Maxime Coquelin --- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c index 3416797d28..52287e7e58 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -123,7 +124,9 @@ mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv) priv->td = NULL; } if (priv->virtq_db_addr) { - claim_zero(munmap(priv->virtq_db_addr, priv->var->length)); + /* Mask out the within page offset for munmap. */ + claim_zero(munmap((void *)((uintptr_t)priv->virtq_db_addr & + ~(rte_mem_page_size() - 1)), priv->var->length)); priv->virtq_db_addr = NULL; } priv->features = 0; @@ -486,6 +489,10 @@ mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv) priv->virtq_db_addr = NULL; goto error; } else { + /* Add within page offset for 64K page system. */ + priv->virtq_db_addr = (char *)priv->virtq_db_addr + + ((rte_mem_page_size() - 1) & + priv->caps.doorbell_bar_offset); DRV_LOG(DEBUG, "VAR address of doorbell mapping is %p.", priv->virtq_db_addr); }