else
bit_mask = 0;
- *requested_va += (clib_cpu_time_now () & bit_mask) * (1 << log2_page_size);
+ *requested_va +=
+ (clib_cpu_time_now () & bit_mask) * (1ull << log2_page_size);
+}
+
+#ifndef MFD_HUGETLB
+#define MFD_HUGETLB 0x0004U
+#endif
+
+clib_error_t *
+clib_mem_create_hugetlb_fd (char *name, int *fdp)
+{
+ clib_error_t *err = 0;
+ int fd = -1;
+ static int memfd_hugetlb_supported = 1;
+ char *mount_dir;
+ char template[] = "/tmp/hugepage_mount.XXXXXX";
+ u8 *filename;
+
+ ASSERT (name);
+
+ if (memfd_hugetlb_supported)
+ {
+ if ((fd = memfd_create (name, MFD_HUGETLB)) != -1)
+ goto done;
+
+ /* avoid further tries if memfd MFD_HUGETLB is not supported */
+ if (errno == EINVAL && strnlen (name, 256) <= 249)
+ memfd_hugetlb_supported = 0;
+ }
+
+ mount_dir = mkdtemp (template);
+ if (mount_dir == 0)
+ return clib_error_return_unix (0, "mkdtemp \'%s\'", template);
+
+ if (mount ("none", (char *) mount_dir, "hugetlbfs", 0, NULL))
+ {
+ rmdir ((char *) mount_dir);
+ err = clib_error_return_unix (0, "mount hugetlb directory '%s'",
+ mount_dir);
+ }
+
+ filename = format (0, "%s/%s%c", mount_dir, name, 0);
+ fd = open ((char *) filename, O_CREAT | O_RDWR, 0755);
+ umount2 ((char *) mount_dir, MNT_DETACH);
+ rmdir ((char *) mount_dir);
+
+ if (fd == -1)
+ err = clib_error_return_unix (0, "open");
+
+done:
+ if (fd != -1)
+ fdp[0] = fd;
+ return err;
}
clib_error_t *
/* if hugepages are needed we need to create mount point */
if (a->flags & CLIB_MEM_VM_F_HUGETLB)
{
- char *mount_dir;
- char template[] = "/tmp/hugepage_mount.XXXXXX";
-
- mount_dir = mkdtemp (template);
- if (mount_dir == 0)
- return clib_error_return_unix (0, "mkdtemp \'%s\'", template);
+ if ((err = clib_mem_create_hugetlb_fd (a->name, &fd)))
+ goto error;
- if (mount ("none", (char *) mount_dir, "hugetlbfs", 0, NULL))
- {
- rmdir ((char *) mount_dir);
- err = clib_error_return_unix (0, "mount hugetlb directory '%s'",
- mount_dir);
- goto error;
- }
-
- filename = format (0, "%s/%s%c", mount_dir, a->name, 0);
-
- if ((fd = open ((char *) filename, O_CREAT | O_RDWR, 0755)) == -1)
- {
- umount2 ((char *) mount_dir, MNT_DETACH);
- rmdir ((char *) mount_dir);
- err = clib_error_return_unix (0, "open");
- goto error;
- }
- umount2 ((char *) mount_dir, MNT_DETACH);
- rmdir ((char *) mount_dir);
mmap_flags |= MAP_LOCKED;
}
else
if (a->flags & CLIB_MEM_VM_F_HUGETLB_PREALLOC)
{
- err = clib_sysfs_prealloc_hugepages (a->numa_node,
- 1 << (log2_page_size - 10),
+ err = clib_sysfs_prealloc_hugepages (a->numa_node, log2_page_size,
n_pages);
if (err)
goto error;
{
if (a != 0)
{
- clib_mem_vm_free (a->addr, 1 << a->log2_page_size);
+ clib_mem_vm_free (a->addr, 1ull << a->log2_page_size);
if (a->fd != -1)
close (a->fd);
}