Attachment 224945 Details for Bug 255591 – patch

[patch] patch

diff (text/plain), 2.44 KB, created by Mark Johnston on 2021-05-14 14:45:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Johnston

Created: 2021-05-14 14:45:57 UTC

Size: 2.44 KB

patch

obsolete

>commit a87e99d767aad5d621a4b278364cf4cc0bcee0dd
>Author: Mark Johnston <markj@FreeBSD.org>
>Date:   Fri May 14 10:44:51 2021 -0400
>
>    linux: Fix SMAP-enabled futex routines
>    
>    PR:             255591
>
>diff --git a/sys/amd64/linux/linux_support.s b/sys/amd64/linux/linux_support.s
>index 391f76414f22..45eb565f667d 100644
>--- a/sys/amd64/linux/linux_support.s
>+++ b/sys/amd64/linux/linux_support.s
>@@ -126,16 +126,16 @@ ENTRY(futex_orl_smap)
> 	movq	$VM_MAXUSER_ADDRESS-4,%rax
> 	cmpq	%rax,%rsi
> 	ja	futex_fault
>+	stac
> 	movl	(%rsi),%eax
> 1:	movl	%eax,%ecx
> 	orl	%edi,%ecx
>-	stac
> #ifdef SMP
> 	lock
> #endif
> 	cmpxchgl %ecx,(%rsi)
>-	clac
> 	jnz	1b
>+	clac
> 	movl	%eax,(%rdx)
> 	xorl	%eax,%eax
> 	movq	%rax,PCB_ONFAULT(%r8)
>@@ -168,16 +168,16 @@ ENTRY(futex_andl_smap)
> 	movq	$VM_MAXUSER_ADDRESS-4,%rax
> 	cmpq	%rax,%rsi
> 	ja	futex_fault
>+	stac
> 	movl	(%rsi),%eax
> 1:	movl	%eax,%ecx
> 	andl	%edi,%ecx
>-	stac
> #ifdef SMP
> 	lock
> #endif
> 	cmpxchgl %ecx,(%rsi)
>-	clac
> 	jnz	1b
>+	clac
> 	movl	%eax,(%rdx)
> 	xorl	%eax,%eax
> 	movq	%rax,PCB_ONFAULT(%r8)
>@@ -210,16 +210,16 @@ ENTRY(futex_xorl_smap)
> 	movq	$VM_MAXUSER_ADDRESS-4,%rax
> 	cmpq	%rax,%rsi
> 	ja	futex_fault
>+	stac
> 	movl	(%rsi),%eax
> 1:	movl	%eax,%ecx
> 	xorl	%edi,%ecx
>-	stac
> #ifdef SMP
> 	lock
> #endif
> 	cmpxchgl %ecx,(%rsi)
>-	clac
> 	jnz	1b
>+	clac
> 	movl	%eax,(%rdx)
> 	xorl	%eax,%eax
> 	movq	%rax,PCB_ONFAULT(%r8)
>diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.s
>index 981bba9f5821..f3ec3bd8c776 100644
>--- a/sys/amd64/linux32/linux32_support.s
>+++ b/sys/amd64/linux32/linux32_support.s
>@@ -126,16 +126,16 @@ ENTRY(futex_orl_smap)
> 	movq	$VM_MAXUSER_ADDRESS-4,%rax
> 	cmpq	%rax,%rsi
> 	ja	futex_fault
>+	stac
> 	movl	(%rsi),%eax
> 1:	movl	%eax,%ecx
> 	orl	%edi,%ecx
>-	stac
> #ifdef SMP
> 	lock
> #endif
> 	cmpxchgl %ecx,(%rsi)
>-	clac
> 	jnz	1b
>+	clac
> 	movl	%eax,(%rdx)
> 	xorl	%eax,%eax
> 	movq	%rax,PCB_ONFAULT(%r8)
>@@ -169,15 +169,15 @@ ENTRY(futex_andl_smap)
> 	cmpq	%rax,%rsi
> 	ja	futex_fault
> 	movl	(%rsi),%eax
>+	stac
> 1:	movl	%eax,%ecx
> 	andl	%edi,%ecx
>-	stac
> #ifdef SMP
> 	lock
> #endif
> 	cmpxchgl %ecx,(%rsi)
>-	clac
> 	jnz	1b
>+	clac
> 	movl	%eax,(%rdx)
> 	xorl	%eax,%eax
> 	movq	%rax,PCB_ONFAULT(%r8)
>@@ -210,16 +210,16 @@ ENTRY(futex_xorl_smap)
> 	movq	$VM_MAXUSER_ADDRESS-4,%rax
> 	cmpq	%rax,%rsi
> 	ja	futex_fault
>+	stac
> 	movl	(%rsi),%eax
> 1:	movl	%eax,%ecx
> 	xorl	%edi,%ecx
>-	stac
> #ifdef SMP
> 	lock
> #endif
> 	cmpxchgl %ecx,(%rsi)
>-	clac
> 	jnz	1b
>+	clac
> 	movl	%eax,(%rdx)
> 	xorl	%eax,%eax
> 	movq	%rax,PCB_ONFAULT(%r8)

Actions: View | Diff

Attachments on bug 255591: 224664 | 224686 | 224945