mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

datapath-windows: Track the number of conntrack entries

Browse Source 
Add a counter to track the number of connection tracking entries. Iterate
over the conntrack entry table only if there are entries.

Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
This commit is contained in:
Sairam Venugopal
2016-07-01 13:49:33 -07:00
committed by Gurucharan Shetty
parent 2e4bd7a144
commit d33f0efaf2
1 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
datapath-windows/ovsext/Conntrack.c
View File

@@ -38,6 +38,8 @@ KSTART_ROUTINE ovsConntrackEntryCleaner;
static PLIST_ENTRY ovsConntrackTable; static PLIST_ENTRY ovsConntrackTable;
static OVS_CT_THREAD_CTX ctThreadCtx; static OVS_CT_THREAD_CTX ctThreadCtx;
static PNDIS_RW_LOCK_EX ovsConntrackLockObj; static PNDIS_RW_LOCK_EX ovsConntrackLockObj;
extern POVS_SWITCH_CONTEXT gOvsSwitchContext;
static UINT64 ctTotalEntries;
/* /*
*---------------------------------------------------------------------------- *----------------------------------------------------------------------------
@@ -50,6 +52,7 @@ OvsInitConntrack(POVS_SWITCH_CONTEXT context)
{ {
NTSTATUS status; NTSTATUS status;
HANDLE threadHandle = NULL; HANDLE threadHandle = NULL;
ctTotalEntries = 0;
/* Init the sync-lock */ /* Init the sync-lock */
ovsConntrackLockObj = NdisAllocateRWLock(context->NdisFilterHandle); ovsConntrackLockObj = NdisAllocateRWLock(context->NdisFilterHandle);
@@ -159,6 +162,7 @@ OvsCtAddEntry(POVS_CT_ENTRY entry, OvsConntrackKeyLookupCtx *ctx, UINT64 now)
entry->timestampStart = now; entry->timestampStart = now;
InsertHeadList(&ovsConntrackTable[ctx->hash & CT_HASH_TABLE_MASK], InsertHeadList(&ovsConntrackTable[ctx->hash & CT_HASH_TABLE_MASK],
&entry->link); &entry->link);
ctTotalEntries++;
} }
static __inline POVS_CT_ENTRY static __inline POVS_CT_ENTRY
@@ -251,6 +255,7 @@ OvsCtEntryDelete(POVS_CT_ENTRY entry)
{ {
RemoveEntryList(&entry->link); RemoveEntryList(&entry->link);
OvsFreeMemoryWithTag(entry, OVS_CT_POOL_TAG); OvsFreeMemoryWithTag(entry, OVS_CT_POOL_TAG);
ctTotalEntries--;
} }
static __inline BOOLEAN static __inline BOOLEAN
@@ -321,6 +326,11 @@ OvsCtLookup(OvsConntrackKeyLookupCtx *ctx)
BOOLEAN reply = FALSE; BOOLEAN reply = FALSE;
POVS_CT_ENTRY found = NULL; POVS_CT_ENTRY found = NULL;
if (!ctTotalEntries)
{
return found;
}
LIST_FORALL(&ovsConntrackTable[ctx->hash & CT_HASH_TABLE_MASK], link) { LIST_FORALL(&ovsConntrackTable[ctx->hash & CT_HASH_TABLE_MASK], link) {
entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link); entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link);
@@ -635,15 +645,16 @@ ovsConntrackEntryCleaner(PVOID data)
NdisGetCurrentSystemTime((LARGE_INTEGER *)&currentTime); NdisGetCurrentSystemTime((LARGE_INTEGER *)&currentTime);
threadSleepTimeout = currentTime + CT_CLEANUP_INTERVAL; threadSleepTimeout = currentTime + CT_CLEANUP_INTERVAL;
for (int i = 0; i < CT_HASH_TABLE_SIZE; i++) { if (ctTotalEntries) {
LIST_FORALL_SAFE(&ovsConntrackTable[i], link, next) { for (int i = 0; i < CT_HASH_TABLE_SIZE; i++) {
entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link); LIST_FORALL_SAFE(&ovsConntrackTable[i], link, next) {
if (entry->expiration < currentTime) { entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link);
OvsCtEntryDelete(entry); if (entry->expiration < currentTime) {
OvsCtEntryDelete(entry);
}
} }
} }
} }
NdisReleaseRWLock(ovsConntrackLockObj, &lockState); NdisReleaseRWLock(ovsConntrackLockObj, &lockState);
KeWaitForSingleObject(&context->event, Executive, KernelMode, KeWaitForSingleObject(&context->event, Executive, KernelMode,
FALSE, (LARGE_INTEGER *)&threadSleepTimeout); FALSE, (LARGE_INTEGER *)&threadSleepTimeout);
@@ -667,12 +678,14 @@ OvsCtFlush(UINT16 zone)
LOCK_STATE_EX lockState; LOCK_STATE_EX lockState;
NdisAcquireRWLockWrite(ovsConntrackLockObj, &lockState, 0); NdisAcquireRWLockWrite(ovsConntrackLockObj, &lockState, 0);
for (int i = 0; i < CT_HASH_TABLE_SIZE; i++) { if (ctTotalEntries) {
LIST_FORALL_SAFE(&ovsConntrackTable[i], link, next) { for (int i = 0; i < CT_HASH_TABLE_SIZE; i++) {
entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link); LIST_FORALL_SAFE(&ovsConntrackTable[i], link, next) {
/* zone is a non-zero value */ entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link);
if (!zone || zone == entry->key.zone) /* zone is a non-zero value */
OvsCtEntryDelete(entry); if (!zone || zone == entry->key.zone)
OvsCtEntryDelete(entry);
}
} }
} }
@@ -1083,7 +1096,6 @@ OvsCtDumpCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
POVS_OPEN_INSTANCE instance = POVS_OPEN_INSTANCE instance =
(POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance; (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
POVS_MESSAGE msgIn; POVS_MESSAGE msgIn;
UINT32 i;
ASSERT(usrParamsCtx->devOp == OVS_READ_DEV_OP); ASSERT(usrParamsCtx->devOp == OVS_READ_DEV_OP);
if (instance->dumpState.ovsMsg == NULL) { if (instance->dumpState.ovsMsg == NULL) {
@@ -1096,54 +1108,56 @@ OvsCtDumpCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
msgIn = instance->dumpState.ovsMsg; msgIn = instance->dumpState.ovsMsg;
UINT32 inBucket = instance->dumpState.index[0]; UINT32 inBucket = instance->dumpState.index[0];
UINT32 inIndex = instance->dumpState.index[1]; UINT32 inIndex = instance->dumpState.index[1];
UINT32 i = CT_HASH_TABLE_SIZE;
UINT32 outIndex = 0; UINT32 outIndex = 0;
LOCK_STATE_EX lockState; LOCK_STATE_EX lockState;
NdisAcquireRWLockRead(ovsConntrackLockObj, &lockState, 0); NdisAcquireRWLockRead(ovsConntrackLockObj, &lockState, 0);
for (i = inBucket; i < CT_HASH_TABLE_SIZE; i++) { if (ctTotalEntries) {
PLIST_ENTRY head, link; for (i = inBucket; i < CT_HASH_TABLE_SIZE; i++) {
head = &ovsConntrackTable[i]; PLIST_ENTRY head, link;
POVS_CT_ENTRY entry = NULL; head = &ovsConntrackTable[i];
POVS_CT_ENTRY entry = NULL;
outIndex = 0; outIndex = 0;
LIST_FORALL(head, link) { LIST_FORALL(head, link) {
/* /*
* if one or more dumps were previously done on this same bucket, * if one or more dumps were previously done on this same
* inIndex will be > 0, so we'll need to reply with the * bucket, inIndex will be > 0, so we'll need to reply with
* inIndex + 1 ct-entry from the bucket. * the inIndex + 1 ct-entry from the bucket.
*/ */
if (outIndex >= inIndex) { if (outIndex >= inIndex) {
entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link); entry = CONTAINING_RECORD(link, OVS_CT_ENTRY, link);
rc = OvsCreateNlMsgFromCtEntry(entry, msgIn, rc = OvsCreateNlMsgFromCtEntry(entry, msgIn,
usrParamsCtx->outputBuffer, usrParamsCtx->outputBuffer,
usrParamsCtx->outputLength, usrParamsCtx->outputLength,
0); 0);
if (rc != NDIS_STATUS_SUCCESS) { if (rc != NDIS_STATUS_SUCCESS) {
NdisReleaseRWLock(ovsConntrackLockObj, &lockState); NdisReleaseRWLock(ovsConntrackLockObj, &lockState);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
}
++outIndex;
break;
} }
++outIndex; ++outIndex;
}
if (entry) {
break; break;
} }
++outIndex; /*
* if no ct-entry was found above, check the next bucket, beginning
* with the first (i.e. index 0) elem from within that bucket
*/
inIndex = 0;
} }
if (entry) {
break;
}
/*
* if no ct-entry was found above, check the next bucket, beginning
* with the first (i.e. index 0) elem from within that bucket
*/
inIndex = 0;
} }
instance->dumpState.index[0] = i; instance->dumpState.index[0] = i;
instance->dumpState.index[1] = outIndex; instance->dumpState.index[1] = outIndex;
NdisReleaseRWLock(ovsConntrackLockObj, &lockState); NdisReleaseRWLock(ovsConntrackLockObj, &lockState);