LU-9029 kernel: kernel update [SLES12 SP2 4.4.38-93]

Update target and kernel_config files for new version

Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \
  mdsdistro=sles12sp2 ossdistro=sles12sp2 mdsfilesystemtype=ldiskfs \
  mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: Ia72bf9e6542627efdd946c7213dee2c77fa73e57
Reviewed-on: https://review.whamcloud.com/24938
Tested-by: Jenkins
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-data-in-dirent.patch
index 5116a6e..9327228 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-data-in-dirent.patch
+++ b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-data-in-dirent.patch
@@ -459,15 +459,22 @@ Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/namei.c
  
        /* Initialize as for dx_probe */
        hinfo.hash_version = dx_info->hash_version;
  
        /* Initialize as for dx_probe */
        hinfo.hash_version = dx_info->hash_version;

-@@ -1876,7 +2476,7 @@ static int make_indexed_dir(handle_t *ha
+@@ -1876,14 +2476,14 @@ static int make_indexed_dir(handle_t *ha

        }
        }

-       dx_release(frames);

  
  

--      retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
-+      retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
+-      retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
++      retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
+ out_frames:
+       /*
+        * Even if the block split failed, we have to properly write
+        * out all the changes we did so far. Otherwise we can end up
+        * with corrupted filesystem.
+        */
+       if (retval)
+               ext4_mark_inode_dirty(handle, dir);
+       dx_release(frames);

        brelse(bh);
        return retval;
        brelse(bh);
        return retval;

- out_frames:

 @@ -1909,6 +1949,8 @@ static int ext4_update_dotdot(handle_t *
        struct buffer_head * dir_block;
        struct ext4_dir_entry_2 * de;
 @@ -1909,6 +1949,8 @@ static int ext4_update_dotdot(handle_t *
        struct buffer_head * dir_block;
        struct ext4_dir_entry_2 * de;

diff --git a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-pdirop.patch
index c977b5e..b757ba4 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-pdirop.patch
+++ b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-pdirop.patch
@@ -1805,15 +1805,17 @@ Index: linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/namei.c
        err = ext4_handle_dirty_dirent_node(handle, dir, bh2);
        if (err)
                goto journal_error;
        err = ext4_handle_dirty_dirent_node(handle, dir, bh2);
        if (err)
                goto journal_error;

-@@ -1945,7 +2283,7 @@ static int make_indexed_dir(handle_t *ha
-       ext4_handle_dirty_dx_node(handle, dir, frame->bh);
-       ext4_handle_dirty_dirent_node(handle, dir, bh);
+@@ -1945,9 +2283,9 @@ static int make_indexed_dir(handle_t *ha
+       retval = ext4_handle_dirty_dirent_node(handle, dir, bh2);
+       if (retval)
+               goto out_frames;        

  
  

--      de = do_split(handle,dir, &bh, frame, &fname->hinfo);
-+      de = do_split(handle, dir, &bh, frames, frame, &fname->hinfo, NULL);
+-      de = do_split(handle,dir, &bh2, frame, &fname->hinfo);
++      de = do_split(handle, dir, &bh2, frames, frame, &fname->hinfo, NULL);

        if (IS_ERR(de)) {
        if (IS_ERR(de)) {

-               /*
-                * Even if the block split failed, we have to properly write
+               retval = PTR_ERR(de);
+               goto out_frames;
+       }

 @@ -2051,8 +2389,8 @@ out:
   * may not sleep between calling this and putting something into
   * the entry, as someone else might have used it while you slept.
 @@ -2051,8 +2389,8 @@ out:
   * may not sleep between calling this and putting something into
   * the entry, as someone else might have used it while you slept.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 819f99e..c960ea2 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -11,7 +11,7 @@ TBD Intel Corporation
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-91          (SLES11 SP4)
          3.12.67-60.64.24    (SLES12 SP1)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-91          (SLES11 SP4)
          3.12.67-60.64.24    (SLES12 SP1)

-         4.4.21-84           (SLES12 SP2)
+         4.4.38-93           (SLES12 SP2)

          vanilla linux 4.5.7 (ZFS only)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
          vanilla linux 4.5.7 (ZFS only)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)


@@ -22,7 +22,7 @@ TBD Intel Corporation
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-91          (SLES11 SP4)
          3.12.67-60.64.24    (SLES12 SP1)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-91          (SLES11 SP4)
          3.12.67-60.64.24    (SLES12 SP1)

-         4.4.21-84           (SLES12 SP2)
+         4.4.38-93           (SLES12 SP2)

          vanilla linux 4.5.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
        * Recommended ZFS / SPL version: 0.6.5.7
          vanilla linux 4.5.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
        * Recommended ZFS / SPL version: 0.6.5.7

diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config
index a95ee91..cd03d3c 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
 #
 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 4.4.21 Kernel Configuration
+# Linux/x86 4.4.38 Kernel Configuration

 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y


@@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set

-CONFIG_LOCALVERSION="-84-default"
+CONFIG_LOCALVERSION="-93-default"

 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y


@@ -3495,8 +3495,10 @@ CONFIG_I2C_SCMI=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_CBUS_GPIO is not set
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_CBUS_GPIO is not set

-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m

 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set

+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y

 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_OCORES is not set


@@ -5036,8 +5038,11 @@ CONFIG_SND_SST_MFLD_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m

+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m

 CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST_ACPI=m

+CONFIG_SND_SOC_INTEL_SST_MATCH=m

 CONFIG_SND_SOC_INTEL_BAYTRAIL=m
 CONFIG_SND_SOC_INTEL_BAYTRAIL=m

+# CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set

 CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m

diff --git a/lustre/kernel_patches/targets/4.4-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in
index acc2a57..7ceb8d1 100644 (file)
--- a/lustre/kernel_patches/targets/4.4-sles12.target.in
+++ b/lustre/kernel_patches/targets/4.4-sles12.target.in
@@ -1,6 +1,6 @@
 lnxmaj="4.4"
 lnxmaj="4.4"

-lnxmin=".21"
-lnxrel="84"
+lnxmin=".38"
+lnxrel="93"

 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated
 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index ce2f1cf..8d03611 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -21,6 +21,6 @@ PATCH SERIES FOR SERVER KERNELS:
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-91          (SLES11 SP4)
 3.12-sles12.series      3.12.67-60.64.24    (SLES12 SP1)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-91          (SLES11 SP4)
 3.12-sles12.series      3.12.67-60.64.24    (SLES12 SP1)

-4.4-sles12.series       4.4.21-84           (SLES12 SP2)
+4.4-sles12.series       4.4.38-93           (SLES12 SP2)

 
 See lustre/ChangeLog for supported client kernel versions.
 
 See lustre/ChangeLog for supported client kernel versions.