This is a backport on lustre 2.5.3 of the Intel patch to support RHEL6.6 kernel on master branch. =================================================================== From 54075d5eb2b1a6a81bc1ff400687135d3dd05a30 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 2 Oct 2014 08:21:54 -0700 Subject: [PATCH] LU-5740 kernel: kernel upgrade RHEL6.6 [2.6.32-504.el6] Upgrade kernel for el6 to RHEL6.6 kernel 2.6.32-504.el6 New ldiskfs patch series for el6.6 is included. Signed-off-by: Bob Glossman Change-Id: Ib820bf5927298263b0aadb662f8327b3c76d17a1 --- config/lustre-build-ldiskfs.m4 | 1 + .../rhel6.6/ext4-inode_info_reorganize.patch | 59 +++++++++++++++++++ .../series/ldiskfs-2.6-rhel6.6.series | 49 ++++++++++++++++ lustre/ChangeLog | 11 ++-- .../kernel-2.6.32-2.6-rhel6-i686.config | 58 ++++++++++++++++--- .../kernel-2.6.32-2.6-rhel6-x86_64.config | 61 +++++++++++++++++--- lustre/kernel_patches/targets/2.6-rhel6.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 8 files changed, 217 insertions(+), 26 deletions(-) create mode 100644 ldiskfs/kernel_patches/patches/rhel6.6/ext4-inode_info_reorganize.patch create mode 100644 ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series Index: b/config/lustre-build-ldiskfs.m4 =================================================================== --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -5,12 +5,14 @@ AC_MSG_CHECKING([which ldiskfs series to SER= AS_IF([test x$RHEL_KERNEL = xyes], [ + AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-504],[ AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-431],[ AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32-343],[ AS_VERSION_COMPARE([$RHEL_KERNEL_VERSION],[2.6.32],[], [SER="2.6-rhel6.series"],[SER="2.6-rhel6.series"])], [SER="2.6-rhel6.4.series"],[SER="2.6-rhel6.4.series"])], - [SER="2.6-rhel6.5.series"],[SER="2.6-rhel6.5.series"]) + [SER="2.6-rhel6.5.series"],[SER="2.6-rhel6.5.series"])], + [SER="2.6-rhel6.6.series"],[SER="2.6-rhel6.6.series"]) ], [test x$SUSE_KERNEL = xyes], [ AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[2.6.32],[], Index: b/ldiskfs/kernel_patches/patches/rhel6.6/ext4-inode_info_reorganize.patch =================================================================== --- /dev/null +++ b/ldiskfs/kernel_patches/patches/rhel6.6/ext4-inode_info_reorganize.patch @@ -0,0 +1,59 @@ +Index: linux-stage/fs/ext4/ext4.h +=================================================================== +--- linux-stage.orig/fs/ext4/ext4.h 2012-08-07 14:16:06.331203480 -0700 ++++ linux-stage/fs/ext4/ext4.h 2012-08-10 10:08:47.854206335 -0700 +@@ -713,6 +713,7 @@ + /* following fields for parallel directory operations -bzzz */ + struct semaphore i_append_sem; + ++ ext4_lblk_t i_dir_start_lookup; + /* + * i_block_group is the number of the block group which contains + * this file's inode. Constant across the lifetime of the inode, +@@ -724,7 +725,6 @@ + unsigned long i_state_flags; /* Dynamic state flags */ + unsigned long i_flags; + +- ext4_lblk_t i_dir_start_lookup; + #ifdef CONFIG_EXT4_FS_XATTR + /* + * Extended attributes can be read independently of the main file +@@ -788,10 +788,12 @@ + unsigned int i_reserved_data_blocks; + unsigned int i_reserved_meta_blocks; + unsigned int i_allocated_meta_blocks; +- unsigned short i_delalloc_reserved_flag; + sector_t i_da_metadata_calc_last_lblock; + int i_da_metadata_calc_len; + ++ /* allocation reservation info for delalloc */ ++ unsigned short i_delalloc_reserved_flag; ++ + /* on-disk additional length */ + __u16 i_extra_isize; + +@@ -807,16 +809,22 @@ + struct list_head i_aio_dio_complete_list; + spinlock_t i_completed_io_lock; + atomic_t i_unwritten; /* Number of inflight conversions pending */ +- struct mutex i_aio_mutex; /* big hammer for unaligned AIO */ + + /* + * Transactions that contain inode's metadata needed to complete + * fsync and fdatasync, respectively. + */ ++ + tid_t i_sync_tid; +- tid_t i_datasync_tid; ++ ++ struct mutex i_aio_mutex; /* big hammer for unaligned AIO */ + + __u64 i_fs_version; ++ /* ++ * Transactions that contain inode's metadata needed to complete ++ * fsync and fdatasync, respectively. ++ */ ++ tid_t i_datasync_tid; + }; + + #define HAVE_DISK_INODE_VERSION Index: b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series =================================================================== --- /dev/null +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series @@ -0,0 +1,49 @@ +rhel6.3/ext4-use-vzalloc-in-ext4_fill_flex_info.patch +rhel6.3/ext4-introduce-ext4_kvmalloc-ext4_kzalloc-and-ext4_kvfree.patch +rhel6.3/ext4-add-missing-kfree-on-error-return-path-in-add_new_gdb.patch +rhel6.3/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch +rhel6.3/ext4-wantedi-2.6.patch +rhel6.3/ext4-map_inode_page-2.6.18.patch +rhel6.3/export-ext4-2.6.patch +rhel6.3/ext4-remove-cond_resched-calls.patch +rhel6.3/ext4-nlink-2.6.patch +sles11sp1/ext4-ext_generation.patch +rhel6.3/ext4-inode-version.patch +rhel6.3/ext4-lookup-dotdot.patch +rhel6.3/ext4-print-inum-in-htree-warning.patch +rhel6.3/ext4-xattr-no-update-ctime.patch +rhel6.4/ext4-prealloc.patch +rhel6.3/ext4-mballoc-extra-checks.patch +rhel6.4/ext4-misc.patch +rhel6.3/ext4-big-endian-check-2.6.patch +rhel6.3/ext4-alloc-policy-2.6.patch +rhel6.3/ext4-force_over_128tb.patch +rhel6.3/ext4-pdir-fix.patch +rhel6.3/ext4-add-more-error-checks-to-ext4_mkdir.patch +rhel6.3/ext4-osd-iop-common.patch +rhel6.3/ext4-osd-iam-exports.patch +rhel6.3/ext4-hash-indexed-dir-dotdot-update.patch +rhel6.3/ext4-kill-dx_root.patch +rhel6.3/ext4-extents-mount-option.patch +rhel6.3/ext4-fiemap-2.6.patch +rhel6.4/ext4-mballoc-pa_free-mismatch.patch +rhel6.3/ext4_data_in_dirent.patch +rhel6.3/ext4-large-eas.patch +rhel6.3/ext4-disable-mb-cache.patch +rhel6.3/ext4-back-dquot-to.patch +rhel6.3/ext4-nocmtime-2.6.patch +rhel6.3/ext4-journal-callback.patch +rhel6.5/ext4-ext-walk-space.patch +rhel6.3/ext4-store-tree-generation-at-find.patch +rhel6.3/ext4_pdirop.patch +rhel6.4/ext4_extra_isize.patch +rhel6.3/ext4-quota-force-block-alloc-quotaoff.patch +rhel6.3/ext4-quota-dont-update-cmtime.patch +rhel6.5/ext4-quota-first-class.patch +rhel6.6/ext4-inode_info_reorganize.patch +rhel6.4/ext4-fix-mbgroups-access.patch +rhel6.3/ext4-fix-ext4_mb_add_n_trim.patch +rhel6.3/ext4-max-dir-size.patch +rhel6.4/ext4-max-dir-size-options.patch +rhel6.3/ext4-not-discard-preallocation-umount.patch +rhel6.3/ext4-journal-path-opt.patch Index: b/lustre/ChangeLog =================================================================== --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,10 +2,10 @@ * version 2.5.3 * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix * Server support for kernels: - 2.6.32-431.23.3.el6 (RHEL6) + 2.6.32-504.el6 (RHEL6) 3.0.101-0.35 (SLES11SP3) * Client support for unpatched kernels: - 2.6.32-431.23.3.el6 (RHEL6) + 2.6.32-504.el6 (RHEL6) 3.0.101-0.35 (SLES11SP3) 3.6.10-2.fc17 (FC17) * Recommended e2fsprogs version: 1.42.9.wc1 or newer Index: b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config =================================================================== --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Wed Feb 12 14:25:22 2014 +# Thu Oct 2 08:32:18 2014 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -191,6 +191,8 @@ CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y # @@ -451,7 +453,7 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_IPMI=y +CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=y @@ -470,6 +472,7 @@ CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_ACPI_EXTLOG=m CONFIG_SFI=y CONFIG_X86_APM_BOOT=y CONFIG_APM=y @@ -557,6 +560,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_MSI_DEFAULT_ON=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y @@ -1049,6 +1053,7 @@ CONFIG_OPENVSWITCH_GRE=y CONFIG_OPENVSWITCH_VXLAN=y CONFIG_RPS=y CONFIG_NETPRIO_CGROUP=y +CONFIG_NET_RX_BUSY_POLL=y CONFIG_RFS_ACCEL=y # @@ -1450,6 +1455,7 @@ CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_ADVANSYS is not set # CONFIG_SCSI_IN2000 is not set @@ -1614,15 +1620,20 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m # CONFIG_MD_MULTIPATH is not set CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m CONFIG_DM_DEBUG=y CONFIG_DM_BUFIO=m CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -1844,6 +1855,10 @@ CONFIG_IXGBE_DCB=y CONFIG_IXGBE_PTP=y CONFIG_IXGBEVF=m CONFIG_IXGB=m +CONFIG_I40E=m +# CONFIG_I40E_VXLAN is not set +# CONFIG_I40E_DCB is not set +CONFIG_I40EVF=m CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set @@ -1855,11 +1870,15 @@ CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX5_CORE=m +CONFIG_MLX5_DEBUG=y CONFIG_TEHUTI=m CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_BNA=m CONFIG_SFC=m @@ -2420,6 +2439,7 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m +CONFIG_HYPERV_KEYBOARD=m # CONFIG_GAMEPORT is not set # @@ -2489,10 +2509,10 @@ CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_XEN=y CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=y +CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=y +CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=y @@ -2659,6 +2679,7 @@ CONFIG_WM8350_POWER=m CONFIG_BATTERY_OLPC=y CONFIG_BATTERY_BQ27x00=m CONFIG_BATTERY_MAX17040=m +# CONFIG_POWERCAP is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2751,6 +2772,7 @@ CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_INTEL_POWERCLAMP is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2849,6 +2871,7 @@ CONFIG_BCMA_DRIVER_GPIO=y CONFIG_MFD_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_RTSX_PCI=m # CONFIG_HTC_PASIC3 is not set # CONFIG_UCB1400_CORE is not set # CONFIG_TPS65010 is not set @@ -3272,6 +3295,7 @@ CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m @@ -3280,6 +3304,7 @@ CONFIG_DRM_TTM=m # CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_I2C_NXP_TDA998X is not set # CONFIG_DRM_TDFX is not set CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -3291,6 +3316,9 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y # CONFIG_DRM_I810 is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y +CONFIG_DRM_I915_FBDEV=y +# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set +CONFIG_DRM_I915_UMS=y CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m @@ -3643,6 +3671,7 @@ CONFIG_HID_LOGITECH=y # CONFIG_LOGIRUMBLEPAD2_FF is not set CONFIG_HID_MICROSOFT=y CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=y CONFIG_HID_PANTHERLORD=y # CONFIG_PANTHERLORD_FF is not set @@ -3689,7 +3718,6 @@ CONFIG_USB_WUSB_CBAF=m # # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -3869,6 +3897,7 @@ CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_REALTEK_PCI=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -3884,6 +3913,7 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -3926,9 +3956,11 @@ CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_INFINIBAND_CXGB4=m CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set -# CONFIG_INFINIBAND_OCRDMA is not set +CONFIG_INFINIBAND_OCRDMA=m +# CONFIG_INFINIBAND_USNIC is not set CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -4160,6 +4192,7 @@ CONFIG_MXM_WMI=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y +CONFIG_UEFI_CPER=y CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m @@ -4454,6 +4487,7 @@ CONFIG_TIMER_STATS=y # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_LOCK_STAT is not set @@ -4541,6 +4575,7 @@ CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y +CONFIG_EARLY_PRINTK_EFI=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set @@ -4660,6 +4695,7 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -4669,7 +4705,7 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m @@ -4709,6 +4745,11 @@ CONFIG_CRYPTO_LZO=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=m CONFIG_CRYPTO_MPILIB=y CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y @@ -4760,7 +4801,6 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m -CONFIG_LIST_SORT=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y Index: b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config =================================================================== --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Wed Feb 12 14:25:22 2014 +# Thu Oct 2 08:32:18 2014 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -193,6 +193,8 @@ CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y # @@ -449,7 +451,7 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_IPMI=y +CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=y @@ -470,6 +472,7 @@ CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_ACPI_EXTLOG=m CONFIG_SFI=y # @@ -539,6 +542,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_MSI_DEFAULT_ON=y CONFIG_PCI_LEGACY=y # CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y @@ -1026,6 +1030,7 @@ CONFIG_OPENVSWITCH_GRE=y CONFIG_OPENVSWITCH_VXLAN=y CONFIG_RPS=y CONFIG_NETPRIO_CGROUP=y +CONFIG_NET_RX_BUSY_POLL=y CONFIG_RFS_ACCEL=y # @@ -1422,6 +1427,7 @@ CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_ADVANSYS is not set CONFIG_SCSI_ARCMSR=m @@ -1566,15 +1572,20 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m # CONFIG_MD_MULTIPATH is not set CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m CONFIG_DM_DEBUG=y CONFIG_DM_BUFIO=m CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -1767,6 +1778,10 @@ CONFIG_IXGBE_DCB=y CONFIG_IXGBE_PTP=y CONFIG_IXGBEVF=m CONFIG_IXGB=m +CONFIG_I40E=m +# CONFIG_I40E_VXLAN is not set +# CONFIG_I40E_DCB is not set +CONFIG_I40EVF=m CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set @@ -1778,11 +1793,15 @@ CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX5_CORE=m +CONFIG_MLX5_DEBUG=y CONFIG_TEHUTI=m CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y CONFIG_QLGE=m CONFIG_BNA=m CONFIG_SFC=m @@ -2314,6 +2333,7 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=m +CONFIG_HYPERV_KEYBOARD=m # CONFIG_GAMEPORT is not set # @@ -2378,10 +2398,10 @@ CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_XEN=y CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=y +CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=y +CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=y @@ -2541,6 +2561,8 @@ CONFIG_WM8350_POWER=m # CONFIG_BATTERY_DS2782 is not set CONFIG_BATTERY_BQ27x00=m CONFIG_BATTERY_MAX17040=m +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2633,6 +2655,7 @@ CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2723,6 +2746,7 @@ CONFIG_BCMA_DRIVER_GPIO=y CONFIG_MFD_CORE=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_RTSX_PCI=m # CONFIG_HTC_PASIC3 is not set # CONFIG_UCB1400_CORE is not set # CONFIG_TPS65010 is not set @@ -3138,6 +3162,7 @@ CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m @@ -3146,6 +3171,7 @@ CONFIG_DRM_TTM=m # CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_I2C_NXP_TDA998X is not set # CONFIG_DRM_TDFX is not set CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -3157,6 +3183,9 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y # CONFIG_DRM_I810 is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y +CONFIG_DRM_I915_FBDEV=y +# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set +CONFIG_DRM_I915_UMS=y CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m @@ -3469,6 +3498,7 @@ CONFIG_HID_LOGITECH=y # CONFIG_LOGIRUMBLEPAD2_FF is not set CONFIG_HID_MICROSOFT=y CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=y CONFIG_HID_PANTHERLORD=y # CONFIG_PANTHERLORD_FF is not set @@ -3515,7 +3545,6 @@ CONFIG_USB_WUSB_CBAF=m # # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -3695,6 +3724,7 @@ CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_REALTEK_PCI=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -3710,6 +3740,7 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -3749,14 +3780,17 @@ CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y CONFIG_INFINIBAND_IPATH=m CONFIG_INFINIBAND_QIB=m +CONFIG_INFINIBAND_QIB_DCA=y # CONFIG_INFINIBAND_AMSO1100 is not set CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_INFINIBAND_CXGB4=m CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set -# CONFIG_INFINIBAND_OCRDMA is not set +CONFIG_INFINIBAND_OCRDMA=m +# CONFIG_INFINIBAND_USNIC is not set CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG=y @@ -3984,6 +4018,7 @@ CONFIG_PVPANIC=y CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y +CONFIG_UEFI_CPER=y CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m @@ -4282,6 +4317,7 @@ CONFIG_TIMER_STATS=y # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_LOCK_STAT is not set @@ -4373,6 +4409,7 @@ CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y +CONFIG_EARLY_PRINTK_EFI=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set @@ -4492,6 +4529,8 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -4501,7 +4540,7 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m @@ -4542,6 +4581,11 @@ CONFIG_CRYPTO_LZO=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=m CONFIG_CRYPTO_MPILIB=y CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y @@ -4596,7 +4640,6 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m -CONFIG_LIST_SORT=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y Index: b/lustre/kernel_patches/targets/2.6-rhel6.target.in =================================================================== --- a/lustre/kernel_patches/targets/2.6-rhel6.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="431.23.3.el6" +lnxrel="504.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.series Index: b/lustre/kernel_patches/which_patch =================================================================== --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -11,7 +11,7 @@ ldiskfs build process and SHOULD NOT be Servers running only ZFS OSDs DO NOT need any patches. PATCH SERIES FOR SERVER KERNELS: -2.6-rhel6.series 2.6.32-431.23.3.el6 +2.6-rhel6.series 2.6.32-504.el6 Clients since 2.6.18 DO NOT need any patches. See lustre/ChangeLog for supported client kernel versions.