Whamcloud Community JIRA

Whamcloud Community JIRA https://jira.whamcloud.com This file is an XML representation of an issue en-us

9.4.14

940014

05-12-2023

[LU-5363] kernel update [SLES11 SP3 3.0.101-0.35] https://jira.whamcloud.com/browse/LU-5363 Lustre <p>New kernel version for SLES11 SP3, 3.0.101-0.35. Need to update lustre config and build files. If upstream fix for loop devices is present need to reeanble sanity test previously skipped.</p> LU-5363

kernel update [SLES11 SP3 3.0.101-0.35]

Improvement Minor Resolved Fixed Bob Glossman Bob Glossman Thu, 17 Jul 2014 16:34:28 +0000 Mon, 25 Aug 2014 16:55:24 +0000 Tue, 19 Aug 2014 01:26:49 +0000 Lustre 2.6.0 Lustre 2.7.0 Lustre 2.5.3 0 6 <p>The new update for sles11sp3 has broken the lustre build. It looks to be due to changes in linux #include files. example errors:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre> CC [M] /home/bogl/lustre-release/lustre/fid/fid_request.o In file included from /home/bogl/lustre-release/lustre/include/linux/lustre_compat25.h:44, from /home/bogl/lustre-release/lustre/include/linux/obd_support.h:54, from /home/bogl/lustre-release/lustre/include/obd_support.h:44, from /home/bogl/lustre-release/lustre/include/linux/obd.h:44, from /home/bogl/lustre-release/lustre/include/obd.h:44, from /home/bogl/lustre-release/lustre/fid/fid_request.c:47: /home/bogl/lustre-release/lustre/include/linux/lustre_patchless_compat.h:100:1: error: "d_count" redefined In file included from /usr/src/linux-3.0.101-0.35/include/linux/fs.h:396, from /usr/src/linux-3.0.101-0.35/include/linux/pagemap.h:8, from /home/bogl/lustre-release/libcfs/include/libcfs/linux/linux-mem.h:54, from /home/bogl/lustre-release/libcfs/include/libcfs/linux/libcfs.h:52, from /home/bogl/lustre-release/libcfs/include/libcfs/libcfs.h:47, from /home/bogl/lustre-release/lustre/fid/fid_request.c:46: /usr/src/linux-3.0.101-0.35/include/linux/dcache.h:153:1: error: this is the location of the previous definition make[8]: *** [/home/bogl/lustre-release/lustre/fid/fid_request.o] Error 1 make[7]: *** [/home/bogl/lustre-release/lustre/fid] Error 2 make[6]: *** [/home/bogl/lustre-release/lustre] Error 2 make[5]: *** [_module_/home/bogl/lustre-release] Error 2 make[4]: *** [sub-make] Error 2 make[3]: *** [all] Error 2 make[3]: Leaving directory `/usr/src/linux-3.0.101-0.35-obj/x86_64/default' make[2]: *** [modules] Error 2 make[2]: Leaving directory `/home/bogl/lustre-release' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/bogl/lustre-release' make: *** [all] Error 2 </pre> </div></div> <p>This problem appears to be due to new unconditional #defines in kernel <linux/dcache.h> of</p> <p>#define d_lock d_lockref.lock<br/> #define d_count d_lockref.count</p> <p>These conflict with the #define of d_count() (a macro function, not a simple #define) in lustre #include lustre/include/linux/lustre_patchless_compat.h.</p> <p>There is already some autoconf for HAVE_D_COUNT, but it looks for an existing d_count() and doesn't find one in linux #includes. Not sure how to change things so it operates correctly. Not sure any distro we still support ever has HAVE_D_COUNT #define'd.</p> <p>Think I may need some help solving this build problem. The kernel update is blocked until I have a working solution.</p> <p>This is due to the inclusion of lock ref in a performance update. It's binary compatible with previous releases and defines d_count so previous code that uses d_count directly works as expected. The naming collision is obviously causing problems so we'll need to work around that a bit.</p> <p>This should work, but is untested:</p> <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <pre class="code-java">diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 0891fd4..eeba701 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1383,6 +1383,24 @@ d_count, [ ]) # LC_HAVE_DCOUNT # +# LC_HAVE_D_LOCKREF +# +# SLES 11 SP3's 3.0.101-0.35 update adds lockref, but defines a d_count +# that is different from later kernel versions. +# +AC_DEFUN([LC_HAVE_D_LOCKREF], [ +LB_CHECK_COMPILE([<span class="code-keyword">if</span> 'd_lockref exists], +d_lockref, [ + #include <linux/dcache.h> +],[ + struct dentry de; + <span class="code-object">int</span> x = de.d_lockref.count; +],[ + AC_DEFINE(HAVE_D_LOCKREF, 1, [d_lockref exists]) +]) +]) # LC_HAVE_D_LOCKREF + +# # LC_OLDSIZE_TRUNCATE_PAGECACHE # # 3.12 truncate_pagecache without oldsize parameter @@ -1595,6 +1613,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_HAVE_DIR_CONTEXT LC_D_COMPARE_5ARGS LC_HAVE_DCOUNT + LC_HAVE_D_LOCKREF # 3.12 LC_OLDSIZE_TRUNCATE_PAGECACHE diff --git a/lustre/include/linux/lustre_patchless_compat.h b/lustre/include/linux/lustre_patchless_compat.h index 5b7bab6..d119f75 100644 --- a/lustre/include/linux/lustre_patchless_compat.h +++ b/lustre/include/linux/lustre_patchless_compat.h @@ -96,8 +96,11 @@ truncate_complete_page(struct address_space *mapping, struct page *page) #ifdef HAVE_DCACHE_LOCK # define dget_dlock(d) dget_locked(d) # define d_count(d) atomic_read(&(d)->d_count) -#elif !defined(HAVE_D_COUNT) +#elif !defined(HAVE_D_COUNT) && !defined(HAVE_D_LOCKREF) # define d_count(d) ((d)->d_count) +#elif !define(HAVE_D_COUNT) && defined(HAVE_D_LOCKREF) +#undef d_count +#define d_count(d) ((d)->d_lockref.count) #endif <span class="code-comment">/* HAVE_DCACHE_LOCK */</span> #ifdef ATTR_OPEN </pre> </div></div> <p>Jeff, thanks for the suggestion. Currently working on an alternate approach suggested by Yang Sheng. doing a wrapper, ll_d_count(), and using autoconf conditionals to translate that correctly for all cases. Using ll_d_count() instead of d_count() in lustre to avoid name collisions. If that doesn't work out I may try your way.</p> <p><a href="http://review.whamcloud.com/11133" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/11133</a></p> <p>in b2_5:<br/> <a href="http://review.whamcloud.com/11140" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/11140</a></p> <p>Landed for 2.7</p> Development Rank 1|hzwrp3: Rank (Obsolete) 14958