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

Align XDP Queues with RSS Better #4484

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Align XDP Queues with RSS Better #4484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
70e299c
Initial WIP function
nibanks Aug 22, 2024
4f1a414
Successfully compiles
nibanks Aug 22, 2024
47eb702
Find right processor queue
nibanks Aug 22, 2024
b1ff11c
Fix build
nibanks Aug 22, 2024
14330bf
nits
nibanks Aug 22, 2024
5586c62
Merge branch 'main' into xdp-get-queue-procs
nibanks Aug 23, 2024
d6fbdec
Works on my machine now
nibanks Aug 23, 2024
25150a2
No sleep
nibanks Aug 23, 2024
b115b40
Merge branch 'main' into xdp-get-queue-procs
nibanks Aug 23, 2024
1fc88e5
Merge branch 'main' into xdp-get-queue-procs
nibanks Aug 29, 2024
ca5d8e6
Let's try this instead
nibanks Aug 29, 2024
4a6929c
Logs and round robin
nibanks Aug 29, 2024
984d142
clog again
nibanks Aug 29, 2024
9936166
Missed the sidecar
nibanks Aug 29, 2024
3b66352
Merge branch 'main' into xdp-get-queue-procs
nibanks Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions src/generated/linux/datapath_raw_xdp_win.c.clog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,26 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, FoundVF , arg2, arg3, arg4);\



/*----------------------------------------------------------
// Decoder Ring for XdpInterfaceQueues
// [ixdp][%p] Initializing %u queues on interface
// QuicTraceLogVerbose(
XdpInterfaceQueues,
"[ixdp][%p] Initializing %u queues on interface",
Interface,
Interface->QueueCount);
// arg2 = arg2 = Interface = arg2
// arg3 = arg3 = Interface->QueueCount = arg3
----------------------------------------------------------*/
#ifndef _clog_4_ARGS_TRACE_XdpInterfaceQueues
#define _clog_4_ARGS_TRACE_XdpInterfaceQueues(uniqueId, encoded_arg_string, arg2, arg3)\
tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpInterfaceQueues , arg2, arg3);\

#endif




/*----------------------------------------------------------
// Decoder Ring for XdpInitialize
// [ xdp][%p] XDP initialized, %u procs
Expand All @@ -71,6 +91,26 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpInitialize , arg2, arg3);\



/*----------------------------------------------------------
// Decoder Ring for XdpInterfaceInitialize
// [ixdp][%p] Initializing interface %u
// QuicTraceLogVerbose(
XdpInterfaceInitialize,
"[ixdp][%p] Initializing interface %u",
Interface,
Interface->ActualIfIndex);
// arg2 = arg2 = Interface = arg2
// arg3 = arg3 = Interface->ActualIfIndex = arg3
----------------------------------------------------------*/
#ifndef _clog_4_ARGS_TRACE_XdpInterfaceInitialize
#define _clog_4_ARGS_TRACE_XdpInterfaceInitialize(uniqueId, encoded_arg_string, arg2, arg3)\
tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpInterfaceInitialize , arg2, arg3);\

#endif




/*----------------------------------------------------------
// Decoder Ring for XdpQueueStart
// [ xdp][%p] XDP queue start on partition %p
Expand Down Expand Up @@ -279,10 +319,10 @@ tracepoint(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpPartitionShutdownComplete , arg2);\
// QuicTraceEvent(
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
ret,
"ConvertInterfaceIndexToLuid");
// arg2 = arg2 = ret = arg2
// arg3 = arg3 = "ConvertInterfaceIndexToLuid" = arg3
Status,
"XdpInterfaceOpen");
// arg2 = arg2 = Status = arg2
// arg3 = arg3 = "XdpInterfaceOpen" = arg3
----------------------------------------------------------*/
#ifndef _clog_4_ARGS_TRACE_LibraryErrorStatus
#define _clog_4_ARGS_TRACE_LibraryErrorStatus(uniqueId, encoded_arg_string, arg2, arg3)\
Expand Down
54 changes: 50 additions & 4 deletions src/generated/linux/datapath_raw_xdp_win.c.clog.h.lttng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,29 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, FoundVF,



/*----------------------------------------------------------
// Decoder Ring for XdpInterfaceQueues
// [ixdp][%p] Initializing %u queues on interface
// QuicTraceLogVerbose(
XdpInterfaceQueues,
"[ixdp][%p] Initializing %u queues on interface",
Interface,
Interface->QueueCount);
// arg2 = arg2 = Interface = arg2
// arg3 = arg3 = Interface->QueueCount = arg3
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpInterfaceQueues,
TP_ARGS(
const void *, arg2,
unsigned int, arg3),
TP_FIELDS(
ctf_integer_hex(uint64_t, arg2, (uint64_t)arg2)
ctf_integer(unsigned int, arg3, arg3)
)
)



/*----------------------------------------------------------
// Decoder Ring for XdpInitialize
// [ xdp][%p] XDP initialized, %u procs
Expand All @@ -51,6 +74,29 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpInitialize,



/*----------------------------------------------------------
// Decoder Ring for XdpInterfaceInitialize
// [ixdp][%p] Initializing interface %u
// QuicTraceLogVerbose(
XdpInterfaceInitialize,
"[ixdp][%p] Initializing interface %u",
Interface,
Interface->ActualIfIndex);
// arg2 = arg2 = Interface = arg2
// arg3 = arg3 = Interface->ActualIfIndex = arg3
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpInterfaceInitialize,
TP_ARGS(
const void *, arg2,
unsigned int, arg3),
TP_FIELDS(
ctf_integer_hex(uint64_t, arg2, (uint64_t)arg2)
ctf_integer(unsigned int, arg3, arg3)
)
)



/*----------------------------------------------------------
// Decoder Ring for XdpQueueStart
// [ xdp][%p] XDP queue start on partition %p
Expand Down Expand Up @@ -274,10 +320,10 @@ TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, XdpPartitionShutdownComplete,
// QuicTraceEvent(
LibraryErrorStatus,
"[ lib] ERROR, %u, %s.",
ret,
"ConvertInterfaceIndexToLuid");
// arg2 = arg2 = ret = arg2
// arg3 = arg3 = "ConvertInterfaceIndexToLuid" = arg3
Status,
"XdpInterfaceOpen");
// arg2 = arg2 = Status = arg2
// arg3 = arg3 = "XdpInterfaceOpen" = arg3
----------------------------------------------------------*/
TRACEPOINT_EVENT(CLOG_DATAPATH_RAW_XDP_WIN_C, LibraryErrorStatus,
TP_ARGS(
Expand Down
42 changes: 42 additions & 0 deletions src/manifest/clog.sidecar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12458,6 +12458,38 @@
],
"macroName": "QuicTraceLogVerbose"
},
"XdpInterfaceInitialize": {
"ModuleProperites": {},
"TraceString": "[ixdp][%p] Initializing interface %u",
"UniqueId": "XdpInterfaceInitialize",
"splitArgs": [
{
"DefinationEncoding": "p",
"MacroVariableName": "arg2"
},
{
"DefinationEncoding": "u",
"MacroVariableName": "arg3"
}
],
"macroName": "QuicTraceLogVerbose"
},
"XdpInterfaceQueues": {
"ModuleProperites": {},
"TraceString": "[ixdp][%p] Initializing %u queues on interface",
"UniqueId": "XdpInterfaceQueues",
"splitArgs": [
{
"DefinationEncoding": "p",
"MacroVariableName": "arg2"
},
{
"DefinationEncoding": "u",
"MacroVariableName": "arg3"
}
],
"macroName": "QuicTraceLogVerbose"
},
"XdpLoadBpfObjectError": {
"ModuleProperites": {},
"TraceString": "[ xdp] ERROR:, loading BPF-OBJ file:%s, %d: [%s].",
Expand Down Expand Up @@ -17251,6 +17283,16 @@
"TraceID": "XdpInitialize",
"EncodingString": "[ xdp][%p] XDP initialized, %u procs"
},
{
"UniquenessHash": "1b9f0d89-3821-2037-08c6-88d59b4e4dae",
"TraceID": "XdpInterfaceInitialize",
"EncodingString": "[ixdp][%p] Initializing interface %u"
},
{
"UniquenessHash": "8101710f-c411-8be4-bddb-9cffaaa1cac3",
"TraceID": "XdpInterfaceQueues",
"EncodingString": "[ixdp][%p] Initializing %u queues on interface"
},
{
"UniquenessHash": "83b58d1d-bb4b-653f-d379-3631b103ed34",
"TraceID": "XdpLoadBpfObjectError",
Expand Down
5 changes: 4 additions & 1 deletion src/platform/datapath_raw_xdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ typedef struct QUIC_CACHEALIGN XDP_PARTITION {
CXPLAT_EVENTQ* EventQ;
XDP_QUEUE* Queues; // A linked list of queues, accessed by Next.
uint16_t PartitionIndex;
uint16_t Processor;
} XDP_PARTITION;

void XdpWorkerAddQueue(_In_ XDP_PARTITION* Partition, _In_ XDP_QUEUE* Queue) {
Expand All @@ -78,7 +79,9 @@ CxPlatDpRawAssignQueue(
)
{
const XDP_INTERFACE_COMMON* Interface = (const XDP_INTERFACE_COMMON*)_Interface;
Route->Queue = &((XDP_QUEUE_COMMON*)Interface->Queues)[0];
XDP_QUEUE_COMMON* Queues = (XDP_QUEUE_COMMON*)Interface->Queues;
CXPLAT_FRE_ASSERT(Queues[0].Partition != NULL); // What if there was no partition?
Route->Queue = &Queues[0]; // TODO - Can we do better than just the first queue?
}

_IRQL_requires_max_(DISPATCH_LEVEL)
Expand Down
8 changes: 7 additions & 1 deletion src/platform/datapath_raw_xdp_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ static uint64_t XskUmemFrameAlloc(struct XskSocketInfo *Xsk)
if (Xsk->UmemFrameFree == 0) {
QuicTraceLogVerbose(
XdpUmemAllocFails,
"[ xdp][umem] Out of UMEM frame, OOM");
"[ xdp][umem] Out of UMEM frame, OOM");
return INVALID_UMEM_FRAME;
}
Frame = Xsk->UmemFrameAddr[--Xsk->UmemFrameFree];
Expand Down Expand Up @@ -689,8 +689,14 @@ CxPlatDpRawInitialize(

if (Config && Config->ProcessorCount) {
Xdp->PartitionCount = Config->ProcessorCount;
for (uint32_t i = 0; i < Xdp->PartitionCount; i++) {
Xdp->Partitions[i].Processor = Config->ProcessorList[i];
}
} else {
Xdp->PartitionCount = CxPlatProcCount();
for (uint32_t i = 0; i < Xdp->PartitionCount; i++) {
Xdp->Partitions[i].Processor = (uint16_t)i;
}
}

QuicTraceLogVerbose(
Expand Down
Loading
Loading