History

x86, bts, mm: clean up buffer allocation

The current mm interface is asymetric. One function allocates a locked buffer, another function only refunds the memory. Change this to have two functions for accounting and refunding locked memory, respectively; and do the actual buffer allocation in ptrace. [ Impact: refactor BTS buffer allocation code ]

Markus Metzger committed 17 years ago

Commit 1cb81b11 parent 7e0bfad3 files · +47 −34Browse files

Unified · Split

3 files
  1. arch/x86/kernel/ptrace.c +26 −13
  2. include/linux/mm.h +4 −2
  3. mm/mlock.c +17 −19
arch/x86/kernel/ptrace.c+26−13
@@ -617,17 +617,28 @@ struct bts_context { · 616 unmodified lines
617617 struct work_struct work;
618618 };
619619
620−static inline void alloc_bts_buffer(struct bts_context *context,
621− unsigned int size)
620+static int alloc_bts_buffer(struct bts_context *context, unsigned int size)
622621 {
623− void *buffer;
622+ void *buffer = NULL;
623+ int err = -ENOMEM;
624624
625− buffer = alloc_locked_buffer(size);
626− if (buffer) {
627− context->buffer = buffer;
628− context->size = size;
629− context->mm = get_task_mm(current);
630− }
625+ err = account_locked_memory(current->mm, current->signal->rlim, size);
626+ if (err < 0)
627+ return err;
628+
629+ buffer = kzalloc(size, GFP_KERNEL);
630+ if (!buffer)
631+ goto out_refund;
632+
633+ context->buffer = buffer;
634+ context->size = size;
635+ context->mm = get_task_mm(current);
636+
637+ return 0;
638+
639+ out_refund:
640+ refund_locked_memory(current->mm, size);
641+ return err;
631642 }
632643
633644 static inline void free_bts_buffer(struct bts_context *context)
@@ -638,7 +649,7 @@ static inline void free_bts_buffer(struct bts_context *context) · 4 unmodified lines
638649 kfree(context->buffer);
639650 context->buffer = NULL;
640651
641− refund_locked_buffer_memory(context->mm, context->size);
652+ refund_locked_memory(context->mm, context->size);
642653 context->size = 0;
643654
644655 mmput(context->mm);
@@ -786,13 +797,15 @@ static int ptrace_bts_config(struct task_struct *child, · 141 unmodified lines
786797 context->tracer = NULL;
787798
788799 if ((cfg.flags & PTRACE_BTS_O_ALLOC) && (cfg.size != context->size)) {
800+ int err;
801+
789802 free_bts_buffer(context);
790803 if (!cfg.size)
791804 return 0;
792805
793− alloc_bts_buffer(context, cfg.size);
794− if (!context->buffer)
795− return -ENOMEM;
806+ err = alloc_bts_buffer(context, cfg.size);
807+ if (err < 0)
808+ return err;
796809 }
797810
798811 if (cfg.flags & PTRACE_BTS_O_TRACE)
include/linux/mm.h+4−2
@@ -19,6 +19,7 @@ struct anon_vma; · 18 unmodified lines
1919 struct file_ra_state;
2020 struct user_struct;
2121 struct writeback_control;
22+struct rlimit;
2223
2324 #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */
2425 extern unsigned long max_mapnr;
@@ -1319,7 +1320,8 @@ int vmemmap_populate_basepages(struct page *start_page, · 1294 unmodified lines
13191320 int vmemmap_populate(struct page *start_page, unsigned long pages, int node);
13201321 void vmemmap_populate_print_last(void);
13211322
1322−extern void *alloc_locked_buffer(size_t size);
1323−extern void refund_locked_buffer_memory(struct mm_struct *mm, size_t size);
1323+extern int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim,
1324+ size_t size);
1325+extern void refund_locked_memory(struct mm_struct *mm, size_t size);
13241326 #endif /* __KERNEL__ */
13251327 #endif /* _LINUX_MM_H */
mm/mlock.c+17−19
@@ -629,38 +629,36 @@ void user_shm_unlock(size_t size, struct user_struct *user) · 628 unmodified lines
629629 free_uid(user);
630630 }
631631
632−void *alloc_locked_buffer(size_t size)
632+int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim,
633+ size_t size)
633634 {
634− unsigned long rlim, vm, pgsz;
635− void *buffer = NULL;
635+ unsigned long lim, vm, pgsz;
636+ int error = -ENOMEM;
636637
637638 pgsz = PAGE_ALIGN(size) >> PAGE_SHIFT;
638639
639− down_write(&current->mm->mmap_sem);
640−
641− rlim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
642− vm = current->mm->total_vm + pgsz;
643− if (rlim < vm)
644− goto out;
640+ down_write(&mm->mmap_sem);
645641
646− rlim = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
647− vm = current->mm->locked_vm + pgsz;
648− if (rlim < vm)
642+ lim = rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
643+ vm = mm->total_vm + pgsz;
644+ if (lim < vm)
649645 goto out;
650646
651− buffer = kzalloc(size, GFP_KERNEL);
652− if (!buffer)
647+ lim = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
648+ vm = mm->locked_vm + pgsz;
649+ if (lim < vm)
653650 goto out;
654651
655− current->mm->total_vm += pgsz;
656− current->mm->locked_vm += pgsz;
652+ mm->total_vm += pgsz;
653+ mm->locked_vm += pgsz;
657654
655+ error = 0;
658656 out:
659− up_write(&current->mm->mmap_sem);
660− return buffer;
657+ up_write(&mm->mmap_sem);
658+ return error;
661659 }
662660
663−void refund_locked_buffer_memory(struct mm_struct *mm, size_t size)
661+void refund_locked_memory(struct mm_struct *mm, size_t size)
664662 {
665663 unsigned long pgsz = PAGE_ALIGN(size) >> PAGE_SHIFT;
666664

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t