evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa: exit when hdr proc ctx table is full"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-15 03:44:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit 57cfb76cee
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/platform/msm/ipa/ipa_v2/ipa_hdr.c
View file

@ -485,6 +485,7 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx,
struct ipa_hdr_proc_ctx_tbl *htbl = &ipa_ctx->hdr_proc_ctx_tbl; struct ipa_hdr_proc_ctx_tbl *htbl = &ipa_ctx->hdr_proc_ctx_tbl;
int id; int id;
int needed_len; int needed_len;
int mem_size;
IPADBG("processing type %d hdr_hdl %d\n", IPADBG("processing type %d hdr_hdl %d\n",
proc_ctx->type, proc_ctx->hdr_hdl); proc_ctx->type, proc_ctx->hdr_hdl);
@ -529,6 +530,14 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx,
goto bad_len; goto bad_len;
} }
mem_size = (ipa_ctx->hdr_proc_ctx_tbl_lcl) ?
IPA_MEM_PART(apps_hdr_proc_ctx_size) :
IPA_MEM_PART(apps_hdr_proc_ctx_size_ddr);
if (htbl->end + ipa_hdr_proc_ctx_bin_sz[bin] > mem_size) {
IPAERR("hdr proc ctx table overflow\n");
goto bad_len;
}
if (list_empty(&htbl->head_free_offset_list[bin])) { if (list_empty(&htbl->head_free_offset_list[bin])) {
offset = kmem_cache_zalloc(ipa_ctx->hdr_proc_ctx_offset_cache, offset = kmem_cache_zalloc(ipa_ctx->hdr_proc_ctx_offset_cache,
GFP_KERNEL); GFP_KERNEL);

9
drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
View file

@ -324,6 +324,7 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx,
struct ipa3_hdr_proc_ctx_tbl *htbl = &ipa3_ctx->hdr_proc_ctx_tbl; struct ipa3_hdr_proc_ctx_tbl *htbl = &ipa3_ctx->hdr_proc_ctx_tbl;
int id; int id;
int needed_len; int needed_len;
int mem_size;
IPADBG_LOW("processing type %d hdr_hdl %d\n", IPADBG_LOW("processing type %d hdr_hdl %d\n",
proc_ctx->type, proc_ctx->hdr_hdl); proc_ctx->type, proc_ctx->hdr_hdl);
@ -366,6 +367,14 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx,
goto bad_len; goto bad_len;
} }
mem_size = (ipa3_ctx->hdr_proc_ctx_tbl_lcl) ?
IPA_MEM_PART(apps_hdr_proc_ctx_size) :
IPA_MEM_PART(apps_hdr_proc_ctx_size_ddr);
if (htbl->end + ipa_hdr_proc_ctx_bin_sz[bin] > mem_size) {
IPAERR("hdr proc ctx table overflow\n");
goto bad_len;
}
if (list_empty(&htbl->head_free_offset_list[bin])) { if (list_empty(&htbl->head_free_offset_list[bin])) {
offset = kmem_cache_zalloc(ipa3_ctx->hdr_proc_ctx_offset_cache, offset = kmem_cache_zalloc(ipa3_ctx->hdr_proc_ctx_offset_cache,
GFP_KERNEL); GFP_KERNEL);