Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   Wei Gao <wegao@suse.com>
To:     tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org,
        dvhart@infradead.org, dave@stgolabs.net, andrealmeid@igalia.com,
        linux-kernel@vger.kernel.org
Cc:     wei gao <wegao@suse.com>
Subject: [PATCH v1] futex: Add compat_sys_futex_waitv for 32bit compatibility
Date:   Thu, 23 Nov 2023 00:31:40 -0500
Message-Id: <20231123053140.16062-1-wegao@suse.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rnJw85Him5sNtjD6xWrFCvByWl+kAN6w86svFMLqAEMvSKPZ3fVdmfG0n0Or?=
 =?us-ascii?Q?ZtPZ8w1LWg+OfBr1CD0PKfr8rtd1TR9AGw4evlaNkxMqA8mFk58RXI9grn1a?=
 =?us-ascii?Q?E9PhtRGZsllE+1mXQunrfdgHAn5zUsSEE6HVB9dVoDfxwimuvsRLUH/crnEJ?=
 =?us-ascii?Q?tlVnN5qJV0N5Z8RG/r0hwzDTUD3YUrf3SaDUBwAaKMnHdhXt1YC/5GyaLAwB?=
 =?us-ascii?Q?oQjIiCKbRs7RdyYkNYo0utEMz4zjqW4mz1aq+/+G1SPNAb3Ds2i+sD5jWQEQ?=
 =?us-ascii?Q?B/r2Ms8fQVxEbXJqzKlOJ5NIIwcXGVbWbApfV/NFhN5rC+wN0OkICr5k3aq6?=
 =?us-ascii?Q?Aj7p6GynyesZl0b8L6FQiQYBzCrA/3PmPbppIjHeQjEvmK+pk3kBB4cX7yv6?=
 =?us-ascii?Q?sHWqS419ojw6iNIj2fdsjxA6uLaGjd7fgv+pa1Id0kN5U7ujNToxs2+act2v?=
 =?us-ascii?Q?F9PjGGTLbDh0vnoMRpy442sT38E7w2tQlXHrrxSY4BW/rzhlIBTYRLWwrEKF?=
 =?us-ascii?Q?u3wpg3Cj0ipq2wuzvPQGq+dlItaE215RiRJZcYRNeUW6udAXULVV69d8UCHu?=
 =?us-ascii?Q?HE5SdhqY3Dhe/IXYzG1R/UcwVHdP8NWOKecXXjluQo18oFtx3k3XamQTykVL?=
 =?us-ascii?Q?MMaQGG85JwunsU+KROwBFnY/B4Zupx56bwxzCo5095eIr6mSV3ghMVYKQ5hB?=
 =?us-ascii?Q?09DgncuttJYrf/74FpcylPQFki18PHZndlMoQT06QRA+1KxVYH2tp8hkTP5c?=
 =?us-ascii?Q?oPn63dFfAyhWToevNb/faHCpmPbagmu5PBS23MqamCmggLshkOadMnfqr/9t?=
 =?us-ascii?Q?B4K783GrRHJ+d0oSIpH3r4c5oU6SXMcnTOBrnhi+Y3SC8yTeM/VVFmSYedeG?=
 =?us-ascii?Q?0CJDAZIJlhtIcy/Ih2kS+8+MJ8nYB6UZ5KhFPGTX4prYXbdl+47sWpQyM00b?=
 =?us-ascii?Q?s7ate7UiUtQBbpFRWzJR9dKRydR3UtW76PkdJKTCFQxlsqiFsACcSGK78F+D?=
 =?us-ascii?Q?5m+4jfw0yuEB6y9X9XuA26i5i3k5/CyqpSKM+SZvZnnAR3m6DeqKUocSX4n3?=
 =?us-ascii?Q?UXC4N3sGVetIWqWdqH8+cy89d/pzqLMXrmEF31FEzmJZiNPFTIRI/8Q9c7ly?=
 =?us-ascii?Q?r3Yl98rdlOV45XuXlY2ywJnDg12xTk2Uht3xTespu3hg2lGi1EN5eV8qSJx9?=
 =?us-ascii?Q?BSkpBnHKM/OIfa1Wxx+NhciFRexhcE1lgpN0D12uoxoNqUNoFe+FE8mpiicC?=
 =?us-ascii?Q?SjknCZ/29elUySh04SrAsjifBAilA3ICV4Z4T4FsRtAFo/QE6zqkMi0KFZMr?=
 =?us-ascii?Q?ehEy+UTY0WlutF96G6txHZukiL9BkRmGfOenMl/gw+wLmSUu9Pvh8eUOTxGY?=
 =?us-ascii?Q?PQg7Isw6MXXiuhRqWy6wW3mDV+phpYYVmw9Gki/NCowaKSV/10wz6CiQFlI9?=
 =?us-ascii?Q?tIumJRwe6GIorI9PhuMGTduo9UpzJDc33GfExrJwV4IAPV9Sj6XknoIC8QNb?=
 =?us-ascii?Q?m2MgREnQ3M4ZZ6WFMv3dWVZw3EshfVsDNy6ASrUmfz/DiRnhFu9P/7jnD0E9?=
 =?us-ascii?Q?XIGquATZX657jos+2sk=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8945261b-5760-4505-9b0d-08dbebe5ad33
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8199.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2023 05:33:09.2435
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +vbtNgDYBKsFjEz+lnr9t1EL5oM4eFYeMGUsIS7mS7ETpWMmGpKu2iQHCBb2TAj+
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8077
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 22 Nov 2023 21:33:25 -0800 (PST)

From: wei gao <wegao@suse.com>

Current implementation lead LTP test case futex_waitv failed when compiled with
-m32. This patch add new compat_sys_futex_waitv to handle m32 mode syscall.

The failure reason is futex_waitv in m32 mode will deliver kernel with struct
old_timespec32 timeout, but this struct type can not directly used by current
sys_futex_waitv implementation.

The new function copy main logic of current sys_futex_waitv, just update parameter
type from "struct __kernel_timespec __user *" to "struct old_timespec32 __user *,"
and use get_old_timespec32 within the new function to get timeout value.

Signed-off-by: wei gao <wegao@suse.com>
---
 arch/x86/entry/syscalls/syscall_32.tbl |  2 +-
 kernel/futex/syscalls.c                | 61 ++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index c8fac5205803..11bd927dd417 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -453,7 +453,7 @@
 446	i386	landlock_restrict_self	sys_landlock_restrict_self
 447	i386	memfd_secret		sys_memfd_secret
 448	i386	process_mrelease	sys_process_mrelease
-449	i386	futex_waitv		sys_futex_waitv
+449	i386	futex_waitv		sys_futex_waitv  compat_sys_futex_waitv
 450	i386	set_mempolicy_home_node		sys_set_mempolicy_home_node
 451	i386	cachestat		sys_cachestat
 452	i386	fchmodat2		sys_fchmodat2
diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index 4b6da9116aa6..62d69f8ec34c 100644
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -486,6 +486,67 @@ COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,
 
 	return ret;
 }
+
+COMPAT_SYSCALL_DEFINE5(futex_waitv, struct futex_waitv __user *, waiters,
+		unsigned int, nr_futexes, unsigned int, flags,
+		struct old_timespec32 __user *, timeout, clockid_t, clockid)
+{
+	struct hrtimer_sleeper to;
+	struct futex_vector *futexv;
+	struct timespec64 ts;
+	ktime_t time;
+	int ret;
+
+	/* This syscall supports no flags for now */
+	if (flags)
+		return -EINVAL;
+
+	if (!nr_futexes || nr_futexes > FUTEX_WAITV_MAX || !waiters)
+		return -EINVAL;
+
+	if (timeout) {
+		int flag_clkid = 0, flag_init = 0;
+
+		if (clockid == CLOCK_REALTIME) {
+			flag_clkid = FLAGS_CLOCKRT;
+			flag_init = FUTEX_CLOCK_REALTIME;
+		}
+
+		if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC)
+			return -EINVAL;
+
+		if (get_old_timespec32(&ts, timeout))
+			return -EFAULT;
+
+		/*
+		 * Since there's no opcode for futex_waitv, use
+		 * FUTEX_WAIT_BITSET that uses absolute timeout as well
+		 */
+		ret = futex_init_timeout(FUTEX_WAIT_BITSET, flag_init, &ts, &time);
+		if (ret)
+			return ret;
+
+		futex_setup_timer(&time, &to, flag_clkid, 0);
+	}
+
+	futexv = kcalloc(nr_futexes, sizeof(*futexv), GFP_KERNEL);
+	if (!futexv) {
+		ret = -ENOMEM;
+		goto destroy_timer;
+	}
+
+	ret = futex_parse_waitv(futexv, waiters, nr_futexes, futex_wake_mark,
+				NULL);
+	if (!ret)
+		ret = futex_wait_multiple(futexv, nr_futexes, timeout ? &to : NULL);
+
+	kfree(futexv);
+
+destroy_timer:
+	if (timeout)
+		futex2_destroy_timeout(&to);
+	return ret;
+}
 #endif /* CONFIG_COMPAT */
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-- 
2.34.1