From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010051.outbound.protection.outlook.com [52.101.56.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0B1A3D812C for ; Tue, 7 Jul 2026 09:56:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.51 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783418179; cv=fail; b=Yt8vWs3qDeG+EivNsUqV2S//MeUeVN6RwpPQHjY6X5+kVxzJN0JYWpmxd1jAFfwqsWN8tlUQVG3CxXJFvv4+7prcW8NqewR+A4DC/PKkFuIcVaS0cLlBrHAJyqO+Fhq4mSkoSKmss7wxaMatbtFxx2WEwgsrG/DfSdXPe0iG8gY= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783418179; c=relaxed/simple; bh=h+oGZoxCx/PKBhU3cMvq1WjiF5ydoy5rUGjH19wKjBI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i27/HPbYMHetnznNs6NBYNRpp3sAY8kB5ckCn+tyrC5AhxWSav5znsnyL/xMBQ09gUkV4wjF3S6SD78d4tGaE44E3NTWU4cEkCVdiNBOyEGFBowcZRYaddiAX+RS8mkdq/4zHxkGfAO8YzEM8/69aCRr28u4X6lXhXe/iMn+moM= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=P7lzqfVh; arc=fail smtp.client-ip=52.101.56.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="P7lzqfVh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gZ5NPUw431sUV95O9+WtDI+9/URYwmNgZ8mN9p0eiL2GlZDvQUpRADTmUA0xPSsZX9GZc1JvoyG9TO6lRTxBh5Bxisuzxv4Rv0pD5pvcynmplDKCv4SMliaPesY/zm0KizI+aBpkVedbEX64DZVHx3pFI03lHo2360AKVsirYJspJ/BJG9WynTb+Mj2JBDIs7RXrM3mkA63pJd1CwGnVVZ0F2At8PbbP8Ik29nm6GZ8RjObIaf6QYGj9aUh/ep0tJ6nM1EUHujMz4x2UZBCmXfIZ9eZSCbUCDc/IrOGbEG4ZcIoydNQ22oTCut9b+WQcqmTzy5PFsCwxgkyiBVSvKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=+wuRAp+EHX7Ow7ulV/WesNinffu7hnG8Js93xYRObRc=; b=SaLsH2xMruKcIfe+ggh07WsmWwqgIEBcgJJSOtv+z/afOVgKHOEyYoq6Qtu3pSomNFHZ+JL1GVtuhBrFKWEHzYmuhWe9eDVC4WVw009zMMTML3l45gJRFDExD2tSVRxKZ+mL+m8ZsA0edyYaa5kN10xcNVSl2hB8+/6KhWs8TWLcvENsYQvux8yMN3i9vmYpIgUNgoT0kPOZ5vhazBViI7xGkn1D6C0RuLKG/Turi9Q1PMCaNmEWuirBXRwGM38lJKOtwWFfCC8rFLgXO551vVjZRpKeR+TXGTW33u6F7K26bFmmGKaxq/DrPC4LAAN2rWGPwVGtAZcKQZxvgET6gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linuxfoundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+wuRAp+EHX7Ow7ulV/WesNinffu7hnG8Js93xYRObRc=; b=P7lzqfVhrYMN8hIk0i2F78dW85JVUjkMEpE/mgZcwXhdnSceK/6oYtVlgjdInLE9NElgsL37NhMcPwgdiAbd4RcYQtcBLH4c5vOz37Agz7mSP9g7eiUQZ4JtGZxkZD2o5wNFD10FReMGe2LsxTuP00eYkiWPm4a+GIARKpym5zI= Received: from BL1PR13CA0114.namprd13.prod.outlook.com (2603:10b6:208:2b9::29) by PH0PR12MB7981.namprd12.prod.outlook.com (2603:10b6:510:26c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.10; Tue, 7 Jul 2026 09:56:13 +0000 Received: from BL6PEPF0001AB4A.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::9) by BL1PR13CA0114.outlook.office365.com (2603:10b6:208:2b9::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.202.9 via Frontend Transport; Tue, 7 Jul 2026 09:56:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF0001AB4A.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.6 via Frontend Transport; Tue, 7 Jul 2026 09:56:12 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Tue, 7 Jul 2026 04:56:09 -0500 Received: from xhdipdslab46.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Tue, 7 Jul 2026 04:56:07 -0500 From: Abhijit Gangurde To: , CC: , , , , Abhijit Gangurde Subject: [PATCH 1/1] RDMA/ionic: Reserve bytes in CQE format for future use Date: Tue, 7 Jul 2026 15:25:41 +0530 Message-ID: <20260707095555.3939295-3-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260707095555.3939295-1-abhijit.gangurde@amd.com> References: <20260707095555.3939295-1-abhijit.gangurde@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB4A:EE_|PH0PR12MB7981:EE_ X-MS-Office365-Filtering-Correlation-Id: efe682d9-2b3e-49d0-e6de-08dedc0dfa91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700016|23010399003|376014|22082099003|18002099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: OlwRScqP3MjpTPUEbB486U8UmuK6tdJW2OppYHH1tOcKVVrLQbR1tA8Ofwig5SE3WKubWCihrBBoz8bWxjPmLc8+7Gq0RxC+9qDZmL2kkB07uLeWL+9rWOKnCQESUQJ2iyOEjmWOp4HmETVxGdmLJMRoAyfe5B9B0aK3FOAvjV7rGhyIyzIKNDMBpsHt6YAN/MXSzyROgqbAbv6Q66BybMIOffMCKvZM4msdqZuLvYbz4DmCSkBIEVvJ3+PTY5T2NMJ6Ecve1a9MgoxaLHw8aO/k7+EF2yGO/enMzx8E7B/3aekpwl0IuoRNTOfMsPRECQkFeuSXHZ5s0xtaSZorcQ3LwcwS5ccptbLSKfbdQmiyMijLtjjZABu1h1nsFpY/4WEy1dZpSjRD1011xjIqx2rS5vPBoj5rH/kiR6bccSF6DobUmGGdS7S6uccbMAUYN1zsWnjLnUVdw3gr5F5lDYqVOz4XQF3wEgkccLD+gF2ckUaPi+aBgh3CIsQw7wy+poMjIKN/1w7fDDzil7QieQOVjvuLadVyqA0rwhcPCz0haHeV3TJN6WuqhTXxwCGbZeZix70xhWemBpB5A/Q3523OLjUHAUnUiOPOiq7hlsmsphxTy1dYHlpB0g23cOevPqW+FZyXXZ2nvVEUnyGffgKAkvYQ/Aoi0792BPEs9WtQRzStbWRV2WgnALvsNaH39OBvbKkybtuehkBALD8FCw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700016)(23010399003)(376014)(22082099003)(18002099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Dzy0NOXGlRcO3QyeMCmfzZhHtvsi6oK5YvutMSU6cA3SgIG6/t608h7Oj/SIDpiEVoKFE6fquA+xjqrgtuZPHQCST2sF5jbBEZIGcyS97lmXq2uY01ekoCU2THF8iX1B5eZ+Sagm5WTtvcWQQByzMxL61roh91zYIUO1D8RNZ7Nao3icHpjLwOspq2vMEcwhNoa4rPHYmFALOznqRNYdc/fApwbuHBWs5sEH/BwbMIyFszXyHIBVzBafrBZCTbljPlYNySOn8R67mezN2h7aMs9XUME5nG+TQViZFH/HLf4NAUumRyBFLh77nKmKynQmGIJrmHxjvH+dHcYhiNw0XYQiCR7pssWkkyJlb0cCGcuFPxmt5NRcaxlCCJfIJ+dTKodDTq9tU8giC7E7VtGHRxS4I6HpRy3ZX5e2OzPT7IwzovW6Hq4iFFFYLIxIz88M X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2026 09:56:12.9392 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efe682d9-2b3e-49d0-e6de-08dedc0dfa91 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB4A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7981 Reserve a few bytes from wqe_id in the CQE format for future use. Signed-off-by: Abhijit Gangurde --- drivers/infiniband/hw/ionic/ionic_datapath.c | 42 +++++++++++--------- drivers/infiniband/hw/ionic/ionic_fw.h | 11 +++-- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/drivers/infiniband/hw/ionic/ionic_datapath.c b/drivers/infiniband/hw/ionic/ionic_datapath.c index aa2944887f23..518de4c7757d 100644 --- a/drivers/infiniband/hw/ionic/ionic_datapath.c +++ b/drivers/infiniband/hw/ionic/ionic_datapath.c @@ -32,6 +32,7 @@ static int ionic_flush_recv(struct ionic_qp *qp, struct ib_wc *wc) { struct ionic_rq_meta *meta; struct ionic_v1_wqe *wqe; + u64 wqe_idx; if (!qp->rq_flush) return 0; @@ -40,21 +41,22 @@ static int ionic_flush_recv(struct ionic_qp *qp, struct ib_wc *wc) return 0; wqe = ionic_queue_at_cons(&qp->rq); + wqe_idx = le64_to_cpu(wqe->base.wqe_idx); - /* wqe_id must be a valid queue index */ - if (unlikely(wqe->base.wqe_id >> qp->rq.depth_log2)) { + /* wqe_idx must be a valid queue index */ + if (unlikely(wqe_idx >> qp->rq.depth_log2)) { ibdev_warn(qp->ibqp.device, "flush qp %u recv index %llu invalid\n", - qp->qpid, (unsigned long long)wqe->base.wqe_id); + qp->qpid, (unsigned long long)wqe_idx); return -EIO; } - /* wqe_id must indicate a request that is outstanding */ - meta = &qp->rq_meta[wqe->base.wqe_id]; + /* wqe_idx must indicate a request that is outstanding */ + meta = &qp->rq_meta[wqe_idx]; if (unlikely(meta->next != IONIC_META_POSTED)) { ibdev_warn(qp->ibqp.device, "flush qp %u recv index %llu not posted\n", - qp->qpid, (unsigned long long)wqe->base.wqe_id); + qp->qpid, (unsigned long long)wqe_idx); return -EIO; } @@ -133,8 +135,8 @@ static int ionic_poll_recv(struct ionic_ibdev *dev, struct ionic_cq *cq, { struct ionic_qp *qp = NULL; struct ionic_rq_meta *meta; + u16 vlan_tag, wqe_idx; u32 src_qpn, st_len; - u16 vlan_tag; u8 op; if (cqe_qp->rq_flush) @@ -144,7 +146,7 @@ static int ionic_poll_recv(struct ionic_ibdev *dev, struct ionic_cq *cq, st_len = be32_to_cpu(cqe->status_length); - /* ignore wqe_id in case of flush error */ + /* ignore wqe_idx in case of flush error */ if (ionic_v1_cqe_error(cqe) && st_len == IONIC_STS_WQE_FLUSHED_ERR) { cqe_qp->rq_flush = true; cq->flush = true; @@ -160,20 +162,22 @@ static int ionic_poll_recv(struct ionic_ibdev *dev, struct ionic_cq *cq, return -EIO; } - /* wqe_id must be a valid queue index */ - if (unlikely(cqe->recv.wqe_id >> qp->rq.depth_log2)) { + wqe_idx = le64_to_cpu(cqe->recv.wqe_idx) & IONIC_V1_CQE_WQE_IDX_MASK; + + /* wqe_idx must be a valid queue index */ + if (unlikely(wqe_idx >> qp->rq.depth_log2)) { ibdev_warn(&dev->ibdev, "qp %u recv index %llu invalid\n", - qp->qpid, (unsigned long long)cqe->recv.wqe_id); + qp->qpid, (unsigned long long)wqe_idx); return -EIO; } - /* wqe_id must indicate a request that is outstanding */ - meta = &qp->rq_meta[cqe->recv.wqe_id]; + /* wqe_idx must indicate a request that is outstanding */ + meta = &qp->rq_meta[wqe_idx]; if (unlikely(meta->next != IONIC_META_POSTED)) { ibdev_warn(&dev->ibdev, "qp %u recv index %llu not posted\n", - qp->qpid, (unsigned long long)cqe->recv.wqe_id); + qp->qpid, (unsigned long long)wqe_idx); return -EIO; } @@ -408,7 +412,7 @@ static int ionic_comp_msn(struct ionic_qp *qp, struct ionic_v1_cqe *cqe) static int ionic_comp_npg(struct ionic_qp *qp, struct ionic_v1_cqe *cqe) { struct ionic_sq_meta *meta; - u16 cqe_idx; + u16 wqe_idx; u32 st_len; if (qp->sq_flush) @@ -430,8 +434,8 @@ static int ionic_comp_npg(struct ionic_qp *qp, struct ionic_v1_cqe *cqe) return 0; } - cqe_idx = cqe->send.npg_wqe_id & qp->sq.mask; - meta = &qp->sq_meta[cqe_idx]; + wqe_idx = le64_to_cpu(cqe->send.npg_wqe_idx) & qp->sq.mask; + meta = &qp->sq_meta[wqe_idx]; meta->local_comp = true; if (ionic_v1_cqe_error(cqe)) { @@ -811,7 +815,7 @@ static void ionic_prep_base(struct ionic_qp *qp, meta->signal = false; meta->local_comp = false; - wqe->base.wqe_id = qp->sq.prod; + wqe->base.wqe_idx = cpu_to_le64(qp->sq.prod); if (wr->send_flags & IB_SEND_FENCE) wqe->base.flags |= cpu_to_be16(IONIC_V1_FLAG_FENCE); @@ -1205,7 +1209,7 @@ static int ionic_prep_recv(struct ionic_qp *qp, meta->wrid = wr->wr_id; - wqe->base.wqe_id = meta - qp->rq_meta; + wqe->base.wqe_idx = cpu_to_le64(meta - qp->rq_meta); wqe->base.num_sge_key = wr->num_sge; /* total length for recv goes in base imm_data_key */ diff --git a/drivers/infiniband/hw/ionic/ionic_fw.h b/drivers/infiniband/hw/ionic/ionic_fw.h index adfbb89d856c..64ab897bf194 100644 --- a/drivers/infiniband/hw/ionic/ionic_fw.h +++ b/drivers/infiniband/hw/ionic/ionic_fw.h @@ -332,7 +332,7 @@ struct ionic_v1_cqe { __le16 old_rq_cq_cindex; } admin; struct { - __u64 wqe_id; + __le64 wqe_idx; __be32 src_qpn_op; __u8 src_mac[6]; __be16 vlan_tag; @@ -342,13 +342,18 @@ struct ionic_v1_cqe { __u8 rsvd[4]; __be32 msg_msn; __u8 rsvd2[8]; - __u64 npg_wqe_id; + __le64 npg_wqe_idx; } send; }; __be32 status_length; __be32 qid_type_flags; }; +/* bits for cqe wqe_idx */ +enum ionic_v1_cqe_wqe_idx_bits { + IONIC_V1_CQE_WQE_IDX_MASK = 0xffff, +}; + /* bits for cqe recv */ enum ionic_v1_cqe_src_qpn_bits { IONIC_V1_CQE_RECV_QPN_MASK = 0xffffff, @@ -423,7 +428,7 @@ static inline u32 ionic_v1_cqe_qtf_qid(u32 qtf) /* v1 base wqe header */ struct ionic_v1_base_hdr { - __u64 wqe_id; + __le64 wqe_idx; __u8 op; __u8 num_sge_key; __be16 flags; -- 2.43.0