Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de8aacbe authored by Luiz Fernando N. Capitulino's avatar Luiz Fernando N. Capitulino Committed by Thomas Gleixner
Browse files

x86: convert mm_context_t semaphore to a mutex 



convert mm_context_t semaphore to a mutex.

Signed-off-by: default avatarLuiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 32c464f5

arch/x86/kernel/i386_ksyms_32.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <asm/semaphore.h>

#include <asm/checksum.h>

#include <asm/desc.h>

arch/x86/kernel/ldt_32.c

+7 −7
Original line number Diff line number Diff line
@@ -92,13 +92,13 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm) 
	struct mm_struct * old_mm;

	int retval = 0;



	init_MUTEX(&mm->context.sem);

	mutex_init(&mm->context.lock);

	mm->context.size = 0;

	old_mm = current->mm;

	if (old_mm && old_mm->context.size > 0) {

		down(&old_mm->context.sem);

		mutex_lock(&old_mm->context.lock);

		retval = copy_ldt(&mm->context, &old_mm->context);

		up(&old_mm->context.sem);

		mutex_unlock(&old_mm->context.lock);

	}

	return retval;

}
@@ -130,7 +130,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount) 
	if (bytecount > LDT_ENTRY_SIZE*LDT_ENTRIES)

		bytecount = LDT_ENTRY_SIZE*LDT_ENTRIES;



	down(&mm->context.sem);

	mutex_lock(&mm->context.lock);

	size = mm->context.size*LDT_ENTRY_SIZE;

	if (size > bytecount)

		size = bytecount;
@@ -138,7 +138,7 @@ static int read_ldt(void __user * ptr, unsigned long bytecount) 
	err = 0;

	if (copy_to_user(ptr, mm->context.ldt, size))

		err = -EFAULT;

	up(&mm->context.sem);

	mutex_unlock(&mm->context.lock);

	if (err < 0)

		goto error_return;

	if (size != bytecount) {
@@ -194,7 +194,7 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int oldmode) 
			goto out;

	}



	down(&mm->context.sem);

	mutex_lock(&mm->context.lock);

	if (ldt_info.entry_number >= mm->context.size) {

		error = alloc_ldt(&current->mm->context, ldt_info.entry_number+1, 1);

		if (error < 0)
@@ -221,7 +221,7 @@ static int write_ldt(void __user * ptr, unsigned long bytecount, int oldmode) 
	error = 0;



out_unlock:

	up(&mm->context.sem);

	mutex_unlock(&mm->context.lock);

out:

	return error;

}

arch/x86/kernel/ptrace_32.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static unsigned long convert_eip_to_linear(struct task_struct *child, struct pt_ 


		seg &= ~7UL;



		down(&child->mm->context.sem);

		mutex_lock(&child->mm->context.lock);

		if (unlikely((seg >> 3) >= child->mm->context.size))

			addr = -1L; /* bogus selector, access would fault */

		else {
@@ -179,7 +179,7 @@ static unsigned long convert_eip_to_linear(struct task_struct *child, struct pt_ 
				addr &= 0xffff;

			addr += base;

		}

		up(&child->mm->context.sem);

		mutex_unlock(&child->mm->context.lock);

	}

	return addr;

}

arch/x86/mm/fault_32.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static inline unsigned long get_segment_eip(struct pt_regs *regs, 
	   LDT and other horrors are only used in user space. */

	if (seg & (1<<2)) {

		/* Must lock the LDT while reading it. */

		down(&current->mm->context.sem);

		mutex_lock(&current->mm->context.lock);

		desc = current->mm->context.ldt;

		desc = (void *)desc + (seg & ~7);

	} else {
@@ -118,7 +118,7 @@ static inline unsigned long get_segment_eip(struct pt_regs *regs, 
	base = get_desc_base((unsigned long *)desc);



	if (seg & (1<<2)) { 

		up(&current->mm->context.sem);

		mutex_unlock(&current->mm->context.lock);

	} else

		put_cpu();

include/asm-x86/mmu_32.h

+2 −2
Original line number Diff line number Diff line 
#ifndef __i386_MMU_H

#define __i386_MMU_H



#include <asm/semaphore.h>

#include <linux/mutex.h>

/*

 * The i386 doesn't have a mmu context, but

 * we put the segment information here.
@@ -10,7 +10,7 @@ 
 */

typedef struct { 

	int size;

	struct semaphore sem;

	struct mutex lock;

	void *ldt;

	void *vdso;

} mm_context_t;