From patchwork Wed Apr 3 17:48:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 1076244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ZD844pWnz9sNM for ; Thu, 4 Apr 2019 04:48:19 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C39441409; Wed, 3 Apr 2019 17:48:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id DFCD81407 for ; Wed, 3 Apr 2019 17:48:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 204447A6 for ; Wed, 3 Apr 2019 17:48:13 +0000 (UTC) X-Originating-IP: 89.46.161.178 Received: from localhost.localdomain (unknown [89.46.161.178]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 0E44C1BF20B; Wed, 3 Apr 2019 17:48:11 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Wed, 3 Apr 2019 20:48:03 +0300 Message-Id: <20190403174803.28924-1-aserdean@ovn.org> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2] datapath-windows: Add Win10Analyze target X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This patch adds a new target called `Win10Analyze` to the driver solution. It enables us to trigger static analysis over the Win10 target. Since the location of the ruleset of drivers is somewhat random starting from 1803: https://www.osr.com/blog/2018/05/21/wdk-1803-ca/ Commit the ruleset inside our repository. This is the same ruleset used for 8,8.1 and 10. Signed-off-by: Alin Gabriel Serdean Acked-by: Anand Kumar Acked-by: Anand Kumar --- datapath-windows/Package/package.VcxProj | 21 ++++- datapath-windows/Package/package.VcxProj.user | 5 +- datapath-windows/automake.mk | 2 + .../misc/DriverRecommendedRules.ruleset | 86 +++++++++++++++++++ datapath-windows/ovsext.sln | 5 ++ datapath-windows/ovsext/ovsext.vcxproj | 39 ++++++++- datapath-windows/ovsext/ovsext.vcxproj.user | 5 +- 7 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 datapath-windows/misc/DriverRecommendedRules.ruleset diff --git a/datapath-windows/Package/package.VcxProj b/datapath-windows/Package/package.VcxProj index de747eed2..5939a8816 100644 --- a/datapath-windows/Package/package.VcxProj +++ b/datapath-windows/Package/package.VcxProj @@ -9,6 +9,10 @@ Win10 Release x64 + + Win10Analyze + x64 + Win8.1 Debug x64 @@ -71,6 +75,13 @@ WindowsKernelModeDriver$(PlatformToolsetVer) Desktop + + + true + 10.0 + WindowsKernelModeDriver$(PlatformToolsetVer) + Desktop + Windows8 true @@ -113,6 +124,9 @@ true + + true + DbgengKernelDebugger False @@ -148,6 +162,11 @@ true + + + true + + true @@ -185,4 +204,4 @@ - + \ No newline at end of file diff --git a/datapath-windows/Package/package.VcxProj.user b/datapath-windows/Package/package.VcxProj.user index 6231d93f7..5b0c53539 100644 --- a/datapath-windows/Package/package.VcxProj.user +++ b/datapath-windows/Package/package.VcxProj.user @@ -15,6 +15,9 @@ TestSign + + TestSign + TestSign @@ -24,4 +27,4 @@ TestSign - + \ No newline at end of file diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk index 3820041f6..b8cf5dd95 100644 --- a/datapath-windows/automake.mk +++ b/datapath-windows/automake.mk @@ -3,6 +3,7 @@ EXTRA_DIST += \ datapath-windows/Package/package.VcxProj.user \ datapath-windows/include/OvsDpInterfaceExt.h \ datapath-windows/include/OvsDpInterfaceCtExt.h \ + datapath-windows/misc/DriverRecommendedRules.ruleset \ datapath-windows/misc/OVS.psm1 \ datapath-windows/misc/install.cmd \ datapath-windows/misc/uninstall.cmd \ @@ -86,5 +87,6 @@ EXTRA_DIST += \ datapath-windows/ovsext/resource.h datapath_windows_analyze: all + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Analyze" MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1Analyze" MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8Analyze" diff --git a/datapath-windows/misc/DriverRecommendedRules.ruleset b/datapath-windows/misc/DriverRecommendedRules.ruleset new file mode 100644 index 000000000..0faae599c --- /dev/null +++ b/datapath-windows/misc/DriverRecommendedRules.ruleset @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln index 1000104f1..ab006e84f 100644 --- a/datapath-windows/ovsext.sln +++ b/datapath-windows/ovsext.sln @@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ovsext", "ovsext\ovsext.vcx EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Win10Analyze|x64 = Win10Analyze|x64 Win10Debug|x64 = Win10Debug|x64 Win10Release|x64 = Win10Release|x64 Win8.1Analyze|x64 = Win8.1Analyze|x64 @@ -22,6 +23,8 @@ Global Win8Release|x64 = Win8Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.ActiveCfg = Win10Analyze|x64 + {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.Build.0 = Win10Analyze|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.ActiveCfg = Win10 Debug|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Build.0 = Win10 Debug|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Deploy.0 = Win10 Debug|x64 @@ -42,6 +45,8 @@ Global {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Debug|x64.Build.0 = Win8 Debug|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.ActiveCfg = Win8 Release|x64 {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.Build.0 = Win8 Release|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.ActiveCfg = Win10Analyze|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.Build.0 = Win10Analyze|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.ActiveCfg = Win10 Debug|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Build.0 = Win10 Debug|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Deploy.0 = Win10 Debug|x64 diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj index 0509b765b..d50a126b4 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj +++ b/datapath-windows/ovsext/ovsext.vcxproj @@ -9,6 +9,10 @@ Win10 Release x64 + + Win10Analyze + x64 + Win8.1 Debug x64 @@ -71,6 +75,13 @@ WindowsKernelModeDriver$(PlatformToolsetVer) Desktop + + + True + 10.0 + WindowsKernelModeDriver$(PlatformToolsetVer) + Desktop + Windows8 True @@ -131,6 +142,9 @@ + + + @@ -182,11 +196,18 @@ true + + true + ..\misc\DriverRecommendedRules.ruleset + true + true + ..\misc\DriverRecommendedRules.ruleset true + ..\misc\DriverRecommendedRules.ruleset @@ -276,6 +297,17 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 + + + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 + + + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 + + + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib;$(DDK_LIB_PATH)\netio.lib @@ -290,6 +322,7 @@ .;$(IntDir);%(AdditionalIncludeDirectories);..\.. .;$(IntDir);%(AdditionalIncludeDirectories);..\.. .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) + .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) .;$(IntDir);%(AdditionalIncludeDirectories);..\.. .;$(IntDir);%(AdditionalIncludeDirectories);..\.. .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) @@ -299,10 +332,12 @@ true true true + true true true true true + true $(Version) @@ -314,6 +349,7 @@ $(Version) + $(Version) $(Version) @@ -375,6 +411,7 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) @@ -387,4 +424,4 @@ - + \ No newline at end of file diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user b/datapath-windows/ovsext/ovsext.vcxproj.user index 6231d93f7..5b0c53539 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj.user +++ b/datapath-windows/ovsext/ovsext.vcxproj.user @@ -15,6 +15,9 @@ TestSign + + TestSign + TestSign @@ -24,4 +27,4 @@ TestSign - + \ No newline at end of file