Skip to content

Commit

Permalink
datapath-windows: Flow get implementation.
Browse files Browse the repository at this point in the history 
In this patch we have implemented the flow get.

Signed-off-by: Ankur Sharma <ankursharma@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
  • Loading branch information
@ankursh @blp
ankursh authored and blp committed Oct 6, 2014
1 parent 211656d commit 8c26b81
Show file tree
Hide file tree
Showing 3 changed files with 186 additions and 26 deletions.
203 changes: 180 additions & 23 deletions datapath-windows/ovsext/Flow.c
View file
Expand Up @@ -53,7 +53,7 @@ static NTSTATUS _MapNlToFlowPut(POVS_MESSAGE msgIn, PNL_ATTR keyAttr,
OvsFlowPut *mappedFlow);
static VOID _MapKeyAttrToFlowPut(PNL_ATTR *keyAttrs,
PNL_ATTR *tunnelAttrs,
OvsFlowPut *mappedFlow);
OvsFlowKey *destKey);

static VOID _MapTunAttrToFlowPut(PNL_ATTR *keyAttrs,
PNL_ATTR *tunnelAttrs,
Expand Down Expand Up @@ -359,19 +359,143 @@ OvsFlowNlGetCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
return rc;
}

/*
*----------------------------------------------------------------------------
* _FlowNlGetCmdHandler --
* Handler for OVS_FLOW_CMD_GET command.
*----------------------------------------------------------------------------
*/
NTSTATUS
_FlowNlGetCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
UINT32 *replyLen)
{
NTSTATUS rc = STATUS_SUCCESS;
POVS_OPEN_INSTANCE instance = (POVS_OPEN_INSTANCE)
(usrParamsCtx->ovsInstance);
POVS_MESSAGE msgIn = instance->dumpState.ovsMsg;
PNL_MSG_HDR nlMsgHdr = &(msgIn->nlMsg);
POVS_HDR ovsHdr = &(msgIn->ovsHdr);
PNL_MSG_HDR nlMsgOutHdr = NULL;
UINT32 attrOffset = NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN;
PNL_ATTR nlAttrs[__OVS_FLOW_ATTR_MAX];

OvsFlowGetInput getInput;
OvsFlowGetOutput getOutput;
NL_BUFFER nlBuf;
PNL_ATTR keyAttrs[__OVS_KEY_ATTR_MAX];
PNL_ATTR tunnelAttrs[__OVS_TUNNEL_KEY_ATTR_MAX];

UNREFERENCED_PARAMETER(usrParamsCtx);
NlBufInit(&nlBuf, usrParamsCtx->outputBuffer,
usrParamsCtx->outputLength);
RtlZeroMemory(&getInput, sizeof(OvsFlowGetInput));
RtlZeroMemory(&getOutput, sizeof(OvsFlowGetOutput));
UINT32 keyAttrOffset = 0;
UINT32 tunnelKeyAttrOffset = 0;

*replyLen = 0;

if (usrParamsCtx->inputLength > usrParamsCtx->outputLength) {
/* Should not be the case.
* We'll be copying the flow keys back from
* input buffer to output buffer. */
rc = STATUS_INVALID_PARAMETER;
OVS_LOG_ERROR("inputLength: %d GREATER THEN outputLength: %d",
usrParamsCtx->inputLength, usrParamsCtx->outputLength);
goto done;
}

/* Get all the top level Flow attributes */
if ((NlAttrParse(nlMsgHdr, attrOffset, NlMsgAttrsLen(nlMsgHdr),
nlFlowPolicy, nlAttrs, ARRAY_SIZE(nlAttrs)))
!= TRUE) {
OVS_LOG_ERROR("Attr Parsing failed for msg: %p",
nlMsgHdr);
rc = STATUS_UNSUCCESSFUL;
goto done;
}

keyAttrOffset = (UINT32)((PCHAR) nlAttrs[OVS_FLOW_ATTR_KEY] -
(PCHAR)nlMsgHdr);

/* Get flow keys attributes */
if ((NlAttrParseNested(nlMsgHdr, keyAttrOffset,
NlAttrLen(nlAttrs[OVS_FLOW_ATTR_KEY]),
nlFlowKeyPolicy, keyAttrs, ARRAY_SIZE(keyAttrs)))
!= TRUE) {
OVS_LOG_ERROR("Key Attr Parsing failed for msg: %p",
nlMsgHdr);
rc = STATUS_UNSUCCESSFUL;
goto done;
}

if (keyAttrs[OVS_KEY_ATTR_TUNNEL]) {
tunnelKeyAttrOffset = (UINT32)((PCHAR)
(keyAttrs[OVS_KEY_ATTR_TUNNEL])
- (PCHAR)nlMsgHdr);

/* Get tunnel keys attributes */
if ((NlAttrParseNested(nlMsgHdr, tunnelKeyAttrOffset,
NlAttrLen(keyAttrs[OVS_KEY_ATTR_TUNNEL]),
nlFlowTunnelKeyPolicy,
tunnelAttrs, ARRAY_SIZE(tunnelAttrs)))
!= TRUE) {
OVS_LOG_ERROR("Tunnel key Attr Parsing failed for msg: %p",
nlMsgHdr);
rc = STATUS_UNSUCCESSFUL;
goto done;
}
}

_MapKeyAttrToFlowPut(keyAttrs, tunnelAttrs,
&(getInput.key));

getInput.dpNo = ovsHdr->dp_ifindex;
getInput.getFlags = FLOW_GET_STATS | FLOW_GET_ACTIONS;

/* 4th argument is a no op.
* We are keeping this argument to be compatible
* with our dpif-windows based interface. */
rc = OvsGetFlowIoctl(&getInput, &getOutput);
if (rc != STATUS_SUCCESS) {
OVS_LOG_ERROR("OvsGetFlowIoctl failed.");
goto done;
}

/* Lets prepare the reply. */
nlMsgOutHdr = (PNL_MSG_HDR)(NlBufAt(&nlBuf, 0, 0));

/* Input already has all the attributes for the flow key.
* Lets copy the values back. */
RtlCopyMemory(usrParamsCtx->outputBuffer, usrParamsCtx->inputBuffer,
usrParamsCtx->inputLength);

rc = _MapFlowStatsToNlStats(&nlBuf, &((getOutput.info).stats));
if (rc != STATUS_SUCCESS) {
OVS_LOG_ERROR("_OvsFlowMapFlowKeyToNlStats failed.");
goto done;
}

rc = _MapFlowActionToNlAction(&nlBuf, ((getOutput.info).actionsLen),
getOutput.info.actions);
if (rc != STATUS_SUCCESS) {
OVS_LOG_ERROR("_MapFlowActionToNlAction failed.");
goto done;
}

NlMsgSetSize(nlMsgOutHdr, NlBufSize(&nlBuf));
NlMsgAlignSize(nlMsgOutHdr);
*replyLen += NlMsgSize(nlMsgOutHdr);

done:
return rc;
}

/*
*----------------------------------------------------------------------------
* _FlowNlDumpCmdHandler --
* Handler for OVS_FLOW_CMD_GET command.
*----------------------------------------------------------------------------
*/
NTSTATUS
_FlowNlDumpCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
UINT32 *replyLen)
Expand Down Expand Up @@ -486,6 +610,12 @@ _FlowNlDumpCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowInfoToNl --
* Maps OvsFlowInfo to Netlink attributes.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowInfoToNl(PNL_BUFFER nlBuf, OvsFlowInfo *flowInfo)
{
Expand All @@ -511,6 +641,12 @@ _MapFlowInfoToNl(PNL_BUFFER nlBuf, OvsFlowInfo *flowInfo)
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowStatsToNlStats --
* Maps OvsFlowStats to OVS_FLOW_ATTR_STATS attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowStatsToNlStats(PNL_BUFFER nlBuf, OvsFlowStats *flowStats)
{
Expand Down Expand Up @@ -541,6 +677,12 @@ _MapFlowStatsToNlStats(PNL_BUFFER nlBuf, OvsFlowStats *flowStats)
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowActionToNlAction --
* Maps flow actions to OVS_FLOW_ATTR_ACTION attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowActionToNlAction(PNL_BUFFER nlBuf, uint32_t actionsLen,
PNL_ATTR actions)
Expand Down Expand Up @@ -568,6 +710,12 @@ _MapFlowActionToNlAction(PNL_BUFFER nlBuf, uint32_t actionsLen,

}

/*
*----------------------------------------------------------------------------
* _MapFlowKeyToNlKey --
* Maps OvsFlowKey to OVS_FLOW_ATTR_KEY attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowKeyToNlKey(PNL_BUFFER nlBuf, OvsFlowKey *flowKey)
{
Expand Down Expand Up @@ -657,6 +805,12 @@ _MapFlowKeyToNlKey(PNL_BUFFER nlBuf, OvsFlowKey *flowKey)
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowTunKeyToNlKey --
* Maps OvsIPv4TunnelKey to OVS_TUNNEL_KEY_ATTR_ID attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowTunKeyToNlKey(PNL_BUFFER nlBuf, OvsIPv4TunnelKey *tunKey)
{
Expand Down Expand Up @@ -706,6 +860,12 @@ _MapFlowTunKeyToNlKey(PNL_BUFFER nlBuf, OvsIPv4TunnelKey *tunKey)
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowTunKeyToNlKey --
* Maps OvsIPv4FlowPutKey to OVS_KEY_ATTR_IPV4 attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowIpv4KeyToNlKey(PNL_BUFFER nlBuf, IpKey *ipv4FlowPutKey)
{
Expand Down Expand Up @@ -789,6 +949,12 @@ _MapFlowIpv4KeyToNlKey(PNL_BUFFER nlBuf, IpKey *ipv4FlowPutKey)
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowIpv6KeyToNlKey --
* Maps _MapFlowIpv6KeyToNlKey to OVS_KEY_ATTR_IPV6 attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey,
Icmp6Key *icmpv6FlowPutKey)
Expand Down Expand Up @@ -893,6 +1059,12 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey,
return rc;
}

/*
*----------------------------------------------------------------------------
* _MapFlowArpKeyToNlKey --
* Maps _MapFlowArpKeyToNlKey to OVS_KEY_ATTR_ARP attribute.
*----------------------------------------------------------------------------
*/
static NTSTATUS
_MapFlowArpKeyToNlKey(PNL_BUFFER nlBuf, ArpKey *arpFlowPutKey)
{
Expand Down Expand Up @@ -959,7 +1131,8 @@ _MapNlToFlowPut(POVS_MESSAGE msgIn, PNL_ATTR keyAttr,

/* Get tunnel keys attributes */
if ((NlAttrParseNested(nlMsgHdr, tunnelKeyAttrOffset,
NlAttrLen(keyAttr), nlFlowTunnelKeyPolicy,
NlAttrLen(keyAttrs[OVS_KEY_ATTR_TUNNEL]),
nlFlowTunnelKeyPolicy,
tunnelAttrs, ARRAY_SIZE(tunnelAttrs)))
!= TRUE) {
OVS_LOG_ERROR("Tunnel key Attr Parsing failed for msg: %p",
Expand All @@ -970,7 +1143,7 @@ _MapNlToFlowPut(POVS_MESSAGE msgIn, PNL_ATTR keyAttr,
}

_MapKeyAttrToFlowPut(keyAttrs, tunnelAttrs,
mappedFlow);
&(mappedFlow->key));

/* Map the action */
if (actionAttr) {
Expand Down Expand Up @@ -1029,10 +1202,9 @@ _MapNlToFlowPutFlags(PGENL_MSG_HDR genlMsgHdr,
static VOID
_MapKeyAttrToFlowPut(PNL_ATTR *keyAttrs,
PNL_ATTR *tunnelAttrs,
OvsFlowPut *mappedFlow)
OvsFlowKey *destKey)
{
const struct ovs_key_ethernet *eth_key;
OvsFlowKey *destKey = &(mappedFlow->key);

_MapTunAttrToFlowPut(keyAttrs, tunnelAttrs, destKey);

Expand Down Expand Up @@ -2054,10 +2226,7 @@ OvsPrepareFlow(OvsFlow **flow,

NTSTATUS
OvsGetFlowIoctl(PVOID inputBuffer,
UINT32 inputLength,
PVOID outputBuffer,
UINT32 outputLength,
UINT32 *replyLen)
PVOID outputBuffer)
{
NTSTATUS status = STATUS_SUCCESS;
OVS_DATAPATH *datapath = NULL;
Expand All @@ -2069,21 +2238,11 @@ OvsGetFlowIoctl(PVOID inputBuffer,
UINT32 dpNo;
LOCK_STATE_EX dpLockState;

if (inputLength != sizeof(OvsFlowGetInput)
|| inputBuffer == NULL) {
return STATUS_INFO_LENGTH_MISMATCH;
}

getInput = (OvsFlowGetInput *) inputBuffer;
getFlags = getInput->getFlags;
getActionsLen = getInput->actionsLen;
if (getInput->getFlags & FLOW_GET_KEY) {
return STATUS_INVALID_PARAMETER;
}

if (outputBuffer == NULL
|| outputLength != (sizeof *getOutput +
getInput->actionsLen)) {
if (outputBuffer == NULL) {
return STATUS_INFO_LENGTH_MISMATCH;
}

Expand All @@ -2104,8 +2263,6 @@ OvsGetFlowIoctl(PVOID inputBuffer,
goto dp_unlock;
}

// XXX: can be optimized to return only how much is written out
*replyLen = outputLength;
getOutput = (OvsFlowGetOutput *)outputBuffer;
ReportFlowInfo(flow, getFlags, &getOutput->info);

Expand Down
4 changes: 1 addition & 3 deletions datapath-windows/ovsext/Flow.h
View file
Expand Up @@ -65,9 +65,7 @@ NTSTATUS OvsDumpFlowIoctl(PVOID inputBuffer, UINT32 inputLength,
UINT32 *replyLen);
NTSTATUS OvsPutFlowIoctl(PVOID inputBuffer, UINT32 inputLength,
struct OvsFlowStats *stats);
NTSTATUS OvsGetFlowIoctl(PVOID inputBuffer, UINT32 inputLength,
PVOID outputBuffer, UINT32 outputLength,
UINT32 *replyLen);
NTSTATUS OvsGetFlowIoctl(PVOID inputBuffer, PVOID outputBuffer);
NTSTATUS OvsFlushFlowIoctl(UINT32 dpNo);

NTSTATUS OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
Expand Down
5 changes: 5 additions & 0 deletions datapath-windows/ovsext/Ioctl.c
View file
Expand Up @@ -654,9 +654,14 @@ OvsDeviceControl(PDEVICE_OBJECT deviceObject,
outputBuffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress,
NormalPagePriority);
if (outputBuffer) {
/* Commenting out the call.
* Post netlink implementation,
* we'll get rid of this file itself. */
#if 0
status = OvsGetFlowIoctl(inputBuffer, inputBufferLen,
outputBuffer, outputBufferLen,
&replyLen);
#endif
} else {
status = STATUS_INSUFFICIENT_RESOURCES;
}
Expand Down

0 comments on commit 8c26b81

Please sign in to comment.