From patchwork Thu Jan 30 09:25:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 13954366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19983C0218A for ; Thu, 30 Jan 2025 09:25:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:CC:Subject :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=yA+7GOmmHGCsZDSKL8wUpHicssMtKCFdwrDrAZhv/ks=; b=B2Nd3iivMIqZ14 Fmgw7xVxy7+DYbjhHM4GAVKU/P5M1e+ZJQSBsHmWu9t3Sz4620oWI6OlW8pkMjFIWpuh5DY2SDBx/ 235Egy2eMIDsbb2uxG2+x1guch+oONMoPIjcxS2OqYT1hP5R8xQ6ZRDH89X0pAJ0pYZI5f/5MZlBq oJE97QYvWA45Oz8espM3NMvYxCuE9cIxd0UXs5+LfHd7mUKp5kekdpJxeZK/onNyke4FOyboKAzST wJOsUbZOa2X8kQ+8Zd/CBOnW/M82oBDTH6uBf9dyQ/CYIEB37HVSbkzPua2RBkrsMjl1HtbdW1g4G 9xFIZBebKf7g4fyetfbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdQnv-00000008V5d-322a; Thu, 30 Jan 2025 09:25:43 +0000 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdQns-00000008V54-2erV for linux-riscv@lists.infradead.org; Thu, 30 Jan 2025 09:25:41 +0000 Received: from hawking.nue2.suse.org (unknown [IPv6:2a07:de40:a101:3:92b1:1cff:fe69:ddc]) by smtp-out2.suse.de (Postfix) with ESMTP id AE4C520D83; Thu, 30 Jan 2025 09:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1738229138; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=60vaxQ07mmbPiwElb15dQhe+W2ORrBdREjdkh0TLzjw=; b=OccbLQ3bB04rK4tMLPHJxrrIEY9Ax2k6nxepRUeg9I+N+w9rHwuDSaldYOo1AjThx6j4Ux o07VF/8iUjaVS6EZmrieU3By2lBeqj7YplXFgBfNNNmW9oLLMx75wyS9nD/fVRLVyUj/lq lnQOAgZRudjT6kg8AeGaIWSYLyxJ1tg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1738229138; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=60vaxQ07mmbPiwElb15dQhe+W2ORrBdREjdkh0TLzjw=; b=3b/ogrd7PC2IozXVhtO9sgs1x9OlnOnDZCG3S4wVCActuwqkfAGgKQCUUn2r7dCTTMRv6M U+HPMm0ASNlU/RAQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=OccbLQ3b; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="3b/ogrd7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1738229138; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=60vaxQ07mmbPiwElb15dQhe+W2ORrBdREjdkh0TLzjw=; b=OccbLQ3bB04rK4tMLPHJxrrIEY9Ax2k6nxepRUeg9I+N+w9rHwuDSaldYOo1AjThx6j4Ux o07VF/8iUjaVS6EZmrieU3By2lBeqj7YplXFgBfNNNmW9oLLMx75wyS9nD/fVRLVyUj/lq lnQOAgZRudjT6kg8AeGaIWSYLyxJ1tg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1738229138; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=60vaxQ07mmbPiwElb15dQhe+W2ORrBdREjdkh0TLzjw=; b=3b/ogrd7PC2IozXVhtO9sgs1x9OlnOnDZCG3S4wVCActuwqkfAGgKQCUUn2r7dCTTMRv6M U+HPMm0ASNlU/RAQ== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id 6AB444A056A; Thu, 30 Jan 2025 10:25:38 +0100 (CET) From: Andreas Schwab To: linux-riscv@lists.infradead.org Subject: [PATCH] riscv/atomic: Do proper sign extension also for unsigned in arch_cmpxchg CC: linux-kernel@vger.kernel.org Date: Thu, 30 Jan 2025 10:25:38 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spamd-Result: default: False [2.59 / 50.00]; BAYES_HAM(-3.00)[100.00%]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; RDNS_NONE(2.00)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[hawking.nue2.suse.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.nue2.suse.org]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.997]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Spamd-Bar: ++ X-Rspamd-Queue-Id: AE4C520D83 X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250130_012540_818688_64EAD04A X-CRM114-Status: GOOD ( 10.75 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Sign extend also an unsigned compare value to match what lr.w is doing. Otherwise try_cmpxchg may spuriously return true when used on a u32 value that has the sign bit set, as it happens often in inode_set_ctime_current. Do this in three conversion steps. The first conversion to long is needed to avoid a -Wpointer-to-int-cast warning when arch_cmpxchg is used with a pointer type. Then convert to int and back to long to always sign extend the 32-bit value to 64-bit. Fixes: 6c58f25e6938 ("riscv/atomic: Fix sign extension for RV64I") Signed-off-by: Andreas Schwab Reviewed-by: Andrew Jones Tested-by: Xi Ruoyao Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/cmpxchg.h b/arch/riscv/include/asm/cmpxchg.h index 4cadc56220fe..427c41dde643 100644 --- a/arch/riscv/include/asm/cmpxchg.h +++ b/arch/riscv/include/asm/cmpxchg.h @@ -231,7 +231,7 @@ __arch_cmpxchg(".w", ".w" sc_sfx, ".w" cas_sfx, \ sc_prepend, sc_append, \ cas_prepend, cas_append, \ - __ret, __ptr, (long), __old, __new); \ + __ret, __ptr, (long)(int)(long), __old, __new); \ break; \ case 8: \ __arch_cmpxchg(".d", ".d" sc_sfx, ".d" cas_sfx, \