From nobody Fri Jul 24 23:30:12 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 771613E44E5 for ; Wed, 22 Jul 2026 09:07:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711266; cv=none; b=Q3G1/He1WbW0vij43eFecFbLXtDyJ1QaT92oCae+xTu4yI1JCRCO+8Ub0s6LpBeGyssZQ4mSXfAVFX4kE+bz9hTGgaf1oPq/x9/Y6dnEwqdwrReFja3zPEPwzOAQZnde/N4Vh+RAOpYTZ6etra4+bE1t+RDAHYekWX9nUPoMwBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711266; c=relaxed/simple; bh=UWn0v6RyHIXyXGZ+Y6Xm8/+J4hz2v7QToayoT2aa3+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d/X+mc+tj9Rvc0Fza4KTB3qBgEJAPVNZxrD2LL7NBe7i5o+FmZt954toO3+UMRKPqfTlUTGmibgJViD/eU4kBHlcFcjMj+9OlD999MyWibs1B6nGOUsehld1Rvd2tkOxM0xOrt5W5IXldtCeR0Lmndg5zrVIxb3BmEKIoHlQrLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=QYO0t1wC; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=29rNHpWv; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QYO0t1wC"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="29rNHpWv" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1784711262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gh7IB1M6N9Ghw7Ou3jOSHhN9PUFNHZxKQr5j52fg6HQ=; b=QYO0t1wCxHJP/AmlkgK4t98FEh47TD4JhH1bteo8TIyx0jXzjEvGs4JL+p1AVGazSYCdjI ZmIUjOaQCHqW6VBnk8Atl4yZfM4ZPHmDcZE0YHpW3nHHems/D+3AMJWWhdtTm0Cs1ksBud VeEGPgE9WnSC/fw10Pgoj5pgY004SK0Sz31zy91AQ7N7csKJBpwhkIKMyxhgTkmMgJnzkz 4sjQdz9m4u9LiyqQFa0v6Tz6oD2CsZcCxFhYLAdSdKQCVdzW5tVXMLw9qagPoh8mu0wZZx XRUYCyXAr/jULK0V4bkzbcvmD9AjOoHOSvWtTFZw6qSGS72MEGzWq6eonn59bg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1784711262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gh7IB1M6N9Ghw7Ou3jOSHhN9PUFNHZxKQr5j52fg6HQ=; b=29rNHpWv/VgQZkKWb/mfZ69R6R/9UT3/61dAWfY1qLITktSaTyqWJHId4kelLik1Pushcl mBTCTslhr1C+ltBw== To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Mathieu Desnoyers , Thomas Gleixner , Peter Zijlstra , Sebastian Andrzej Siewior Cc: Nam Cao Subject: [PATCH v4 1/3] riscv: compat_vdso: switch to standard kbuild rule Date: Wed, 22 Jul 2026 11:06:42 +0200 Message-ID: <82d1f43d6ad6a84b56e102444023ae7eee41eb13.1784710768.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The compat_vdso Makefile has a custom build rule for *.S files. This is unnecessary, and makes it hard to extend this Makefile to support building *.c files. Switch to standard kbuild rule instead. Reviewed-by: Thomas Wei=C3=9Fschuh Signed-off-by: Nam Cao --- arch/riscv/kernel/compat_vdso/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/riscv/kernel/compat_vdso/Makefile b/arch/riscv/kernel/com= pat_vdso/Makefile index 24e37d1ef7ec..7ec9dd47c4fa 100644 --- a/arch/riscv/kernel/compat_vdso/Makefile +++ b/arch/riscv/kernel/compat_vdso/Makefile @@ -8,7 +8,6 @@ compat_vdso-syms =3D rt_sigreturn compat_vdso-syms +=3D getcpu compat_vdso-syms +=3D flush_icache =20 -COMPAT_CC :=3D $(CC) COMPAT_LD :=3D $(LD) =20 # binutils 2.35 does not support the zifencei extension, but in the ISA @@ -43,8 +42,7 @@ $(obj)/compat_vdso.so.dbg: $(obj)/compat_vdso.lds $(obj-c= ompat_vdso) FORCE LDFLAGS_compat_vdso.so.dbg =3D -shared -S -soname=3Dlinux-compat_vdso.so.1= \ --build-id=3Dsha1 --hash-style=3Dboth --eh-frame-hdr =20 -$(obj-compat_vdso): %.o: %.S FORCE - $(call if_changed_dep,compat_vdsoas) +$(obj-compat_vdso): KBUILD_AFLAGS +=3D $(COMPAT_CC_FLAGS) =20 # strip rule for the .so file $(obj)/%.so: OBJCOPYFLAGS :=3D -S @@ -66,7 +64,3 @@ quiet_cmd_compat_vdsold =3D VDSOLD $@ cmd_compat_vdsold =3D $(COMPAT_LD) $(ld_flags) $(COMPAT_LD_FLAGS) -T= $(filter-out FORCE,$^) -o $@.tmp && \ $(OBJCOPY) $(patsubst %, -G __compat_vdso_%, $(compat_v= dso-syms)) $@.tmp $@ && \ rm $@.tmp - -# actual build commands -quiet_cmd_compat_vdsoas =3D VDSOAS $@ - cmd_compat_vdsoas =3D $(COMPAT_CC) $(a_flags) $(COMPAT_CC_FLAGS) -c = -o $@ $< --=20 2.47.3 From nobody Fri Jul 24 23:30:12 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B02713BF694 for ; Wed, 22 Jul 2026 09:07:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711266; cv=none; b=CBh4rogeycNCBYcPbFspTEKzCe6Jv0Z5X8yMMYAS9eu9fJQzsMYsgwGl4KwKf7RNPOEOGXhRKH0rs/JKe4RJZExF2oqy6fX6+HuG04dPPdqlNVxqCRCfqBYzMmtAidbrI9LIsADxI4LoNeHig7sWSA8KpASsbK/0LC24Wj71Lw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711266; c=relaxed/simple; bh=psNLbakOPOG4r60Lhf4fSUqKwGjkZUhuf40loe/dYK4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AG/rn4wXaV2qcTQfX1kMYllvl/29mtwQ29EB4Nwfw+xF0HFlK3UxykM2Dgn8YS2s/4OfIBg6tRSneEwHUq3M4KsL+5OEOFFNaU/Qmbmx/sJwgTzRpa1ltJMNcCBocxgjc2FlpeDnaShMYOkclRpRFmafuCylwbidFHxu4HVwoLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=IxlKEPv1; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=EBJoVIuc; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="IxlKEPv1"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EBJoVIuc" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1784711263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9B1Sb2gFl2JYRtTWXT8xaC7KS5GdcxcmKr7gpZV2JDw=; b=IxlKEPv14HDGdQy9HHmZgQ3U4k/ptNsl3D33QMgYONjC9lGM5dBCxhROlzb9viX9hQxKjp WquV2Y2D/531AKyKTNe9J2GRBlvhNuYKhWBrvhSGlnG4yAwDDOcejfDGUmK/HcJpb0p9dw EpC9ZbsHLjnAQCLnCLUjgnhGt0lHZPmEWACAIsmfMdMf71RtTVe8wHs0LWi+mLCbfSPJVL 3hT2DcCwJmDw0lytwzyqshF6Rbg3CunUSkKFqiuw8fRHlfE1HjBdctMKPMHzuKWtAZUdnX CUbFWfp8tbj/D+JRt2bJBwEZqhClRBMclqapr52lO1aptWfladRtL8J0ub/zNg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1784711263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9B1Sb2gFl2JYRtTWXT8xaC7KS5GdcxcmKr7gpZV2JDw=; b=EBJoVIucFznDj+Aj/8R6pxAwekeCSHMnGr1dIwpIaOfgL+awirB3ERBp1Q2DDfcZFZjWpI j22uFy+BzyuYalDg== To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Mathieu Desnoyers , Thomas Gleixner , Peter Zijlstra , Sebastian Andrzej Siewior Cc: Nam Cao Subject: [PATCH v4 2/3] riscv: compat_vdso: Allow *.c source files Date: Wed, 22 Jul 2026 11:06:43 +0200 Message-ID: <1ba6b1e392a0d61551405dbf356fbc8292c96627.1784710768.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extend to support building *.c files. This allows adding futex.c in a follow-up commit. Reviewed-by: Thomas Wei=C3=9Fschuh Signed-off-by: Nam Cao --- arch/riscv/kernel/compat_vdso/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/kernel/compat_vdso/Makefile b/arch/riscv/kernel/com= pat_vdso/Makefile index 7ec9dd47c4fa..03d128080c6a 100644 --- a/arch/riscv/kernel/compat_vdso/Makefile +++ b/arch/riscv/kernel/compat_vdso/Makefile @@ -43,6 +43,7 @@ LDFLAGS_compat_vdso.so.dbg =3D -shared -S -soname=3Dlinux= -compat_vdso.so.1 \ --build-id=3Dsha1 --hash-style=3Dboth --eh-frame-hdr =20 $(obj-compat_vdso): KBUILD_AFLAGS +=3D $(COMPAT_CC_FLAGS) +$(obj-compat_vdso): KBUILD_CFLAGS +=3D $(COMPAT_CC_FLAGS) =20 # strip rule for the .so file $(obj)/%.so: OBJCOPYFLAGS :=3D -S --=20 2.47.3 From nobody Fri Jul 24 23:30:12 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A49B479885 for ; Wed, 22 Jul 2026 09:07:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711267; cv=none; b=CjOhSUEeUd6LDq9uuGIpHH5dFBP7P8bH8eAUrMKf0J7kjYEGIE4uQsEjc6w7EjAyYqT+qyUn4km7QXwVwktu79IrPH5KxjaubvuaamzPUrh6FNT6jTfnnXNvnLbIMecyV2G9RziybcLbOXfvzfU8raerRrypR3EwRhhP0f758hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784711267; c=relaxed/simple; bh=/15l7d89jKJRQh/HPTe7s+zCz+3lHKzNt8dkc9vBigY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rzi1ODEP1/4VcIzuHWSXBZumDn6Ets9t6MQzYp0C7np7PdMuKIdVaqZsgyjh8GmptVLrdJDAQeIVaFnzdUlDRjq3Qn8linSmQv9OBtV1pha/nVjH8m02yd1l0inKFxgvc7ypbdKmeogSjhnekt2L+N5o2UHqczH4oF8ppptc1pQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=foaBVEH1; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=tV5ylZLE; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="foaBVEH1"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tV5ylZLE" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1784711263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFODpMu+WfRfEg9IQTVlGYlT/AsOkHHP1Pb7IzEntzo=; b=foaBVEH1pM1MoV7O8BRRF2h5I4pOPSt1DZ5EFAlrEpHkjZZ2srber2JuvTwYHSRc0h9wfA in31uw81+Yg2VffceuLyG81dnaudLjahfgQY4Xa5yzfLEtgBjS7Eho10GINVfKna2jPGLT BJkq18/44+JeCku96agkxhN2Ljdrj9yG77DeLpgO8rXhvONCgFNRzeXGhL0tz1/WUQrPrL 7V2duA9rzmXkRPAMKcNx/5X9LFKBhtCQbvnSUQGjjSmAsgTuxAxRUCUaLTa+2gQCSQr89+ I18tyvXT5CMM4OuI2/4d4VrNe1M/9/s3QbJQC4FbCrak0N9geWCBgFWToLU3MQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1784711263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IFODpMu+WfRfEg9IQTVlGYlT/AsOkHHP1Pb7IzEntzo=; b=tV5ylZLEJ9Fd02GR8No+6t+Y/N9tDd35Nve+SwhM426ijYvAH9rKyj7ekmSYyw50N1L6Hg NoUCE91D1jGnITAA== To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Mathieu Desnoyers , Thomas Gleixner , Peter Zijlstra , Sebastian Andrzej Siewior Cc: Nam Cao Subject: [PATCH v4 3/3] riscv: vdso: Implement __vdso_futex_robust_try_unlock() Date: Wed, 22 Jul 2026 11:06:44 +0200 Message-ID: <58e34a774f2e9ab810e79a55abde16fa8047ae5f.1784710768.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is the RISC-V port for __vdso_futex_robust_try_unlock(). It is based on the x86's implementation in commit 61cfc8e372d1 ("x86/vdso: Prepare for robust futex unlock support") and commit a2274cc0091e ("x86/vdso: Implement __vdso_futex_robust_try_unlock()"). When the FUTEX_ROBUST_UNLOCK mechanism is used for unlocking (PI-)futexes, the unlock sequence in userspace looks like this: 1) robust_list_set_op_pending(mutex); 2) robust_list_remove(mutex); lval =3D gettid(); 3) if (atomic_try_cmpxchg(&mutex->lock, lval, 0)) 4) robust_list_clear_op_pending(); else 5) sys_futex(OP,...FUTEX_ROBUST_UNLOCK); That still leaves a minimal race window between #3 and #4 where the mutex could be acquired by some other task which observes that it is the last user and: 1) unmaps the mutex memory 2) maps a different file, which ends up covering the same address When then the original task exits before reaching #4 then the kernel robust list handling observes the pending op entry and tries to fix up user space. In case that the newly mapped data contains the TID of the exiting thread at the address of the mutex/futex the kernel will set the owner died bit in that memory and therefore corrupt unrelated data. Provide a VDSO function which exposes the critical section window in the VDSO symbol table. The resulting addresses are updated in the task's mm when the VDSO is (re)map()'ed. The core code detects when a task was interrupted within the critical section and is about to deliver a signal. It then invokes an architecture specific function which determines whether the pending op pointer has to be cleared or not. The unlock assembly sequence on 64-bit is: mv a5, a0 ; move LOCK to a5 .Lretry lr.w a0, (a5) ; load *LOCK bne a0, a1, 24 .Lend ; if (*LOCK !=3D TID) then exit sc.w.rl t0, zero, (a5) ; try changing *LOCK from TID to zero .Lstart bnez t0, .Lretry ; retry if store-conditional failed sd zero, 0(a2) ; clear POP .Lend sext.w a0,a0 ret So if the kernel sees that the user task is between .Lstart and .Lend, t0 can be checked to determine if the pending op pointer (POP) should be cleared. When the kernel is built with ZACAS, another unlock assembly sequence is provided using ZACAS instructions. If the CPU supports ZACAS, that alternative sequence is used and the critical section is also changed to that. There are two entry points to handle the different robust list pending op pointer sizes: __vdso_futex_robust_list64_try_unlock() __vdso_futex_robust_list32_try_unlock() The 32-bit VDSO and compat VDSO provides __vdso_futex_robust_list32_try_unlock(). Unlike x86, the RISC-V 64-bit VDSO provides only provides __vdso_futex_robust_list64_try_unlock(). Because RISC-V threads can only have one list_op_pending pointer type. Reviewed-by: Thomas Wei=C3=9Fschuh Signed-off-by: Nam Cao --- This depends on compat vdso patching: https://lore.kernel.org/all/20260630-riscv-vdso32-alternative-v1-0-a32fd89b= 7b1c@linutronix.de/ --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/cpufeature-macros.h | 2 + arch/riscv/include/asm/futex_robust.h | 16 ++++ arch/riscv/include/asm/vdso/futex.h | 14 ++++ arch/riscv/kernel/compat_vdso/Makefile | 7 +- arch/riscv/kernel/compat_vdso/futex.c | 3 + arch/riscv/kernel/vdso.c | 61 +++++++++++++++ arch/riscv/kernel/vdso/Makefile | 7 +- arch/riscv/kernel/vdso/futex.c | 87 ++++++++++++++++++++++ arch/riscv/kernel/vdso/vdso.lds.S | 8 ++ 10 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 arch/riscv/include/asm/futex_robust.h create mode 100644 arch/riscv/include/asm/vdso/futex.h create mode 100644 arch/riscv/kernel/compat_vdso/futex.c create mode 100644 arch/riscv/kernel/vdso/futex.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index c2c2f5f3ed5e..588963bef804 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -166,6 +166,7 @@ config RISCV select HAVE_FUNCTION_GRAPH_TRACER if HAVE_DYNAMIC_FTRACE_WITH_ARGS select HAVE_FUNCTION_GRAPH_FREGS select HAVE_FUNCTION_TRACER if HAVE_DYNAMIC_FTRACE + select HAVE_FUTEX_ROBUST_UNLOCK select HAVE_EBPF_JIT if MMU select HAVE_GENERIC_TIF_BITS select HAVE_GUP_FAST if MMU diff --git a/arch/riscv/include/asm/cpufeature-macros.h b/arch/riscv/includ= e/asm/cpufeature-macros.h index a8103edbf51f..f522c6c3cd97 100644 --- a/arch/riscv/include/asm/cpufeature-macros.h +++ b/arch/riscv/include/asm/cpufeature-macros.h @@ -6,6 +6,8 @@ #ifndef _ASM_CPUFEATURE_MACROS_H #define _ASM_CPUFEATURE_MACROS_H =20 +#include + #include #include =20 diff --git a/arch/riscv/include/asm/futex_robust.h b/arch/riscv/include/asm= /futex_robust.h new file mode 100644 index 000000000000..16ec58e925c8 --- /dev/null +++ b/arch/riscv/include/asm/futex_robust.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_FUTEX_ROBUST_H +#define _ASM_RISCV_FUTEX_ROBUST_H + +#include +#include + +static inline void __user *arch_futex_robust_unlock_get_pop(struct pt_regs= *regs) +{ + if (cpu_supports_zacas()) + return (regs->a0 =3D=3D regs->a1) ? (void __user *)regs->a2 : NULL; + else + return (regs->t0 =3D=3D 0) ? (void __user *)regs->a2 : NULL; +} + +#endif /* _ASM_RISCV_FUTEX_ROBUST_H */ diff --git a/arch/riscv/include/asm/vdso/futex.h b/arch/riscv/include/asm/v= dso/futex.h new file mode 100644 index 000000000000..9e173f45f3e2 --- /dev/null +++ b/arch/riscv/include/asm/vdso/futex.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_VDSO_FUTEX_H +#define __ASM_VDSO_FUTEX_H + +#include + +static inline bool cpu_supports_zacas(void) +{ + return IS_ENABLED(CONFIG_RISCV_ISA_ZACAS) && IS_ENABLED(CONFIG_TOOLCHAIN_= HAS_ZACAS) && + riscv_has_extension_unlikely(RISCV_ISA_EXT_ZACAS); +} + +#endif /* __ASM_VDSO_FUTEX_H */ diff --git a/arch/riscv/kernel/compat_vdso/Makefile b/arch/riscv/kernel/com= pat_vdso/Makefile index 03d128080c6a..81307063945d 100644 --- a/arch/riscv/kernel/compat_vdso/Makefile +++ b/arch/riscv/kernel/compat_vdso/Makefile @@ -24,7 +24,12 @@ COMPAT_CC_FLAGS +=3D $(call cc-option,-mno-riscv-attribu= te) COMPAT_CC_FLAGS +=3D $(call as-option,-Wa$(comma)-mno-arch-attr) =20 # Files to link into the compat_vdso -obj-compat_vdso =3D $(patsubst %, %.o, $(compat_vdso-syms)) note.o +obj-compat_vdso :=3D $(patsubst %, %.o, $(compat_vdso-syms)) note.o + +ifdef CONFIG_FUTEX_ROBUST_UNLOCK +compat_vdso-syms +=3D __vdso_futex_robust_list32_try_unlock +obj-compat_vdso +=3D futex.o +endif =20 # Build rules targets :=3D $(obj-compat_vdso) compat_vdso.so compat_vdso.so.dbg compat_v= dso.lds diff --git a/arch/riscv/kernel/compat_vdso/futex.c b/arch/riscv/kernel/comp= at_vdso/futex.c new file mode 100644 index 000000000000..ad05ded43955 --- /dev/null +++ b/arch/riscv/kernel/compat_vdso/futex.c @@ -0,0 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../vdso/futex.c" diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index 9c2f5e442338..2610363f9a02 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -33,11 +34,69 @@ static struct __vdso_info vdso_info; static struct __vdso_info compat_vdso_info; #endif =20 +#define _CONCAT3(a, b, c) a ## b ## c +#define CONCAT3(a, b, c) _CONCAT3(a, b, c) + +#if defined(CONFIG_RISCV_ISA_ZACAS) && defined(CONFIG_TOOLCHAIN_HAS_ZACAS) +#define FUTEX_CAS_SET_VDSO_CS_RANGE(vdso, fd, idx, xlen, symbol) \ +({ \ + void *start =3D symbol(vdso, CONCAT3(futex_list, xlen, _try_unlock_cs_cas= _start)); \ + void *end =3D symbol(vdso, CONCAT3(futex_list, xlen, _try_unlock_cs_cas= _end)); \ + \ + futex_set_vdso_cs_range(fd, idx, (uintptr_t)start, (uintptr_t)end, xlen = =3D=3D 32); \ +}) +#else +#define FUTEX_CAS_SET_VDSO_CS_RANGE(...) BUILD_BUG() +#endif + +#define FUTEX_LRSC_SET_VDSO_CS_RANGE(vdso, fd, idx, xlen, symbol) \ +({ \ + void *start =3D symbol(vdso, CONCAT3(futex_list, xlen, _try_unlock_cs_lrs= c_start)); \ + void *end =3D symbol(vdso, CONCAT3(futex_list, xlen, _try_unlock_cs_lrs= c_end)); \ + \ + futex_set_vdso_cs_range(fd, idx, (uintptr_t)start, (uintptr_t)end, xlen = =3D=3D 32); \ +}) + +#define FUTEX_SET_VDSO_CS_RANGE(vdso, fd, idx, xlen, symbol) \ +({ \ + if (cpu_supports_zacas()) \ + FUTEX_CAS_SET_VDSO_CS_RANGE(vdso, fd, idx, xlen, symbol); \ + else \ + FUTEX_LRSC_SET_VDSO_CS_RANGE(vdso, fd, idx, xlen, symbol); \ +}) + +#ifdef CONFIG_FUTEX_ROBUST_UNLOCK + +/* Allow parameters to expand first */ +#define __VDSO_SYMBOL(vdso, name) VDSO_SYMBOL(vdso, name) +#define __COMPAT_VDSO_SYMBOL(vdso, name) COMPAT_VDSO_SYMBOL(vdso, name) + +static void vdso_futex_robust_unlock_update_ips(void) +{ + unsigned long vdso =3D (unsigned long) current->mm->context.vdso; + struct futex_mm_data *fd =3D ¤t->mm->futex; + + futex_reset_cs_ranges(fd); + + if (!is_compat_task()) + FUTEX_SET_VDSO_CS_RANGE(vdso, fd, 0, __riscv_xlen, __VDSO_SYMBOL); + +#ifdef CONFIG_COMPAT + if (is_compat_task()) + FUTEX_SET_VDSO_CS_RANGE(vdso, fd, 0, 32, __COMPAT_VDSO_SYMBOL); +#endif +} +#else +static inline void vdso_futex_robust_unlock_update_ips(void) {} +#endif + static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_struct *new_vma) { current->mm->context.vdso =3D (void *)new_vma->vm_start; =20 + vdso_futex_robust_unlock_update_ips(); + return 0; } =20 @@ -147,6 +206,8 @@ static int __setup_additional_pages(struct mm_struct *m= m, if (IS_ERR(ret)) goto up_fail; =20 + vdso_futex_robust_unlock_update_ips(); + return 0; =20 up_fail: diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makef= ile index 8dbf2532a573..8da2f605bde4 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -27,12 +27,17 @@ asflags-y +=3D -DVDSO_CFI=3D1 endif =20 # Files to link into the vdso -obj-vdso =3D $(patsubst %, %.o, $(vdso-syms)) note.o +obj-vdso :=3D $(patsubst %, %.o, $(vdso-syms)) note.o =20 ifdef CONFIG_VDSO_GETRANDOM obj-vdso +=3D vgetrandom-chacha.o endif =20 +ifdef CONFIG_FUTEX_ROBUST_UNLOCK +obj-vdso +=3D futex.o +vdso-syms +=3D __vdso_futex_robust_list$(BITS)_try_unlock +endif + ccflags-y :=3D -fno-stack-protector ccflags-y +=3D -DDISABLE_BRANCH_PROFILING ccflags-y +=3D -fno-builtin diff --git a/arch/riscv/kernel/vdso/futex.c b/arch/riscv/kernel/vdso/futex.c new file mode 100644 index 000000000000..761bf2a209a6 --- /dev/null +++ b/arch/riscv/kernel/vdso/futex.c @@ -0,0 +1,87 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include +#include +#include + +#define LABEL(pop_size, which) __stringify(__vdso_futex_list##pop_size##_t= ry_unlock_cs_##which) + +#define futex_robust_try_unlock_cas(pop_size, store_pop, lock, tid, pop) \ +({ \ + /* \ + * arch_futex_robust_unlock_get_pop() assumes the variables are in \ + * those registers. So make sure. \ + * \ + * tid and pop are in a1 and a2 at function entry according to the \ + * calling convention, so it likely still works if we remove _tid \ + * and _pop. But technically compiler is allowed to move tid and pop \ + * to different registers, and _tid and _pop do not generate any \ + * extra instructions so it does not hurt to keep them. \ + */ \ + register __u32 ret asm ("a0") =3D tid; \ + register __u32 _tid asm ("a1") =3D tid; \ + register void *_pop asm ("a2") =3D pop; \ + \ + asm volatile ( \ + " .option push\n" \ + " .option arch, +zacas\n" \ + " amocas.w.rl %[ret], zero, (%[lock])\n" \ + " .option pop\n" \ + LABEL(pop_size, cas_start)":" \ + " bne %[ret], %[tid], "LABEL(pop_size, cas_end)"\n" \ + " "store_pop" zero, (%[pop])\n" \ + LABEL(pop_size, cas_end)":" \ + : [ret] "+&r" (ret) \ + : [tid] "r" (_tid), \ + [lock] "r" (lock), \ + [pop] "r" (_pop) \ + : "memory" \ + ); \ + \ + ret; \ +}) + +#define futex_robust_try_unlock_lrsc(pop_size, store_pop, lock, tid, pop) \ +({ \ + register void *_pop asm ("a2") =3D pop; \ + __u32 ret; \ + \ + asm volatile ( \ + "1: lr.w %[ret], (%[lock])\n" \ + " bne %[ret], %[tid], "LABEL(pop_size, lrsc_end)"\n" \ + " sc.w.rl t0, x0, (%[lock])\n" \ + LABEL(pop_size, lrsc_start)":" \ + " bnez t0, 1b\n" \ + " "store_pop" zero, (%[pop])\n" \ + LABEL(pop_size, lrsc_end)":" \ + : [ret] "=3D&r" (ret) \ + : [tid] "r" (tid), \ + [lock] "r" (lock), \ + [pop] "r" (_pop) \ + : "t0", "memory" \ + ); \ + \ + ret; \ +}) + + +#if __riscv_xlen =3D=3D 64 +__u32 __vdso_futex_robust_list64_try_unlock(__u32 *lock, __u32 tid, __u64 = *pop) +{ + if (cpu_supports_zacas()) + return futex_robust_try_unlock_cas(64, "sd", lock, tid, pop); + else + return futex_robust_try_unlock_lrsc(64, "sd", lock, tid, pop); +} +#endif + +#if __riscv_xlen =3D=3D 32 +__u32 __vdso_futex_robust_list32_try_unlock(__u32 *lock, __u32 tid, __u32 = *pop) +{ + if (cpu_supports_zacas()) + return futex_robust_try_unlock_cas(32, "sw", lock, tid, pop); + else + return futex_robust_try_unlock_lrsc(32, "sw", lock, tid, pop); +} +#endif diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vds= o.lds.S index c29ef12a63bb..9acfa9ef5bab 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S @@ -82,6 +82,14 @@ VERSION #endif #if defined(CONFIG_VDSO_GETRANDOM) && !defined(COMPAT_VDSO) __vdso_getrandom; +#endif + +#ifdef CONFIG_FUTEX_ROBUST_UNLOCK +#if defined(CONFIG_32BIT) || defined(COMPAT_VDSO) + __vdso_futex_robust_list32_try_unlock; +#else + __vdso_futex_robust_list64_try_unlock; +#endif #endif local: *; }; --=20 2.47.3