Răsfoiți Sursa

rmnet_mem: I2204484688ac9e29f6910699d5848e3407251695

I2204484688ac9e29f6910699d5848e3407251695

CRs-Fixed: 3558216
Change-Id: I2204484688ac9e29f6910699d5848e3407251695
Signed-off-by: Raul Martinez <[email protected]>
Raul Martinez 2 ani în urmă
părinte
comite
b50c35d33a
2 a modificat fișierele cu 13 adăugiri și 9 ștergeri
  1. 3 3
      mem/rmnet_mem_main.c
  2. 10 6
      mem/rmnet_mem_pool.c

+ 3 - 3
mem/rmnet_mem_main.c

@@ -76,11 +76,11 @@ rmnet_mem_id_recycled[j]++;page=mem_page->addr;page_ref_inc(mem_page->addr);
 list_rotate_left(&rmnet_mem_pool[j]);break;}list_rotate_left(&rmnet_mem_pool[j])
 ;i++;}while(i<=(0xd0a+237-0xdf2));if(page&&pageorder){*pageorder=j;break;}i=
 (0xd2d+202-0xdf7);}}if(!page){if(order<(0xd18+223-0xdf4)){page=__dev_alloc_pages
-(gfp_mask,order);if(page){if(static_pool_size[order]<max_pool_size[order]&&
+(GFP_ATOMIC,order);if(page){if(static_pool_size[order]<max_pool_size[order]&&
 pool_unbound_feature[order]){rmnet_mem_add_page(page,order);page_ref_inc(page);}
 if(pageorder){*pageorder=order;}}}else{if(static_pool_size[order]<max_pool_size[
-order]&&pool_unbound_feature[order]){page=__dev_alloc_pages(gfp_mask,order);if(
-page){rmnet_mem_add_page(page,order);page_ref_inc(page);}if(pageorder){*
+order]&&pool_unbound_feature[order]){page=__dev_alloc_pages(GFP_ATOMIC,order);if
+(page){rmnet_mem_add_page(page,order);page_ref_inc(page);}if(pageorder){*
 pageorder=order;}}}}spin_unlock_irqrestore(&rmnet_mem_lock,flags);if(pageorder&&
 code&&page){if(*pageorder==order)*code=RMNET_MEM_SUCCESS;else if(*pageorder>
 order)*code=RMNET_MEM_UPGRADE;else if(*pageorder<order)*code=RMNET_MEM_DOWNGRADE

+ 10 - 6
mem/rmnet_mem_pool.c

@@ -6,24 +6,27 @@
 #include "rmnet_mem_priv.h"
 #define DATARMNETc8aadbe769 (0xdf7+6169-0x241c)
 #define DATARMNET831d60a2b1 (0xd18+223-0xdf4)
+#define DATARMNETa967925c7a (0xdb7+6677-0x263c)
+#define DATARMNET19337c1bbf (0xdb7+6670-0x2634)
 extern struct work_struct pool_adjust_work;extern struct workqueue_struct*mem_wq
 ;int DATARMNET291f036d31(struct sk_buff*skb,struct genl_info*DATARMNET54338da2ff
 ){u8 mode=(0xd2d+202-0xdf7);struct sk_buff*DATARMNETa13fcf9070;struct 
 DATARMNET5d6175c98d mem_info;struct nlattr*na;if(DATARMNET54338da2ff->attrs[
 DATARMNETe5184c7a76]){na=DATARMNET54338da2ff->attrs[DATARMNETe5184c7a76];if(
 nla_memcpy(&mem_info,na,sizeof(mem_info))>(0xd2d+202-0xdf7)){rm_err(
-"%s(): modeinfo %u\n",__func__,mem_info.DATARMNET3a4d9ad400);}}rm_err(
+"%s(): modeinfo %u\n",__func__,mem_info.DATARMNET3a4d9ad400);}rm_err(
 "\x25\x73\x28\x29\x3a\x20\x6d\x6f\x64\x65\x20\x25\x75" "\n",__func__,mode);
 DATARMNETa13fcf9070=nlmsg_new(NLMSG_DEFAULT_SIZE,GFP_KERNEL);if(!
-DATARMNETa13fcf9070)return-ENOMEM;DATARMNETe85d734d4f((0xdb7+6677-0x263c),
-DATARMNET54338da2ff);return(0xd2d+202-0xdf7);}int DATARMNET8e48a951e4(struct 
+DATARMNETa13fcf9070)return-ENOMEM;DATARMNETe85d734d4f(DATARMNETa967925c7a,
+DATARMNET54338da2ff);}else{DATARMNETe85d734d4f(DATARMNET19337c1bbf,
+DATARMNET54338da2ff);}return(0xd2d+202-0xdf7);}int DATARMNET8e48a951e4(struct 
 sk_buff*skb,struct genl_info*DATARMNET54338da2ff){struct sk_buff*
 DATARMNETa13fcf9070;struct DATARMNET5d23779a8f mem_info;struct nlattr*na;int i;
 u8 DATARMNET205e85dea0=(0xd2d+202-0xdf7);if(DATARMNET54338da2ff->attrs[
 DATARMNETb0428b7575]){na=DATARMNET54338da2ff->attrs[DATARMNETb0428b7575];if(
 nla_memcpy(&mem_info,na,sizeof(mem_info))>(0xd2d+202-0xdf7)){pr_err(
 "\x25\x73\x28\x29\x3a\x20\x6d\x6f\x64\x65\x69\x6e\x66\x6f\x20\x25\x75" "\n",
-__func__,mem_info.DATARMNET855b934a37);}}rm_err(
+__func__,mem_info.DATARMNET855b934a37);}rm_err(
 "\x25\x73\x28\x29\x3a\x20\x70\x6f\x6f\x6c\x5f\x73\x69\x7a\x65\x20\x25\x75" "\n",
 __func__,mem_info.DATARMNETe87b937bb6[(0xd2d+202-0xdf7)]);for(i=
 (0xd2d+202-0xdf7);i<POOL_LEN;i++){if(mem_info.DATARMNET855b934a37&
@@ -31,5 +34,6 @@ __func__,mem_info.DATARMNETe87b937bb6[(0xd2d+202-0xdf7)]);for(i=
 target_static_pool_size[i]=mem_info.DATARMNETe87b937bb6[i];DATARMNET205e85dea0=
 (0xd26+209-0xdf6);}}if(DATARMNET205e85dea0&&mem_wq)queue_work(mem_wq,&
 pool_adjust_work);DATARMNETa13fcf9070=nlmsg_new(NLMSG_DEFAULT_SIZE,GFP_KERNEL);
-if(!DATARMNETa13fcf9070)return-ENOMEM;DATARMNETe85d734d4f((0xdb7+6677-0x263c),
-DATARMNET54338da2ff);return(0xd2d+202-0xdf7);}
+if(!DATARMNETa13fcf9070)return-ENOMEM;DATARMNETe85d734d4f(DATARMNETa967925c7a,
+DATARMNET54338da2ff);}else{DATARMNETe85d734d4f(DATARMNET19337c1bbf,
+DATARMNET54338da2ff);}return(0xd2d+202-0xdf7);}