#include <linux/cpu.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
+#include <linux/oom.h>
-#include <wrapper/mm.h>
#include <wrapper/ringbuffer/config.h>
#include <wrapper/ringbuffer/backend.h>
#include <wrapper/ringbuffer/frontend.h>
* and returns if there should be enough free pages based on the
* current estimate.
*/
- if (!wrapper_check_enough_free_pages(num_pages))
+ if (num_pages >= si_mem_available())
goto not_enough_pages;
/*
* end up running out of memory because of this buffer allocation, we
* want to kill the offending app first.
*/
- wrapper_set_current_oom_origin();
+ set_current_oom_origin();
num_pages_per_subbuf = num_pages >> get_count_order(num_subbuf);
subbuf_size = chanb->subbuf_size;
}
}
- wrapper_clear_current_oom_origin();
+ clear_current_oom_origin();
vfree(pages);
return 0;
array_error:
vfree(pages);
pages_error:
- wrapper_clear_current_oom_origin();
+ clear_current_oom_origin();
not_enough_pages:
return -ENOMEM;
}
+++ /dev/null
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/mm.h
- *
- * Copyright (C) 2018 Francis Deslauriers <francis.deslauriers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_MM_H
-#define _LTTNG_WRAPPER_MM_H
-
-#include <linux/mm.h>
-#include <linux/oom.h>
-
-#include <lttng-kernel-version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) \
- || LTTNG_UBUNTU_KERNEL_RANGE(4,4,25,44, 4,5,0,0))
-
-/*
- * Returns true if the current estimation of the number of page available is
- * larger than the number of pages passed as parameter.
- */
-static inline
-bool wrapper_check_enough_free_pages(unsigned long num_pages)
-{
- return num_pages < si_mem_available();
-}
-
-#else
-
-static inline
-bool wrapper_check_enough_free_pages(unsigned long num_pages)
-{
- /*
- * The si_mem_available function is not available on this kernel. Since
- * we can't reliably know if there is enough memory available, so we
- * return true.
- */
- return true;
-}
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-static inline
-void wrapper_set_current_oom_origin(void)
-{
- return set_current_oom_origin();
-}
-
-static inline
-void wrapper_clear_current_oom_origin(void)
-{
- return clear_current_oom_origin();
-}
-
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
-
-static inline
-void wrapper_set_current_oom_origin(void)
-{
- return;
-}
-
-static inline
-void wrapper_clear_current_oom_origin(void)
-{
- return;
-}
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
-#endif /* _LTTNG_WRAPPER_MM_H */