diff --git a/.gitignore b/.gitignore index 60c9a74..73cccc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dpdk-1.7.0-20140603git5ebbb1728.tgz +/dpdk-1.7.0.tar.gz diff --git a/common_linuxapp b/common_linuxapp index 8e22ecd..c2934fb 100644 --- a/common_linuxapp +++ b/common_linuxapp @@ -1,12 +1,12 @@ # BSD LICENSE -# +# # Copyright(c) 2010-2014 Intel Corporation. All rights reserved. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -16,7 +16,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -33,7 +33,7 @@ # # define executive environment # -# CONFIG_RTE_EXEC_ENV can be linuxapp, baremetal +# CONFIG_RTE_EXEC_ENV can be linuxapp, baremetal, bsdapp # CONFIG_RTE_EXEC_ENV="linuxapp" CONFIG_RTE_EXEC_ENV_LINUXAPP=y @@ -123,6 +123,15 @@ CONFIG_RTE_LOG_HISTORY=256 CONFIG_RTE_LIBEAL_USE_HPET=n CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n +CONFIG_RTE_EAL_IGB_UIO=n +CONFIG_RTE_EAL_VFIO=y + +# +# Special configurations in PCI Config Space for high performance +# +CONFIG_RTE_PCI_CONFIG=n +CONFIG_RTE_PCI_EXTENDED_TAG="" +CONFIG_RTE_PCI_MAX_READ_REQUEST_SIZE=0 # # Compile Environment Abstraction Layer for linux @@ -136,7 +145,7 @@ CONFIG_RTE_LIBRTE_EAL_BAREMETAL=n # # Compile Environment Abstraction Layer to support Vmware TSC map -# +# CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y # @@ -153,11 +162,16 @@ CONFIG_RTE_MAX_ETHPORTS=32 CONFIG_RTE_LIBRTE_IEEE1588=n CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16 +# +# Support NIC bypass logic +# +CONFIG_RTE_NIC_BYPASS=n + # # Compile burst-oriented IGB & EM PMD drivers # -CONFIG_RTE_LIBRTE_EM_PMD=n -CONFIG_RTE_LIBRTE_IGB_PMD=n +CONFIG_RTE_LIBRTE_EM_PMD=y +CONFIG_RTE_LIBRTE_IGB_PMD=y CONFIG_RTE_LIBRTE_E1000_DEBUG_INIT=n CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n @@ -168,7 +182,7 @@ CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n # # Compile burst-oriented IXGBE PMD driver # -CONFIG_RTE_LIBRTE_IXGBE_PMD=n +CONFIG_RTE_LIBRTE_IXGBE_PMD=y CONFIG_RTE_LIBRTE_IXGBE_DEBUG_INIT=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n @@ -177,6 +191,25 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y CONFIG_RTE_LIBRTE_IXGBE_ALLOW_UNSUPPORTED_SFP=n +CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y + +# +# Compile burst-oriented I40E PMD driver +# +CONFIG_RTE_LIBRTE_I40E_PMD=y +CONFIG_RTE_LIBRTE_I40E_DEBUG_INIT=n +CONFIG_RTE_LIBRTE_I40E_DEBUG_RX=n +CONFIG_RTE_LIBRTE_I40E_DEBUG_TX=n +CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n +CONFIG_RTE_LIBRTE_I40E_DEBUG_DRIVER=n +CONFIG_RTE_LIBRTE_I40E_PF_DISABLE_STRIP_CRC=n +CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y +CONFIG_RTE_LIBRTE_I40E_ALLOW_UNSUPPORTED_SFP=n +CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n +CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF=4 +# interval up to 8160 us, aligned to 2 (or default value) +CONFIG_RTE_LIBRTE_I40E_ITR_INTERVAL=-1 # # Compile burst-oriented VIRTIO PMD driver @@ -210,7 +243,14 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16 # CONFIG_RTE_LIBRTE_PMD_PCAP=y +# +# Compile link bonding PMD library +# +CONFIG_RTE_LIBRTE_PMD_BOND=y +# +# Compile Xen PMD +# CONFIG_RTE_LIBRTE_PMD_XENVIRT=n # @@ -254,6 +294,11 @@ CONFIG_RTE_LIBRTE_MALLOC=y CONFIG_RTE_LIBRTE_MALLOC_DEBUG=n CONFIG_RTE_MALLOC_MEMZONE_SIZE=11M +# +# Compile librte_cfgfile +# +CONFIG_RTE_LIBRTE_CFGFILE=y + # # Compile librte_cmdline # @@ -272,6 +317,13 @@ CONFIG_RTE_LIBRTE_HASH_DEBUG=n CONFIG_RTE_LIBRTE_LPM=y CONFIG_RTE_LIBRTE_LPM_DEBUG=n +# +# Compile librte_acl +# +CONFIG_RTE_LIBRTE_ACL=y +CONFIG_RTE_LIBRTE_ACL_DEBUG=n +CONFIG_RTE_LIBRTE_ACL_STANDALONE=n + # # Compile librte_power # @@ -284,6 +336,14 @@ CONFIG_RTE_MAX_LCORE_FREQS=64 # CONFIG_RTE_LIBRTE_NET=y +# +# Compile librte_ip_frag +# +CONFIG_RTE_LIBRTE_IP_FRAG=y +CONFIG_RTE_LIBRTE_IP_FRAG_DEBUG=n +CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=4 +CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT=n + # # Compile librte_meter # @@ -299,10 +359,29 @@ CONFIG_RTE_SCHED_SUBPORT_TC_OV=n CONFIG_RTE_SCHED_PORT_N_GRINDERS=8 # -# Compile the test application +# Compile the distributor library +# +CONFIG_RTE_LIBRTE_DISTRIBUTOR=y + +# +# Compile librte_port +# +CONFIG_RTE_LIBRTE_PORT=y + +# +# Compile librte_table +# +CONFIG_RTE_LIBRTE_TABLE=y + +# +# Compile librte_pipeline +# +CONFIG_RTE_LIBRTE_PIPELINE=y + +# # Compile librte_kni # -CONFIG_RTE_LIBRTE_KNI=y +CONFIG_RTE_LIBRTE_KNI=n CONFIG_RTE_KNI_KO_DEBUG=n CONFIG_RTE_KNI_VHOST=n CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024 @@ -331,9 +410,3 @@ CONFIG_RTE_APP_TEST=y CONFIG_RTE_TEST_PMD=y CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n - -# -# Support NIC bypass logic -# -CONFIG_RTE_NIC_BYPASS=n - diff --git a/defconfig_i686-default-linuxapp-gcc b/defconfig_i686-native-linuxapp-gcc similarity index 95% rename from defconfig_i686-default-linuxapp-gcc rename to defconfig_i686-native-linuxapp-gcc index 6aaf124..61d8cc7 100644 --- a/defconfig_i686-default-linuxapp-gcc +++ b/defconfig_i686-native-linuxapp-gcc @@ -1,12 +1,12 @@ # BSD LICENSE -# +# # Copyright(c) 2010-2014 Intel Corporation. All rights reserved. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -16,7 +16,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -46,7 +46,7 @@ # Note: if your compiler does not support the relevant -march options, # it will be compiled with whatever latest processor the compiler supports! # -CONFIG_RTE_MACHINE="default" +CONFIG_RTE_MACHINE="native" # # define the architecture we compile for. @@ -66,3 +66,8 @@ CONFIG_RTE_TOOLCHAIN_GCC=y # KNI is not supported on 32-bit # CONFIG_RTE_LIBRTE_KNI=n + +# +# Vectorized PMD is not supported on 32-bit +# +CONFIG_RTE_IXGBE_INC_VECTOR=n diff --git a/defconfig_x86_64-default-linuxapp-gcc b/defconfig_x86_64-native-linuxapp-gcc similarity index 96% rename from defconfig_x86_64-default-linuxapp-gcc rename to defconfig_x86_64-native-linuxapp-gcc index 7380e16..54d71f9 100644 --- a/defconfig_x86_64-default-linuxapp-gcc +++ b/defconfig_x86_64-native-linuxapp-gcc @@ -1,12 +1,12 @@ # BSD LICENSE -# +# # Copyright(c) 2010-2014 Intel Corporation. All rights reserved. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -16,7 +16,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -46,7 +46,7 @@ # Note: if your compiler does not support the relevant -march options, # it will be compiled with whatever latest processor the compiler supports! # -CONFIG_RTE_MACHINE="default" +CONFIG_RTE_MACHINE="native" # # define the architecture we compile for. @@ -61,8 +61,3 @@ CONFIG_RTE_ARCH_X86_64=y # CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y - -# -# KNI is not supported on fedora -# -CONFIG_RTE_LIBRTE_KNI=n diff --git a/dpdk.spec b/dpdk.spec index 5ec9860..a9f6aee 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,28 +1,20 @@ -%global rel 0.10 +%global rel 1.0 # As per packaging guidelines, since dpdk is pre-release, this is the git hash # that I used with git archive to build the source tarball and the date on which # I did it -%global upstreamtag 20140603git5ebbb1728 Name: dpdk Version: 1.7.0 -Release: %{rel}.%{upstreamtag}%{?dist} +Release: %{rel}%{?dist} URL: http://dpdk.org -Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{version}-%{upstreamtag}.tgz -Source1: defconfig_x86_64-default-linuxapp-gcc -Source2: defconfig_i686-default-linuxapp-gcc +Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{version}.tar.gz +Source1: defconfig_x86_64-native-linuxapp-gcc +Source2: defconfig_i686-native-linuxapp-gcc Source3: common_linuxapp -# -# Currently the igb_uio module doesn't have a configuration option to disable -# itself in dpdk. Since we don't build kernel modules as part of user space -# pacakges, this patch manually removes the Makefile directives to build it -# This can be dropped when upstream makes this configurable -# -Patch0: dpdk-1.7.0-igb_uio_disable.patch -Patch1: dpdk-debug.patch -Patch2: dpdk-link-using-cc.patch +Patch0: dpdk-debug.patch + Summary: Data Plane Development Kit core @@ -40,14 +32,15 @@ License: BSD and LGPLv2 and GPLv2 # ExclusiveArch: %{ix86} x86_64 +%global machine native + %ifarch x86_64 -%global target x86_64-default-linuxapp-gcc +%global target x86_64-%{machine}-linuxapp-gcc %else -%global target i686-default-linuxapp-gcc +%global target i686-%{machine}-linuxapp-gcc %endif -%global machine default BuildRequires: kernel-devel, kernel-headers, libpcap-devel, doxygen @@ -85,20 +78,19 @@ cp %{SOURCE1} ./config/ cp %{SOURCE2} ./config/ cp %{SOURCE3} ./config/ %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build # need to enable debuginfo #Note that RPM_OPT_FLAGS is not being used here as it conflicts with #Flags that the package sets. -make V=1 O=%{target} T=%{target} %{?_smp_mflags} config -make V=1 O=%{target} %{?_smp_mflags} -make V=1 O=%{target} %{?_smp_mflags} doc +make V=1 O=%{target} T=%{target} config +make V=1 O=%{target} +make V=1 O=%{target} doc %install make V=1 O=%{target} DESTDIR=%{destdir} +find %{destdir} -name '*.orig' | xargs rm -f mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libdir}/%{name}-%{version} mkdir -p %{buildroot}%{_includedir}/%{name}-%{version} @@ -142,7 +134,10 @@ cp -a tools %{buildroot}%{datadir} %exclude %{docdir}/html %changelog -* Wed Jul 03 2014 - Neil Horman +* Thu Jul 10 2014 - Neil Horman - 1.0.7-1.0 +- Update source to official 1.7.0 release + +* Thu Jul 03 2014 - Neil Horman - Fixing up release numbering * Tue Jul 01 2014 - Neil Horman - 1.0.7-0.9.1.20140603git5ebbb1728 diff --git a/sources b/sources index c4d0dd0..3424e9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70de60182a0d48b58431dae2f6921db4 dpdk-1.7.0-20140603git5ebbb1728.tgz +fb44b52b0f19508d0ffab2af24b29205 dpdk-1.7.0.tar.gz