From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) (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 55A522D97AA; Sun, 5 Jul 2026 17:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.97.179.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783274280; cv=none; b=X3DoiCIHmGhDlYU1aWz6xcKcdUdFtCpHF3RGZFavZxsZ9ZtiDg5wrdSPSMQAV0FNASptDoJ5W+dNhn9k14VXSByz12SbTy6MvTbWZaw46/2BqyCzLLUtM4f24GelOz3qh2Fs3IMgaSX88Q9ZlonhBhDE06jNcsOu+4ujY/pHaX0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783274280; c=relaxed/simple; bh=vpN8IxfOhDXyVs8kkIrDnlBxFeqO6+0CNAnot2BSRXA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lI2vJeBcOnFUOl54lqOcM/2nRZEZrdknRSYY4riV0b5QvIrJ4xpIiJYr6IDopRKIITmN/SSDpwMZ7ncZWj1yyt76q+mcn5R79uCWCh5LkR/vdmzYY6Fj91Ml0Kam+Ii3HzlHntXFcC03druQ3egC6ITja7XIHXk9p4hkzhLhFuM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b=LYwqKzj2; arc=none smtp.client-ip=213.97.179.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="LYwqKzj2" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=b0AOh/du7rk/Bwrq2Hm83ndmieYYcKgBe1lIXVSJQZ0=; b=LYwqKzj2s+9TRqu/uYZ6DJwAS4 zp1DOlxHGGuS9YsGmQpC2gvRKgIq7qYFOsuFxqA9ZtJcMEYtC+c30kCCMcSaHMFhotAYL4vF3l3M7 kLebeNI+ynugbW6LSh0cBUMczu08ksOdf75R5JLqmfLfa/fBmbNhMCcrDLGZzJSvgsyz7wCPW9SCl qyTQhE78y39qL3Uz7rWTCwAQXv9g8oPsXwGe1m8VMEd2KYctNvG0HDcpKXQMGiwi3qSlwxBHAnAZH ya2kYXSCXb58335OvkYN9KfqVaOab8XJ06fwBMDZ4eedidOTsI2x2ivM5BnQqvyxCsWmCAIyfAFTU RurUFcUA==; Received: from 201-69-111-23.dial-up.telesp.net.br ([201.69.111.23] helo=[192.168.15.100]) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1wgR5x-009PnY-PK; Sun, 05 Jul 2026 19:57:33 +0200 From: =?utf-8?q?Andr=C3=A9_Almeida?= Date: Sun, 05 Jul 2026 14:56:54 -0300 Subject: [PATCH v4 4/5] arm64: vdso32: Bring vdso32-offsets.h back Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260705-tonyk-robust_arm-v4-4-e0fd0fa259d3@igalia.com> References: <20260705-tonyk-robust_arm-v4-0-e0fd0fa259d3@igalia.com> In-Reply-To: <20260705-tonyk-robust_arm-v4-0-e0fd0fa259d3@igalia.com> To: Catalin Marinas , Will Deacon , Thomas Gleixner , Mark Rutland , Mathieu Desnoyers , Sebastian Andrzej Siewior , Carlos O'Donell , Peter Zijlstra , Florian Weimer , Rich Felker , Torvald Riegel , Darren Hart , Ingo Molnar , Davidlohr Bueso , Arnd Bergmann , Uros Bizjak , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , "Liam R. Howlett" Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, kernel-dev@igalia.com, LKML , =?utf-8?q?Andr=C3=A9_Almeida?= X-Mailer: b4 0.15.2 Commit c7767f5c43df ("arm64: vdso32: Remove unused vdso32-offsets.h") removed vdso32-offsets.h because it was empty and therefore useless. With the introduction of __vdso_futex_robust_try_unlock(), there is the need to expose offsets again. Signed-off-by: André Almeida --- arch/arm64/Makefile | 2 +- arch/arm64/include/asm/vdso.h | 3 +++ arch/arm64/kernel/vdso32/Makefile | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 6b005c8fef70..265716644193 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -211,7 +211,7 @@ vdso_prepare: prepare0 include/generated/vdso-offsets.h arch/arm64/kernel/vdso/vdso.so ifdef CONFIG_COMPAT_VDSO $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 \ - arch/arm64/kernel/vdso32/vdso.so + include/generated/vdso32-offsets.h arch/arm64/kernel/vdso32/vdso.so endif endif diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h index 232b46969088..43a214b93524 100644 --- a/arch/arm64/include/asm/vdso.h +++ b/arch/arm64/include/asm/vdso.h @@ -10,6 +10,9 @@ #ifndef __ASSEMBLER__ #include +#ifdef CONFIG_COMPAT_VDSO +#include +#endif #define VDSO_SYMBOL(base, name) \ ({ \ diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index bea3675fa668..4bd60f059f4a 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -135,6 +135,14 @@ $(c-obj-vdso-gettimeofday): %.o: %.c FORCE $(asm-obj-vdso): %.o: %.S FORCE $(call if_changed_dep,vdsoas) +# Generate VDSO offsets using helper script +gen-vdsosym := $(src)/../vdso/gen_vdso_offsets.sh +quiet_cmd_vdsosym = VDSOSYM $@ + cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ + +include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE + $(call if_changed,vdsosym) + # Actual build commands quiet_cmd_vdsold_and_vdso_check = LD32 $@ cmd_vdsold_and_vdso_check = $(cmd_vdsold); $(cmd_vdso_check) -- 2.54.0