mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 07:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Optimize flow-context usage.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2018-01-14 09:01:42 +05:00
parent 1f19d69652
commit 4f28387b1c
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/fortdrv.c
View File

@ -355,13 +355,13 @@ fort_callout_notify (FWPS_CALLOUT_NOTIFY_TYPE notifyType,
static void
fort_callout_flow_classify_v4 (const FWPS_INCOMING_METADATA_VALUES0 *inMetaValues,
UINT64 flowContext,
FWPS_CLASSIFY_OUT0 *classifyOut,
UINT32 dataSize, BOOL inbound)
{
const UINT64 flowId = inMetaValues->flowHandle;
const UINT32 headerSize = inbound ? inMetaValues->transportHeaderSize : 0;
if (fort_stat_flow_classify(&g_device->stat, flowId,
if (fort_stat_flow_classify(&g_device->stat, flowContext,
headerSize + dataSize, inbound)) {
fort_callout_classify_block(classifyOut);
} else {
@ -384,9 +384,9 @@ fort_callout_stream_classify_v4 (const FWPS_INCOMING_VALUES0 *inFixedValues,
UNUSED(inFixedValues);
UNUSED(filter);
UNUSED(flowContext);
fort_callout_flow_classify_v4(inMetaValues, classifyOut, dataSize, inbound);
fort_callout_flow_classify_v4(inMetaValues, flowContext, classifyOut,
dataSize, inbound);
}
static void
@ -408,16 +408,17 @@ fort_callout_datagram_classify_v4 (const FWPS_INCOMING_VALUES0 *inFixedValues,
UNUSED(filter);
UNUSED(flowContext);
fort_callout_flow_classify_v4(inMetaValues, classifyOut, dataSize, inbound);
fort_callout_flow_classify_v4(inMetaValues, flowContext, classifyOut,
dataSize, inbound);
}
static void
fort_callout_flow_delete_v4 (UINT16 layerId, UINT32 calloutId, UINT64 flowId)
fort_callout_flow_delete_v4 (UINT16 layerId, UINT32 calloutId, UINT64 flowContext)
{
UNUSED(layerId);
UNUSED(calloutId);
fort_stat_flow_delete(&g_device->stat, flowId);
fort_stat_flow_delete(&g_device->stat, flowContext);
}
static void

50
src/driver/fortstat.c
View File

@ -58,8 +58,7 @@ typedef struct fort_stat_flow {
} FORT_STAT_FLOW, *PFORT_STAT_FLOW;
typedef struct fort_stat {
UCHAR volatile closing;
UCHAR closed : 1;
UCHAR is_dirty : 1;
UCHAR log_stat : 1;
@ -247,12 +246,15 @@ fort_stat_proc_add (PFORT_STAT stat, UINT32 process_id)
}
static void
fort_stat_flow_context_set (PFORT_STAT stat, UINT64 flow_id)
fort_stat_flow_context_set (PFORT_STAT stat, PFORT_STAT_FLOW flow)
{
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_STREAM_V4, stat->stream4_id, flow_id);
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_DATAGRAM_DATA_V4, stat->datagram4_id, flow_id);
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_INBOUND_TRANSPORT_V4, stat->in_transport4_id, flow_id);
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_OUTBOUND_TRANSPORT_V4, stat->out_transport4_id, flow_id);
const UINT64 flow_id = flow->flow_id;
const UINT64 flowContext = (UINT64) flow;
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_STREAM_V4, stat->stream4_id, flowContext);
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_DATAGRAM_DATA_V4, stat->datagram4_id, flowContext);
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_INBOUND_TRANSPORT_V4, stat->in_transport4_id, flowContext);
FwpsFlowAssociateContext0(flow_id, FWPS_LAYER_OUTBOUND_TRANSPORT_V4, stat->out_transport4_id, flowContext);
}
static void
@ -330,7 +332,7 @@ fort_stat_flow_add (PFORT_STAT stat, UINT64 flow_id,
flow->flow_id = flow_id;
fort_stat_flow_context_set(stat, flow_id);
fort_stat_flow_context_set(stat, flow);
is_new_flow = TRUE;
} else {
@ -380,13 +382,19 @@ fort_stat_open (PFORT_STAT stat)
static void
fort_stat_close (PFORT_STAT stat)
{
stat->closing = TRUE;
KLOCK_QUEUE_HANDLE lock_queue;
KeAcquireInStackQueuedSpinLock(&stat->lock, &lock_queue);
stat->closed = TRUE;
tommy_hashdyn_foreach_node_arg(&stat->flows_map,
fort_stat_flow_context_remove, stat);
tommy_arrayof_done(&stat->flows);
tommy_hashdyn_done(&stat->flows_map);
KeReleaseInStackQueuedSpinLock(&lock_queue);
}
static void
@ -473,40 +481,29 @@ fort_stat_flow_associate (PFORT_STAT stat, UINT64 flow_id,
}
static void
fort_stat_flow_delete (PFORT_STAT stat, UINT64 flow_id)
fort_stat_flow_delete (PFORT_STAT stat, UINT64 flowContext)
{
KLOCK_QUEUE_HANDLE lock_queue;
PFORT_STAT_FLOW flow;
const tommy_key_t flow_hash = fort_stat_flow_hash(flow_id);
if (stat->closing)
return;
PFORT_STAT_FLOW flow = (PFORT_STAT_FLOW) flowContext;
KeAcquireInStackQueuedSpinLock(&stat->lock, &lock_queue);
flow = fort_stat_flow_get(stat, flow_id, flow_hash);
if (flow != NULL) {
if (!stat->closed) {
fort_stat_flow_free(stat, flow);
}
KeReleaseInStackQueuedSpinLock(&lock_queue);
}
static BOOL
fort_stat_flow_classify (PFORT_STAT stat, UINT64 flow_id,
fort_stat_flow_classify (PFORT_STAT stat, UINT64 flowContext,
UINT32 data_len, BOOL inbound)
{
KLOCK_QUEUE_HANDLE lock_queue;
PFORT_STAT_FLOW flow;
const tommy_key_t flow_hash = fort_stat_flow_hash(flow_id);
PFORT_STAT_FLOW flow = (PFORT_STAT_FLOW) flowContext;
BOOL limited = FALSE;
KeAcquireInStackQueuedSpinLock(&stat->lock, &lock_queue);
if (!stat->log_stat)
goto end;
flow = fort_stat_flow_get(stat, flow_id, flow_hash);
if (flow != NULL && flow->opt.proc_index != FORT_PROC_BAD_INDEX) {
if (stat->log_stat && flow->opt.proc_index != FORT_PROC_BAD_INDEX) {
PFORT_STAT_PROC proc = &stat->procs[flow->opt.proc_index];
UINT32 *proc_bytes = inbound ? &proc->traf.in_bytes
: &proc->traf.out_bytes;
@ -537,7 +534,6 @@ fort_stat_flow_classify (PFORT_STAT stat, UINT64 flow_id,
stat->is_dirty = TRUE;
}
end:
KeReleaseInStackQueuedSpinLock(&lock_queue);
return limited;