Commit ebe5cf35 authored by Hans Petter Selasky's avatar Hans Petter Selasky
Browse files

Implement basic support for allocating memory from a specific numa node

in the LinuxKPI.

Differential Revision:	https://reviews.freebsd.org/D29077
Reviewed by:	markj@ and kib@
MFC after:	1 week
Sponsored by:	Mellanox Technologies // NVIDIA Networking
parent 94dddbfd
...@@ -35,11 +35,13 @@ ...@@ -35,11 +35,13 @@
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/malloc.h> #include <sys/malloc.h>
struct domainset;
struct thread; struct thread;
struct task_struct; struct task_struct;
extern int linux_alloc_current(struct thread *, int flags); extern int linux_alloc_current(struct thread *, int flags);
extern void linux_free_current(struct task_struct *); extern void linux_free_current(struct task_struct *);
extern struct domainset *linux_get_vm_domain_set(int node);
static inline void static inline void
linux_set_current(struct thread *td) linux_set_current(struct thread *td)
......
...@@ -554,11 +554,9 @@ class_remove_file(struct class *class, const struct class_attribute *attr) ...@@ -554,11 +554,9 @@ class_remove_file(struct class *class, const struct class_attribute *attr)
sysfs_remove_file(&class->kobj, &attr->attr); sysfs_remove_file(&class->kobj, &attr->attr);
} }
static inline int #define dev_to_node(dev) linux_dev_to_node(dev)
dev_to_node(struct device *dev) #define of_node_to_nid(node) -1
{ int linux_dev_to_node(struct device *);
return -1;
}
char *kvasprintf(gfp_t, const char *, va_list); char *kvasprintf(gfp_t, const char *, va_list);
char *kasprintf(gfp_t, const char *, ...); char *kasprintf(gfp_t, const char *, ...);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 Isilon Systems, Inc.
* Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 iX Systems, Inc.
* Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2010 Panasas, Inc.
* Copyright (c) 2013-2017 Mellanox Technologies, Ltd. * Copyright (c) 2013-2021 Mellanox Technologies, Ltd.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <sys/proc.h> #include <sys/proc.h>
#include <vm/uma.h> #include <vm/uma.h>
#include <linux/compat.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/llist.h> #include <linux/llist.h>
...@@ -48,16 +49,15 @@ MALLOC_DECLARE(M_KMALLOC); ...@@ -48,16 +49,15 @@ MALLOC_DECLARE(M_KMALLOC);
#define kvzalloc(size, flags) kmalloc(size, (flags) | __GFP_ZERO) #define kvzalloc(size, flags) kmalloc(size, (flags) | __GFP_ZERO)
#define kvcalloc(n, size, flags) kvmalloc_array(n, size, (flags) | __GFP_ZERO) #define kvcalloc(n, size, flags) kvmalloc_array(n, size, (flags) | __GFP_ZERO)
#define kzalloc(size, flags) kmalloc(size, (flags) | __GFP_ZERO) #define kzalloc(size, flags) kmalloc(size, (flags) | __GFP_ZERO)
#define kzalloc_node(size, flags, node) kmalloc(size, (flags) | __GFP_ZERO) #define kzalloc_node(size, flags, node) kmalloc_node(size, (flags) | __GFP_ZERO, node)
#define kfree_const(ptr) kfree(ptr) #define kfree_const(ptr) kfree(ptr)
#define vzalloc(size) __vmalloc(size, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, 0) #define vzalloc(size) __vmalloc(size, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, 0)
#define vfree(arg) kfree(arg) #define vfree(arg) kfree(arg)
#define kvfree(arg) kfree(arg) #define kvfree(arg) kfree(arg)
#define vmalloc_node(size, node) __vmalloc(size, GFP_KERNEL, 0) #define vmalloc_node(size, node) __vmalloc_node(size, GFP_KERNEL, node)
#define vmalloc_user(size) __vmalloc(size, GFP_KERNEL | __GFP_ZERO, 0) #define vmalloc_user(size) __vmalloc(size, GFP_KERNEL | __GFP_ZERO, 0)
#define vmalloc(size) __vmalloc(size, GFP_KERNEL, 0) #define vmalloc(size) __vmalloc(size, GFP_KERNEL, 0)
#define __kmalloc(...) kmalloc(__VA_ARGS__) #define __kmalloc(...) kmalloc(__VA_ARGS__)
#define kmalloc_node(chunk, flags, n) kmalloc(chunk, flags)
/* /*
* Prefix some functions with linux_ to avoid namespace conflict * Prefix some functions with linux_ to avoid namespace conflict
...@@ -126,6 +126,13 @@ kmalloc(size_t size, gfp_t flags) ...@@ -126,6 +126,13 @@ kmalloc(size_t size, gfp_t flags)
return (malloc(size, M_KMALLOC, linux_check_m_flags(flags))); return (malloc(size, M_KMALLOC, linux_check_m_flags(flags)));
} }
static inline void *
kmalloc_node(size_t size, gfp_t flags, int node)
{
return (malloc_domainset(size, M_KMALLOC,
linux_get_vm_domain_set(node), linux_check_m_flags(flags)));
}
static inline void * static inline void *
kcalloc(size_t n, size_t size, gfp_t flags) kcalloc(size_t n, size_t size, gfp_t flags)
{ {
...@@ -133,12 +140,27 @@ kcalloc(size_t n, size_t size, gfp_t flags) ...@@ -133,12 +140,27 @@ kcalloc(size_t n, size_t size, gfp_t flags)
return (mallocarray(n, size, M_KMALLOC, linux_check_m_flags(flags))); return (mallocarray(n, size, M_KMALLOC, linux_check_m_flags(flags)));
} }
static inline void *
kcalloc_node(size_t n, size_t size, gfp_t flags, int node)
{
flags |= __GFP_ZERO;
return (mallocarray_domainset(n, size, M_KMALLOC,
linux_get_vm_domain_set(node), linux_check_m_flags(flags)));
}
static inline void * static inline void *
__vmalloc(size_t size, gfp_t flags, int other) __vmalloc(size_t size, gfp_t flags, int other)
{ {
return (malloc(size, M_KMALLOC, linux_check_m_flags(flags))); return (malloc(size, M_KMALLOC, linux_check_m_flags(flags)));
} }
static inline void *
__vmalloc_node(size_t size, gfp_t flags, int node)
{
return (malloc_domainset(size, M_KMALLOC,
linux_get_vm_domain_set(node), linux_check_m_flags(flags)));
}
static inline void * static inline void *
vmalloc_32(size_t size) vmalloc_32(size_t size)
{ {
...@@ -151,6 +173,13 @@ kmalloc_array(size_t n, size_t size, gfp_t flags) ...@@ -151,6 +173,13 @@ kmalloc_array(size_t n, size_t size, gfp_t flags)
return (mallocarray(n, size, M_KMALLOC, linux_check_m_flags(flags))); return (mallocarray(n, size, M_KMALLOC, linux_check_m_flags(flags)));
} }
static inline void *
kmalloc_array_node(size_t n, size_t size, gfp_t flags, int node)
{
return (mallocarray_domainset(n, size, M_KMALLOC,
linux_get_vm_domain_set(node), linux_check_m_flags(flags)));
}
static inline void * static inline void *
kvmalloc_array(size_t n, size_t size, gfp_t flags) kvmalloc_array(size_t n, size_t size, gfp_t flags)
{ {
......
/*-
* Copyright (c) 2021 NVIDIA Networking
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice unmodified, this list of conditions, and the following
* disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/domainset.h>
#include <sys/bus.h>
#include <linux/compat.h>
#include <linux/device.h>
struct domainset *
linux_get_vm_domain_set(int node)
{
KASSERT(node < MAXMEMDOM, ("Invalid VM domain %d", node));
if (node < 0)
return (DOMAINSET_RR());
else
return (DOMAINSET_PREF(node));
}
int
linux_dev_to_node(struct device *dev)
{
int numa_domain;
if (dev == NULL || dev->bsddev == NULL ||
bus_get_domain(dev->bsddev, &numa_domain) != 0)
return (-1);
else
return (numa_domain);
}
...@@ -4565,6 +4565,8 @@ compat/linuxkpi/common/src/linux_devres.c optional compat_linuxkpi \ ...@@ -4565,6 +4565,8 @@ compat/linuxkpi/common/src/linux_devres.c optional compat_linuxkpi \
compile-with "${LINUXKPI_C}" compile-with "${LINUXKPI_C}"
compat/linuxkpi/common/src/linux_dmi.c optional compat_linuxkpi \ compat/linuxkpi/common/src/linux_dmi.c optional compat_linuxkpi \
compile-with "${LINUXKPI_C}" compile-with "${LINUXKPI_C}"
compat/linuxkpi/common/src/linux_domain.c optional compat_linuxkpi \
compile-with "${LINUXKPI_C}"
compat/linuxkpi/common/src/linux_firmware.c optional compat_linuxkpi \ compat/linuxkpi/common/src/linux_firmware.c optional compat_linuxkpi \
compile-with "${LINUXKPI_C}" compile-with "${LINUXKPI_C}"
compat/linuxkpi/common/src/linux_hrtimer.c optional compat_linuxkpi \ compat/linuxkpi/common/src/linux_hrtimer.c optional compat_linuxkpi \
......
...@@ -6,6 +6,7 @@ SRCS= linux_compat.c \ ...@@ -6,6 +6,7 @@ SRCS= linux_compat.c \
linux_current.c \ linux_current.c \
linux_devres.c \ linux_devres.c \
linux_dmi.c \ linux_dmi.c \
linux_domain.c \
linux_firmware.c \ linux_firmware.c \
linux_hrtimer.c \ linux_hrtimer.c \
linux_idr.c \ linux_idr.c \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment