Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cxi/update main #9791

Merged
merged 34 commits into from
Feb 12, 2024
Merged

Cxi/update main #9791

merged 34 commits into from
Feb 12, 2024

Conversation

jswaro
Copy link
Contributor

@jswaro jswaro commented Feb 6, 2024

Pulling in CXI provider updates while we change the internal development workflow.

git log --oneline upstream-cxi..v1.20.x-ss -- prov/cxi
git cherry-pick -x 3d342dd92 99d4f5c06 68f8bca42 1d3c7acee 0ea29901d a56de218b 084ac3576 a64d05e77 991eb2cae 37db2270e 85842b54c 05bf077c8 8edfeb803 bfc412fe8 e110915f2 3572eed8f 8c188ef8b c13d2f5ee 55d271291 198e5f30f 7ba640912 8feac6124 f8543c05b ad00b2782 263614e58 dc5cc7fd2 c28f6ca2f 2b07914e4 b81a7c892 5f9f12074 07299528b 70f0cba39 a5031488f fd17e4c91

JosephNemeth and others added 30 commits February 6, 2024 14:05
@JosephNemeth @jswaro
prov/cxi: fix asprintf() error handling.
22513d5 
NETCASSINI-6104

This corrects a memory pointer compile failure for an unchecked
asprintf() return value.

Signed-off-by: Joe Nemeth <joseph.nemeth@hpe.com>
(cherry picked from commit 3d342dd)
@iziemba @jswaro
prov/cxi: Move msg otx_reqs inc to after ring
0aa6916 
Making this change is required for messaging to use the TXC emit
functions. The TXC emit functions already handle otx_reqs.

Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 99d4f5c)
@iziemba @jswaro
prov/cxi: Update eager put to use TXC emit dma
0b16d74 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 68f8bca)
@iziemba @jswaro
prov/cxi: Define cmdq idc msg wrapper func
b6d0326 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 1d3c7ac)
@iziemba @jswaro
prov/cxi: Define TXC idc msg wrapper func
fc36c99 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 0ea2990)
@iziemba @jswaro
prov/cxi: Update eager idc to use TXC emit idc msg
8e7dee2 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit a56de21)
@iziemba @jswaro
prov/cxi: Update rdzv put to use TXC emit dma
91ff351 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 084ac35)
@iziemba @jswaro
prov/cxi: Remove unused cxip_send_prep_cmdq
97fa5bc 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit a64d05e)
@iziemba @jswaro
prov/cxi: Rename CP set
0f2f563 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 991eb2c)
@iziemba @jswaro
prov/cxi: Define RXC emit dma func
40a250f 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 37db227)
@iziemba @jswaro
prov/cxi: Update issue rget to use RXC emit dma
f56e9ab 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 85842b5)
@iziemba @jswaro
prov/cxi: Define RXC emit idc msg func
1a4fdbb 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 05bf077)
@iziemba @jswaro
prov/cxi: Update notify comp to use RXC idc msg
70c35da 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 8edfeb8)
@iziemba @jswaro
prov/cxi: Update rdzv notify to use RXC emit dma
d3c398c 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit bfc412f)
@iziemba @jswaro
prov/cxi: Update ctrl msg to use CMDQ emit idc msg
5086316 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit e110915)
@iziemba @jswaro
prov/cxi: Store send VNI in caddr struct
4ba3e3e 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 3572eed)
@iziemba @jswaro
prov/cxi: Update ctrl msg clients to pass in VNI
3dd5cca 
Flow control implementation is now setup to handle flow control from
initiators with different VNIs. Collectives do not support multiple
VNIs.

Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 8c188ef)
@iziemba @jswaro
prov/cxi: Define domain command queues struct
a787795 
Domain command queues will be used to emit commands when max_ep_auth_key
> LCID communication profile limit (16).

Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit c13d2f5)
@iziemba @jswaro
prov/cxi: Support domain tx cmdq allocation
94cf016 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 55d2712)
@iziemba @jswaro
prov/cxi: Define additional cmdq helper functions
d408aab 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 198e5f3)
@iziemba @jswaro
prov/cxi: Define func to find domain cmdq
69b7e84 
To support scalable transmit FI_AV_AUTH_KEY endpoints, command queues
must be owned by the domain. The domain is going to have to manage
access to multiple endpoints attempting to send RDMA traffic on
different VNIs. To support this, multiple transmit command queues are
required.

cxip_domain_find_cmdq() is the logic to select which transmit command
queue is used. The following is the priority:
1. Reuse command queue matching requested configuration
2. Reuse command queue which is empty
3. Allocate new command queue

Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 7ba6409)
@iziemba @jswaro
prov/cxi: Define domain emit idc put
5dde9d0 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 8feac61)
@iziemba @jswaro
prov/cxi: Update TXC emit idc put with dom version
ce467a9 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit f8543c0)
@iziemba @jswaro
prov/cxi: Define domain emit dma put
ec53269 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit ad00b27)
@iziemba @jswaro
prov/cxi: Update TXC emit dma with dom version
956f4e4 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 263614e)
@iziemba @jswaro
prov/cxi: Define domain emit idc amo
86ab56b 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit dc5cc7f)
@iziemba @jswaro
prov/cxi: Update TXC emit idc amo with dom version
7fbd1d3 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit c28f6ca)
@iziemba @jswaro
prov/cxi: Define domain emit amo
cc7e14a 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 2b07914)
@iziemba @jswaro
prov/cxi: Update TXC emit dma amo with dom version
981382b 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit b81a7c8)
@iziemba @jswaro
prov/cxi: Define domain idc msg
4257a6e 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 5f9f120)
@iziemba @jswaro
prov/cxi: Update TXC emit idc msg with dom version
18b242a 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 0729952)
@iziemba @jswaro
prov/cxi: Update RXC emit dma with dom version
d5a3098 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit 70f0cba)
@iziemba @jswaro
prov/cxi: Update RXC emit idc msg with dom version
a1388cc 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit a503148)
@iziemba @jswaro
prov/cxi: Update ctrl msg to use dom cmdq
c3789aa 
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
(cherry picked from commit fd17e4c)
@jswaro jswaro merged commit 4c86b54 into main Feb 12, 2024
19 checks passed
@jswaro jswaro deleted the cxi/update-main branch February 12, 2024 13:43
@thomasgillis thomasgillis mentioned this pull request Feb 22, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@muttormark muttormark Awaiting requested review from muttormark

@swelch swelch Awaiting requested review from swelch

@iziemba iziemba Awaiting requested review from iziemba

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jswaro @JosephNemeth @iziemba