Fix congest type flags error and replace a corrupt patch

Currently, there is a repeated judgement in check_qp_congest_type
whenever enable LDCP or HC3, the congest type flags all will be set
on LDCP.

This patch fixes this bug and replace a corrupt patch--0077, which
has a change that directly acts on patch but not code. This act
will disrupt the patch format.

Signed-off-by: Ran Zhou <zhouran10@h-partners.com>
This commit is contained in:
Ran Zhou 2023-12-12 19:02:37 +08:00
parent 254fe16d77
commit 4a7be9bb67
3 changed files with 19 additions and 14 deletions

View File

@ -1,8 +1,7 @@
From 1b3ec79e4d617555c0e12a3fe12db7925d385ef6 Mon Sep 17 00:00:00 2001 From 99e1e64edab954ce1895d83a3d6f4317bc12c444 Mon Sep 17 00:00:00 2001
From: Yixing Liu <liuyixing1@huawei.com> From: Yixing Liu <liuyixing1@huawei.com>
Date: Wed, 12 Apr 2023 17:01:09 +0800 Date: Wed, 12 Apr 2023 17:01:09 +0800
Subject: [PATCH 2/2] libhns: Support congestion control algorithm Subject: [PATCH] libhns: Support congestion control algorithm configuration
configuration
driver inclusion driver inclusion
category: feature category: feature
@ -67,7 +66,7 @@ index 76c7adb..41e9599 100644
struct verbs_context ibv_ctx; struct verbs_context ibv_ctx;
void *uar; void *uar;
diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c
index 282ab74..6c6120c 100644 index 282ab74..499735c 100644
--- a/providers/hns/hns_roce_u_verbs.c --- a/providers/hns/hns_roce_u_verbs.c
+++ b/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c
@@ -89,10 +89,10 @@ int hns_roce_u_query_device(struct ibv_context *context, @@ -89,10 +89,10 @@ int hns_roce_u_query_device(struct ibv_context *context,
@ -140,7 +139,7 @@ index 282ab74..6c6120c 100644
+ cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_LDCP; + cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_LDCP;
+ break; + break;
+ case HNSDV_QP_CREATE_ENABLE_HC3: + case HNSDV_QP_CREATE_ENABLE_HC3:
+ cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_LDCP; + cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_HC3;
+ break; + break;
+ case HNSDV_QP_CREATE_ENABLE_DIP: + case HNSDV_QP_CREATE_ENABLE_DIP:
+ cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_DIP; + cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_DIP;

View File

@ -1,7 +1,7 @@
From f912bc59d0b56b560a0097b5f738ba160a3e23eb Mon Sep 17 00:00:00 2001 From 12f8951a6a98f82dd1f70afc23d66e328cf1988b Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang@huawei.com> From: Chengchang Tang <tangchengchang@huawei.com>
Date: Thu, 7 Dec 2023 09:47:59 +0800 Date: Thu, 7 Dec 2023 09:47:59 +0800
Subject: [PATCH 77/80] libhns: Fix parent domain unsupported comp mask Subject: [PATCH] libhns: Fix parent domain unsupported comp mask
driver inclusion driver inclusion
category: bugfix category: bugfix
@ -55,7 +55,7 @@ Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c
index e597e93..fae6126 100644 index 34e8d07..ba3fef6 100644
--- a/providers/hns/hns_roce_u_verbs.c --- a/providers/hns/hns_roce_u_verbs.c
+++ b/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c
@@ -238,7 +238,7 @@ struct ibv_pd *hns_roce_u_alloc_pad(struct ibv_context *context, @@ -238,7 +238,7 @@ struct ibv_pd *hns_roce_u_alloc_pad(struct ibv_context *context,

View File

@ -1,6 +1,6 @@
Name: rdma-core Name: rdma-core
Version: 41.0 Version: 41.0
Release: 24 Release: 25
Summary: RDMA core userspace libraries and daemons Summary: RDMA core userspace libraries and daemons
License: GPLv2 or BSD License: GPLv2 or BSD
Url: https://github.com/linux-rdma/rdma-core Url: https://github.com/linux-rdma/rdma-core
@ -334,6 +334,12 @@ fi
%{_mandir}/* %{_mandir}/*
%changelog %changelog
* Tue Dec 12 2023 Ran Zhou <zhouran10@h-partners.com> - 41.0-25
- Type: bugfix
- ID: NA
- SUG: NA
- DESC: Fix congest type flags error and replace a corrupt patch
* Fri Dec 8 2023 Ran Zhou <zhouran10@h-partners.com> - 41.0-24 * Fri Dec 8 2023 Ran Zhou <zhouran10@h-partners.com> - 41.0-24
- Type: bugfix - Type: bugfix
- ID: NA - ID: NA