Support xdc shuffle for RDMA #29400
+122
−85
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -78,7 +78,6 @@ namespace NActors { | |||||
| Metrics->UpdateIcQueueTimeHistogram(duration.MicroSeconds()); | ||||||
| } | ||||||
| event.Span && event.Span.Event("FeedBuf:INITIAL"); | ||||||
| if (event.Buffer) { | ||||||
| State = EState::BODY; | ||||||
| Iter = event.Buffer->GetBeginIter(); | ||||||
|
|
@@ -105,22 +104,15 @@ namespace NActors { | |||||
| } else if (Params.UseExternalDataChannel && !SerializationInfo->Sections.empty()) { | ||||||
| State = EState::SECTIONS; | ||||||
| SectionIndex = 0; | ||||||
| XXH3_64bits_reset(&RdmaChecksumState); | ||||||
|
|
||||||
| bool sendViaRdma = false; | ||||||
| // Check if any section can be send via rdma | ||||||
| for (const auto& section : SerializationInfo->Sections) { | ||||||
| sendViaRdma |= section.IsRdmaCapable; | ||||||
| } | ||||||
| if (sendViaRdma && Params.UseRdma && RdmaMemPool) { | ||||||
| if (SerializeEventRdma(event)) { | ||||||
| Chunker.DiscardEvent(); | ||||||
| } | ||||||
| } | ||||||
|
|
@@ -168,8 +160,7 @@ namespace NActors { | |||||
| p += NInterconnect::NDetail::SerializeNumber(section.Alignment, p); | ||||||
| if (section.IsInline && Params.UseXdcShuffle) { | ||||||
| type = static_cast<ui8>(EXdcCommand::DECLARE_SECTION_INLINE); | ||||||
| } else if (section.IsRdmaCapable) { | ||||||
| type = static_cast<ui8>(EXdcCommand::DECLARE_SECTION_RDMA); | ||||||
| } | ||||||
| Y_ABORT_UNLESS(p <= std::end(sectionInfo)); | ||||||
|
|
@@ -268,16 +259,18 @@ namespace NActors { | |||||
| if (!Params.UseExternalDataChannel || sections.empty()) { | ||||||
| // all data goes inline | ||||||
| IsPartInline = true; | ||||||
| IsPartRdma = false; | ||||||
| PartLenRemain = Max<size_t>(); | ||||||
| } else if (!Params.UseXdcShuffle) { | ||||||
| // when UseXdcShuffle feature is not supported by the remote side, we transfer whole event over XDC | ||||||
| IsPartInline = false; | ||||||
| IsPartRdma = false; | ||||||
| PartLenRemain = Max<size_t>(); | ||||||
| } else { | ||||||
| Y_ABORT_UNLESS(SectionIndex < sections.size()); | ||||||
| IsPartInline = sections[SectionIndex].IsInline; | ||||||
| IsPartRdma = sections[SectionIndex].IsRdmaCapable; | ||||||
| while (SectionIndex < sections.size() && IsPartInline == sections[SectionIndex].IsInline && IsPartRdma == sections[SectionIndex].IsRdmaCapable) { | ||||||
| PartLenRemain += sections[SectionIndex].Size; | ||||||
| ++SectionIndex; | ||||||
| } | ||||||
|
|
@@ -288,8 +281,8 @@ namespace NActors { | |||||
| std::optional<bool> complete = false; | ||||||
| if (IsPartInline) { | ||||||
| complete = FeedInlinePayload(task, event); | ||||||
| } else if (IsPartRdma) { | ||||||
| complete = FeedRdmaPayload(task, event, rdmaDeviceIndex, task.Params.ChecksumRdmaEvent); | ||||||
| } else { | ||||||
| complete = FeedExternalPayload(task, event); | ||||||
| } | ||||||
|
|
@@ -325,56 +318,54 @@ namespace NActors { | |||||
| return complete; | ||||||
| } | ||||||
|
|
||||||
| bool TEventOutputChannel::SerializeEventRdma(TEventHolder& event) { | ||||||
| if (!event.Buffer && event.Event) { | ||||||
| std::optional<TRope> rope = event.Event->SerializeToRope(GetDefaultRcBufAllocator()); | ||||||
| if (!rope) { | ||||||
| return false; // serialization failed | ||||||
| } | ||||||
| event.Buffer = MakeIntrusive<TEventSerializedData>( | ||||||
| std::move(*rope), event.Event->CreateSerializationInfo() | ||||||
| ); | ||||||
| event.Event = nullptr; | ||||||
| Iter = event.Buffer->GetBeginIter(); | ||||||
| } | ||||||
|
|
||||||
| return true; | ||||||
| } | ||||||
|
|
||||||
| std::optional<bool> TEventOutputChannel::FeedRdmaPayload(TTcpPacketOutTask& task, TEventHolder& event, ssize_t rdmaDeviceIndex, bool checksumming) { | ||||||
| Y_ABORT_UNLESS(rdmaDeviceIndex >= 0); | ||||||
|
|
||||||
| Y_ABORT_UNLESS(event.Buffer); | ||||||
| if (RdmaCredsBuffer.CredsSize() == 0) { | ||||||
| auto prevIter = Iter; | ||||||
| size_t prevPartLenRemain = PartLenRemain; | ||||||
| for (; Iter.Valid() && PartLenRemain; ++Iter) { | ||||||
| TRcBuf buf = Iter.GetChunk(); | ||||||
| auto memReg = NInterconnect::NRdma::TryExtractFromRcBuf(buf); | ||||||
| if (memReg.Empty()) { | ||||||
| Iter = prevIter; | ||||||
| IsPartRdma = false; | ||||||
| RdmaCredsBuffer.Clear(); | ||||||
| PartLenRemain = prevPartLenRemain; | ||||||
| return false; | ||||||
| } | ||||||
| if (checksumming) { | ||||||
| XXH3_64bits_update(&RdmaChecksumState, buf.GetData(), buf.GetSize()); | ||||||
| } | ||||||
| auto cred = RdmaCredsBuffer.AddCreds(); | ||||||
| cred->SetAddress(reinterpret_cast<ui64>(memReg.GetAddr())); | ||||||
| cred->SetSize(memReg.GetSize()); | ||||||
| cred->SetRkey(memReg.GetRKey(rdmaDeviceIndex)); | ||||||
|
|
||||||
| event.EventActuallySerialized += buf.GetSize(); | ||||||
| PartLenRemain -= buf.GetSize(); | ||||||
| } | ||||||
| } | ||||||
| Y_ABORT_UNLESS(PartLenRemain == 0); | ||||||
|
|
||||||
| ui16 credsSerializedSize = RdmaCredsBuffer.ByteSizeLong(); | ||||||
| // Part = | TChannelPart | EXdcCommand::RDMA_READ | rdmaCreds.Size | rdmaCreds | checkSum | | ||||||
|
Member
There was a problem hiding this comment. lets rename to something like CumulativeChecksum to show what it is. |
||||||
| size_t partSize = sizeof(TChannelPart) + sizeof(ui8) + sizeof(ui16) + credsSerializedSize + sizeof(ui32); | ||||||
| Y_ABORT_UNLESS(partSize < 4096); | ||||||
|
|
@@ -396,20 +387,22 @@ namespace NActors { | |||||
| ptr += sizeof(ui16); | ||||||
|
|
||||||
| ui32 payloadSz = 0; | ||||||
| for (const auto& rdmaCred : RdmaCredsBuffer.GetCreds()) { | ||||||
| payloadSz += rdmaCred.GetSize(); | ||||||
| } | ||||||
|
|
||||||
| Y_ABORT_UNLESS(RdmaCredsBuffer.SerializePartialToArray(ptr, credsSerializedSize)); | ||||||
| ptr += credsSerializedSize; | ||||||
| WriteUnaligned<ui32>(ptr, checksumming ? XXH3_64bits_digest(&RdmaChecksumState) : 0); | ||||||
| OutputQueueSize -= payloadSz; | ||||||
|
|
||||||
| task.Write<false>(buffer, partSize); | ||||||
|
|
||||||
| task.AttachRdmaPayloadSize(payloadSz); | ||||||
|
|
||||||
| RdmaCredsBuffer.Clear(); | ||||||
|
|
||||||
| return !Iter.Valid(); | ||||||
|
There was a problem hiding this comment. The return value logic is incorrect. The function should return
Suggested change
|
||||||
| } | ||||||
|
|
||||||
| std::optional<bool> TEventOutputChannel::FeedExternalPayload(TTcpPacketOutTask& task, TEventHolder& event) { | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The trailing whitespace on line 368 should be removed to maintain code cleanliness and consistency.