https://jira.whamcloud.com This file is an XML representation of an issue en-us 9.4.14 940014 05-12-2023 https://jira.whamcloud.com/browse/LU-6763 Lustre <p>While building Lustre master on CentOS 6.5 with 2.6.32-431.el6 kernel and OFED 3.12-1 we get a build error:</p> <p>[ 212s] In file included from /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/klnds/o2iblnd/o2iblnd.h:82,<br/> [ 212s] from /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/klnds/o2iblnd/o2iblnd.c:42:<br/> [ 212s] /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/include/lnet/lib-lnet.h:708: error: redefinition of 'sk_sleep'<br/> [ 212s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s_cos/include/linux/compat-2.6.35.h:41: note: previous definition of 'sk_sleep' was here</p> <p>The kernel is not providing sk_sleep:<br/> [ 146s] checking if Linux kernel has 'sk_sleep'... no</p> <p>So it appears that the compat header from OFED defines sk_sleep, then later lnet/include/lnet/lib-lnet.h checks if the kernel provides sk_sleep and defines sk_sleep again if the kernel doesn't.</p> Lustre master on CentOS 6.5 with 2.6.32-431.el6 kernel and OFED 3.12-1 LU-6763

redefinition of sk_sleep when using external OFED and CentOS 6.5

Bug Minor Resolved Fixed Amir Shehata Justin Miller patch Wed, 24 Jun 2015 17:45:52 +0000 Mon, 18 Jul 2016 12:49:53 +0000 Fri, 10 Jul 2015 12:15:02 +0000 Lustre 2.8.0 Lustre 2.8.0 0 5 <p>One of those funny corner cases. The solution is to move the sk_sleep test out of libcfs to lustre-lnet.m4. There we can use HAVE_COMPACT to include compact-2.6.h which will contain the OFED version of sk_sleep.</p> <p>James Simmons (uja.ornl@yahoo.com) uploaded a new patch: <a href="http://review.whamcloud.com/15386" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/15386</a><br/> Subject: <a href="https://jira.whamcloud.com/browse/LU-6763" title="redefinition of sk_sleep when using external OFED and CentOS 6.5" class="issue-link" data-issue-key="LU-6763"><del>LU-6763</del></a> lnet: test for sk_sleep presence in compact-2.6.h<br/> Project: fs/lustre-release<br/> Branch: master<br/> Current Patch Set: 1<br/> Commit: 7f8c7d7904ebad8afbcbd64fc147f7ea7abe23da</p> <p>Justin can you try the patch at <a href="http://review.whamcloud.com/#/c/15386" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/#/c/15386</a>.</p> <p>Hi James,</p> <p>I tried the patch and got this:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>[ 116s] /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/lnet/lib-socket.c: In function 'lnet_sock_accept': [ 116s] /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/lnet/lib-socket.c:575: error: implicit declaration of function 'sk_sleep' [ 116s] cc1: warnings being treated as errors [ 116s] /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/lnet/lib-socket.c:575: error: passing argument 1 of 'add_wait_queue' makes pointer from integer without a cast [ 116s] /usr/src/linux-2.6.32-431.el6_1.0000.8785/include/linux/wait.h:122: note: expected 'struct wait_queue_head_t *' but argument is of type 'int' [ 116s] /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/lnet/lib-socket.c:584: error: passing argument 1 of 'remove_wait_queue' makes pointer from integer without a cast [ 116s] /usr/src/linux-2.6.32-431.el6_1.0000.8785/include/linux/wait.h:124: note: expected 'struct wait_queue_head_t *' but argument is of type 'int' [ 116s] make[8]: *** [/home/abuild/rpmbuild/BUILD/cray-lustre/lnet/lnet/lib-socket.o] Error 1 </pre> </div></div> <p>FWIW, we're trying to build commit 0b868add80281c085ce1b297d1cb078deaab802a + your patch from this ticket. I'll try a later master commit.</p> <p>Ah I see what I missed. lib-socket.c needs to include compact-2.6.h as well.</p> <p>Give it try now.</p> <p>One thing after another. I'm not sure why o2iblnd is able to compile (o2iblnd.h also includes compat-2.6.h) but not lib-socket.c...</p> <p>[ 223s] /home/abuild/rpmbuild/BUILD/cray-lustre/lnet/lnet/lib-socket.c:46:30: error: linux/compat-2.6.h: No such file or directory</p> <p>I think the answer lies in the Makefile.in's. lnet/klnds/o2iblnd/Makefile.in has:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre># Need to make sure that an external OFED source pool overrides # any in-kernel OFED sources NOSTDINC_FLAGS += @EXTRA_OFED_INCLUDE@ </pre> </div></div> <p>I think we'd need something similar in the lnet/lnet/Makefile.in</p> <p>Edit - I'll add that automake and friends are sort of black magic to me, so there might be a different or better way of fixing this.</p> <p>Added automagic stuff. Try it again.</p> <p>Sorry I needed to update the patch. I discovered the Mellanox doesn't just provide a compatibility layer but it actually replaces core linux network headers. To handle this you need to have compact-2.6.h first in every file that has sock.h. I found just placing compact-2.6.h in lib-types.h caused other nightmares so the best solution was to remove sock.h in lib-types.h and place compact-2.6 at the top of every file that uses sock.h.</p> <p>Amir</p> <p>Could you please take care of this patch?</p> <p>Thanks</p> <p>Peter</p> <p>Oleg Drokin (oleg.drokin@intel.com) merged in patch <a href="http://review.whamcloud.com/15386/" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/15386/</a><br/> Subject: <a href="https://jira.whamcloud.com/browse/LU-6763" title="redefinition of sk_sleep when using external OFED and CentOS 6.5" class="issue-link" data-issue-key="LU-6763"><del>LU-6763</del></a> lnet: test for sk_sleep presence in compact-2.6.h<br/> Project: fs/lustre-release<br/> Branch: master<br/> Current Patch Set: <br/> Commit: 87fe2c045ff07cadb3c2034618254a6acfe53180</p> <p>Landed for 2.8</p> Related LU-6769 LU-8401 Development Rank 1|hzxgjj: Rank (Obsolete) 9223372036854775807 Severity