From patchwork Tue Oct 24 17:43:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Christensen X-Patchwork-Id: 133268 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9EC5E4316B; Tue, 24 Oct 2023 19:43:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47624402A9; Tue, 24 Oct 2023 19:43:36 +0200 (CEST) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mails.dpdk.org (Postfix) with ESMTP id C77D74021D for ; Tue, 24 Oct 2023 19:43:34 +0200 (CEST) Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39OHbQ0h010471; Tue, 24 Oct 2023 17:43:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=m1Rjrw1NTha2EBzRvkaPB2f1fpcUSsucUWAxsCocrPY=; b=nmAM+QFXNGIpv6D/9/bEXZ+N3XGlwxuQNQvV42LXFuQgdtJ7upTcNe87plWd7ofk2UZZ Jkp/fnLmCQQ/F4fasDjgx7hZs/QFmMFHQcoPQG5zjnL6U5ERkmK3/ZQtcrna0J1o7c6d tUDFrBtTIuBGbYe9oJZ62xC+KBnQ6oTkUZ0y/t9YvpYPccGHENRZyghe57t6Q/PpjiMn 46yTEoFq5Hbf/2eDVkugoIODnvdRr6O9PPcSgC6OTlxflBlZAC6msKGQf0+EfyuH5AkM 63kzJ1SH38lmJ5YZjjfdsywdQHo/j3n+t2FJ+pnUhLbqzhkYpczfmGH6shsl+lQpfjDr 1g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3txjfyg8y7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 17:43:31 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39OHcSuD016389; Tue, 24 Oct 2023 17:43:30 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3txjfyg8x9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 17:43:30 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39OGRQDn026839; Tue, 24 Oct 2023 17:43:29 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3tvsyns4mu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 17:43:29 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39OHhSY441878256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Oct 2023 17:43:28 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B24115805C; Tue, 24 Oct 2023 17:43:28 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E165558054; Tue, 24 Oct 2023 17:43:27 +0000 (GMT) Received: from ltc19u30.ibm.com (unknown [9.114.224.51]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 24 Oct 2023 17:43:27 +0000 (GMT) From: David Christensen To: thomas@monjalon.net, Ruifeng Wang , Min Zhou , David Christensen , Stanislaw Kardach , Bruce Richardson , Konstantin Ananyev Cc: dev@dpdk.org Subject: [PATCH v3] eal/linux: verify mmu type for DPDK support (ppc64le) Date: Tue, 24 Oct 2023 13:43:15 -0400 Message-Id: <20231024174315.318408-1-drc@linux.vnet.ibm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231023231939.188417-1-drc@linux.vnet.ibm.com> References: <20231023231939.188417-1-drc@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 5jltskxX6XwQbNRgU3cxrdW4dMAP3JNO X-Proofpoint-ORIG-GUID: XOKfeokEUwvX8ob4HMv_CwoNHs7a5WWM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-24_17,2023-10-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=999 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310240152 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org IBM POWER systems support more than one type of memory management unit (MMU). The Power ISA 3.0 specification, which applies to P9 and later CPUs, defined a new Radix MMU which, among other things, allows an anonymous memory page mapping to be converted into a hugepage mapping at a specific address. This is a required feature in DPDK so we need to test the MMU type when POWER systems are used and provide a more useful error message for the user when running on an unsupported system. Bugzilla ID: 1221 Suggested-by: Thomas Monjalon Signed-off-by: David Christensen --- v3: * Move test function from "common" tree to "linux" v2: * Replace ifdef with arch specific functions --- lib/eal/arm/meson.build | 1 + lib/eal/arm/rte_mmu.c | 11 ++++++ lib/eal/linux/eal.c | 8 +++++ lib/eal/linux/eal_linux_private.h | 17 ++++++++++ lib/eal/loongarch/meson.build | 1 + lib/eal/loongarch/rte_mmu.c | 11 ++++++ lib/eal/ppc/meson.build | 1 + lib/eal/ppc/rte_mmu.c | 56 +++++++++++++++++++++++++++++++ lib/eal/riscv/meson.build | 1 + lib/eal/riscv/rte_mmu.c | 11 ++++++ lib/eal/x86/meson.build | 1 + lib/eal/x86/rte_mmu.c | 11 ++++++ 12 files changed, 130 insertions(+) create mode 100644 lib/eal/arm/rte_mmu.c create mode 100644 lib/eal/linux/eal_linux_private.h create mode 100644 lib/eal/loongarch/rte_mmu.c create mode 100644 lib/eal/ppc/rte_mmu.c create mode 100644 lib/eal/riscv/rte_mmu.c create mode 100644 lib/eal/x86/rte_mmu.c -- 2.39.1 diff --git a/lib/eal/arm/meson.build b/lib/eal/arm/meson.build index dca1106aaeec..6fba3d6ba7b8 100644 --- a/lib/eal/arm/meson.build +++ b/lib/eal/arm/meson.build @@ -7,5 +7,6 @@ sources += files( 'rte_cpuflags.c', 'rte_cycles.c', 'rte_hypervisor.c', + 'rte_mmu.c', 'rte_power_intrinsics.c', ) diff --git a/lib/eal/arm/rte_mmu.c b/lib/eal/arm/rte_mmu.c new file mode 100644 index 000000000000..3c043be10236 --- /dev/null +++ b/lib/eal/arm/rte_mmu.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) IBM Corporation 2023 + */ + +#include + +bool +eal_mmu_supported_linux_arch(void) +{ + return true; +} diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 5f4b2fb0054a..6f838265b15b 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -44,6 +44,7 @@ #include #include "eal_private.h" +#include "eal_linux_private.h" #include "eal_thread.h" #include "eal_internal_cfg.h" #include "eal_filesystem.h" @@ -983,6 +984,13 @@ rte_eal_init(int argc, char **argv) return -1; } + /* verify if DPDK supported on architecture MMU */ + if (!eal_mmu_supported_linux_arch()) { + rte_eal_init_alert("unsupported MMU type."); + rte_errno = ENOTSUP; + return -1; + } + if (!__atomic_compare_exchange_n(&run_once, &has_run, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) { rte_eal_init_alert("already called initialization."); diff --git a/lib/eal/linux/eal_linux_private.h b/lib/eal/linux/eal_linux_private.h new file mode 100644 index 000000000000..b7eaac922849 --- /dev/null +++ b/lib/eal/linux/eal_linux_private.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 IBM Corporation + */ + +#ifndef _EAL_LINUX_PRIVATE_H_ +#define _EAL_LINUX_PRIVATE_H_ + +#include + +/** + * Check for architecture supported MMU. + * + * This function is private to the EAL for Linux. + */ +bool eal_mmu_supported_linux_arch(void); + +#endif /* _EAL_LINUX_PRIVATE_H_ */ diff --git a/lib/eal/loongarch/meson.build b/lib/eal/loongarch/meson.build index 4dcc27babb9b..3acfe6c3bd77 100644 --- a/lib/eal/loongarch/meson.build +++ b/lib/eal/loongarch/meson.build @@ -7,5 +7,6 @@ sources += files( 'rte_cpuflags.c', 'rte_cycles.c', 'rte_hypervisor.c', + 'rte_mmu.c', 'rte_power_intrinsics.c', ) diff --git a/lib/eal/loongarch/rte_mmu.c b/lib/eal/loongarch/rte_mmu.c new file mode 100644 index 000000000000..3c043be10236 --- /dev/null +++ b/lib/eal/loongarch/rte_mmu.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) IBM Corporation 2023 + */ + +#include + +bool +eal_mmu_supported_linux_arch(void) +{ + return true; +} diff --git a/lib/eal/ppc/meson.build b/lib/eal/ppc/meson.build index 71c7ac870da6..eeeaeee240b7 100644 --- a/lib/eal/ppc/meson.build +++ b/lib/eal/ppc/meson.build @@ -7,5 +7,6 @@ sources += files( 'rte_cpuflags.c', 'rte_cycles.c', 'rte_hypervisor.c', + 'rte_mmu.c', 'rte_power_intrinsics.c', ) diff --git a/lib/eal/ppc/rte_mmu.c b/lib/eal/ppc/rte_mmu.c new file mode 100644 index 000000000000..fd762defd72d --- /dev/null +++ b/lib/eal/ppc/rte_mmu.c @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) IBM Corporation 2023 + */ + +#include "stdio.h" +#include "string.h" +#include "rte_log.h" +#include + +bool +eal_mmu_supported_linux_arch(void) +{ + static const char proc_cpuinfo[] = "/proc/cpuinfo"; + static const char str_mmu[] = "MMU"; + static const char str_radix[] = "Radix"; + static const char err_msg[] = "DPDK on PPC64 requires radix-mmu"; + char buf[512]; + char *ret = NULL; + FILE *f = fopen(proc_cpuinfo, "r"); + + if (f == NULL) { + RTE_LOG(ERR, EAL, "Cannot open %s\n", proc_cpuinfo); + return false; + } + + /* + * Example "MMU" in /proc/cpuinfo: + * ... + * model : 8335-GTW + * machine : PowerNV 8335-GTW + * firmware : OPAL + * MMU : Radix + * ... or ... + * model : IBM,9009-22A + * machine : CHRP IBM,9009-22A + * MMU : Hash + */ + while (fgets(buf, sizeof(buf), f) != NULL) { + ret = strstr(buf, str_mmu); + if (ret == NULL) + continue; + ret += sizeof(str_mmu) - 1; + ret = strchr(ret, ':'); + if (ret == NULL) + continue; + ret = strstr(ret, str_radix); + break; + } + fclose(f); + + if (ret == NULL) { + fprintf(stderr, "EAL: FATAL: %s\n", err_msg); + RTE_LOG(ERR, EAL, "%s\n", err_msg); + } + return (ret != NULL); +} diff --git a/lib/eal/riscv/meson.build b/lib/eal/riscv/meson.build index dca1106aaeec..6fba3d6ba7b8 100644 --- a/lib/eal/riscv/meson.build +++ b/lib/eal/riscv/meson.build @@ -7,5 +7,6 @@ sources += files( 'rte_cpuflags.c', 'rte_cycles.c', 'rte_hypervisor.c', + 'rte_mmu.c', 'rte_power_intrinsics.c', ) diff --git a/lib/eal/riscv/rte_mmu.c b/lib/eal/riscv/rte_mmu.c new file mode 100644 index 000000000000..3c043be10236 --- /dev/null +++ b/lib/eal/riscv/rte_mmu.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) IBM Corporation 2023 + */ + +#include + +bool +eal_mmu_supported_linux_arch(void) +{ + return true; +} diff --git a/lib/eal/x86/meson.build b/lib/eal/x86/meson.build index d33a240e1a98..e08dffa13dcc 100644 --- a/lib/eal/x86/meson.build +++ b/lib/eal/x86/meson.build @@ -7,6 +7,7 @@ sources += files( 'rte_cpuflags.c', 'rte_cycles.c', 'rte_hypervisor.c', + 'rte_mmu.c', 'rte_spinlock.c', 'rte_power_intrinsics.c', ) diff --git a/lib/eal/x86/rte_mmu.c b/lib/eal/x86/rte_mmu.c new file mode 100644 index 000000000000..3c043be10236 --- /dev/null +++ b/lib/eal/x86/rte_mmu.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) IBM Corporation 2023 + */ + +#include + +bool +eal_mmu_supported_linux_arch(void) +{ + return true; +}