From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34347)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <serge.fdrv@gmail.com>) id 1aoCVE-0000um-NG
	for qemu-devel@nongnu.org; Thu, 07 Apr 2016 12:09:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <serge.fdrv@gmail.com>) id 1aoCVA-0007d0-PC
	for qemu-devel@nongnu.org; Thu, 07 Apr 2016 12:09:52 -0400
Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:36745)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <serge.fdrv@gmail.com>) id 1aoCVA-0007cw-HR
	for qemu-devel@nongnu.org; Thu, 07 Apr 2016 12:09:48 -0400
Received: by mail-lf0-x233.google.com with SMTP id g184so60667135lfb.3
	for <qemu-devel@nongnu.org>; Thu, 07 Apr 2016 09:09:48 -0700 (PDT)
References: <1460044433-19282-1-git-send-email-sergey.fedorov@linaro.org>
	<1460044433-19282-11-git-send-email-sergey.fedorov@linaro.org>
	<5706846B.2060804@redhat.com>
From: Sergey Fedorov <serge.fdrv@gmail.com>
Message-ID: <57068648.5050604@gmail.com>
Date: Thu, 7 Apr 2016 19:09:44 +0300
MIME-Version: 1.0
In-Reply-To: <5706846B.2060804@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 10/11] tcg/mips: Make direct jump patching
	thread-safe
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, Sergey Fedorov <sergey.fedorov@linaro.org>, qemu-devel@nongnu.org
Cc: Richard Henderson <rth@twiddle.net>, =?UTF-8?Q?Alex_Benn=c3=a9e?= <alex.bennee@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Peter Crosthwaite <crosthwaite.peter@gmail.com>

On 07/04/16 19:01, Paolo Bonzini wrote:
>
> On 07/04/2016 17:53, Sergey Fedorov wrote:
>> Ensure direct jump patching in MIPS is atomic by using
>> atomic_read()/atomic_set() for code patching.
>>
>> Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
>> Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org>
>> ---
>>  tcg/mips/tcg-target.inc.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
>> index 682e19897db0..e65835d2096b 100644
>> --- a/tcg/mips/tcg-target.inc.c
>> +++ b/tcg/mips/tcg-target.inc.c
>> @@ -1886,6 +1886,7 @@ static void tcg_target_init(TCGContext *s)
>>  void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
>>  {
>>      uint32_t *ptr = (uint32_t *)jmp_addr;
>> -    *ptr = deposit32(*ptr, 0, 26, addr >> 2);
>> +    uint32_t insn = atomic_read(ptr);
>> +    atomic_write(ptr, deposit32(insn, 0, 26, addr >> 2));
> Oops. :)
>
> Paolo

Nice catch! I think I just didn't cross-compile it for MIPS...

Thanks,
Sergey

>
>>      flush_icache_range(jmp_addr, jmp_addr + 4);
>>  }