Skip to content

Commit 8c7f6e9

Browse files
author
Nicholas Bellinger
committed
target: Fall back to vzalloc upon ->sess_cmd_map kzalloc failure
This patch changes transport_alloc_session_tags() to fall back to use vzalloc when kzalloc fails for big tag_num that end up generating larger order allocations. Also use is_vmalloc_addr() in transport_alloc_session_tags() failure path, and normal transport_free_session() path to determine when vfree() needs to be called instead of kfree(). v2 changes: - Use __GFP_NOWARN | __GFP_REPEAT for sess_cmd_map kzalloc (mst) Cc: Michael S. Tsirkin <[email protected]> Cc: Asias He <[email protected]> Cc: Kent Overstreet <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
1 parent 4a47d3a commit 8c7f6e9

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

drivers/target/target_core_transport.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,24 @@ int transport_alloc_session_tags(struct se_session *se_sess,
236236
{
237237
int rc;
238238

239-
se_sess->sess_cmd_map = kzalloc(tag_num * tag_size, GFP_KERNEL);
239+
se_sess->sess_cmd_map = kzalloc(tag_num * tag_size,
240+
GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
240241
if (!se_sess->sess_cmd_map) {
241-
pr_err("Unable to allocate se_sess->sess_cmd_map\n");
242-
return -ENOMEM;
242+
se_sess->sess_cmd_map = vzalloc(tag_num * tag_size);
243+
if (!se_sess->sess_cmd_map) {
244+
pr_err("Unable to allocate se_sess->sess_cmd_map\n");
245+
return -ENOMEM;
246+
}
243247
}
244248

245249
rc = percpu_ida_init(&se_sess->sess_tag_pool, tag_num);
246250
if (rc < 0) {
247251
pr_err("Unable to init se_sess->sess_tag_pool,"
248252
" tag_num: %u\n", tag_num);
249-
kfree(se_sess->sess_cmd_map);
253+
if (is_vmalloc_addr(se_sess->sess_cmd_map))
254+
vfree(se_sess->sess_cmd_map);
255+
else
256+
kfree(se_sess->sess_cmd_map);
250257
se_sess->sess_cmd_map = NULL;
251258
return -ENOMEM;
252259
}
@@ -412,7 +419,10 @@ void transport_free_session(struct se_session *se_sess)
412419
{
413420
if (se_sess->sess_cmd_map) {
414421
percpu_ida_destroy(&se_sess->sess_tag_pool);
415-
kfree(se_sess->sess_cmd_map);
422+
if (is_vmalloc_addr(se_sess->sess_cmd_map))
423+
vfree(se_sess->sess_cmd_map);
424+
else
425+
kfree(se_sess->sess_cmd_map);
416426
}
417427
kmem_cache_free(se_sess_cache, se_sess);
418428
}

0 commit comments

Comments
 (0)