From: Vitaly Fertman <c17818@cray.com>
Date: Fri, 4 Dec 2020 19:18:48 +0000 (+0300)
Subject: LU-14185 osp: alloc fails for OSP obj xattr cache
X-Git-Tag: 2.14.0-RC1~57
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=bb29a2d0ff776ed54db7612e92b67809a406b0df

LU-14185 osp: alloc fails for OSP obj xattr cache

osp_oac_xattr_find_or_add() may get ENOMEM as it tries to allocate
over len=buf->lb_len=XATTR_SIZE_MAX, thus order:5. Use large alloc
instead.

HPE-bug-id: LUS-9551
Signed-off-by: Vitaly Fertman <c17818@cray.com>
Change-Id: I98c08d16d0343cb60f6efcb63d20739103f2af1c
Reviewed-by: Sergey Cheremencev <c17829@cray.com>
Reviewed-by: Andriy Skulysh <c17819@cray.com>
Tested-by: Alexander Lezhoev <c17454@cray.com>
Reviewed-on: https://review.whamcloud.com/40871
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sergey Cheremencev <sergey.cheremencev@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/osp/osp_object.c b/lustre/osp/osp_object.c
index 759a548..fabf7d6 100644
--- a/lustre/osp/osp_object.c
+++ b/lustre/osp/osp_object.c
@@ -186,7 +186,7 @@ static inline void osp_oac_xattr_put(struct osp_xattr_entry *oxe)
 	if (atomic_dec_and_test(&oxe->oxe_ref)) {
 		LASSERT(list_empty(&oxe->oxe_list));
 
-		OBD_FREE(oxe, oxe->oxe_buflen);
+		OBD_FREE_LARGE(oxe, oxe->oxe_buflen);
 	}
 }
 
@@ -279,7 +279,7 @@ osp_oac_xattr_find_or_add(struct osp_object *obj, const char *name, size_t len)
 	if (oxe)
 		return oxe;
 
-	OBD_ALLOC(oxe, size);
+	OBD_ALLOC_LARGE(oxe, size);
 	if (unlikely(!oxe))
 		return NULL;
 
@@ -300,7 +300,7 @@ osp_oac_xattr_find_or_add(struct osp_object *obj, const char *name, size_t len)
 	spin_unlock(&obj->opo_lock);
 
 	if (tmp) {
-		OBD_FREE(oxe, size);
+		OBD_FREE_LARGE(oxe, size);
 		oxe = tmp;
 	}
 
@@ -332,7 +332,7 @@ osp_oac_xattr_assignment(struct osp_object *obj, struct osp_xattr_entry *oxe,
 	bool unlink_only = false;
 
 	if (oxe->oxe_buflen < size) {
-		OBD_ALLOC(new, size);
+		OBD_ALLOC_LARGE(new, size);
 		if (likely(new)) {
 			INIT_LIST_HEAD(&new->oxe_list);
 			new->oxe_buflen = size;
@@ -2308,7 +2308,7 @@ static void osp_object_free(const struct lu_env *env, struct lu_object *o)
 			 "Still has %d users on the xattr entry %.*s\n",
 			 count-1, (int)oxe->oxe_namelen, oxe->oxe_buf);
 
-		OBD_FREE(oxe, oxe->oxe_buflen);
+		OBD_FREE_LARGE(oxe, oxe->oxe_buflen);
 	}
 	OBD_FREE_PRE(obj, sizeof(*obj), "slab-freed");
 	call_rcu(&obj->opo_header.loh_rcu, osp_object_free_rcu);