From: Jincheng Miao <jmiao@redhat.com>
To: Shu Shen <shu.shen@radisys.com>, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] igb_uio: fix Xen compatibility with kernel 3.18
Date: Fri, 12 Dec 2014 12:39:17 +0800 [thread overview]
Message-ID: <548A7175.6060701@redhat.com> (raw)
In-Reply-To: <1418326403-27870-1-git-send-email-shu.shen@radisys.com>
ACK, kernel-3.18.0 drops _PAGE_IOMAP.
On 12/12/2014 03:33 AM, Shu Shen wrote:
> This patch fixes build failing with undefined symbol _PAGE_IOMAP with
> kernel 3.18.
>
> The Xen-specific _PAGE_IOMAP PTE flag was removed in kernel 3.18 and
> could be used for other purpose in future. This patch ensures that
> _PAGE_IOMAP flag is only used for kernels before 3.18.
>
> Signed-off-by: Shu Shen <shu.shen@radisys.com>
> ---
> lib/librte_eal/linuxapp/igb_uio/compat.h | 4 ++++
> lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 2 ++
> 2 files changed, 6 insertions(+)
>
> diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h
> index 9454382..c1d45a6 100644
> --- a/lib/librte_eal/linuxapp/igb_uio/compat.h
> +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h
> @@ -11,6 +11,10 @@
> #define pci_cfg_access_unlock pci_unblock_user_cfg_access
> #endif
>
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
> +#define HAVE_PTE_MASK_PAGE_IOMAP
> +#endif
> +
> #ifndef PCI_MSIX_ENTRY_SIZE
> #define PCI_MSIX_ENTRY_SIZE 16
> #define PCI_MSIX_ENTRY_LOWER_ADDR 0
> diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> index 47ff2f3..60a2db1 100644
> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> @@ -287,7 +287,9 @@ igbuio_dom0_mmap_phys(struct uio_info *info, struct vm_area_struct *vma)
>
> idx = (int)vma->vm_pgoff;
> vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
> +#if defined(HAVE_PTE_MASK_PAGE_IOMAP)
> vma->vm_page_prot.pgprot |= _PAGE_IOMAP;
> +#endif
>
> return remap_pfn_range(vma,
> vma->vm_start,
next prev parent reply other threads:[~2014-12-12 4:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-11 19:33 Shu Shen
2014-12-12 4:39 ` Jincheng Miao [this message]
2014-12-16 23:59 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=548A7175.6060701@redhat.com \
--to=jmiao@redhat.com \
--cc=dev@dpdk.org \
--cc=shu.shen@radisys.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).