From: Nithin Raju Date: Fri, 19 Jun 2015 16:13:08 +0000 (-0700) Subject: datapath-windows: use correct dst port during Vxlan Tx X-Git-Tag: v2.4.0~80 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=0980247015b8102d0510643cc40a8b6931357abd datapath-windows: use correct dst port during Vxlan Tx A previous commit used the wrong DST port in the UDP header during Vxlan Tx which caused Vxlan tunneling to break. Fixing it here.. Also included is a cosmetic fix in OvsDetectTunnelRxPkt() where we were using htons() instead of ntohs(). Doesn't make a difference in practice though. One more change is, OvsIpHlprCbVxlan() has been nuked since it is not used. Not sure if it is worth being resurrected. Testing done: Ping across Vxlan tunnel and Stt tunnel. Signed-off-by: Nithin Raju Reported-by: Eitan Eliahu Acked-by: Alin Gabriel Serdean Signed-off-by: Gurucharan Shetty --- diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c index d75949ca4..e5c122fbb 100644 --- a/datapath-windows/ovsext/Actions.c +++ b/datapath-windows/ovsext/Actions.c @@ -207,7 +207,7 @@ OvsDetectTunnelRxPkt(OvsForwardingContext *ovsFwdCtx, */ if (!flowKey->ipKey.nwFrag && flowKey->ipKey.nwProto == IPPROTO_UDP) { - UINT16 dstPort = htons(flowKey->ipKey.l4.tpDst); + UINT16 dstPort = ntohs(flowKey->ipKey.l4.tpDst); tunnelVport = OvsFindTunnelVportByDstPort(ovsFwdCtx->switchContext, dstPort, OVS_VPORT_TYPE_VXLAN); @@ -654,14 +654,13 @@ OvsTunnelPortTx(OvsForwardingContext *ovsFwdCtx) /* Do the encap. Encap function does not consume the NBL. */ switch(ovsFwdCtx->tunnelTxNic->ovsType) { case OVS_VPORT_TYPE_VXLAN: - status = OvsEncapVxlan(ovsFwdCtx->curNbl, &ovsFwdCtx->tunKey, - ovsFwdCtx->switchContext, + status = OvsEncapVxlan(ovsFwdCtx->tunnelTxNic, ovsFwdCtx->curNbl, + &ovsFwdCtx->tunKey, ovsFwdCtx->switchContext, &ovsFwdCtx->layers, &newNbl); break; case OVS_VPORT_TYPE_STT: status = OvsEncapStt(ovsFwdCtx->tunnelTxNic, ovsFwdCtx->curNbl, - &ovsFwdCtx->tunKey, - ovsFwdCtx->switchContext, + &ovsFwdCtx->tunKey, ovsFwdCtx->switchContext, &ovsFwdCtx->layers, &newNbl); break; default: diff --git a/datapath-windows/ovsext/Stt.c b/datapath-windows/ovsext/Stt.c index 1f708c843..b6272c3c7 100644 --- a/datapath-windows/ovsext/Stt.c +++ b/datapath-windows/ovsext/Stt.c @@ -114,8 +114,8 @@ OvsEncapStt(POVS_VPORT_ENTRY vport, return NDIS_STATUS_FAILURE; } - status = OvsDoEncapStt(vport, curNbl, tunKey, &fwdInfo, layers, switchContext, - newNbl); + status = OvsDoEncapStt(vport, curNbl, tunKey, &fwdInfo, layers, + switchContext, newNbl); return status; } diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c index fa6be666b..f43805aa3 100644 --- a/datapath-windows/ovsext/Vxlan.c +++ b/datapath-windows/ovsext/Vxlan.c @@ -170,7 +170,8 @@ OvsCleanupVxlanTunnel(PIRP irp, *---------------------------------------------------------------------------- */ static __inline NDIS_STATUS -OvsDoEncapVxlan(PNET_BUFFER_LIST curNbl, +OvsDoEncapVxlan(POVS_VPORT_ENTRY vport, + PNET_BUFFER_LIST curNbl, OvsIPv4TunnelKey *tunKey, POVS_FWD_INFO fwdInfo, POVS_PACKET_HDR_INFO layers, @@ -185,6 +186,7 @@ OvsDoEncapVxlan(PNET_BUFFER_LIST curNbl, IPHdr *ipHdr; UDPHdr *udpHdr; VXLANHdr *vxlanHdr; + POVS_VXLAN_VPORT vportVxlan; UINT32 headRoom = OvsGetVxlanTunHdrSize(); UINT32 packetLength; @@ -211,6 +213,10 @@ OvsDoEncapVxlan(PNET_BUFFER_LIST curNbl, } } } + + vportVxlan = (POVS_VXLAN_VPORT) GetOvsVportPriv(vport); + ASSERT(vportVxlan); + /* If we didn't split the packet above, make a copy now */ if (*newNbl == NULL) { *newNbl = OvsPartialCopyNBL(switchContext, curNbl, 0, headRoom, @@ -274,7 +280,7 @@ OvsDoEncapVxlan(PNET_BUFFER_LIST curNbl, /* UDP header */ udpHdr = (UDPHdr *)((PCHAR)ipHdr + sizeof *ipHdr); udpHdr->source = htons(tunKey->flow_hash | 32768); - udpHdr->dest = htons(tunKey->dst_port); + udpHdr->dest = htons(vportVxlan->dstPort); udpHdr->len = htons(NET_BUFFER_DATA_LENGTH(curNb) - headRoom + sizeof *udpHdr + sizeof *vxlanHdr); udpHdr->check = 0; @@ -308,7 +314,8 @@ ret_error: *---------------------------------------------------------------------------- */ NDIS_STATUS -OvsEncapVxlan(PNET_BUFFER_LIST curNbl, +OvsEncapVxlan(POVS_VPORT_ENTRY vport, + PNET_BUFFER_LIST curNbl, OvsIPv4TunnelKey *tunKey, POVS_SWITCH_CONTEXT switchContext, POVS_PACKET_HDR_INFO layers, @@ -331,48 +338,10 @@ OvsEncapVxlan(PNET_BUFFER_LIST curNbl, return NDIS_STATUS_FAILURE; } - return OvsDoEncapVxlan(curNbl, tunKey, &fwdInfo, layers, + return OvsDoEncapVxlan(vport, curNbl, tunKey, &fwdInfo, layers, switchContext, newNbl); } - -/* - *---------------------------------------------------------------------------- - * OvsIpHlprCbVxlan -- - * Callback function for IP helper. - * XXX: not used currently - *---------------------------------------------------------------------------- - */ -static VOID -OvsIpHlprCbVxlan(PNET_BUFFER_LIST curNbl, - UINT32 inPort, - OvsIPv4TunnelKey *tunKey, - PVOID cbData1, - PVOID cbData2, - NTSTATUS result, - POVS_FWD_INFO fwdInfo) -{ - OVS_PACKET_HDR_INFO layers; - OvsFlowKey key; - NDIS_STATUS status; - UNREFERENCED_PARAMETER(inPort); - - status = OvsExtractFlow(curNbl, inPort, &key, &layers, NULL); - if (result == STATUS_SUCCESS) { - status = OvsDoEncapVxlan(curNbl, tunKey, fwdInfo, &layers, - (POVS_SWITCH_CONTEXT)cbData1, NULL); - } else { - status = NDIS_STATUS_FAILURE; - } - - if (status != NDIS_STATUS_SUCCESS) { - // XXX: Free up the NBL; - return; - } - - OvsLookupFlowOutput((POVS_SWITCH_CONTEXT)cbData1, cbData2, curNbl); -} - /* *---------------------------------------------------------------------------- * OvsCalculateUDPChecksum diff --git a/datapath-windows/ovsext/Vxlan.h b/datapath-windows/ovsext/Vxlan.h index 448ee9722..b010af02d 100644 --- a/datapath-windows/ovsext/Vxlan.h +++ b/datapath-windows/ovsext/Vxlan.h @@ -62,7 +62,8 @@ NTSTATUS OvsCleanupVxlanTunnel(PIRP irp, NDIS_STATUS OvsSlowPathDecapVxlan(const PNET_BUFFER_LIST packet, OvsIPv4TunnelKey *tunnelKey); -NDIS_STATUS OvsEncapVxlan(PNET_BUFFER_LIST curNbl, +NDIS_STATUS OvsEncapVxlan(POVS_VPORT_ENTRY vport, + PNET_BUFFER_LIST curNbl, OvsIPv4TunnelKey *tunKey, POVS_SWITCH_CONTEXT switchContext, POVS_PACKET_HDR_INFO layers,