From patchwork Mon Dec 7 14:22:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 9388 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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 AD47D95D1; Mon, 7 Dec 2015 15:23:25 +0100 (CET) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0080.outbound.protection.outlook.com [207.46.100.80]) by dpdk.org (Postfix) with ESMTP id 070CC95CF for ; Mon, 7 Dec 2015 15:23:24 +0100 (CET) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerin.Jacob@caviumnetworks.com; Received: from localhost.localdomain.localdomain (111.93.218.67) by BY1PR0701MB1723.namprd07.prod.outlook.com (10.162.111.142) with Microsoft SMTP Server (TLS) id 15.1.337.19; Mon, 7 Dec 2015 14:23:16 +0000 From: Jerin Jacob To: Date: Mon, 7 Dec 2015 19:52:50 +0530 Message-ID: <1449498170-19872-1-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: MA1PR01CA0047.INDPRD01.PROD.OUTLOOK.COM (25.164.116.147) To BY1PR0701MB1723.namprd07.prod.outlook.com (25.162.111.142) X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1723; 2:ELoyHdy+2WYTkXD5C1HzB6z/wpV9Zwa7qd3KGt/g7oL4XB+uyAgPpq2KHxuEY7Vmv/d6RrDe3NdYqrQAw2l8Tt6E7h3+Oagt0cON6kv0bnB9kQiaQd14ltDCQCY+GnFudC22MyB7C9XVXorXzgu6nQ==; 3:rDGREEvHK+TdhMYSanXm3U+hpNm8zQdwRFdz8jTx2KkySjCZLSO89ph69eIU/eXUq9GpLFdD/dZLUzyETalV5TnNxXmLe77EuphEYFvjdf0EaGbW96bq5lyLe3wgMkZ/; 25:XmdyMqY8Of06VoSu+iru07e5xpEsHY5XiAPDaov2ifZecJrogyOfFuTHsQX3vHMu2cWJLm8x/ju4t4eiJgPwWfWz7dNavcZyw25fS0pgawxlo2ygdfuA1i9AKhk3yEZNtAN9V6mbdWGRDbnqdD4xmhQvv2VMlRFzGkkv4RDP3W9F40q+zScWAoG5TJcjixgOYpU+ZppG1jD35qEHJhdFXqM6TDuDhl+Kzas+Jh2knzE5S+vS3/2nWC81V1Qpml8o X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1723; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1723; 20:m5ULcfA4NmJUpqFbXoTylhkui1Hbd249QebKuLG8sq+s+jlWB5NlQsZOrEz8Ln2wXi1JzHYxtUcgbMTg6A3nfIo1fWWNplzYYHa3TVkfUfWhKN6xbJdPGR+Jnku45kh45rYLY8NVQXu7K/2JlyiapyZUkmy5zPtj8cFR5rHZY1jOb9KwCr5QprHaODgyfNNaePicQu2h+vUA9xq5fH+dMiwHQVYEV3ou7AHc3+u4q5xeXoNWAc5WfNphEmtU1h3XWzpeQKA8bhCu0O1NeZM1dXEdh5G6jaEwLTc92a/Xwkms4f6r0IsfXfc0Q63j0OMOvaHD3UdQVhCi8wgOG8zuj/F9oNle0vvDGKLSSlbDGfLz69RZFRmmU9EzuelXGOkHSiHQFwOk0E7BrrhtKqud6BVB1bp9UftgxWqworzOTmyvQ3+aMhg6ma5AyXhvFFS9vur0arglJ6MtNss1Hxy0ixHyvZZcxPO1fq79asGDAnHEOSV/covIt/YCQe3gNka+yYaYnUO3rishUQ84KenyudQjn0m6PNQas1FRvdZcBf/tTkhtp/aMvFx3pLDz6A/I5nXOrJMQX0W+JyRjKKad2CE06FoxLJLhdMjJiMw1OmQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236414709691187); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046); SRVR:BY1PR0701MB1723; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1723; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1723; 4:hH4AVgM9lIFoXG6IYSm/MdlVnpa5wr3k6jjBUdBygvE7P89GolvurQsj/fL+OVdZvMljS4IO+Nvy2n+jySckOH7+Zvgv8yFxPJharg4x/Q9Gd5vyoUZ+DGe4+1nYrJV4QrCvTNIOeCvN0+kdaHiVkyktXXXWld+Wzczw/41OAS98Akc+EcbWgXIkIlNzK8jDx2BSS9udGFn1UxMgCMrhj3D016LqIEzCN5+wfEGrIIYn3RKizVGVkm1UQwaOBQofN/8I5BQ3ZoAlHGAwnars1VnT0nC5f4qMO6/Zs/3oDg5eRj6SLFNF1yy26LjJPZeTS596/easm5GO7R0I50E/FUfJh5Fjq893RtnVa4bEFaIu+t50TnxNJyBYo0Y/i+nUaf9TIOn7awIBDvxPYcXqw6wEje8Grbw1Gs3aQR8Q7r0= X-Forefront-PRVS: 078310077C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(189002)(199003)(107886002)(105586002)(5001960100002)(189998001)(97736004)(110136002)(2351001)(81156007)(106356001)(229853001)(66066001)(47776003)(36756003)(33646002)(42186005)(5003940100001)(87976001)(50466002)(48376002)(77096005)(19580405001)(101416001)(575784001)(19580395003)(6116002)(86362001)(5004730100002)(50226001)(5009440100003)(3846002)(40100003)(5008740100001)(92566002)(4001430100002)(122386002)(586003)(50986999)(1096002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1723; H:localhost.localdomain.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0701MB1723; 23:QLb9bo3RqEL7SgY72zrwCS0w2bImLyru0BNs1el?= =?us-ascii?Q?Zk2aKgo9HOwrtqtDfPDy/izIf9U/aAaEjxephjQcjqIR/f14PqiW8RJa8gpp?= =?us-ascii?Q?xgfQcKpRhlX86nWTjtogN8yXDmTqYSYpq0fcV2kTGqoxhg8sHvMgNWZKcDN0?= =?us-ascii?Q?yfU9AUTGagHZoT8pTeE1sF5zE6lrXUNrT7GTkoakzpDvnJMFI6T2uo9qoh+q?= =?us-ascii?Q?OKNPGfb/i0cJqd7hRsz5Ioaw164U+jjs2nCsbWo0WVg2v106r83osRnnKTI7?= =?us-ascii?Q?dCVXXZsWKUkCuM31SgoiSpSv+X6L5wZan5c5BsoopWVm6opq1MTxY3/FbPGj?= =?us-ascii?Q?+6QUEEZ9FdQoZzEZ/OA+Rxs1HJh2uF1XZuHt214eB6oiHhOnTDK1UhG8ZTkl?= =?us-ascii?Q?pwJ61aUF3E9/zdzTcxyXgxB5aK7bKBC8qVUOujljWZxahwatbz0Fkq2mQ8yo?= =?us-ascii?Q?lxlhCZ6N2QR8NwI5XFGFUNHhoF8q6bGGN23N6ORN7FNX5HisP1ZVpgblj0Qf?= =?us-ascii?Q?JAJX81HYJKi6hOcE3FrN2mcLWwdz0PY3lql01iWjFvgNg8w+k9+DiVFyAl1Y?= =?us-ascii?Q?dsEWiyMnijQfGNBfcO42Tg6N96uRsaInt4QR7KRPSbdsVtwVQKp3Afsls8Q0?= =?us-ascii?Q?mv/384w6MjvwmypZZIvy7cxARG2XR3XSHJHkx4T+R2N9HU/brdAvTu5BsiCB?= =?us-ascii?Q?WPk5pFbc82tuSLYgs9cyzvE+MoyAiHVTsawWq8Krn/o2JbmgV/8PM6wfAgg0?= =?us-ascii?Q?+VQJUe+mHz1lqHGuMYohieo9iz35uTlBC0FiS/XhApUUUeN5J+v1d2A1RSHA?= =?us-ascii?Q?nHDOPH7cupdBjId12ScaqLibpqKUkI0Nat0/lssa0+OYnHbvZxwC/Kgp2ZCf?= =?us-ascii?Q?z4WMqUBZvv3POU3BsJoAj4NCuCRZTXx48K7Zoo8iqbASZT/AQulge0jo+s5R?= =?us-ascii?Q?LcQ6ElTPh3I2qvtuAhwE8TQFywayGDq8ElGvQFacOostyl6VBOhebs3PLeib?= =?us-ascii?Q?BHduhqd6/NyqX9IJxFnPvN4089Tw6T3YCTG5Gn2Kz3pOmdFQnTeVs+zKT7N5?= =?us-ascii?Q?UZklH2IujS+DIDGJ3xohM5VRwz+tTc8XIgiAdkWxykcQ25FhvzQcqMd/dOWF?= =?us-ascii?Q?kgbX5Y8I1Lrk7eDa+AVf92gzzC029tfC0?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1723; 5:Dmr+yaleQQhBnoXC/y5FRZ6R9pey87WjE5j55YVIk60ztzwEmSC6v7XbSuSsV5GM8h0IeJjF8UXNoOwsK0Ra6Ep+yENn/UAi6snxklqTh6EJGdnf9A+cOMwt/ol+U1OgVT9qJoowYUMFKQm3HBCF9w==; 24:qk+aZ/9k4w5gsxgnoOgesXcbi13yJcvH3WSisNwQQeaelW8xcHXAfYt0MfprEAW7dseojofb8lnd2qz9MexLcGhrxzzXH9A5R/PBlBFff6w= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2015 14:23:16.5984 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1723 Subject: [dpdk-dev] [PATCH] config: cleanup existing RTE_CACHE_LINE_SIZE selection scheme X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" by default, all the targets will be configured with the 64-byte cache line size, targets which have different cache line size can be overridden through target specific config file. Selected ThunderX and power8 as CONFIG_RTE_CACHE_LINE_SIZE=128 targets based on existing configuration. Signed-off-by: Jerin Jacob Acked-by: Thomas Monjalon --- config/common_bsdapp | 5 +++++ config/common_linuxapp | 6 +++++- config/defconfig_arm64-armv8a-linuxapp-gcc | 2 -- config/defconfig_ppc_64-power8-linuxapp-gcc | 2 ++ lib/librte_eal/common/include/rte_memory.h | 3 --- lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h | 4 ---- mk/arch/arm/rte.vars.mk | 2 +- mk/arch/ppc_64/rte.vars.mk | 2 +- mk/machine/armv8a/rte.vars.mk | 2 +- mk/machine/thunderx/rte.vars.mk | 2 +- mk/machine/xgene1/rte.vars.mk | 2 +- 11 files changed, 17 insertions(+), 15 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index 3286481..5dbcc33 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -94,6 +94,11 @@ CONFIG_RTE_BUILD_COMBINE_LIBS=n CONFIG_RTE_NEXT_ABI=y # +# Machine's cache line size +# +CONFIG_RTE_CACHE_LINE_SIZE=64 + +# # Compile Environment Abstraction Layer # CONFIG_RTE_LIBRTE_EAL=y diff --git a/config/common_linuxapp b/config/common_linuxapp index 2866986..54168be 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -94,6 +94,11 @@ CONFIG_RTE_BUILD_COMBINE_LIBS=n CONFIG_RTE_NEXT_ABI=y # +# Machine's cache line size +# +CONFIG_RTE_CACHE_LINE_SIZE=64 + +# # Compile Environment Abstraction Layer # CONFIG_RTE_LIBRTE_EAL=y @@ -110,7 +115,6 @@ CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n CONFIG_RTE_EAL_IGB_UIO=y CONFIG_RTE_EAL_VFIO=y CONFIG_RTE_MALLOC_DEBUG=n - # Default driver path (or "" to disable) CONFIG_RTE_EAL_PMD_PATH="" diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc index 57f7941..52e0c97 100644 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ b/config/defconfig_arm64-armv8a-linuxapp-gcc @@ -43,8 +43,6 @@ CONFIG_RTE_FORCE_INTRINSICS=y CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_CACHE_LINE_SIZE=64 - CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_LIBRTE_VIRTIO_PMD=n CONFIG_RTE_LIBRTE_IVSHMEM=n diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc index 03760c4..a80a19e 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc @@ -36,6 +36,8 @@ CONFIG_RTE_ARCH="ppc_64" CONFIG_RTE_ARCH_PPC_64=y CONFIG_RTE_ARCH_64=y +CONFIG_RTE_CACHE_LINE_SIZE=128 + CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h index 33f5a77..b697c90 100644 --- a/lib/librte_eal/common/include/rte_memory.h +++ b/lib/librte_eal/common/include/rte_memory.h @@ -68,9 +68,6 @@ enum rte_page_sizes { }; #define SOCKET_ID_ANY -1 /**< Any NUMA socket. */ -#ifndef RTE_CACHE_LINE_SIZE -#define RTE_CACHE_LINE_SIZE 64 /**< Cache line size. */ -#endif #define RTE_CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */ #define RTE_CACHE_LINE_ROUNDUP(size) \ diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h index e724af7..cfd142a 100644 --- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h @@ -68,10 +68,6 @@ */ #define RTE_KNI_NAMESIZE 32 -#ifndef RTE_CACHE_LINE_SIZE -#define RTE_CACHE_LINE_SIZE 64 /**< Cache line size. */ -#endif - /* * Request id. */ diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk index df0c043..bd85140 100644 --- a/mk/arch/arm/rte.vars.mk +++ b/mk/arch/arm/rte.vars.mk @@ -32,7 +32,7 @@ ARCH ?= arm CROSS ?= -CPU_CFLAGS ?= -marm -DRTE_CACHE_LINE_SIZE=64 -munaligned-access +CPU_CFLAGS ?= -marm -munaligned-access CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk index fdba019..363fcd1 100644 --- a/mk/arch/ppc_64/rte.vars.mk +++ b/mk/arch/ppc_64/rte.vars.mk @@ -32,7 +32,7 @@ ARCH ?= powerpc CROSS ?= -CPU_CFLAGS ?= -m64 -DRTE_CACHE_LINE_SIZE=128 +CPU_CFLAGS ?= -m64 CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf64 diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk index 8c018a4..d5049e1 100644 --- a/mk/machine/armv8a/rte.vars.mk +++ b/mk/machine/armv8a/rte.vars.mk @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc -DRTE_CACHE_LINE_SIZE=64 +MACHINE_CFLAGS += -march=armv8-a+crc diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk index 0bb6b3d..81da1b4 100644 --- a/mk/machine/thunderx/rte.vars.mk +++ b/mk/machine/thunderx/rte.vars.mk @@ -55,4 +55,4 @@ CROSS ?= aarch64-thunderx-linux-gnu- # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc -mcpu=thunderx -DRTE_CACHE_LINE_SIZE=128 +MACHINE_CFLAGS += -march=armv8-a+crc -mcpu=thunderx diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk index bdf8c6b..419c234 100644 --- a/mk/machine/xgene1/rte.vars.mk +++ b/mk/machine/xgene1/rte.vars.mk @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a -DRTE_CACHE_LINE_SIZE=64 +MACHINE_CFLAGS += -march=armv8-a