[dpdk-dev] kni: fix build with kernel 4.11

Message ID 20170320112208.7941-1-ferruh.yigit@intel.com
State Superseded, archived
Headers show

Checks

Context Check Description
checkpatch warning coding style issues
Intel-compilation success Compilation OK

Commit Message

Ferruh Yigit March 20, 2017, 11:22 a.m.
compile error:
.../build/build/lib/librte_eal/linuxapp/kni/kni_net.c:124:6:
error: implicit declaration of function ‘signal_pending’
[-Werror=implicit-function-declaration]
  if (signal_pending(current) || ret_val <= 0) {
      ^~~~~~~~~~~~~~

Linux 4.11 moves signal function declarations to its own header file:
Linux: 174cd4b1e5fb ("sched/headers: Prepare to move signal wakeup &
sigpending methods from <linux/sched.h> into <linux/sched/signal.h>")

User new header file "linux/sched/signal.h" to fix build error.

Reported-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_eal/linuxapp/kni/compat.h  | 6 ++++++
 lib/librte_eal/linuxapp/kni/kni_dev.h | 6 ++++++
 2 files changed, 12 insertions(+)

Comments

Jerin Jacob March 20, 2017, 11:34 a.m.
On Mon, Mar 20, 2017 at 11:22:08AM +0000, Ferruh Yigit wrote:
> compile error:
> .../build/build/lib/librte_eal/linuxapp/kni/kni_net.c:124:6:
> error: implicit declaration of function ‘signal_pending’
> [-Werror=implicit-function-declaration]
>   if (signal_pending(current) || ret_val <= 0) {
>       ^~~~~~~~~~~~~~
> 
> Linux 4.11 moves signal function declarations to its own header file:
> Linux: 174cd4b1e5fb ("sched/headers: Prepare to move signal wakeup &
> sigpending methods from <linux/sched.h> into <linux/sched/signal.h>")
> 
> User new header file "linux/sched/signal.h" to fix build error.
> 
> Reported-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Tested-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

Kernel version: 4.11-rc3

> ---
>  lib/librte_eal/linuxapp/kni/compat.h  | 6 ++++++
>  lib/librte_eal/linuxapp/kni/kni_dev.h | 6 ++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h
> index 78da08e..d96275a 100644
> --- a/lib/librte_eal/linuxapp/kni/compat.h
> +++ b/lib/librte_eal/linuxapp/kni/compat.h
> @@ -2,6 +2,8 @@
>   * Minimal wrappers to allow compiling kni on older kernels.
>   */
>  
> +#include <linux/version.h>
> +
>  #ifndef RHEL_RELEASE_VERSION
>  #define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
>  #endif
> @@ -67,3 +69,7 @@
>  	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)))
>  #undef NET_NAME_UNKNOWN
>  #endif
> +
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
> +#define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
> +#endif
> diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h
> index 002e5fa..72385ab 100644
> --- a/lib/librte_eal/linuxapp/kni/kni_dev.h
> +++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
> @@ -30,9 +30,15 @@
>  #endif
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
> +#include "compat.h"
> +
>  #include <linux/if.h>
>  #include <linux/wait.h>
> +#ifdef HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
> +#include <linux/sched/signal.h>
> +#else
>  #include <linux/sched.h>
> +#endif
>  #include <linux/netdevice.h>
>  #include <linux/spinlock.h>
>  #include <linux/list.h>
> -- 
> 2.9.3
>
Pankaj Gupta March 21, 2017, 7:12 a.m.
Hello,

> 
> compile error:
> .../build/build/lib/librte_eal/linuxapp/kni/kni_net.c:124:6:
> error: implicit declaration of function ‘signal_pending’
> [-Werror=implicit-function-declaration]
>   if (signal_pending(current) || ret_val <= 0) {
>       ^~~~~~~~~~~~~~
> 
> Linux 4.11 moves signal function declarations to its own header file:
> Linux: 174cd4b1e5fb ("sched/headers: Prepare to move signal wakeup &
> sigpending methods from <linux/sched.h> into <linux/sched/signal.h>")
> 
> User new header file "linux/sched/signal.h" to fix build error.
> 
> Reported-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> ---
>  lib/librte_eal/linuxapp/kni/compat.h  | 6 ++++++
>  lib/librte_eal/linuxapp/kni/kni_dev.h | 6 ++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/compat.h
> b/lib/librte_eal/linuxapp/kni/compat.h
> index 78da08e..d96275a 100644
> --- a/lib/librte_eal/linuxapp/kni/compat.h
> +++ b/lib/librte_eal/linuxapp/kni/compat.h
> @@ -2,6 +2,8 @@
>   * Minimal wrappers to allow compiling kni on older kernels.
>   */
>  
> +#include <linux/version.h>
> +
>  #ifndef RHEL_RELEASE_VERSION
>  #define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
>  #endif
> @@ -67,3 +69,7 @@
>  	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)))
>  #undef NET_NAME_UNKNOWN
>  #endif
> +
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
> +#define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
> +#endif
> diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h
> b/lib/librte_eal/linuxapp/kni/kni_dev.h
> index 002e5fa..72385ab 100644
> --- a/lib/librte_eal/linuxapp/kni/kni_dev.h
> +++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
> @@ -30,9 +30,15 @@
>  #endif
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
> +#include "compat.h"
> +
>  #include <linux/if.h>
>  #include <linux/wait.h>
> +#ifdef HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
> +#include <linux/sched/signal.h>
> +#else
>  #include <linux/sched.h>
> +#endif
>  #include <linux/netdevice.h>
>  #include <linux/spinlock.h>
>  #include <linux/list.h>
> --
> 2.9.3

This patch fixes build error of DPDK with linux kernel version 4.11.0-rc2 for me.

Tested-by:pagupta@redhat.com

> 
>

Patch hide | download patch | download mbox

diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h
index 78da08e..d96275a 100644
--- a/lib/librte_eal/linuxapp/kni/compat.h
+++ b/lib/librte_eal/linuxapp/kni/compat.h
@@ -2,6 +2,8 @@ 
  * Minimal wrappers to allow compiling kni on older kernels.
  */
 
+#include <linux/version.h>
+
 #ifndef RHEL_RELEASE_VERSION
 #define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
 #endif
@@ -67,3 +69,7 @@ 
 	(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)))
 #undef NET_NAME_UNKNOWN
 #endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
+#endif
diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h
index 002e5fa..72385ab 100644
--- a/lib/librte_eal/linuxapp/kni/kni_dev.h
+++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
@@ -30,9 +30,15 @@ 
 #endif
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include "compat.h"
+
 #include <linux/if.h>
 #include <linux/wait.h>
+#ifdef HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
+#include <linux/sched/signal.h>
+#else
 #include <linux/sched.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>