[dpdk-dev] [PATCH 1/2] igb_uio: fix compability on old kernel

[Guillaume Gaudonville]

On 07/25/2014 07:36 PM, Stephen Hemminger wrote:
> Add more compatibility wrappers, and split out all the wrapper
> code to a separate file. Builds on Debian Squeeze (2.6.32) which
> is oldest version of kernel current DPDK supports.
>
> Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
>
> ---
>   lib/librte_eal/linuxapp/igb_uio/compat.h  |  103 ++++++++++++++++++++++++++++++
>   lib/librte_eal/linuxapp/igb_uio/igb_uio.c |   81 -----------------------
>   2 files changed, 104 insertions(+), 80 deletions(-)
>
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h	2014-07-25 10:29:58.664127988 -0700
> @@ -0,0 +1,103 @@
> +/*
> + * Minimal wrappers to allow compiling igb_uio on older kernels.
> + */
> +
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> +#define pci_cfg_access_lock   pci_block_user_cfg_access
> +#define pci_cfg_access_unlock pci_unblock_user_cfg_access
> +#endif
> +
> +#ifndef PCI_MSIX_ENTRY_SIZE
> +#define PCI_MSIX_ENTRY_SIZE             16
> +#define  PCI_MSIX_ENTRY_LOWER_ADDR      0
> +#define  PCI_MSIX_ENTRY_UPPER_ADDR      4
> +#define  PCI_MSIX_ENTRY_DATA            8
> +#define  PCI_MSIX_ENTRY_VECTOR_CTRL     12
> +#define   PCI_MSIX_ENTRY_CTRL_MASKBIT   1
> +#endif
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
> +static int pci_num_vf(struct pci_dev *dev)
> +{
> +	struct iov {
> +		int pos;
> +		int nres;
> +		u32 cap;
> +		u16 ctrl;
> +		u16 total;
> +		u16 initial;
> +		u16 nr_virtfn;
> +	} *iov = (struct iov *)dev->sriov;
> +
> +	if (!dev->is_physfn)
> +		return 0;
> +
> +	return iov->nr_virtfn;
> +}
> +#endif
> +
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> +
> +/* Check if INTX works to control irq's.
> + * Set's INTX_DISABLE flag and reads it back
> + */
> +static bool pci_intx_mask_supported(struct pci_dev *pdev)
> +{
> +	bool mask_supported = false;
> +	uint16_t orig, new;
> +
> +	pci_block_user_cfg_access(pdev);
> +	pci_read_config_word(pdev, PCI_COMMAND, &orig);
> +	pci_write_config_word(pdev, PCI_COMMAND,
> +			      orig ^ PCI_COMMAND_INTX_DISABLE);
> +	pci_read_config_word(pdev, PCI_COMMAND, &new);
> +
> +	if ((new ^ orig) & ~PCI_COMMAND_INTX_DISABLE) {
> +		dev_err(&pdev->dev, "Command register changed from "
> +			"0x%x to 0x%x: driver or hardware bug?\n", orig, new);
> +	} else if ((new ^ orig) & PCI_COMMAND_INTX_DISABLE) {
> +		mask_supported = true;
> +		pci_write_config_word(pdev, PCI_COMMAND, orig);
> +	}
> +	pci_unblock_user_cfg_access(pdev);
> +
> +	return mask_supported;
> +}
> +
> +static bool pci_check_and_mask_intx(struct pci_dev *pdev)
> +{
> +	bool pending;
> +	uint32_t status;
> +
> +	pci_block_user_cfg_access(pdev);
> +	pci_read_config_dword(pdev, PCI_COMMAND, &status);
> +
> +	/* interrupt is not ours, goes to out */
> +	pending = (((status >> 16) & PCI_STATUS_INTERRUPT) != 0);
> +	if (pending) {
> +		uint16_t old, new;
> +
> +		old = status;
> +		if (status != 0)
> +			new = old & (~PCI_COMMAND_INTX_DISABLE);
> +		else
> +			new = old | PCI_COMMAND_INTX_DISABLE;
> +
> +		if (old != new)
> +			pci_write_config_word(pdev, PCI_COMMAND, new);
> +	}
> +	pci_unblock_user_cfg_access(pdev);
> +
> +	return pending;
> +}
> +#endif
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)
> +/* Compatability wrapper for new kernel API for IRQ */
> +#define irq_data	irq_desc
> +#define irq_get_irq_data(irq)	irq_to_desc(irq)
> +#define irq_data_get_msi(data)	get_irq_desc_msi(data)
> +#endif
> +
irq_to_desc is not exported to modules before kernel 3.4 and commit 
3911ff30.
On Red Hat 6.5 the module fails to load due to an unknow symbol error. 
I've seen
another post saying that it also fails to insert on kernel 2.6.34. I 
guess it should not work
either on debian squeeze (kernel 2.6.32), did you compile it in built-in?

For now, I don't see how we could fix it, since it is not exported we 
are not allowed to use it in a kernel
module. Do you have a way to fix this issue?

Thanks,
Guillaume
> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c	2014-07-25 10:29:58.668128002 -0700
> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c	2014-07-25 10:29:58.664127988 -0700
> @@ -37,10 +37,7 @@
>   #endif
>   #include <rte_pci_dev_features.h>
>   
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> -#define pci_cfg_access_lock   pci_block_user_cfg_access
> -#define pci_cfg_access_unlock pci_unblock_user_cfg_access
> -#endif
> +#include "compat.h"
>   
>   #ifdef RTE_PCI_CONFIG
>   #define PCI_SYS_FILE_BUF_SIZE      10
> @@ -70,26 +67,6 @@ igbuio_get_uio_pci_dev(struct uio_info *
>   }
>   
>   /* sriov sysfs */
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
> -static int pci_num_vf(struct pci_dev *dev)
> -{
> -	struct iov {
> -		int pos;
> -		int nres;
> -		u32 cap;
> -		u16 ctrl;
> -		u16 total;
> -		u16 initial;
> -		u16 nr_virtfn;
> -	} *iov = (struct iov *)dev->sriov;
> -
> -	if (!dev->is_physfn)
> -		return 0;
> -
> -	return iov->nr_virtfn;
> -}
> -#endif
> -
>   static ssize_t
>   show_max_vfs(struct device *dev, struct device_attribute *attr,
>   	     char *buf)
> @@ -228,62 +205,6 @@ static struct attribute *dev_attrs[] = {
>   static const struct attribute_group dev_attr_grp = {
>   	.attrs = dev_attrs,
>   };
> -
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
> -/* Check if INTX works to control irq's.
> - * Set's INTX_DISABLE flag and reads it back
> - */
> -static bool pci_intx_mask_supported(struct pci_dev *pdev)
> -{
> -	bool mask_supported = false;
> -	uint16_t orig, new;
> -
> -	pci_block_user_cfg_access(pdev);
> -	pci_read_config_word(pdev, PCI_COMMAND, &orig);
> -	pci_write_config_word(pdev, PCI_COMMAND,
> -			      orig ^ PCI_COMMAND_INTX_DISABLE);
> -	pci_read_config_word(pdev, PCI_COMMAND, &new);
> -
> -	if ((new ^ orig) & ~PCI_COMMAND_INTX_DISABLE) {
> -		dev_err(&pdev->dev, "Command register changed from "
> -			"0x%x to 0x%x: driver or hardware bug?\n", orig, new);
> -	} else if ((new ^ orig) & PCI_COMMAND_INTX_DISABLE) {
> -		mask_supported = true;
> -		pci_write_config_word(pdev, PCI_COMMAND, orig);
> -	}
> -	pci_unblock_user_cfg_access(pdev);
> -
> -	return mask_supported;
> -}
> -
> -static bool pci_check_and_mask_intx(struct pci_dev *pdev)
> -{
> -	bool pending;
> -	uint32_t status;
> -
> -	pci_block_user_cfg_access(pdev);
> -	pci_read_config_dword(pdev, PCI_COMMAND, &status);
> -
> -	/* interrupt is not ours, goes to out */
> -	pending = (((status >> 16) & PCI_STATUS_INTERRUPT) != 0);
> -	if (pending) {
> -		uint16_t old, new;
> -
> -		old = status;
> -		if (status != 0)
> -			new = old & (~PCI_COMMAND_INTX_DISABLE);
> -		else
> -			new = old | PCI_COMMAND_INTX_DISABLE;
> -
> -		if (old != new)
> -			pci_write_config_word(pdev, PCI_COMMAND, new);
> -	}
> -	pci_unblock_user_cfg_access(pdev);
> -
> -	return pending;
> -}
> -#endif
> -
>   /*
>    * It masks the msix on/off of generating MSI-X messages.
>    */