|
|
@@ -118,6 +118,8 @@
|
|
|
#include <linux/memory.h>
|
|
|
#include <linux/prefetch.h>
|
|
|
|
|
|
+#include <net/sock.h>
|
|
|
+
|
|
|
#include <asm/cacheflush.h>
|
|
|
#include <asm/tlbflush.h>
|
|
|
#include <asm/page.h>
|
|
|
@@ -965,7 +967,7 @@ out:
|
|
|
spin_unlock_irqrestore(&l3->list_lock, flags);
|
|
|
}
|
|
|
|
|
|
-static void *ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
+static void *__ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
gfp_t flags, bool force_refill)
|
|
|
{
|
|
|
int i;
|
|
|
@@ -1012,7 +1014,20 @@ static void *ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
return objp;
|
|
|
}
|
|
|
|
|
|
-static void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
+static inline void *ac_get_obj(struct kmem_cache *cachep,
|
|
|
+ struct array_cache *ac, gfp_t flags, bool force_refill)
|
|
|
+{
|
|
|
+ void *objp;
|
|
|
+
|
|
|
+ if (unlikely(sk_memalloc_socks()))
|
|
|
+ objp = __ac_get_obj(cachep, ac, flags, force_refill);
|
|
|
+ else
|
|
|
+ objp = ac->entry[--ac->avail];
|
|
|
+
|
|
|
+ return objp;
|
|
|
+}
|
|
|
+
|
|
|
+static void *__ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
void *objp)
|
|
|
{
|
|
|
if (unlikely(pfmemalloc_active)) {
|
|
|
@@ -1022,6 +1037,15 @@ static void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
set_obj_pfmemalloc(&objp);
|
|
|
}
|
|
|
|
|
|
+ return objp;
|
|
|
+}
|
|
|
+
|
|
|
+static inline void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
|
|
|
+ void *objp)
|
|
|
+{
|
|
|
+ if (unlikely(sk_memalloc_socks()))
|
|
|
+ objp = __ac_put_obj(cachep, ac, objp);
|
|
|
+
|
|
|
ac->entry[ac->avail++] = objp;
|
|
|
}
|
|
|
|