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 316EBA0548 for ; Wed, 19 May 2021 20:50:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F10C84003F; Wed, 19 May 2021 20:50:54 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.69]) by mails.dpdk.org (Postfix) with ESMTP id 52ECB4003F for ; Wed, 19 May 2021 20:50:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UkFa6+iuNKn1UbXQgBbm8/YhAwARrFPOAQt+w3EZm94X2pP/+n6Txld9aAsAyGWjgmGoi5GYg3YSWGzV/2/ieM5j+jsRyPe6LuCSuz1fbLC7uVkGKaBH3SCB/ftyz1NxGKM47ayrLL1eX9gsN3VtqDdU5InCEE2ZQPuz7qbJ0Tcxk8waSHUHsE625Yuqgq/HfY1hRGCZBpYLF2kpSs8Yf6HJOZtcfpAKe11IxUULa6xtjBV/AIm11TPVOHNluTR/JYbkVVpZnFSwKjPf0zQMBsSsLtIs3iVDCF1BSEEQTWquRVP48DQuYO16Stqt2ufHBsAMHf+NBMybCeqP2T76Xw== 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-SenderADCheck; bh=824L7jbvaESsXyoFYJQuanmxv3hyOyvYrPk21FU/MJ0=; b=Q/GvgTngxYAmNIDPXbPbvJjstyMqklNrtZ86HLliXIcecNVbunetRsPsXJmIOeFY1FQAvr0ThDUxzqaJKslvpmsomCIhyICEuEMfqunEErb0h73ahtKlO7lIxFdB+DLVWE4F4iqRPDShd4peMOQQ4AxFkhd+l6p6o5fYChimm2VgRgtjvfqrnyHPQq86GrLcJ8PDOeqnWtpFxTqtEuF/mSmuzuubnU8hp7pRoW9NKgujjeQUixCVqv0sMWR69vyGbWRXh9J/ly8TPOkGLJDiLQY0gGXhTvw/i1pd8u0Qa9Rc8PX0PTtmvlnpjgQdnGsc/1K073p9uyry1lhrwHV78A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=debian.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=824L7jbvaESsXyoFYJQuanmxv3hyOyvYrPk21FU/MJ0=; b=h1LBv8Es29xH6+1igvLXBX1xBv193UMAuSAUTgUcfkUJJsv+TcCCOh4XQ/DoxdCCOYD+F4t7m9HzPj6p9KaCg4klzhrUuylsSnlTX5r/IiT9mdb7/RQsBY+Tg9y8hzBaABAm3ZS1JRvLSATN/QXGf14lJyf9Nn9XedHAzZbDaOzjktcjNHkpBiTJ4cQPcCZn+bqGMSWtb0GuZZgdFEzHRNyj76yAJ8ShHUStF5G+exlv4iWhCzo8H3zkDfymlFZqHwf+ybtMTtNCZKhFKwp7AdvMOxpKoIKQ+6KfdVOUJpbCFm5r3YoJV+tV0LbvORoVRiPXrqifHVfw2G7ztX7Ijw== Received: from MW4PR04CA0172.namprd04.prod.outlook.com (2603:10b6:303:85::27) by DM6PR12MB4896.namprd12.prod.outlook.com (2603:10b6:5:1b6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Wed, 19 May 2021 18:50:52 +0000 Received: from CO1NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:303:85:cafe::5) by MW4PR04CA0172.outlook.office365.com (2603:10b6:303:85::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.33 via Frontend Transport; Wed, 19 May 2021 18:50:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; debian.org; dkim=none (message not signed) header.d=none;debian.org; 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 CO1NAM11FT041.mail.protection.outlook.com (10.13.174.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:50:51 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 May 2021 18:50:50 +0000 From: Viacheslav Ovsiienko To: CC: , Date: Wed, 19 May 2021 21:50:37 +0300 Message-ID: <20210519185037.31224-1-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.145.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: eb4b125b-f63b-4e6c-0f51-08d91af706ac X-MS-TrafficTypeDiagnostic: DM6PR12MB4896: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:506; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IlOxF95go9eMPw6yz7oAjZaOUDc00BL4T9plcRUmSPQbRxNyJguP+42eAsrFXT3k7ZEVM8DL/BjU8sbOhM6RaUZNvh+F6+2dRCG7PsuFwChtqKfKM1EdguI7NERyyFTlD7qKKWwrLPFWowH08bDC2Sv62X9rj418oQAeHzfWKB8dWadNMOLFzk4xvx0WY0rNqVlvo9PpECzAzwj6sfxjHfnWQDV9AsmrqADnNGwdMxkvb2org8+SVRoMEyezvDFGWo+X1wPq43cO6VsgXrMxtsoVN+5i+W0IvpgqblSDV/7bMK2CQ2MP7DwqSlIV8RdLzS+DVxf1w08xYdaEccv2xLb9rVestrT9gU/kI3XIcy06AWGHFC3QyWJndAlwz4dyR9OV2JKOV680++dny7T8cCYeN7Ed2uL2fqFP+aJjetByIjwznHrNf0Fjyf82VU4jkd+fJXaQWsTbpOgKd1ubF+lDJ6u+FXtBQhOnOkMcc51UnOCvXOvNr+tcCvgZ72dUtbMIzS4FSGNhBdwvKYufreRzySSCW44PU2VvabWe1nNBRLbGkOeibbhV9aedsWH+qDMZ8hgIE0oHvtxh7n8mr8XbFEOa60uCOuM9c7N69AFKP+uXHtnBK2DbltNuTSPFVFakptoE9ZVMC1OeOU8ZMhf8klg/vWUQZoC3SEH+u1nvLMfcR9XmHf55skp0aNOQ 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)(346002)(136003)(39850400004)(396003)(376002)(46966006)(36840700001)(47076005)(478600001)(82740400003)(70586007)(70206006)(54906003)(83380400001)(4326008)(6286002)(316002)(426003)(86362001)(2906002)(36906005)(26005)(2616005)(107886003)(6916009)(36756003)(55016002)(5660300002)(6666004)(336012)(186003)(356005)(16526019)(7636003)(7696005)(8936002)(36860700001)(1076003)(8676002)(82310400003)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:50:51.9720 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb4b125b-f63b-4e6c-0f51-08d91af706ac 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: CO1NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4896 Subject: [dpdk-stable] [PATCH 20.11] net/mlx5: support timestamp format 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" [ upstream commit d61381ad46d0c42a4d8ab08742ae63d61ca0f53e ] This patch adds support for the timestamp format settings for the receive and send queues. If the firmware version x.30.1000 or above is installed and the NIC timestamps are configured with the real-time format, the default zero values for newly added fields cause the queue creation to fail. The patch queries the timestamp formats supported by the hardware and sets the configuration values in queue context accordingly. Fixes: 86fc67fc9315 ("net/mlx5: create advanced RxQ object via DevX") Fixes: ae18a1ae9692 ("net/mlx5: support Tx hairpin queues") Fixes: 15c3807e86ab ("common/mlx5: support DevX QP operations") Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad Acked-by: Ori Kam --- drivers/net/mlx5/linux/mlx5_os.c | 3 +++ drivers/net/mlx5/mlx5.h | 3 +++ drivers/net/mlx5/mlx5_devx.c | 1 + drivers/net/mlx5/mlx5_flow_age.c | 5 +++-- drivers/net/mlx5/mlx5_txpp.c | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index fb385460e5..b907e6de16 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1119,6 +1119,9 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, sh->cmng.relaxed_ordering_read = 0; sh->cmng.relaxed_ordering_write = 0; } + sh->rq_ts_format = config->hca_attr.rq_ts_format; + sh->sq_ts_format = config->hca_attr.sq_ts_format; + sh->qp_ts_format = config->hca_attr.qp_ts_format; /* Check for LRO support. */ if (config->dest_tir && config->hca_attr.lro_cap && config->dv_flow_en) { diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 97f8a016b4..cd701880ee 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -689,6 +689,9 @@ struct mlx5_dev_ctx_shared { uint16_t bond_dev; /* Bond primary device id. */ uint32_t devx:1; /* Opened with DV. */ uint32_t flow_hit_aso_en:1; /* Flow Hit ASO is supported. */ + uint32_t rq_ts_format:2; /* RQ timestamp formats supported. */ + uint32_t sq_ts_format:2; /* SQ timestamp formats supported. */ + uint32_t qp_ts_format:2; /* QP timestamp formats supported. */ uint32_t eqn; /* Event Queue number. */ uint32_t max_port; /* Maximal IB device port index. */ void *ctx; /* Verbs/DV/DevX context. */ diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c index 9970a58156..377362e321 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -1369,6 +1369,7 @@ mlx5_txq_create_devx_sq_resources(struct rte_eth_dev *dev, uint16_t idx, sq_attr.allow_multi_pkt_send_wqe = !!priv->config.mps; sq_attr.allow_swp = !!priv->config.swp; sq_attr.min_wqe_inline_mode = priv->config.hca_attr.vport_inline_mode; + sq_attr.ts_format = mlx5_ts_format_conv(priv->sh->sq_ts_format); sq_attr.wq_attr.uar_page = mlx5_os_get_devx_uar_page_id(priv->sh->tx_uar); sq_attr.wq_attr.wq_type = MLX5_WQ_TYPE_CYCLIC; diff --git a/drivers/net/mlx5/mlx5_flow_age.c b/drivers/net/mlx5/mlx5_flow_age.c index 0ea61be4eb..6c4ee0d33c 100644 --- a/drivers/net/mlx5/mlx5_flow_age.c +++ b/drivers/net/mlx5/mlx5_flow_age.c @@ -257,7 +257,7 @@ mlx5_aso_init_sq(struct mlx5_aso_sq *sq) static int mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket, struct mlx5dv_devx_uar *uar, uint32_t pdn, - uint32_t eqn, uint16_t log_desc_n) + uint32_t eqn, uint16_t log_desc_n, uint32_t ts_format) { struct mlx5_devx_create_sq_attr attr = { 0 }; struct mlx5_devx_modify_sq_attr modify_attr = { 0 }; @@ -296,6 +296,7 @@ mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket, attr.tis_num = 0; attr.user_index = 0xFFFF; attr.cqn = sq->cq.cq->id; + attr.ts_format = mlx5_ts_format_conv(ts_format); wq_attr->uar_page = mlx5_os_get_devx_uar_page_id(uar); wq_attr->pd = pdn; wq_attr->wq_type = MLX5_WQ_TYPE_CYCLIC; @@ -348,7 +349,7 @@ mlx5_aso_queue_init(struct mlx5_dev_ctx_shared *sh) { return mlx5_aso_sq_create(sh->ctx, &sh->aso_age_mng->aso_sq, 0, sh->tx_uar, sh->pdn, sh->eqn, - MLX5_ASO_QUEUE_LOG_DESC); + MLX5_ASO_QUEUE_LOG_DESC, sh->sq_ts_format); } /** diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c index 28afda28cb..72b0690913 100644 --- a/drivers/net/mlx5/mlx5_txpp.c +++ b/drivers/net/mlx5/mlx5_txpp.c @@ -328,6 +328,7 @@ mlx5_txpp_create_rearm_queue(struct mlx5_dev_ctx_shared *sh) sq_attr.tis_num = sh->tis->id; sq_attr.cqn = wq->cq->id; sq_attr.cd_master = 1; + sq_attr.ts_format = mlx5_ts_format_conv(sh->sq_ts_format); sq_attr.wq_attr.uar_page = mlx5_os_get_devx_uar_page_id(sh->tx_uar); sq_attr.wq_attr.wq_type = MLX5_WQ_TYPE_CYCLIC; sq_attr.wq_attr.pd = sh->pdn; @@ -577,6 +578,7 @@ mlx5_txpp_create_clock_queue(struct mlx5_dev_ctx_shared *sh) sq_attr.state = MLX5_SQC_STATE_RST; sq_attr.cqn = wq->cq->id; sq_attr.packet_pacing_rate_limit_index = sh->txpp.pp_id; + sq_attr.ts_format = mlx5_ts_format_conv(sh->sq_ts_format); sq_attr.wq_attr.cd_slave = 1; sq_attr.wq_attr.uar_page = mlx5_os_get_devx_uar_page_id(sh->tx_uar); sq_attr.wq_attr.wq_type = MLX5_WQ_TYPE_CYCLIC; -- 2.18.1