diff options
| author | Anand Kumar <kumaranand@vmware.com> | 2017-05-04 15:12:52 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-05-08 10:01:30 -0400 |
| commit | 39ccaaf7d1f819cb0fd796f3bdb3c2c8b17f24ed (patch) | |
| tree | 5e52ef36d254113e8dffcf5e6a1fc4c54a842c77 /datapath-windows/ovsext/User.c | |
| parent | 45bde0177ad31571e2d4bb5d98b616ddc6131fab (diff) | |
| download | openvswitch-39ccaaf7d1f819cb0fd796f3bdb3c2c8b17f24ed.tar.gz | |
datapath-windows: Retain MRU value in the _OVS_BUFFER_CONTEXT.
This patch introduces a new field MRU(Maximum Recieved Unit) in the
_OVS_BUFFER_CONTEXT and it is used only for Ip Fragments to retain MRU for
the reassembled IP datagram when the packet is forwarded to userspace.
Signed-off-by: Anand Kumar <kumaranand@vmware.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Diffstat (limited to 'datapath-windows/ovsext/User.c')
| -rw-r--r-- | datapath-windows/ovsext/User.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/datapath-windows/ovsext/User.c b/datapath-windows/ovsext/User.c index c7ac28456..31546408d 100644 --- a/datapath-windows/ovsext/User.c +++ b/datapath-windows/ovsext/User.c @@ -283,7 +283,8 @@ OvsNlExecuteCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx, [OVS_PACKET_ATTR_ACTIONS] = {.type = NL_A_UNSPEC, .optional = FALSE}, [OVS_PACKET_ATTR_USERDATA] = {.type = NL_A_UNSPEC, .optional = TRUE}, [OVS_PACKET_ATTR_EGRESS_TUN_KEY] = {.type = NL_A_UNSPEC, - .optional = TRUE} + .optional = TRUE}, + [OVS_PACKET_ATTR_MRU] = { .type = NL_A_U16, .optional = TRUE } }; RtlZeroMemory(&execute, sizeof(OvsPacketExecute)); @@ -381,6 +382,10 @@ _MapNlAttrToOvsPktExec(PNL_MSG_HDR nlMsgHdr, PNL_ATTR *nlAttrs, ASSERT(keyAttrs[OVS_KEY_ATTR_IN_PORT]); execute->inPort = NlAttrGetU32(keyAttrs[OVS_KEY_ATTR_IN_PORT]); execute->keyAttrs = keyAttrs; + + if (nlAttrs[OVS_PACKET_ATTR_MRU]) { + execute->mru = NlAttrGetU16(nlAttrs[OVS_PACKET_ATTR_MRU]); + } } NTSTATUS @@ -397,6 +402,7 @@ OvsExecuteDpIoctl(OvsPacketExecute *execute) POVS_VPORT_ENTRY vport = NULL; PNL_ATTR tunnelAttrs[__OVS_TUNNEL_KEY_ATTR_MAX]; OvsFlowKey tempTunKey = {0}; + POVS_BUFFER_CONTEXT ctx; if (execute->packetLen == 0) { status = STATUS_INVALID_PARAMETER; @@ -459,6 +465,9 @@ OvsExecuteDpIoctl(OvsPacketExecute *execute) ndisStatus = OvsExtractFlow(pNbl, execute->inPort, &key, &layers, tempTunKey.tunKey.dst == 0 ? NULL : &tempTunKey.tunKey); + ctx = (POVS_BUFFER_CONTEXT)NET_BUFFER_LIST_CONTEXT_DATA_START(pNbl); + ctx->mru = execute->mru; + if (ndisStatus == NDIS_STATUS_SUCCESS) { NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, &lockState, 0); ndisStatus = OvsActionsExecute(gOvsSwitchContext, NULL, pNbl, @@ -988,6 +997,7 @@ OvsCreateQueueNlPacket(PVOID userData, UINT32 nlMsgSize; NL_BUFFER nlBuf; PNL_MSG_HDR nlMsg; + POVS_BUFFER_CONTEXT ctx; if (vport == NULL){ /* No vport is not fatal. */ @@ -1071,6 +1081,14 @@ OvsCreateQueueNlPacket(PVOID userData, goto fail; } + /* Set MRU attribute */ + ctx = (POVS_BUFFER_CONTEXT)NET_BUFFER_LIST_CONTEXT_DATA_START(nbl); + if (ctx->mru != 0) { + if (!NlMsgPutTailU16(&nlBuf, OVS_PACKET_ATTR_MRU, (UINT16)ctx->mru)) { + goto fail; + } + } + /* XXX must send OVS_PACKET_ATTR_EGRESS_TUN_KEY if set by vswtchd */ if (userData){ if (!NlMsgPutTailUnspec(&nlBuf, OVS_PACKET_ATTR_USERDATA, |