Message ID | 1414657104-16141-1-git-send-email-jmiao@redhat.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id B9791683B; Thu, 30 Oct 2014 09:11:44 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AA0EA6835 for <dev@dpdk.org>; Thu, 30 Oct 2014 09:11:42 +0100 (CET) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9U8KaMK031636 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for <dev@dpdk.org>; Thu, 30 Oct 2014 04:20:36 -0400 Received: from dhcp-66-71-51.eng.nay.redhat.com.com (dhcp-66-71-51.eng.nay.redhat.com [10.66.71.51] (may be forged)) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9U8KXs9023600; Thu, 30 Oct 2014 04:20:35 -0400 From: Jincheng Miao <jmiao@redhat.com> To: dev@dpdk.org Date: Thu, 30 Oct 2014 16:18:24 +0800 Message-Id: <1414657104-16141-1-git-send-email-jmiao@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Subject: [dpdk-dev] [PATCH] igb_uio: fix build for longterm kernel 2.6.32.63 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Commit Message
Jincheng Miao
Oct. 30, 2014, 8:18 a.m. UTC
There is a logical error in igb_uio/compat.h when define pci_num_vf().
Only CONFIG_PCI_IOV enabled, this function could be defined.
This patch fix the following error for linux-2.6.32.63:
CC [M] /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.o
/root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.c: In function ‘show_max_vfs’:
/root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.c:75: error: implicit declaration of function ‘pci_num_vf’
Signed-off-by: Jincheng Miao <jmiao@redhat.com>
---
lib/librte_eal/linuxapp/igb_uio/compat.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Comments
This patch will make RHEL6 build failed. The root cause is that RHEL-based kernel is slightly different with upstream kernel. It has some functions (pci_num_vf, kstrtoul, etc) which don't exist in upstream longterm kernel. For better compatibility, IMHO it is distinguishing RHEL-based kernel and upstream one. Using macro like: ``` #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \ !(defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 3)) static int pci_num_vf(struct pci_dev *dev) { ``` But this is RHEL-specified fix. For other distros, if they have some problem, we should hack it in the same way. Thanks and regards, Jincheng Miao On 10/30/2014 04:18 PM, Jincheng Miao wrote: > There is a logical error in igb_uio/compat.h when define pci_num_vf(). > Only CONFIG_PCI_IOV enabled, this function could be defined. > > This patch fix the following error for linux-2.6.32.63: > CC [M] /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.o > /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.c: In function ‘show_max_vfs’: > /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.c:75: error: implicit declaration of function ‘pci_num_vf’ > > Signed-off-by: Jincheng Miao <jmiao@redhat.com> > --- > lib/librte_eal/linuxapp/igb_uio/compat.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h > index 676fa1b..0af0cae 100644 > --- a/lib/librte_eal/linuxapp/igb_uio/compat.h > +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h > @@ -21,7 +21,7 @@ > #endif > > #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \ > - !defined(CONFIG_PCI_IOV) > + defined(CONFIG_PCI_IOV) > > static int pci_num_vf(struct pci_dev *dev) > {
Hi Jincheng, 2014-10-31 09:54, Jincheng Miao: > This patch will make RHEL6 build failed. > > The root cause is that RHEL-based kernel is slightly different with > upstream kernel. > It has some functions (pci_num_vf, kstrtoul, etc) which don't exist in > upstream longterm kernel. Yes it seems that the functions are stub-defined in RHEL if CONFIG_PCI_IOV is not defined. > For better compatibility, IMHO it is distinguishing RHEL-based kernel > and upstream one. Yes we have to handle the RedHat difference. > Using macro like: > ``` > #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \ > !(defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= > RHEL_RELEASE_VERSION(6, 3)) > > static int pci_num_vf(struct pci_dev *dev) > { > ``` > > But this is RHEL-specified fix. For other distros, if they have some > problem, we should hack it in the same way. > > Thanks and regards, > Jincheng Miao > > > On 10/30/2014 04:18 PM, Jincheng Miao wrote: > > There is a logical error in igb_uio/compat.h when define pci_num_vf(). > > Only CONFIG_PCI_IOV enabled, this function could be defined. > > > > This patch fix the following error for linux-2.6.32.63: > > CC [M] /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.o > > /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.c: In function ‘show_max_vfs’: > > /root/dpdk-source/build/build/lib/librte_eal/linuxapp/igb_uio/igb_uio.c:75: error: implicit declaration of function ‘pci_num_vf’ > > > > Signed-off-by: Jincheng Miao <jmiao@redhat.com> > > --- > > lib/librte_eal/linuxapp/igb_uio/compat.h | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h > > index 676fa1b..0af0cae 100644 > > --- a/lib/librte_eal/linuxapp/igb_uio/compat.h > > +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h > > @@ -21,7 +21,7 @@ > > #endif > > > > #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \ > > - !defined(CONFIG_PCI_IOV) > > + defined(CONFIG_PCI_IOV) > > > > static int pci_num_vf(struct pci_dev *dev) > > {
diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h index 676fa1b..0af0cae 100644 --- a/lib/librte_eal/linuxapp/igb_uio/compat.h +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h @@ -21,7 +21,7 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \ - !defined(CONFIG_PCI_IOV) + defined(CONFIG_PCI_IOV) static int pci_num_vf(struct pci_dev *dev) {