From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 17218A0548; Mon, 20 Sep 2021 14:53:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50F3D410ED; Mon, 20 Sep 2021 14:53:23 +0200 (CEST) Received: from AZHDRRW-EX01.nvidia.com (azhdrrw-ex01.nvidia.com [20.51.104.162]) by mails.dpdk.org (Postfix) with ESMTP id D7C1A410EB for ; Mon, 20 Sep 2021 14:53:21 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.170) by mxs.oss.nvidia.com (10.13.234.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.858.15; Mon, 20 Sep 2021 05:53:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AHAAZc3X19qLSaLvE2DaaRvIS90si++00PXIxdPA8R0BanFx+qp90fV/ZzxTcLjx6Xx29nu5dQrs/4VIW9ch7342iq8YdqsOOoqTnjDIvLtrKT6OC6D48LXAyTcwhdzOc9dwekLPvQFybQsdTU2MOwugpTwS2EvahviqV/pblO/5wOtFB8byS7CoAl63NQqsLdN/G5qf3hjT+0VUJPMDZpyUUZwnffQN6XkO0TNvO5mQyQNsOA0ckLKtA/Qvb1vQrWrfPFu3hrOAx3r9ZNxrAWKU6EylfUeJT9gdyA7TNfTxbWU5Opgd3+3vbE+gajq7b7zusberEUn8M8RE/N2NdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=R6RwgOdgGmCeTcQORVoYSTeWG7nnDo2E4sDsgoH34x0=; b=cZ1anSsCYmdJjJ6InBpMtxZuJR3hlYydcEhRfbsxT3B5qumm8FpQVIfGX4QcmDzpqS2fZWBk8LKXB+aY7TV0m82u6oKqL5cQdrGmRHaSiRu7w4QQZxPE/zTrkirlbqRXbL2M8IRW7x61dn85rjYu/0CPrufjavixQ1+N+6u6kQM0lrPtT3cbrrYaYSzlJ8olhQjL70a+JNxvUINbbFfOV8fnHiDu2n4IXFv2heFcn85d9rlecOQIMpxCPdN5BbqWE7gxYMnCIHz2N+UQf5+omez/wp8cjY4PxESKnARGTJlOL0e7jZ+Kq4PKp8Pfvy/v1dTwE/8Id2r6S0P23YtFpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R6RwgOdgGmCeTcQORVoYSTeWG7nnDo2E4sDsgoH34x0=; b=q1a8P2UYF9gjy7y+nJ1VinTlyY7kGEi1HKASKGPpJe5jMQVUPqTcQYzH/dGu9Hnyocmm2pb3QF3fqYrkp5oLKpG0Wq4dh9oOkOjIdsdgdc5Su31iQmI6i4xb0PwePWFkqwF8u4oln1wTskFW5J+y2VQivon/1nDz8t1PQ56kPXA/r1/2QI9xe2n/taH+fsI5UO5P2/dmc9zX+l0akPsVW5ASJG+PYYMm5zrNmFe2+uoieNJw3SCd4Br40d76iJSW/NXtV/moE5f1zF1l3S3wMrK55apEx+81KOpo0lX+1ekKhvzWUpex2kxqUYX6SgrJoNlLzNofs2JjHV6YN7gShw== Received: from MWHPR01CA0032.prod.exchangelabs.com (2603:10b6:300:101::18) by SA0PR12MB4431.namprd12.prod.outlook.com (2603:10b6:806:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Mon, 20 Sep 2021 12:53:19 +0000 Received: from CO1NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:300:101:cafe::de) by MWHPR01CA0032.outlook.office365.com (2603:10b6:300:101::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Mon, 20 Sep 2021 12:53:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT051.mail.protection.outlook.com (10.13.174.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4523.14 via Frontend Transport; Mon, 20 Sep 2021 12:53:19 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 20 Sep 2021 12:53:18 +0000 Received: from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 20 Sep 2021 12:53:16 +0000 From: To: CC: Anatoly Burakov , Dmitry Kozlyuk , John Levon , "Viacheslav Ovsiienko" Date: Mon, 20 Sep 2021 15:53:00 +0300 Message-ID: <20210920125302.820273-2-dkozlyuk@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920125302.820273-1-dkozlyuk@nvidia.com> References: <20210914103456.535427-1-dkozlyuk@nvidia.com> <20210920125302.820273-1-dkozlyuk@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea27fd82-fcbe-4041-0397-08d97c359f0f X-MS-TrafficTypeDiagnostic: SA0PR12MB4431: X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qEF/uiiaagUqYc/EIPzhi+MULCYQt1b0882HwcsMnAF9gVGm/+nymKty6UoEQRm001BxAiMh43If8vsjRHGzK3VdChu8VkCRVZHMbIutxbuWCDbl1N5S/2hndWLiLdwwZLb7ig0S5C2Otru/0iWJIMMjGHEMofftY/uOhr/2UB3anbbbsDi3ApxcTG58kiC9eXDPIz2f4NkwuJJE2pD3wP1f9XwC/gX9VC1RthqG2EqJfCb9reWp3I9CATLUjS2JX5N96Jzbtaqy6DS1ylvPgo601fn4Lxrj536zOYdcZw/s1zpIkjzjrsSogRqPTvPiLxATdJCMkuDSQSw4H3hjVrJnpyMevbMo2FjJJlHKg2K7VKV5GypXcZz7IxyaliwaZpJi7Ga87d4y4zMjd5azLOQHHkP2oSerrOX751sHmzFZWgpgdsKzOtMPhaODO5LMq3ml1XFwyEapgzjBryTs9yg0RM5EqctwPVNFcNnEKzBmXWXtgxgCgp2TOVMs6DXAbVw8zEpwnhfTiIpMwrHuruh8VNmXTrRZjD9cr/e3No+oV8ZiLEPCxeMfv9SkwCgzDiMfjRoCTxNljVuE4nHU1Y5smk5MqzdMndWRvcHJVXzyksYQlUJWsozxd38H+th6O2yw1JnqO732crmtpOGGEjYtR+4CyinqBpLvWWIuLom7tP9fBaC0Wf0Yo8N1+2IcF13ixQ+uwWI7CROnpGs5jQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(346002)(39860400002)(396003)(376002)(36840700001)(46966006)(26005)(47076005)(1076003)(107886003)(16526019)(356005)(186003)(6666004)(70586007)(2876002)(83380400001)(36906005)(82310400003)(55016002)(316002)(7696005)(54906003)(4326008)(426003)(70206006)(82740400003)(7636003)(86362001)(2906002)(2616005)(5660300002)(36756003)(478600001)(8936002)(8676002)(36860700001)(6286002)(6916009)(336012); DIR:OUT; SFP:1101; X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2021 12:53:19.2158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea27fd82-fcbe-4041-0397-08d97c359f0f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4431 Subject: [dpdk-dev] [PATCH v4 1/3] eal/linux: make hugetlbfs analysis reusable 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 Sender: "dev" From: Dmitry Kozlyuk get_hugepage_dir() searched for a hugetlbfs mount with a given page size using handcraft parsing of /proc/mounts and mixing traversal logic with selecting the needed entry. Separate code to enumerate hugetlbfs mounts to eal_hugepage_mount_walk() taking a callback that can inspect already parsed entries. Use mntent(3) API for parsing. This allows to reuse enumeration logic in subsequent patches. Signed-off-by: Dmitry Kozlyuk Reviewed-by: Viacheslav Ovsiienko --- lib/eal/linux/eal_hugepage_info.c | 153 +++++++++++++++++++----------- lib/eal/linux/eal_hugepage_info.h | 39 ++++++++ 2 files changed, 135 insertions(+), 57 deletions(-) create mode 100644 lib/eal/linux/eal_hugepage_info.h diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c index d97792cade..193282e779 100644 --- a/lib/eal/linux/eal_hugepage_info.c +++ b/lib/eal/linux/eal_hugepage_info.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -34,6 +35,7 @@ #include "eal_private.h" #include "eal_internal_cfg.h" #include "eal_hugepages.h" +#include "eal_hugepage_info.h" #include "eal_filesystem.h" static const char sys_dir_path[] = "/sys/kernel/mm/hugepages"; @@ -195,73 +197,110 @@ get_default_hp_size(void) return size; } -static int -get_hugepage_dir(uint64_t hugepage_sz, char *hugedir, int len) +int +eal_hugepage_mount_walk(eal_hugepage_mount_walk_cb *cb, void *cb_arg) { - enum proc_mount_fieldnames { - DEVICE = 0, - MOUNTPT, - FSTYPE, - OPTIONS, - _FIELDNAME_MAX - }; - static uint64_t default_size = 0; - const char proc_mounts[] = "/proc/mounts"; - const char hugetlbfs_str[] = "hugetlbfs"; - const size_t htlbfs_str_len = sizeof(hugetlbfs_str) - 1; - const char pagesize_opt[] = "pagesize="; - const size_t pagesize_opt_len = sizeof(pagesize_opt) - 1; - const char split_tok = ' '; - char *splitstr[_FIELDNAME_MAX]; - char buf[BUFSIZ]; - int retval = -1; - const struct internal_config *internal_conf = - eal_get_internal_configuration(); - - FILE *fd = fopen(proc_mounts, "r"); - if (fd == NULL) - rte_panic("Cannot open %s\n", proc_mounts); + static const char PATH[] = "/proc/mounts"; + static const char OPTION[] = "pagesize"; + + static uint64_t default_size; + + FILE *f = NULL; + struct mntent mntent; + char strings[PATH_MAX]; + char *hugepage_sz_str; + uint64_t hugepage_sz; + bool stopped = false; + int ret = -1; + + f = setmntent(PATH, "r"); + if (f == NULL) { + RTE_LOG(ERR, EAL, "%s(): setmntent(%s): %s\n", + __func__, PATH, strerror(errno)); + goto exit; + } if (default_size == 0) default_size = get_default_hp_size(); - while (fgets(buf, sizeof(buf), fd)){ - if (rte_strsplit(buf, sizeof(buf), splitstr, _FIELDNAME_MAX, - split_tok) != _FIELDNAME_MAX) { - RTE_LOG(ERR, EAL, "Error parsing %s\n", proc_mounts); - break; /* return NULL */ + ret = 0; + while (getmntent_r(f, &mntent, strings, sizeof(strings)) != NULL) { + if (strcmp(mntent.mnt_type, "hugetlbfs") != 0) + continue; + + hugepage_sz_str = hasmntopt(&mntent, OPTION); + if (hugepage_sz_str != NULL) { + hugepage_sz_str += strlen(OPTION) + 1; /* +1 for '=' */ + hugepage_sz = rte_str_to_size(hugepage_sz_str); + if (hugepage_sz == 0) { + RTE_LOG(DEBUG, EAL, "Cannot parse hugepage size from '%s' for %s\n", + mntent.mnt_opts, mntent.mnt_dir); + continue; + } + } else { + RTE_LOG(DEBUG, EAL, "Hugepage filesystem at %s without %s option\n", + mntent.mnt_dir, OPTION); + hugepage_sz = default_size; } - /* we have a specified --huge-dir option, only examine that dir */ - if (internal_conf->hugepage_dir != NULL && - strcmp(splitstr[MOUNTPT], internal_conf->hugepage_dir) != 0) - continue; + if (cb(mntent.mnt_dir, hugepage_sz, cb_arg) != 0) { + stopped = true; + break; + } + } - if (strncmp(splitstr[FSTYPE], hugetlbfs_str, htlbfs_str_len) == 0){ - const char *pagesz_str = strstr(splitstr[OPTIONS], pagesize_opt); + if (ferror(f) || (!stopped && !feof(f))) { + RTE_LOG(ERR, EAL, "%s(): getmntent_r(): %s\n", + __func__, strerror(errno)); + ret = -1; + goto exit; + } - /* if no explicit page size, the default page size is compared */ - if (pagesz_str == NULL){ - if (hugepage_sz == default_size){ - strlcpy(hugedir, splitstr[MOUNTPT], len); - retval = 0; - break; - } - } - /* there is an explicit page size, so check it */ - else { - uint64_t pagesz = rte_str_to_size(&pagesz_str[pagesize_opt_len]); - if (pagesz == hugepage_sz) { - strlcpy(hugedir, splitstr[MOUNTPT], len); - retval = 0; - break; - } - } - } /* end if strncmp hugetlbfs */ - } /* end while fgets */ +exit: + if (f != NULL) + endmntent(f); + return ret; +} - fclose(fd); - return retval; +struct match_hugepage_mount_arg { + uint64_t hugepage_sz; + char *hugedir; + int hugedir_len; + bool done; +}; + +static int +match_hugepage_mount(const char *path, uint64_t hugepage_sz, void *cb_arg) +{ + const struct internal_config *internal_conf = + eal_get_internal_configuration(); + struct match_hugepage_mount_arg *arg = cb_arg; + + /* we have a specified --huge-dir option, only examine that dir */ + if (internal_conf->hugepage_dir != NULL && + strcmp(path, internal_conf->hugepage_dir) != 0) + return 0; + + if (hugepage_sz == arg->hugepage_sz) { + strlcpy(arg->hugedir, path, arg->hugedir_len); + arg->done = true; + return 1; + } + + return 0; +} + +static int +get_hugepage_dir(uint64_t hugepage_sz, char *hugedir, int len) +{ + struct match_hugepage_mount_arg arg = { + .hugepage_sz = hugepage_sz, + .hugedir = hugedir, + .hugedir_len = len, + .done = false, + }; + int ret = eal_hugepage_mount_walk(match_hugepage_mount, &arg); + return ret == 0 && arg.done ? 0 : -1; } /* diff --git a/lib/eal/linux/eal_hugepage_info.h b/lib/eal/linux/eal_hugepage_info.h new file mode 100644 index 0000000000..c7efa37c66 --- /dev/null +++ b/lib/eal/linux/eal_hugepage_info.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2021 NVIDIA CORPORATION & AFFILIATES. + */ + +#ifndef _EAL_HUGEPAGE_INFO_ +#define _EAL_HUGEPAGE_INFO_ + +#include + +/** + * Function called for each hugetlbfs mount point. + * + * @param path + * Mount point directory. + * @param hugepage_sz + * Hugepage size for the mount or default system hugepage size. + * @param arg + * User data. + * + * @return + * 0 to continue walking, 1 to stop. + */ +typedef int (eal_hugepage_mount_walk_cb)(const char *path, uint64_t hugepage_sz, + void *arg); + +/** + * Enumerate hugetlbfs mount points. + * + * @param cb + * Function called for each mount point. + * @param cb_arg + * User data passed to the callback. + * + * @return + * 0 on success, negative on failure. + */ +int eal_hugepage_mount_walk(eal_hugepage_mount_walk_cb *cb, void *cb_arg); + +#endif /* _EAL_HUGEPAGE_INFO_ */ -- 2.25.1