On Thu, Oct 23, 2014 at 05:33:13PM -0700, Nithin Raju wrote:
> In this patch, we make the following updates to the vport add code:
>
> 1. Clarify the roles of the different hash tables, so it is easier to
> read/write code in the future.
> 2. Update OvsNewVportCmdHandler() to support adding bridge-internal
> ports.
> 3. Fixes in OvsNewVportCmdHandler() to support adding external port.
> Earlier, we'd hit ASSERTs.
> 4. I could not figure out way to add a port of type
> OVS_PORT_TYPE_INTERNAL with name "internal" to the confdb using
> ovs-vsctl.exe. And, this is needed in order to add the Hyper-V
> internal port from userspace. To workaround this problem, we treat a
> port of type OVS_PORT_TYPE_NETDEV with name "internal" as a request
> to add the Hyper-V internal port. This is a workaround. The end
> result is that there's a discrepancy between the port type in the
> datpaath v/s confdb, but this has not created any trouble in testing
> so far. If this ends up becoming an issue, we can mark the Hyper-V
> internal port to be of type OVS_PORT_TYPE_NETDEV. No harm.
> 5. Because of changes indicated in #1, we also update the vport dump
> code to look at the correct hash table for ports added from
> userspace.
> 6. Add a OvsGetTunnelVport() for convenience.
> 7. Update ASSERTs() while cleaning up the switch.
> 8. Nuke OvsGetExternalVport() and OvsGetExternalMtu().
>
> Signed-off-by: Nithin Raju <[email protected]>
Applied, thanks.
I had to apply the following hunk by hand because of a change in the
context, please check that it is OK:
diff a/datapath-windows/ovsext/Switch.c b/datapath-windows/ovsext/Switch.c
(rejected hunks)
@@ -428,6 +428,7 @@ OvsCleanupSwitchContext(POVS_SWITCH_CONTEXT switchContext)
/* We need to do cleanup for tunnel port here. */
ASSERT(switchContext->numHvVports == 0);
+ ASSERT(switchContext->numNonHvVports == 0);
NdisFreeRWLock(switchContext->dispatchLock);
NdisFreeSpinLock(&(switchContext->pidHashLock));
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
