d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kni: move more kernel version check to compat header

Browse Source 
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Ferruh Yigit 2016-05-30 12:22:34 +01:00 committed by Thomas Monjalon
parent 4b33c132bc
commit f2027fb2c1
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/librte_eal/linuxapp/kni/compat.h
View File

@ -14,16 +14,25 @@
#endif /* < 2.6.39 */ #endif /* < 2.6.39 */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
#define HAVE_SIMPLIFIED_PERNET_OPERATIONS
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
#define sk_sleep(s) (s)->sk_sleep #define sk_sleep(s) (s)->sk_sleep
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
#define HAVE_CHANGE_CARRIER_CB
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
#define HAVE_IOV_ITER_MSGHDR #define HAVE_IOV_ITER_MSGHDR
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)
#define HAVE_KIOCB_MSG_PARAM #define HAVE_KIOCB_MSG_PARAM
#define HAVE_REBUILD_HEADER
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)

30
lib/librte_eal/linuxapp/kni/kni_misc.c
View File

@ -35,6 +35,8 @@
#include <net/netns/generic.h> #include <net/netns/generic.h>
#include <exec-env/rte_kni_common.h> #include <exec-env/rte_kni_common.h>
#include "compat.h"
#include "kni_dev.h" #include "kni_dev.h"
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
@ -105,7 +107,7 @@ struct kni_net {
static int __net_init kni_init_net(struct net *net) static int __net_init kni_init_net(struct net *net)
{ {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
struct kni_net *knet = net_generic(net, kni_net_id); struct kni_net *knet = net_generic(net, kni_net_id);
#else #else
struct kni_net *knet; struct kni_net *knet;
@ -116,7 +118,7 @@ static int __net_init kni_init_net(struct net *net)
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
/* Clear the bit of device in use */ /* Clear the bit of device in use */
clear_bit(KNI_DEV_IN_USE_BIT_NUM, &knet->device_in_use); clear_bit(KNI_DEV_IN_USE_BIT_NUM, &knet->device_in_use);
@ -124,7 +126,7 @@ static int __net_init kni_init_net(struct net *net)
init_rwsem(&knet->kni_list_lock); init_rwsem(&knet->kni_list_lock);
INIT_LIST_HEAD(&knet->kni_list_head); INIT_LIST_HEAD(&knet->kni_list_head);
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
return 0; return 0;
#else #else
ret = net_assign_generic(net, kni_net_id, knet); ret = net_assign_generic(net, kni_net_id, knet);
@ -132,25 +134,25 @@ static int __net_init kni_init_net(struct net *net)
kfree(knet); kfree(knet);
return ret; return ret;
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
} }
static void __net_exit kni_exit_net(struct net *net) static void __net_exit kni_exit_net(struct net *net)
{ {
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32) #ifndef HAVE_SIMPLIFIED_PERNET_OPERATIONS
struct kni_net *knet = net_generic(net, kni_net_id); struct kni_net *knet = net_generic(net, kni_net_id);
kfree(knet); kfree(knet);
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
} }
static struct pernet_operations kni_net_ops = { static struct pernet_operations kni_net_ops = {
.init = kni_init_net, .init = kni_init_net,
.exit = kni_exit_net, .exit = kni_exit_net,
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
.id = &kni_net_id, .id = &kni_net_id,
.size = sizeof(struct kni_net), .size = sizeof(struct kni_net),
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
}; };
static int __init static int __init
@ -165,11 +167,11 @@ kni_init(void)
return -EINVAL; return -EINVAL;
} }
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
rc = register_pernet_subsys(&kni_net_ops); rc = register_pernet_subsys(&kni_net_ops);
#else #else
rc = register_pernet_gen_subsys(&kni_net_id, &kni_net_ops); rc = register_pernet_gen_subsys(&kni_net_id, &kni_net_ops);
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
if (rc) if (rc)
return -EPERM; return -EPERM;
@ -187,11 +189,11 @@ kni_init(void)
return 0; return 0;
out: out:
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
unregister_pernet_subsys(&kni_net_ops); unregister_pernet_subsys(&kni_net_ops);
#else #else
register_pernet_gen_subsys(&kni_net_id, &kni_net_ops); register_pernet_gen_subsys(&kni_net_id, &kni_net_ops);
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
return rc; return rc;
} }
@ -199,11 +201,11 @@ static void __exit
kni_exit(void) kni_exit(void)
{ {
misc_deregister(&kni_misc); misc_deregister(&kni_misc);
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS
unregister_pernet_subsys(&kni_net_ops); unregister_pernet_subsys(&kni_net_ops);
#else #else
register_pernet_gen_subsys(&kni_net_id, &kni_net_ops); register_pernet_gen_subsys(&kni_net_id, &kni_net_ops);
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) */ #endif
KNI_PRINT("####### DPDK kni module unloaded #######\n"); KNI_PRINT("####### DPDK kni module unloaded #######\n");
} }

8
lib/librte_eal/linuxapp/kni/kni_net.c
View File

@ -641,7 +641,7 @@ kni_net_header(struct sk_buff *skb, struct net_device *dev,
/* /*
* Re-fill the eth header * Re-fill the eth header
*/ */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) #ifdef HAVE_REBUILD_HEADER
static int static int
kni_net_rebuild_header(struct sk_buff *skb) kni_net_rebuild_header(struct sk_buff *skb)
{ {
@ -671,7 +671,7 @@ static int kni_net_set_mac(struct net_device *netdev, void *p)
return 0; return 0;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)) #ifdef HAVE_CHANGE_CARRIER_CB
static int kni_net_change_carrier(struct net_device *dev, bool new_carrier) static int kni_net_change_carrier(struct net_device *dev, bool new_carrier)
{ {
if (new_carrier) if (new_carrier)
@ -684,7 +684,7 @@ static int kni_net_change_carrier(struct net_device *dev, bool new_carrier)
static const struct header_ops kni_net_header_ops = { static const struct header_ops kni_net_header_ops = {
.create = kni_net_header, .create = kni_net_header,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) #ifdef HAVE_REBUILD_HEADER
.rebuild = kni_net_rebuild_header, .rebuild = kni_net_rebuild_header,
#endif /* < 4.1.0 */ #endif /* < 4.1.0 */
.cache = NULL, /* disable caching */ .cache = NULL, /* disable caching */
@ -701,7 +701,7 @@ static const struct net_device_ops kni_net_netdev_ops = {
.ndo_get_stats = kni_net_stats, .ndo_get_stats = kni_net_stats,
.ndo_tx_timeout = kni_net_tx_timeout, .ndo_tx_timeout = kni_net_tx_timeout,
.ndo_set_mac_address = kni_net_set_mac, .ndo_set_mac_address = kni_net_set_mac,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)) #ifdef HAVE_CHANGE_CARRIER_CB
.ndo_change_carrier = kni_net_change_carrier, .ndo_change_carrier = kni_net_change_carrier,
#endif #endif
}; };