[roce-0111]sync mainline kernel 5.5rc6 roce patchset into ubuntu HWE kernel branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
kunpeng920 |
Fix Released
|
Undecided
|
Unassigned | ||
Ubuntu-18.04-hwe |
Fix Released
|
Undecided
|
Ike Panhc | ||
Ubuntu-20.04 |
Fix Released
|
Undecided
|
Ike Panhc | ||
Upstream-kernel |
Fix Released
|
Undecided
|
Unassigned | ||
linux (Ubuntu) |
Fix Released
|
Undecided
|
Ike Panhc |
Bug Description
[Bug Description]
roce patchset have merged into mainline 5.5rc6 kernel. Pls backport ubuntu 18.04.5 kernel version
[Steps to Reproduce]
1)
2)
3)
[Actual Results]
[Expected Results]
[Reproducibility]
[Additional information]
(Firmware version, kernel version, affected hardware, etc. if required):
[Resolution]
RDMA/hns: Delete unnecessary callback functions for cq
RDMA/hns: Rename the functions used inside creating cq
RDMA/hns: Redefine the member of hns_roce_cq struct
RDMA/hns: Redefine interfaces used in creating cq
IB/umem: remove the dmasync argument to ib_umem_get
RDMA/hns: Modify appropriate printings
RDMA/hns: Fix non-standard error codes
RDMA/hns: Modify hns_roce_
RDMA/hns: Simplify doorbell initialization code
RDMA/hns: Replace not intuitive function/macro names
RDMA/hns: Modify fields of struct hns_roce_srq
RDMA/hns: Delete unnecessary uar from hns_roce_cq
RDMA/hns: Remove unnecessary structure hns_roce_sqp
RDMA/hns: Delete unnecessary variable max_post
RDMA/hns: Remove unsupported modify_port callback
RDMA: Connect between the mmap entry and the umap_priv structure
RDMA/hns: Fix build error again
RDMA/hns: Fix memory leak on 'context' on error return path
RDMA/hns: Bugfix for qpc/cqc timer configuration
RDMA/hns: Fix to support 64K page for srq
RDMA/hns: Delete BITS_PER_BYTE redefinition
RDMA/hns: Prevent undefined behavior in hns_roce_
RDMA/hns: Release qp resources when failed to destroy qp
RDMA/hns: Fix a spelling mistake in a macro
RDMA/hns: Modify return value of restrack functions
RDMA/hns: Modify variable/field name from vlan to vlan_id
RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que
RDMA/hns: remove a redundant le16_to_cpu
RDMA/hns: Prevent memory leaks of eq->buf_list
RDMA/hns: Correct the value of srq_desc_size
RDMA/hns: Correct the value of HNS_ROCE_
RDMA/hns: Add support for reporting wc as software mode
RDMA/hns: Bugfix for posting a wqe with sge
RDMA/hns: Fix coding style issues
RDMA/hns: Replace custom macros HNS_ROCE_ALIGN_UP
RDMA/hns: Remove redundant print information
RDMA/hns: Delete unnessary parameters in hns_roce_
RDMA/hns: Update the value of qp type
RDMA/hns: Remove unused function hns_roce_
RDMA/hns: Avoid printing address of mtt page
RDMA/hns: Simplify the calculation and usage of wqe idx for post verbs
update 01120
RDMA/hns: Get pf capabilities from firmware
RDMA/hns: Add interfaces to get pf capabilities from firmware
RDMA/hns: Remove some redundant variables related to capabilities
RDMA/hns: Add support for extended atomic in userspace
[Status]
(Fix committed): RDMA/hns: Delete unnecessary callback functions for cq
(Fix committed): RDMA/hns: Rename the functions used inside creating cq
(Fix committed): RDMA/hns: Redefine the member of hns_roce_cq struct
(Fix committed): RDMA/hns: Redefine interfaces used in creating cq
(Fix committed): IB/umem: remove the dmasync argument to ib_umem_get
(Fix committed): RDMA/hns: Modify appropriate printings
(Fix committed): RDMA/hns: Fix non-standard error codes
(Fix committed): RDMA/hns: Modify hns_roce_
(Fix committed): RDMA/hns: Simplify doorbell initialization code
(Fix committed): RDMA/hns: Replace not intuitive function/macro names
(Fix committed): RDMA/hns: Modify fields of struct hns_roce_srq
(Fix committed): RDMA/hns: Delete unnecessary uar from hns_roce_cq
(Fix committed): RDMA/hns: Remove unnecessary structure hns_roce_sqp
(Fix committed): RDMA/hns: Delete unnecessary variable max_post
(Fix committed): RDMA/hns: Remove unsupported modify_port callback
(Fix committed): RDMA: Connect between the mmap entry and the umap_priv structure
(Fix committed): RDMA/hns: Fix build error again
(Fix committed): RDMA/hns: Fix memory leak on 'context' on error return path
(Fix committed): RDMA/hns: Bugfix for qpc/cqc timer configuration
(Fix committed): RDMA/hns: Fix to support 64K page for srq
(Fix committed): RDMA/hns: Delete BITS_PER_BYTE redefinition
(Fix committed): RDMA/hns: Prevent undefined behavior in hns_roce_
(Fix committed): RDMA/hns: Release qp resources when failed to destroy qp
(Fix committed): RDMA/hns: Fix a spelling mistake in a macro
(Fix committed): RDMA/hns: Modify return value of restrack functions
(Fix committed): RDMA/hns: Modify variable/field name from vlan to vlan_id
(Fix committed): RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que
(Fix committed): RDMA/hns: remove a redundant le16_to_cpu
(Fix committed): RDMA/hns: Prevent memory leaks of eq->buf_list
(Fix committed): RDMA/hns: Correct the value of srq_desc_size
(Fix committed): RDMA/hns: Correct the value of HNS_ROCE_
(Fix committed): RDMA/hns: Add support for reporting wc as software mode
(Fix committed): RDMA/hns: Bugfix for posting a wqe with sge
(Fix committed): RDMA/hns: Fix coding style issues
(Fix committed): RDMA/hns: Replace custom macros HNS_ROCE_ALIGN_UP
(Fix committed): RDMA/hns: Remove redundant print information
(Fix committed): RDMA/hns: Delete unnessary parameters in hns_roce_
(Fix committed): RDMA/hns: Update the value of qp type
(Fix committed): RDMA/hns: Remove unused function hns_roce_
(Fix committed): RDMA/hns: Avoid printing address of mtt page
(Fix committed): RDMA/hns: Simplify the calculation and usage of wqe idx for post verbs
(Fix committed): RDMA/hns: Get pf capabilities from firmware
(Fix committed): RDMA/hns: Add interfaces to get pf capabilities from firmware
(Fix committed): RDMA/hns: Remove some redundant variables related to capabilities
(Fix committed): RDMA/hns: Add support for extended atomic in userspace
CVE References
tags: | added: ikeradar |
description: | updated |
summary: |
- [roce-0111]sync mainline kernel 5.5rc5 roce patchset into ubuntu HWE + [roce-0111]sync mainline kernel 5.5rc6 roce patchset into ubuntu HWE kernel branch Edit |
summary: |
[roce-0111]sync mainline kernel 5.5rc6 roce patchset into ubuntu HWE - kernel branch Edit + kernel branch |
Changed in kunpeng920: | |
status: | New → In Progress |
description: | updated |
description: | updated |
description: | updated |
Changed in linux (Ubuntu): | |
status: | New → In Progress |
assignee: | nobody → Ike Panhc (ikepanhc) |
Changed in kunpeng920: | |
status: | Incomplete → In Progress |
Changed in kunpeng920: | |
status: | Incomplete → In Progress |
Changed in kunpeng920: | |
status: | In Progress → Fix Committed |
description: | updated |
Changed in kunpeng920: | |
status: | Fix Committed → Fix Released |
Get an error on cherry-pick. Might need to pull other RDMA patches.
error: could not apply c043ff2cfb7f... RDMA: Connect between the mmap entry and the umap_priv structure
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
$ git diff infiniband/ core/core_ priv.h 6be180eb8cb3. .000000000000 infiniband/ core/core_ priv.h infiniband/ core/core_ priv.h set_netns_ put(struct sk_b
diff --cc drivers/
index 9d07378b5b42,
--- a/drivers/
+++ b/drivers/
@@@ -388,4 -387,15 +388,18 @@@ int ib_device_
int rdma_nl_ net_init( struct rdma_dev_net *rnet); net_exit( struct rdma_dev_net *rnet); mmap_entry *entry; priv_init( struct rdma_umap_priv *priv, mmap_entry *entry); rdma/ib_ verbs.h 416e72ea80d9. .000000000000 rdma/ib_ verbs.h rdma/ib_ verbs.h client_ data(struct ib_devi device_ ops(struct ib_device *device,
const struct ib_device_ops *ops);
void rdma_nl_
++<<<<<<< HEAD
++=======
+
+ struct rdma_umap_priv {
+ struct vm_area_struct *vma;
+ struct list_head list;
+ struct rdma_user_
+ };
+
+ void rdma_umap_
+ struct vm_area_struct *vma,
+ struct rdma_user_
+
++>>>>>>> c043ff2cfb7f... RDMA: Connect between the mmap entry and the umap_priv structure
#endif /* _CORE_PRIV_H */
diff --cc include/
index 44c52639db55,
--- a/include/
+++ b/include/
@@@ -2789,18 -2826,21 +2789,34 @@@ void ib_set_
void ib_set_
- #if IS_ENABLED( CONFIG_ INFINIBAND_ USER_ACCESS) mmap_io( struct ib_ucontext *ucontext, struct vm_area_struct *vma, mmap_io( struct ib_ucontext *ucontext,
int rdma_user_
++<<<<<<< HEAD
+ unsigned long pfn, unsigned long size, pgprot_t prot);
+#else
+static inline int rdma_user_
+ struct vm_area_struct *vma,
+ unsigned long pfn, unsigned long size,
+ pgprot_t prot)
+{
+ return -EINVAL;
+}