From patchwork Tue Mar 25 12:15:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 14028528 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70CFFC36005 for ; Tue, 25 Mar 2025 12:19:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCCEB28000F; Tue, 25 Mar 2025 08:19:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7C3228000C; Tue, 25 Mar 2025 08:19:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF6D628000F; Tue, 25 Mar 2025 08:19:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8FDD628000C for ; Tue, 25 Mar 2025 08:19:39 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4EFE680E1A for ; Tue, 25 Mar 2025 12:19:41 +0000 (UTC) X-FDA: 83259979362.03.3336FAB Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf04.hostedemail.com (Postfix) with ESMTP id 8DA7440008 for ; Tue, 25 Mar 2025 12:19:39 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JljTIfo5; spf=pass (imf04.hostedemail.com: domain of guoren@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=guoren@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742905179; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f/7z1UEmmv90J4Pkt5cqGJp3GyVlfnf5CBH8pHirtjU=; b=Bfb1XvTNhj1WFT7CaV4tmBcz25ewd98hP8rJd6M1qjWV3N48FG7p359mnNZfhPwOiyzLCO cKBI9DikBqZbyvu8S2D5pqnh0ktFEb2z98f/OoLk0wKrN9p67HLs3R9rDszbP3zYq1fwJp YqfvfsnrinoYH2ta6w91h9FrBHgZ5Zg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JljTIfo5; spf=pass (imf04.hostedemail.com: domain of guoren@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=guoren@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742905179; a=rsa-sha256; cv=none; b=cCm1cTwJ8W1PRzc8vBMETlHfYKh/pmTR87i1/kn8DGs1SMjUT5KNxh6eeQuKre1OGGFHYq OEIrbDKMsK90rGHIUm3JWRNrn/3ps9dUqaQwoLX67GmcFNQKE0uvVVf8WIYJNHLzNuvUnH YryaIULCXgYZlONrC/ZCMquhbPnqYq4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 4163143492; Tue, 25 Mar 2025 12:19:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9525CC4CEE4; Tue, 25 Mar 2025 12:19:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742905178; bh=ISWjhncK1TCy0/aI9ckRc78SEAPhWPAPLhDyLEaKeFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JljTIfo5gVHDwGhEgHhBruSFSNYbpMWvToA3rfmH1hgjQuNmceDaFgEXe/3gGSZTH exytkNjTyCOkyjtIhKFOb0XGBYJ/tpWrvx6cqLa0p1rcK+JqHxqzeKhqUHGTeZz3P1 268w16IQAohPKFTX+GCAMPr0BXefchXZAvm7xNqRcO9DHHxQ6x1Rv1VAQxtWYoauze 0NzZoWSBD1Kbjn5BxOB0hY0NfP+8euHRcxIFeOdx1yFNa3b1LyV/a54VkoW3kpUbNb g/Y6OJcrFuELv1f7GjT/hSs+HZj8euBQvkCNVQ43y1CvxpAwAHEzaLOslayxcIa/XB KKnS677yv+Sgw== From: guoren@kernel.org To: arnd@arndb.de, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, paul.walmsley@sifive.com, palmer@dabbelt.com, anup@brainfault.org, atishp@atishpatra.org, oleg@redhat.com, kees@kernel.org, tglx@linutronix.de, will@kernel.org, mark.rutland@arm.com, brauner@kernel.org, akpm@linux-foundation.org, rostedt@goodmis.org, edumazet@google.com, unicorn_wang@outlook.com, inochiama@outlook.com, gaohan@iscas.ac.cn, shihua@iscas.ac.cn, jiawei@iscas.ac.cn, wuwei2016@iscas.ac.cn, drew@pdp7.com, prabhakar.mahadev-lad.rj@bp.renesas.com, ctsai390@andestech.com, wefu@redhat.com, kuba@kernel.org, pabeni@redhat.com, josef@toxicpanda.com, dsterba@suse.com, mingo@redhat.com, peterz@infradead.org, boqun.feng@gmail.com, guoren@kernel.org, xiao.w.wang@intel.com, qingfang.deng@siflower.com.cn, leobras@redhat.com, jszhang@kernel.org, conor.dooley@microchip.com, samuel.holland@sifive.com, yongxuan.wang@sifive.com, luxu.kernel@bytedance.com, david@redhat.com, ruanjinjie@huawei.com, cuiyunhui@bytedance.com, wangkefeng.wang@huawei.com, qiaozhe@iscas.ac.cn Cc: ardb@kernel.org, ast@kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-mm@kvack.org, linux-crypto@vger.kernel.org, bpf@vger.kernel.org, linux-input@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-serial@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, maple-tree@lists.infradead.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-atm-general@lists.sourceforge.net, linux-btrfs@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-nfs@vger.kernel.org, linux-sctp@vger.kernel.org, linux-usb@vger.kernel.org, linux-media@vger.kernel.org Subject: [RFC PATCH V3 12/43] rv64ilp32_abi: riscv: Introduce cmpxchg_double Date: Tue, 25 Mar 2025 08:15:53 -0400 Message-Id: <20250325121624.523258-13-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250325121624.523258-1-guoren@kernel.org> References: <20250325121624.523258-1-guoren@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 8DA7440008 X-Stat-Signature: jk6fixr9a68h144xzy6ptmgiokta7oew X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1742905179-79659 X-HE-Meta: U2FsdGVkX19qj3qgcKK6IqlCxnh3mhppCuAON1iwWbzBSmkdMlmOBn0rzS3omqq6QL9IklQB3Uh2ddVqh6lIWa8S5oVzq69EiUOsha9mi44Ee4iJpw8/P+bwc+Mxl5WGGCg7KdSA0i0VC2peQp97XcoKHFWrvRGxnVSOsFZUK7Q0CVmFXqtEJfzuQiP7Y/N/9cWh/3v4dwFjJF/da+iVKGA2r4sMs2uluqs+kV6/QxSwFqAe1QrHvh4JfrgGC8UWMpJCZDvzf44LBQpyTz6B1lyhBgSHFou5GPWO+ZaRqDm29pGpk2K587e7z8nbGl5ybN2fUDdn/sIwzC97KWoe6DMoNV7ppBGVPeo6e5AvGtWBeBuB71WjruB3LYMHGQM2it/dyjjsmvtMkYynWot8/F7GA7wxAB8sEbM9vMD0nwGUoDpGXLjjPoauD9b5glzi2uGU5y7qSGrlpLCZBSQ2LzozUWZu5Za85P+yFJUsIDNd9G4TOKD4nX0XRQc8Hg5ImxoNlJqQqvw5wcKb6O8Lk39aehPN6wuy6lo1sTNgSy32N70ZUpdYU2Gnnhoaq0ryHsKyxm9Re+kRf8gEWThKKJ2c8mumfMCT1v4332YaV3S/cjE+BNF+m2ynzQ7Bf1bI9IaB53t0SmYYwOwWRcS+k3I14eqN8vROzfHrYw2zHycrl0M6gQhcyMnkJJ0ZJNJtoAtFYpxGgn9YNRK7ULNHLJyZt5OByo7UZwbT0z6786iqqj5tVPy4nNAdL9kOxVUdWtSQhvnp1sL6Y0EnXSII4IeuqxZ0g0+V0ei9d3giLoGg0ZINiQN0fkrUYVFe+E9fKvN6pafFvHD9ypp31RWANdKNzpnnd8Lh9/DlrGN3D3q0hBveIzmZZfpnQs4HisIhFxyCz+c11NZxUVxLtgXcIDKbHcOBcZBg1gI+8tbsn8lcDKrX9Ey9C+LBbYqn25s5bnZ7XpoM+I8yL+MjBIQ aHbbxKgd DMD1HclDlHSYTLsCmbBVKTCvEF3/PM0huZpEDQQblB0zvP3YTH3JZzE9kUZw3pnJNTkA0p+TFhQ4lE/Cg0xH1I3UDkismawVt/Z3R9TX9tVpvl8/4DGicNam6OYHEcrNgxNwkEAYsjMgjvJbOYTHndrhBlgwv4zOK91Qt/plyBLzz3jSDhHbGFMU5FXoFkS3sqQ9/E65mAEqUNXpJGCcxm5u0X0daeZd1R/b3axM+xtbYwGRbE1sP21XBocpbiVe/KIWfNIR2fhdXDnTdhmgCRK+IKcUtJzRIc2vMjraHnsGpaXdNamQuZ1cpZYeG96jefCxli21gaQlXQS6cudwuOlGUiXRvECzkR7HU X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Guo Ren (Alibaba DAMO Academy)" The rv64ilp32 abi has the ability to exclusively load and store (ld/sd) a pair of words from an address. Then the SLUB can take advantage of a cmpxchg_double implementation to avoid taking some locks. This patch provides an implementation of cmpxchg_double for 32-bit pairs, and activates the logic required for the SLUB to use these functions (HAVE_ALIGNED_STRUCT_PAGE and HAVE_CMPXCHG_DOUBLE). Inspired from the commit: 5284e1b4bc8a ("arm64: xchg: Implement cmpxchg_double") Signed-off-by: Guo Ren (Alibaba DAMO Academy) --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/cmpxchg.h | 53 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index da2111b0111c..884235cf4092 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -141,6 +141,7 @@ config RISCV select HAVE_ARCH_USERFAULTFD_MINOR if 64BIT && USERFAULTFD select HAVE_ARCH_VMAP_STACK if MMU && 64BIT select HAVE_ASM_MODVERSIONS + select HAVE_CMPXCHG_DOUBLE if ABI_RV64ILP32 select HAVE_CONTEXT_TRACKING_USER select HAVE_DEBUG_KMEMLEAK select HAVE_DMA_CONTIGUOUS if MMU diff --git a/arch/riscv/include/asm/cmpxchg.h b/arch/riscv/include/asm/cmpxchg.h index 938d50194dba..944f6d825f78 100644 --- a/arch/riscv/include/asm/cmpxchg.h +++ b/arch/riscv/include/asm/cmpxchg.h @@ -7,6 +7,7 @@ #define _ASM_RISCV_CMPXCHG_H #include +#include #include #include @@ -409,6 +410,58 @@ static __always_inline void __cmpwait(volatile void *ptr, #define __cmpwait_relaxed(ptr, val) \ __cmpwait((ptr), (unsigned long)(val), sizeof(*(ptr))) + +#ifdef CONFIG_HAVE_CMPXCHG_DOUBLE +#define system_has_cmpxchg_double() 1 + +#define __cmpxchg_double_check(ptr1, ptr2) \ +({ \ + if (sizeof(*(ptr1)) != 4) \ + BUILD_BUG(); \ + if (sizeof(*(ptr2)) != 4) \ + BUILD_BUG(); \ + VM_BUG_ON((ulong *)(ptr2) - (ulong *)(ptr1) != 1); \ + VM_BUG_ON(((ulong)ptr1 & 0x7) != 0); \ +}) + +#define __cmpxchg_double(old1, old2, new1, new2, ptr) \ +({ \ + __typeof__(ptr) __ptr = (ptr); \ + register unsigned int __ret; \ + u64 __old; \ + u64 __new; \ + u64 __tmp; \ + switch (sizeof(*(ptr))) { \ + case 4: \ + __old = ((u64)old2 << 32) | (u64)old1; \ + __new = ((u64)new2 << 32) | (u64)new1; \ + __asm__ __volatile__ ( \ + "0: lr.d %0, %2\n" \ + " bne %0, %z3, 1f\n" \ + " sc.d %1, %z4, %2\n" \ + " bnez %1, 0b\n" \ + "1:\n" \ + : "=&r" (__tmp), "=&r" (__ret), "+A" (*__ptr) \ + : "rJ" (__old), "rJ" (__new) \ + : "memory"); \ + __ret = (__old == __tmp); \ + break; \ + default: \ + BUILD_BUG(); \ + } \ + __ret; \ +}) + +#define arch_cmpxchg_double(ptr1, ptr2, o1, o2, n1, n2) \ +({ \ + int __ret; \ + __cmpxchg_double_check(ptr1, ptr2); \ + __ret = __cmpxchg_double((ulong)(o1), (ulong)(o2), \ + (ulong)(n1), (ulong)(n2), \ + ptr1); \ + __ret; \ +}) +#endif #endif #endif /* _ASM_RISCV_CMPXCHG_H */