Disable CONFIG_HYPERV_BALLOON and CONFIG_PAGE_REPORTING

Author: LiliDeng

linux_pipeline/Jenkins_pipeline_msft

@@ -177,8 +177,8 @@ pipeline {
 		description: 'What stages to run', name: 'ENABLED_STAGES')
 	}
 	environment {
-		LISAV2_REMOTE = "https://github.com/lis/LISAv2.git"
-		LISAV2_BRANCH = "master"
+		LISAV2_REMOTE = "https://github.com/LiliDeng/LISAv2.git"
+		LISAV2_BRANCH = "fix_issues815"
 		LISAV2_AZURE_REGION = "westus2"
 		LISAV2_RG_IDENTIFIER = "msftk"
 		LISAV2_AZURE_VM_SIZE_SMALL = "Standard_A2"
@@ -392,7 +392,7 @@ pipeline {
 							" -RGIdentifier '${env.LISAV2_RG_IDENTIFIER}'" +
 							" -TestPlatform 'Azure'" +
 							" -CustomKernel 'localfile:./scripts/package_building/${env.BUILD_NUMBER}-${env.BRANCH_NAME}-${env.KERNEL_ARTIFACTS_PATH}/*/${env.PACKAGE_TYPE}/*.${env.PACKAGE_TYPE}'" +
-							" -OverrideVMSize '${env.LISAV2_AZURE_VM_SIZE_LARGE}'" +
+							" -OverrideVMSize '${env.LISAV2_AZURE_VM_SIZE_LARGE}' -ForceCustom" +
 							" -ARMImageName '${env.AZURE_OS_IMAGE}'" +
 							" -TestNames 'VERIFY-LIS-MODULES-VERSION'" +
 							" -StorageAccount 'ExistingStorage_Standard'" +
@@ -427,7 +427,7 @@ pipeline {
 							" -RGIdentifier '${env.LISAV2_RG_IDENTIFIER}'" +
 							" -TestPlatform 'Azure'" +
 							" -CustomKernel 'localfile:./scripts/package_building/${env.BUILD_NUMBER}-${env.BRANCH_NAME}-${env.KERNEL_ARTIFACTS_PATH}/*/${env.PACKAGE_TYPE}/*.${env.PACKAGE_TYPE}'" +
-							" -OverrideVMSize '${env.LISAV2_AZURE_VM_SIZE_SMALL}'" +
+							" -OverrideVMSize '${env.LISAV2_AZURE_VM_SIZE_SMALL}' -ForceCustom" +
 							" -ARMImageName '${env.AZURE_OS_IMAGE}'" +
 							" -TestNames 'VERIFY-LIS-MODULES-VERSION'" +
 							" -StorageAccount 'ExistingStorage_Standard'" +
@@ -497,7 +497,7 @@ pipeline {
 					" -RGIdentifier '${env.LISAV2_RG_IDENTIFIER}'" +
 					" -TestPlatform 'Azure'" +
 					" -CustomKernel 'localfile:./scripts/package_building/${env.BUILD_NUMBER}-${env.BRANCH_NAME}-${env.KERNEL_ARTIFACTS_PATH}/*/${env.PACKAGE_TYPE}/*.${env.PACKAGE_TYPE}'" +
-					" -OverrideVMSize '${env.LISAV2_AZURE_VM_SIZE_SMALL}'" +
+					" -OverrideVMSize '${env.LISAV2_AZURE_VM_SIZE_SMALL}' -ForceCustom" +
 					" -ARMImageName '${env.AZURE_OS_IMAGE}'" +
 					" -TestNames 'CAPTURE-VHD-BEFORE-TEST'" +
 					" -XMLSecretFile '${env.Azure_Secrets_File}'"

linux_pipeline/Jenkinsfile_upstream_kernel

@@ -397,7 +397,7 @@ pipeline {
 							" -RGIdentifier '${LISAV2_RG_IDENTIFIER}'" +
 							" -TestPlatform 'Azure'" +
 							" -CustomKernel 'localfile:./scripts/package_building/${env.BUILD_NUMBER}-${env.BRANCH_NAME}-${env.KERNEL_ARTIFACTS_PATH}/*/${env.PACKAGE_TYPE}/*.${env.PACKAGE_TYPE}'" +
-							" -OverrideVMSize '${LISAV2_AZURE_VM_SIZE_LARGE}'" +
+							" -OverrideVMSize '${LISAV2_AZURE_VM_SIZE_LARGE}' -ForceCustom" +
 							" -ARMImageName '${AZURE_OS_IMAGE}'" +
 							" -TestNames 'VERIFY-LIS-MODULES-VERSION'" +
 							" -StorageAccount 'ExistingStorage_Standard'" +

scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos

@@ -904,7 +904,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
+CONFIG_PAGE_REPORTING=n
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
@@ -1817,7 +1817,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_MQ_DEFAULT=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -4112,7 +4112,7 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
+CONFIG_HYPERV_BALLOON=n
 # CONFIG_STAGING is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WIRELESS=m
@@ -5527,3 +5527,4 @@ CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
 CONFIG_KALLSYMS_ALL=y
+CONFIG_TASK_IO_ACCOUNTING=y

scripts/package_building/deps-lis/kernel_config/Microsoft/config-azure-centos-5.4

@@ -908,7 +908,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
+CONFIG_PAGE_REPORTING=n
 CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -1931,6 +1931,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_MQ_DEFAULT=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -4356,7 +4357,7 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
+CONFIG_HYPERV_BALLOON=n
 # end of Microsoft Hyper-V guest support
 
 # CONFIG_GREYBUS is not set
@@ -5993,3 +5994,4 @@ CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
 # end of Kernel hacking
+CONFIG_TASK_IO_ACCOUNTING=y