diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2023-05-30 11:26:33 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-05-30 11:26:34 +0200 |
| commit | 111d467485e647843d0ac9862cb290a8445c7167 (patch) | |
| tree | 0aacb974b0983c12507e2e5d823fa5289544f62a | |
| parent | rxrpc: Truncate UTS_RELEASE for rxrpc version (diff) | |
| parent | net/smc: Don't use RMBs not mapped to new link in SMCRv2 ADD LINK (diff) | |
| download | wireguard-linux-111d467485e647843d0ac9862cb290a8445c7167.tar.xz wireguard-linux-111d467485e647843d0ac9862cb290a8445c7167.zip | |
Merge branch 'two-fixes-for-smcrv2'
Wen Gu says:
====================
Two fixes for SMCRv2
This patch set includes two bugfix for SMCRv2.
====================
Link: https://lore.kernel.org/r/1685101741-74826-1-git-send-email-guwen@linux.alibaba.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | net/smc/smc_llc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c index a0840b8c935b..7a8d9163d186 100644 --- a/net/smc/smc_llc.c +++ b/net/smc/smc_llc.c @@ -578,7 +578,10 @@ static struct smc_buf_desc *smc_llc_get_next_rmb(struct smc_link_group *lgr, { struct smc_buf_desc *buf_next; - if (!buf_pos || list_is_last(&buf_pos->list, &lgr->rmbs[*buf_lst])) { + if (!buf_pos) + return _smc_llc_get_next_rmb(lgr, buf_lst); + + if (list_is_last(&buf_pos->list, &lgr->rmbs[*buf_lst])) { (*buf_lst)++; return _smc_llc_get_next_rmb(lgr, buf_lst); } @@ -614,6 +617,8 @@ static int smc_llc_fill_ext_v2(struct smc_llc_msg_add_link_v2_ext *ext, goto out; buf_pos = smc_llc_get_first_rmb(lgr, &buf_lst); for (i = 0; i < ext->num_rkeys; i++) { + while (buf_pos && !(buf_pos)->used) + buf_pos = smc_llc_get_next_rmb(lgr, &buf_lst, buf_pos); if (!buf_pos) break; rmb = buf_pos; @@ -623,8 +628,6 @@ static int smc_llc_fill_ext_v2(struct smc_llc_msg_add_link_v2_ext *ext, cpu_to_be64((uintptr_t)rmb->cpu_addr) : cpu_to_be64((u64)sg_dma_address(rmb->sgt[lnk_idx].sgl)); buf_pos = smc_llc_get_next_rmb(lgr, &buf_lst, buf_pos); - while (buf_pos && !(buf_pos)->used) - buf_pos = smc_llc_get_next_rmb(lgr, &buf_lst, buf_pos); } len += i * sizeof(ext->rt[0]); out: |