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-6769 Lustre <p>This is very similar to <a href="https://jira.whamcloud.com/browse/LU-5140" title="Mellanox backport header conflicts with newer kernels" class="issue-link" data-issue-key="LU-5140"><del>LU-5140</del></a>, except the conflict is in kthread.h</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>[ 224s] In file included from /usr/src/packages/BUILD/cray-lustre/lnet/klnds/o2iblnd/o2iblnd.h:44, [ 224s] from /usr/src/packages/BUILD/cray-lustre/lnet/klnds/o2iblnd/o2iblnd.c:42: [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:21: error: redefinition of typedef 'kthread_work_func_t' [ 224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:55: error: previous declaration of 'kthread_work_func_t' was here [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:23: error: redefinition of 'struct kthread_worker' [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:29: error: redefinition of 'struct kthread_work' [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:75: error: conflicting types for '__init_kthread_worker' [ 224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:109: error: previous declaration of '__init_kthread_worker' was here [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:94: error: conflicting types for 'queue_kthread_work' [ 224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:128: error: previous declaration of 'queue_kthread_work' was here [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:96: error: conflicting types for 'flush_kthread_work' [ 224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:130: error: previous declaration of 'flush_kthread_work' was here [ 224s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:97: error: conflicting types for 'flush_kthread_worker' [ 224s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:131: error: previous declaration of 'flush_kthread_worker' was here </pre> </div></div> <p>I think we just to test for the kthread code and define CONFIG_COMPAT_IS_KTHREAD as appropriate. I have a patch but might not get around to pushing until Monday.</p> LU-6769

Mellanox backport header (kthread.h) conflicts with newer kernels

Bug Minor Resolved Fixed Amir Shehata Chris Horn RTS patch Fri, 26 Jun 2015 22:06:57 +0000 Thu, 14 Jun 2018 21:41:35 +0000 Wed, 29 Jul 2015 15:57:20 +0000 Lustre 2.8.0 0 7 <p>Ugh. Does moving compact-2.6.h to be the first file fix the issue?</p> <p>It does, but if I include your change from <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> then the error shows up elsewhere:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>[ 139s] In file included from /usr/src/packages/BUILD/cray-lustre/lnet/include/lnet/lib-types.h:49, [ 139s] from /usr/src/packages/BUILD/cray-lustre/lnet/include/lnet/lib-lnet.h:51, [ 139s] from /usr/src/packages/BUILD/cray-lustre/lnet/lnet/api-ni.c:39: [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:21: error: redefinition of typedef 'kthread_work_func_t' [ 139s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:55: error: previous declaration of 'kthread_work_func_t' was here [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:23: error: redefinition of 'struct kthread_worker' [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:29: error: redefinition of 'struct kthread_work' [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:75: error: conflicting types for '__init_kthread_worker' [ 139s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:109: error: previous declaration of '__init_kthread_worker' was here [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:94: error: conflicting types for 'queue_kthread_work' [ 139s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:128: error: previous declaration of 'queue_kthread_work' was here [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:96: error: conflicting types for 'flush_kthread_work' [ 139s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:130: error: previous declaration of 'flush_kthread_work' was here [ 139s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/kthread.h:97: error: conflicting types for 'flush_kthread_worker' [ 139s] /usr/src/linux-3.0.101-0.46.1_1.0000.8764/include/linux/kthread.h:131: error: previous declaration of 'flush_kthread_worker' was here </pre> </div></div> <p>If I add a test for this in lustre-lnet.m4, and set:</p> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent"> <pre>EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_IS_KTHREAD" </pre> </div></div> <p>appropriately then things seem to work.</p> <p>Chris Horn (hornc@cray.com) uploaded a new patch: <a href="http://review.whamcloud.com/15428" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/15428</a><br/> Subject: <a href="https://jira.whamcloud.com/browse/LU-6769" title="Mellanox backport header (kthread.h) conflicts with newer kernels" class="issue-link" data-issue-key="LU-6769"><del>LU-6769</del></a> build: Test for kthread_worker support<br/> Project: fs/lustre-release<br/> Branch: master<br/> Current Patch Set: 1<br/> Commit: d3fd0a93347070422f1c02095d86030e2473d7de</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/15428/" class="external-link" target="_blank" rel="nofollow noopener">http://review.whamcloud.com/15428/</a><br/> Subject: <a href="https://jira.whamcloud.com/browse/LU-6769" title="Mellanox backport header (kthread.h) conflicts with newer kernels" class="issue-link" data-issue-key="LU-6769"><del>LU-6769</del></a> build: Test for kthread_worker support<br/> Project: fs/lustre-release<br/> Branch: master<br/> Current Patch Set: <br/> Commit: b984a7bed4afec88677c89840d85f40b48d14c23</p> <p>Landed for 2.8</p> Related LU-6763 Development Rank 1|hzxgq7: Rank (Obsolete) 9223372036854775807 Severity