Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932458AbbLHMmD (ORCPT ); Tue, 8 Dec 2015 07:42:03 -0500 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:52562 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbbLHMmC convert rfc822-to-8bit (ORCPT ); Tue, 8 Dec 2015 07:42:02 -0500 Message-ID: <5666D00E.1000301@arm.com> Date: Tue, 08 Dec 2015 12:41:50 +0000 From: Vladimir Murzin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Russell King - ARM Linux CC: Shengjiu Wang , "ard.biesheuvel@linaro.org" , "nico@linaro.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH V2] ARM: SWP emulation: Restore original *data when failed References: <726a7ce88982fba5df84e4d22b083e39b57a6bc6.1444900732.git.shengjiu.wang@freescale.com> <5666AF7D.5000703@arm.com> <20151208104418.GB8644@n2100.arm.linux.org.uk> In-Reply-To: <20151208104418.GB8644@n2100.arm.linux.org.uk> X-OriginalArrivalTime: 08 Dec 2015 12:41:57.0532 (UTC) FILETIME=[D35C05C0:01D131B5] X-MC-Unique: 0DM2JjT9RpSkVH6O7TNxgA-1 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1877 Lines: 52 On 08/12/15 10:44, Russell King - ARM Linux wrote: > On Tue, Dec 08, 2015 at 10:22:53AM +0000, Vladimir Murzin wrote: >> On 15/10/15 10:30, Shengjiu Wang wrote: >>> __user_swpX_asm maybe failed in first STREX operation, emulate_swpX >>> will try again, but the *data has been changed in first time. which >>> causes the result is wrong. >>> This patch is to fix this issue. When STREX succeed, change the *data. >>> if it fail, *data is not changed. >>> >>> Signed-off-by: Shengjiu Wang >>> --- >>> arch/arm/kernel/swp_emulate.c | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c >>> index 5b26e7e..c3fe769d 100644 >>> --- a/arch/arm/kernel/swp_emulate.c >>> +++ b/arch/arm/kernel/swp_emulate.c >>> @@ -36,10 +36,10 @@ >>> */ >>> #define __user_swpX_asm(data, addr, res, temp, B) \ >>> __asm__ __volatile__( \ >>> - " mov %2, %1\n" \ >>> - "0: ldrex"B" %1, [%3]\n" \ >>> - "1: strex"B" %0, %2, [%3]\n" \ >>> + "0: ldrex"B" %2, [%3]\n" \ >>> + "1: strex"B" %0, %1, [%3]\n" \ >>> " cmp %0, #0\n" \ >>> + " moveq %1, %2\n" \ >>> " movne %0, %4\n" \ >>> "2:\n" \ >>> " .section .text.fixup,\"ax\"\n" \ >>> >> >> I wonder what is status of this patch? I see that arm64 counterpart has >> landed in mainline, but I didn't manage to track down this one - is it >> because it never been submitted to patch system? > > Most probably. > I've just submitted (on behalf of Shengjiu) it as 8475/1 with assumption you have no concerns about the patch. Thanks Vladimir -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/