From patchwork Tue Mar 25 12:16:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 14028539 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 0DCFDC35FFC for ; Tue, 25 Mar 2025 12:22:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AC7428001B; Tue, 25 Mar 2025 08:22:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45C2F280017; Tue, 25 Mar 2025 08:22:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FE3D28001B; Tue, 25 Mar 2025 08:22:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 10106280017 for ; Tue, 25 Mar 2025 08:22:18 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EFA1CA0E09 for ; Tue, 25 Mar 2025 12:22:17 +0000 (UTC) X-FDA: 83259985914.16.529AC03 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf08.hostedemail.com (Postfix) with ESMTP id 2914A160009 for ; Tue, 25 Mar 2025 12:22:16 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YKbe7u9X; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf08.hostedemail.com: domain of guoren@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=guoren@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742905336; a=rsa-sha256; cv=none; b=SqP1e/IcOv1YBrfB4S3nW0JtM54g69+KnNq79tQ8zFpR32B7TLvyWtIxGfC5uTisYsZsA2 f+cuSLsJ3rHa1mBdxQJXCyoe1AwTSt3cIMc/ZC1eD3s9+0gLYRP7FmYTX/o9OSCBfhdb77 BrAafrLSWAgot0fcwL6/+0L1jyae9sk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=YKbe7u9X; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf08.hostedemail.com: domain of guoren@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=guoren@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742905336; 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=zlvDNMthVG81SVxrXuqQOBZt/JOmGvaXVUDfrb2SKJM=; b=l/2yWJs9q/FcVLUY0JB+h7akkWz51YnzXvOnRC2rNZBRriZw2erp3euFhfTHsE3TcaGfpH z7ILYqo6HnNxGXxD21Gd9Vtrltlnh8G8pOs8H7+x2unmjHwMj+ciAJ+VHLKrFsB3O6qQVu 48I8swezzD+gb3ZfzJUJy1hYlv5CIw4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 758B86158F; Tue, 25 Mar 2025 12:22:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BE58C4CEED; Tue, 25 Mar 2025 12:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742905335; bh=Gba3zEmCGRsT82kSH4PvBGfFD1Y0z5mGbjQJQ/8lKIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YKbe7u9Xvh8isSihGt6kXF+4MLeubRmVXpDt87uyRN/SP7UllOiStMyrtlJQjIfsu 1Hqtk5naMe0UheGZS80Sfa0zl11d6cST2bQbzQbQP6zp3JTlEhxFZ1+erShyWgpVv5 m4OgxrFrdZWkRi8e5adLBRWw11xX6PZl4Esqh79r65lvkXVdx7361AQY5CaHF/wGsB E83s0iVJpTljmHXSCPSP2d0uzzX5JuGLn7J9OB6gQRtgkhW2o+6R7WFKdYQYdMxY96 tsyLis/6rOdw68n8FLG2k9n+ahfkJr3B2G35UK8EUKDj+I6/B4BHklYbO/OqqvREWx amTO7iSypzjUw== 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 23/43] rv64ilp32_abi: compat: Correct compat_ulong_t cast Date: Tue, 25 Mar 2025 08:16:04 -0400 Message-Id: <20250325121624.523258-24-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: 2914A160009 X-Stat-Signature: kib6rbspooyqtheo1upfc11johiuumyk X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1742905336-49883 X-HE-Meta: U2FsdGVkX18NjGRDjMuDW2ALnBYEaAXXSsF+lViIr8Vp2teOFWKOc6qKK71lbn1DhzsgQzz+/JOyQOoQEsvcXv9qrwQ+217F49S6wXR0OzdQYdwjRlKK5wR2vn7XlajLmY2NtxRB4+Vv+rTETn9hU5AagzfUtxOhnhwHpYhqQXf1F9McLeWbGG4B4tLjMsuKO4WTKNbKcnvlc+MPmWHFUI3aBeJYFbMyWJrJlDTqwMqadaQbXB6SgyQAA5fTlhe+AjKHjcwV0HeImqME/wxHg6RnxiMCpgUTyDZU0f12Wp9WlnNPdBWUq9Ef1h5cXg945ou6j6myGMSiCgSNe3ieIUQt+Wdy1cezPR2+ooKFcWmuWgUuf3l0d/BabkXOSJ47vvvi9JwE8+6Lmgp/ijfkISeoMiW1axB9ngIXKQQrll4g/XcZYXZERzPFmIeesPpZkQU/cqU1z46+CozyEuvgD0UDBTR2CbJNDA3Oy3wAOCQasgWm7lKXI73ckk4hE5UTxXFBOHdUKS1lCx5sd3TeLLSuW9Qltn/HaF8mmLrliPalprbt9GNzqH8gsIp1arJJO5uheaCd+D1tYS3IDGuPkQeToNzDPHj4RyUe48HzNSc68o9BlVLCX9LPF6Z8cUM91+50H1FpUbjnJX0SoDccDn41OS3gDpKnyDfSW+Hjghi499EmVDuCB/ilkR0jg7V0HNbEmJXyq2FxYKsT5NppmeWK2lrRA1R1PGW+n4Ff8j0HCsOTGV8ZjX2fytkvCqvkVKT692SHU4M+pzL0KA1HN8+lpG6qUbT6fz0ouikZ0d4n6zI5ls32Uxu8R9ToI722d9udPhmVu7MzWNyHzjQI52E/cPjJ6ysCwpVJNQbn/f+ioUKKOm19pF548QjwTPXnCUqFxd2+XP8wvVCsp2ziZZJms6sq3kxQRw3PyEr41+27RDV/4BPip7lF1v0oN+tBMUaCfwD5r/+fVkcgmWx D7Mj60Yg EmALyO4Q4ebp38wQa8V0MVllku69JgILfHF/MXj2bOAlKuPyiUPhApgNySPagkp4dmmc6rrPVemKq8fU05JjEnpTsDB862Fvy+6+p+AnGjtrGGUJbBecfGOM6qQTszkS972bool1m7K0Bbn5/9oHTljYSA3qQT2w2vFF4w7Sbjy35ylq/xt6DiQ73FwA6vqQnRrdbpA3Lb2WSaCn3WpNC0P//zALPD2JNx7hc0th3crseO9dYsUo+LUHtI9TOljfuOb2k+0toA0ju5TNApXZfGCImutLD0Iq2OBht9jIs0E1uZ/Gnt5j1qGudXRPIA0+TihCQ9NLYNoPXjKKPyoR0/f/mwQ9LP2smNhWU 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)" RV64ILP32 ABI systems have BITS_PER_LONG set to 32, matching sizeof(compat_ulong_t). Adjust code involving compat_ulong_t accordingly. Signed-off-by: Guo Ren (Alibaba DAMO Academy) --- include/uapi/linux/auto_fs.h | 6 ++++++ kernel/compat.c | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h index 8081df849743..7d925ee810b6 100644 --- a/include/uapi/linux/auto_fs.h +++ b/include/uapi/linux/auto_fs.h @@ -80,9 +80,15 @@ enum { #define AUTOFS_IOC_SETTIMEOUT32 _IOWR(AUTOFS_IOCTL, \ AUTOFS_IOC_SETTIMEOUT_CMD, \ compat_ulong_t) +#if __riscv_xlen == 64 +#define AUTOFS_IOC_SETTIMEOUT _IOWR(AUTOFS_IOCTL, \ + AUTOFS_IOC_SETTIMEOUT_CMD, \ + unsigned long long) +#else #define AUTOFS_IOC_SETTIMEOUT _IOWR(AUTOFS_IOCTL, \ AUTOFS_IOC_SETTIMEOUT_CMD, \ unsigned long) +#endif #define AUTOFS_IOC_EXPIRE _IOR(AUTOFS_IOCTL, \ AUTOFS_IOC_EXPIRE_CMD, \ struct autofs_packet_expire) diff --git a/kernel/compat.c b/kernel/compat.c index fb50f29d9b36..46ffdc5e7cc4 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -203,11 +203,17 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask, return -EFAULT; while (nr_compat_longs > 1) { - compat_ulong_t l1, l2; + compat_ulong_t l1; unsafe_get_user(l1, umask++, Efault); + nr_compat_longs -= 1; +#if BITS_PER_LONG == 64 + compat_ulong_t l2; unsafe_get_user(l2, umask++, Efault); *mask++ = ((unsigned long)l2 << BITS_PER_COMPAT_LONG) | l1; - nr_compat_longs -= 2; + nr_compat_longs -= 1; +#else + *mask++ = l1; +#endif } if (nr_compat_longs) unsafe_get_user(*mask, umask++, Efault); @@ -234,8 +240,11 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask, while (nr_compat_longs > 1) { unsigned long m = *mask++; unsafe_put_user((compat_ulong_t)m, umask++, Efault); + nr_compat_longs -= 1; +#if BITS_PER_LONG == 64 unsafe_put_user(m >> BITS_PER_COMPAT_LONG, umask++, Efault); - nr_compat_longs -= 2; + nr_compat_longs -= 1; +#endif } if (nr_compat_longs) unsafe_put_user((compat_ulong_t)*mask, umask++, Efault);