Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
3aa6b46c
Commit
3aa6b46c
authored
Feb 09, 2016
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by:
Ingo Molnar
<
mingo@kernel.org
>
parents
975db45e
8a5fd564
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
82 additions
and
29 deletions
+82
-29
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/kvm_arm.h
+1
-0
arch/arm64/include/asm/kvm_emulate.h
arch/arm64/include/asm/kvm_emulate.h
+6
-2
arch/arm64/kvm/hyp/switch.c
arch/arm64/kvm/hyp/switch.c
+6
-2
arch/arm64/kvm/inject_fault.c
arch/arm64/kvm/inject_fault.c
+35
-3
arch/arm64/kvm/sys_regs.c
arch/arm64/kvm/sys_regs.c
+4
-5
arch/mips/boot/dts/brcm/bcm6328.dtsi
arch/mips/boot/dts/brcm/bcm6328.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7125.dtsi
arch/mips/boot/dts/brcm/bcm7125.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7346.dtsi
arch/mips/boot/dts/brcm/bcm7346.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7358.dtsi
arch/mips/boot/dts/brcm/bcm7358.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7360.dtsi
arch/mips/boot/dts/brcm/bcm7360.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7362.dtsi
arch/mips/boot/dts/brcm/bcm7362.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7420.dtsi
arch/mips/boot/dts/brcm/bcm7420.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7425.dtsi
arch/mips/boot/dts/brcm/bcm7425.dtsi
+1
-0
arch/mips/boot/dts/brcm/bcm7435.dtsi
arch/mips/boot/dts/brcm/bcm7435.dtsi
+1
-0
drivers/base/regmap/regmap-mmio.c
drivers/base/regmap/regmap-mmio.c
+8
-8
kernel/locking/lockdep.c
kernel/locking/lockdep.c
+10
-6
lib/scatterlist.c
lib/scatterlist.c
+3
-3
No files found.
arch/arm64/include/asm/kvm_arm.h
View file @
3aa6b46c
...
...
@@ -182,6 +182,7 @@
#define CPTR_EL2_TCPAC (1 << 31)
#define CPTR_EL2_TTA (1 << 20)
#define CPTR_EL2_TFP (1 << CPTR_EL2_TFP_SHIFT)
#define CPTR_EL2_DEFAULT 0x000033ff
/* Hyp Debug Configuration Register bits */
#define MDCR_EL2_TDRA (1 << 11)
...
...
arch/arm64/include/asm/kvm_emulate.h
View file @
3aa6b46c
...
...
@@ -127,10 +127,14 @@ static inline unsigned long *vcpu_spsr(const struct kvm_vcpu *vcpu)
static
inline
bool
vcpu_mode_priv
(
const
struct
kvm_vcpu
*
vcpu
)
{
u32
mode
=
*
vcpu_cpsr
(
vcpu
)
&
PSR_MODE_MASK
;
u32
mode
;
if
(
vcpu_mode_is_32bit
(
vcpu
))
if
(
vcpu_mode_is_32bit
(
vcpu
))
{
mode
=
*
vcpu_cpsr
(
vcpu
)
&
COMPAT_PSR_MODE_MASK
;
return
mode
>
COMPAT_PSR_MODE_USR
;
}
mode
=
*
vcpu_cpsr
(
vcpu
)
&
PSR_MODE_MASK
;
return
mode
!=
PSR_MODE_EL0t
;
}
...
...
arch/arm64/kvm/hyp/switch.c
View file @
3aa6b46c
...
...
@@ -36,7 +36,11 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)
write_sysreg
(
val
,
hcr_el2
);
/* Trap on AArch32 cp15 c15 accesses (EL1 or EL0) */
write_sysreg
(
1
<<
15
,
hstr_el2
);
write_sysreg
(
CPTR_EL2_TTA
|
CPTR_EL2_TFP
,
cptr_el2
);
val
=
CPTR_EL2_DEFAULT
;
val
|=
CPTR_EL2_TTA
|
CPTR_EL2_TFP
;
write_sysreg
(
val
,
cptr_el2
);
write_sysreg
(
vcpu
->
arch
.
mdcr_el2
,
mdcr_el2
);
}
...
...
@@ -45,7 +49,7 @@ static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu)
write_sysreg
(
HCR_RW
,
hcr_el2
);
write_sysreg
(
0
,
hstr_el2
);
write_sysreg
(
read_sysreg
(
mdcr_el2
)
&
MDCR_EL2_HPMN_MASK
,
mdcr_el2
);
write_sysreg
(
0
,
cptr_el2
);
write_sysreg
(
CPTR_EL2_DEFAULT
,
cptr_el2
);
}
static
void
__hyp_text
__activate_vm
(
struct
kvm_vcpu
*
vcpu
)
...
...
arch/arm64/kvm/inject_fault.c
View file @
3aa6b46c
...
...
@@ -27,7 +27,11 @@
#define PSTATE_FAULT_BITS_64 (PSR_MODE_EL1h | PSR_A_BIT | PSR_F_BIT | \
PSR_I_BIT | PSR_D_BIT)
#define EL1_EXCEPT_SYNC_OFFSET 0x200
#define CURRENT_EL_SP_EL0_VECTOR 0x0
#define CURRENT_EL_SP_ELx_VECTOR 0x200
#define LOWER_EL_AArch64_VECTOR 0x400
#define LOWER_EL_AArch32_VECTOR 0x600
static
void
prepare_fault32
(
struct
kvm_vcpu
*
vcpu
,
u32
mode
,
u32
vect_offset
)
{
...
...
@@ -97,6 +101,34 @@ static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt,
*
fsr
=
0x14
;
}
enum
exception_type
{
except_type_sync
=
0
,
except_type_irq
=
0x80
,
except_type_fiq
=
0x100
,
except_type_serror
=
0x180
,
};
static
u64
get_except_vector
(
struct
kvm_vcpu
*
vcpu
,
enum
exception_type
type
)
{
u64
exc_offset
;
switch
(
*
vcpu_cpsr
(
vcpu
)
&
(
PSR_MODE_MASK
|
PSR_MODE32_BIT
))
{
case
PSR_MODE_EL1t
:
exc_offset
=
CURRENT_EL_SP_EL0_VECTOR
;
break
;
case
PSR_MODE_EL1h
:
exc_offset
=
CURRENT_EL_SP_ELx_VECTOR
;
break
;
case
PSR_MODE_EL0t
:
exc_offset
=
LOWER_EL_AArch64_VECTOR
;
break
;
default:
exc_offset
=
LOWER_EL_AArch32_VECTOR
;
}
return
vcpu_sys_reg
(
vcpu
,
VBAR_EL1
)
+
exc_offset
+
type
;
}
static
void
inject_abt64
(
struct
kvm_vcpu
*
vcpu
,
bool
is_iabt
,
unsigned
long
addr
)
{
unsigned
long
cpsr
=
*
vcpu_cpsr
(
vcpu
);
...
...
@@ -108,8 +140,8 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
*
vcpu_spsr
(
vcpu
)
=
cpsr
;
*
vcpu_elr_el1
(
vcpu
)
=
*
vcpu_pc
(
vcpu
);
*
vcpu_pc
(
vcpu
)
=
get_except_vector
(
vcpu
,
except_type_sync
);
*
vcpu_cpsr
(
vcpu
)
=
PSTATE_FAULT_BITS_64
;
*
vcpu_pc
(
vcpu
)
=
vcpu_sys_reg
(
vcpu
,
VBAR_EL1
)
+
EL1_EXCEPT_SYNC_OFFSET
;
vcpu_sys_reg
(
vcpu
,
FAR_EL1
)
=
addr
;
...
...
@@ -143,8 +175,8 @@ static void inject_undef64(struct kvm_vcpu *vcpu)
*
vcpu_spsr
(
vcpu
)
=
cpsr
;
*
vcpu_elr_el1
(
vcpu
)
=
*
vcpu_pc
(
vcpu
);
*
vcpu_pc
(
vcpu
)
=
get_except_vector
(
vcpu
,
except_type_sync
);
*
vcpu_cpsr
(
vcpu
)
=
PSTATE_FAULT_BITS_64
;
*
vcpu_pc
(
vcpu
)
=
vcpu_sys_reg
(
vcpu
,
VBAR_EL1
)
+
EL1_EXCEPT_SYNC_OFFSET
;
/*
* Build an unknown exception, depending on the instruction
...
...
arch/arm64/kvm/sys_regs.c
View file @
3aa6b46c
...
...
@@ -1007,11 +1007,10 @@ static int emulate_cp(struct kvm_vcpu *vcpu,
if
(
likely
(
r
->
access
(
vcpu
,
params
,
r
)))
{
/* Skip instruction, since it was emulated */
kvm_skip_instr
(
vcpu
,
kvm_vcpu_trap_il_is32bit
(
vcpu
));
}
/* Handled */
return
0
;
}
}
/* Not handled */
return
-
1
;
...
...
@@ -1043,7 +1042,7 @@ static void unhandled_cp_access(struct kvm_vcpu *vcpu,
}
/**
* kvm_handle_cp_64 -- handles a mrrc/mcrr trap on a guest CP15 access
* kvm_handle_cp_64 -- handles a mrrc/mcrr trap on a guest CP1
4/CP1
5 access
* @vcpu: The VCPU pointer
* @run: The kvm_run struct
*/
...
...
@@ -1095,7 +1094,7 @@ static int kvm_handle_cp_64(struct kvm_vcpu *vcpu,
}
/**
* kvm_handle_cp
15_32 -- handles a mrc/mcr trap on a guest
CP15 access
* kvm_handle_cp
_32 -- handles a mrc/mcr trap on a guest CP14/
CP15 access
* @vcpu: The VCPU pointer
* @run: The kvm_run struct
*/
...
...
arch/mips/boot/dts/brcm/bcm6328.dtsi
View file @
3aa6b46c
...
...
@@ -74,6 +74,7 @@ uart0: serial@10000100 {
timer: timer@10000040 {
compatible = "syscon";
reg = <0x10000040 0x2c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7125.dtsi
View file @
3aa6b46c
...
...
@@ -98,6 +98,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7125-sun-top-ctrl", "syscon";
reg = <0x404000 0x60c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7346.dtsi
View file @
3aa6b46c
...
...
@@ -118,6 +118,7 @@ upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7346-sun-top-ctrl", "syscon";
reg = <0x404000 0x51c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7358.dtsi
View file @
3aa6b46c
...
...
@@ -112,6 +112,7 @@ upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7358-sun-top-ctrl", "syscon";
reg = <0x404000 0x51c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7360.dtsi
View file @
3aa6b46c
...
...
@@ -112,6 +112,7 @@ upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7360-sun-top-ctrl", "syscon";
reg = <0x404000 0x51c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7362.dtsi
View file @
3aa6b46c
...
...
@@ -118,6 +118,7 @@ upg_aon_irq0_intc: upg_aon_irq0_intc@408b80 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7362-sun-top-ctrl", "syscon";
reg = <0x404000 0x51c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7420.dtsi
View file @
3aa6b46c
...
...
@@ -99,6 +99,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7420-sun-top-ctrl", "syscon";
reg = <0x404000 0x60c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7425.dtsi
View file @
3aa6b46c
...
...
@@ -100,6 +100,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7425-sun-top-ctrl", "syscon";
reg = <0x404000 0x51c>;
little-endian;
};
reboot {
...
...
arch/mips/boot/dts/brcm/bcm7435.dtsi
View file @
3aa6b46c
...
...
@@ -114,6 +114,7 @@ upg_irq0_intc: upg_irq0_intc@406780 {
sun_top_ctrl: syscon@404000 {
compatible = "brcm,bcm7425-sun-top-ctrl", "syscon";
reg = <0x404000 0x51c>;
little-endian;
};
reboot {
...
...
drivers/base/regmap/regmap-mmio.c
View file @
3aa6b46c
...
...
@@ -133,17 +133,17 @@ static int regmap_mmio_gather_write(void *context,
while
(
val_size
)
{
switch
(
ctx
->
val_bytes
)
{
case
1
:
__raw_
writeb
(
*
(
u8
*
)
val
,
ctx
->
regs
+
offset
);
writeb
(
*
(
u8
*
)
val
,
ctx
->
regs
+
offset
);
break
;
case
2
:
__raw_
writew
(
*
(
u16
*
)
val
,
ctx
->
regs
+
offset
);
writew
(
*
(
u16
*
)
val
,
ctx
->
regs
+
offset
);
break
;
case
4
:
__raw_
writel
(
*
(
u32
*
)
val
,
ctx
->
regs
+
offset
);
writel
(
*
(
u32
*
)
val
,
ctx
->
regs
+
offset
);
break
;
#ifdef CONFIG_64BIT
case
8
:
__raw_
writeq
(
*
(
u64
*
)
val
,
ctx
->
regs
+
offset
);
writeq
(
*
(
u64
*
)
val
,
ctx
->
regs
+
offset
);
break
;
#endif
default:
...
...
@@ -193,17 +193,17 @@ static int regmap_mmio_read(void *context,
while
(
val_size
)
{
switch
(
ctx
->
val_bytes
)
{
case
1
:
*
(
u8
*
)
val
=
__raw_
readb
(
ctx
->
regs
+
offset
);
*
(
u8
*
)
val
=
readb
(
ctx
->
regs
+
offset
);
break
;
case
2
:
*
(
u16
*
)
val
=
__raw_
readw
(
ctx
->
regs
+
offset
);
*
(
u16
*
)
val
=
readw
(
ctx
->
regs
+
offset
);
break
;
case
4
:
*
(
u32
*
)
val
=
__raw_
readl
(
ctx
->
regs
+
offset
);
*
(
u32
*
)
val
=
readl
(
ctx
->
regs
+
offset
);
break
;
#ifdef CONFIG_64BIT
case
8
:
*
(
u64
*
)
val
=
__raw_
readq
(
ctx
->
regs
+
offset
);
*
(
u64
*
)
val
=
readq
(
ctx
->
regs
+
offset
);
break
;
#endif
default:
...
...
kernel/locking/lockdep.c
View file @
3aa6b46c
...
...
@@ -1822,7 +1822,7 @@ check_deadlock(struct task_struct *curr, struct held_lock *next,
*/
static
int
check_prev_add
(
struct
task_struct
*
curr
,
struct
held_lock
*
prev
,
struct
held_lock
*
next
,
int
distance
,
int
trylock_loop
)
struct
held_lock
*
next
,
int
distance
,
int
*
stack_saved
)
{
struct
lock_list
*
entry
;
int
ret
;
...
...
@@ -1883,8 +1883,11 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
}
}
if
(
!
trylock_loop
&&
!
save_trace
(
&
trace
))
if
(
!*
stack_saved
)
{
if
(
!
save_trace
(
&
trace
))
return
0
;
*
stack_saved
=
1
;
}
/*
* Ok, all validations passed, add the new lock
...
...
@@ -1907,6 +1910,8 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
* Debugging printouts:
*/
if
(
verbose
(
hlock_class
(
prev
))
||
verbose
(
hlock_class
(
next
)))
{
/* We drop graph lock, so another thread can overwrite trace. */
*
stack_saved
=
0
;
graph_unlock
();
printk
(
"
\n
new dependency: "
);
print_lock_name
(
hlock_class
(
prev
));
...
...
@@ -1929,7 +1934,7 @@ static int
check_prevs_add
(
struct
task_struct
*
curr
,
struct
held_lock
*
next
)
{
int
depth
=
curr
->
lockdep_depth
;
int
trylock_loop
=
0
;
int
stack_saved
=
0
;
struct
held_lock
*
hlock
;
/*
...
...
@@ -1956,7 +1961,7 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)
*/
if
(
hlock
->
read
!=
2
&&
hlock
->
check
)
{
if
(
!
check_prev_add
(
curr
,
hlock
,
next
,
distance
,
trylock_loop
))
distance
,
&
stack_saved
))
return
0
;
/*
* Stop after the first non-trylock entry,
...
...
@@ -1979,7 +1984,6 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)
if
(
curr
->
held_locks
[
depth
].
irq_context
!=
curr
->
held_locks
[
depth
-
1
].
irq_context
)
break
;
trylock_loop
=
1
;
}
return
1
;
out_bug:
...
...
lib/scatterlist.c
View file @
3aa6b46c
...
...
@@ -598,9 +598,9 @@ EXPORT_SYMBOL(sg_miter_next);
*
* Description:
* Stops mapping iterator @miter. @miter should have been started
*
started using sg_miter_start(). A stopped iteration can be
*
resumed by calling sg_miter_next() on it. This is useful when
*
resources (kmap)
need to be released during iteration.
*
using sg_miter_start(). A stopped iteration can be resumed by
*
calling sg_miter_next() on it. This is useful when resources (kmap)
* need to be released during iteration.
*
* Context:
* Preemption disabled if the SG_MITER_ATOMIC is set. Don't care
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment