\*****************************************************************************/
#include <sys/kmem.h>
+#include <linux/mm_compat.h>
#include "splat-internal.h"
#define SPLAT_LINUX_NAME "linux"
#define SPLAT_LINUX_DESC "Kernel Compatibility Tests"
#define SPLAT_LINUX_TEST1_ID 0x1001
-#define SPLAT_LINUX_TEST1_NAME "shrink_dcache"
-#define SPLAT_LINUX_TEST1_DESC "Shrink dcache test"
-
-#define SPLAT_LINUX_TEST2_ID 0x1002
-#define SPLAT_LINUX_TEST2_NAME "shrink_icache"
-#define SPLAT_LINUX_TEST2_DESC "Shrink icache test"
-
-#define SPLAT_LINUX_TEST3_ID 0x1003
-#define SPLAT_LINUX_TEST3_NAME "shrinker"
-#define SPLAT_LINUX_TEST3_DESC "Shrinker test"
-
-
-/*
- * Attempt to shrink the dcache memory. This is simply a functional
- * to ensure we can correctly call the shrinker. We don't check that
- * the cache actually decreased because we have no control over what
- * else may be running on the system. This avoid false positives.
- */
-static int
-splat_linux_test1(struct file *file, void *arg)
-{
- int remain_before;
- int remain_after;
-
- remain_before = shrink_dcache_memory(0, GFP_KERNEL);
- remain_after = shrink_dcache_memory(KMC_REAP_CHUNK, GFP_KERNEL);
-
- splat_vprint(file, SPLAT_LINUX_TEST1_NAME,
- "Shrink dcache memory, remain %d -> %d\n",
- remain_before, remain_after);
-
- return 0;
-}
-
-/*
- * Attempt to shrink the icache memory. This is simply a functional
- * to ensure we can correctly call the shrinker. We don't check that
- * the cache actually decreased because we have no control over what
- * else may be running on the system. This avoid false positives.
- */
-static int
-splat_linux_test2(struct file *file, void *arg)
-{
- int remain_before;
- int remain_after;
-
- remain_before = shrink_icache_memory(0, GFP_KERNEL);
- remain_after = shrink_icache_memory(KMC_REAP_CHUNK, GFP_KERNEL);
-
- splat_vprint(file, SPLAT_LINUX_TEST2_NAME,
- "Shrink icache memory, remain %d -> %d\n",
- remain_before, remain_after);
-
- return 0;
-}
+#define SPLAT_LINUX_TEST1_NAME "shrinker"
+#define SPLAT_LINUX_TEST1_DESC "Shrinker test"
/*
* Wait queue used to eliminate race between dropping of slab
static unsigned long splat_linux_shrinker_size = 0;
static struct file *splat_linux_shrinker_file = NULL;
-static int
+static spl_shrinker_t
__splat_linux_shrinker_fn(struct shrinker *shrink, struct shrink_control *sc)
{
static int failsafe = 0;
static unsigned long last_splat_linux_shrinker_size = 0;
+ unsigned long size;
+ spl_shrinker_t count;
/*
* shrinker_size can only decrease or stay the same between callbacks
last_splat_linux_shrinker_size = splat_linux_shrinker_size;
if (sc->nr_to_scan) {
- splat_linux_shrinker_size = splat_linux_shrinker_size -
- MIN(sc->nr_to_scan, splat_linux_shrinker_size);
+ size = MIN(sc->nr_to_scan, splat_linux_shrinker_size);
+ splat_linux_shrinker_size -= size;
- splat_vprint(splat_linux_shrinker_file, SPLAT_LINUX_TEST3_NAME,
+ splat_vprint(splat_linux_shrinker_file, SPLAT_LINUX_TEST1_NAME,
"Reclaimed %lu objects, size now %lu\n",
- sc->nr_to_scan, splat_linux_shrinker_size);
+ size, splat_linux_shrinker_size);
+
+#ifdef HAVE_SPLIT_SHRINKER_CALLBACK
+ count = size;
+#else
+ count = splat_linux_shrinker_size;
+#endif /* HAVE_SPLIT_SHRINKER_CALLBACK */
+
} else {
- splat_vprint(splat_linux_shrinker_file, SPLAT_LINUX_TEST3_NAME,
+ count = splat_linux_shrinker_size;
+ splat_vprint(splat_linux_shrinker_file, SPLAT_LINUX_TEST1_NAME,
"Cache size is %lu\n", splat_linux_shrinker_size);
}
/* Far more calls than expected abort drop_slab as a failsafe */
if (failsafe > 100) {
- splat_vprint(splat_linux_shrinker_file, SPLAT_LINUX_TEST3_NAME,
+ splat_vprint(splat_linux_shrinker_file, SPLAT_LINUX_TEST1_NAME,
"Far more calls than expected (%d), size now %lu\n",
failsafe, splat_linux_shrinker_size);
- return -1;
+ return (SHRINK_STOP);
} else {
/*
* We only increment failsafe if it doesn't trigger. This
/* Shrinker has run, so signal back to test. */
wake_up(&shrinker_wait);
- return (int)splat_linux_shrinker_size;
+ return (count);
}
SPL_SHRINKER_CALLBACK_WRAPPER(splat_linux_shrinker_fn);
rc = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
if (rc)
- splat_vprint(file, SPLAT_LINUX_TEST3_NAME,
+ splat_vprint(file, SPLAT_LINUX_TEST1_NAME,
"Failed user helper '%s %s %s', rc = %d\n",
argv[0], argv[1], argv[2], rc);
* API and this test ensures the compatibility code is correct.
*/
static int
-splat_linux_test3(struct file *file, void *arg)
+splat_linux_test1(struct file *file, void *arg)
{
int rc = -EINVAL;
* use is detected.
*/
if (splat_linux_shrinker_size || splat_linux_shrinker_file) {
- splat_vprint(file, SPLAT_LINUX_TEST3_NAME,
+ splat_vprint(file, SPLAT_LINUX_TEST1_NAME,
"Failed due to concurrent shrinker test, rc = %d\n", rc);
return (rc);
}
*/
rc = wait_event_timeout(shrinker_wait, !splat_linux_shrinker_size, HZ);
if (!rc) {
- splat_vprint(file, SPLAT_LINUX_TEST3_NAME,
+ splat_vprint(file, SPLAT_LINUX_TEST1_NAME,
"Failed cache shrinking timed out, size now %lu",
splat_linux_shrinker_size);
rc = -ETIMEDOUT;
}
if (!rc && splat_linux_shrinker_size != 0) {
- splat_vprint(file, SPLAT_LINUX_TEST3_NAME,
+ splat_vprint(file, SPLAT_LINUX_TEST1_NAME,
"Failed cache was not shrunk to 0, size now %lu",
splat_linux_shrinker_size);
rc = -EDOM;
SPLAT_TEST_INIT(sub, SPLAT_LINUX_TEST1_NAME, SPLAT_LINUX_TEST1_DESC,
SPLAT_LINUX_TEST1_ID, splat_linux_test1);
- SPLAT_TEST_INIT(sub, SPLAT_LINUX_TEST2_NAME, SPLAT_LINUX_TEST2_DESC,
- SPLAT_LINUX_TEST2_ID, splat_linux_test2);
- SPLAT_TEST_INIT(sub, SPLAT_LINUX_TEST3_NAME, SPLAT_LINUX_TEST3_DESC,
- SPLAT_LINUX_TEST3_ID, splat_linux_test3);
return sub;
}
splat_linux_fini(splat_subsystem_t *sub)
{
ASSERT(sub);
- SPLAT_TEST_FINI(sub, SPLAT_LINUX_TEST3_ID);
- SPLAT_TEST_FINI(sub, SPLAT_LINUX_TEST2_ID);
SPLAT_TEST_FINI(sub, SPLAT_LINUX_TEST1_ID);
kfree(sub);
projects / mirror_spl-debian.git / blobdiff