From patchwork Tue Mar 18 10:46:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 874398 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp2442904wrq; Tue, 18 Mar 2025 03:48:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKgN1tBOdNLytNri6YQe5Hxc+XbZLXv6LkIFFo4K6hTmEaRfO5hefFY4/ZJpCcpAxWugiRjg==@linaro.org X-Google-Smtp-Source: AGHT+IFnSXDXyEMwOPQNJyuUYoI+JlOLVu+H8h7QyVn8c7llQtqlOff0lQ4Jd59sgcJAeNp6T7d0 X-Received: by 2002:a05:690c:6081:b0:6ef:8e4c:65ea with SMTP id 00721157ae682-6ff45ef7195mr193207017b3.5.1742294886046; Tue, 18 Mar 2025 03:48:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742294886; cv=none; d=google.com; s=arc-20240605; b=OINf6G6Vfy/Y0ALVL/9nEIrKqoewbbQBUEeFNGp8iVOahIyQzObZGYkPR8D1hAXRQx JP5LuPYDcWOpdhPSdkaF4rRUX4i1AfN9I8tVMR9pfe9ENyjKxA2DbQI/AcEKTVTtDo5S WQ+3lq8QXLY+Dm5uSgd/g4R2hCSAEqMp4YjNPpPs6UR/0jo6LKHLq19RBQ6OwBv3T80F 7rmbiNnQWm0mvLiRE4rn2KUwv6z6eOIi9FiwXS3PNOPhJrPErGitnEA9yUBfoUCH7RSX UzZ6HxR8RQDWWfnWHvqHJ2wmM9VinbSLMCE+UShtfhmpqAnVYeXx3UBOgHHTIi5Vssfw u7pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TUPMXX+5sSwyIqdYqFFgUpRfjoD0n8qbhqt4q3YOLUA=; fh=HaKHCOHL46OAAPpM3W6HDLkDmJxXWc+qggc/xnkS9u8=; b=b8ukp+/SGX/7M09EoX+xGFCCv39fXpdUraNaQgM8zUxdzf9GOsJHcd4LFIaiB44sTi 6qkteERMzocc1+G/jfDkHZ4CQcyJIYWGdwgaJmxQheItmmpM0PQPrSoBJZ00CJL/p6B7 IrVzRk/9HGpAGCzt1CIdwcVMZXTyVPDknC6WRAk+s+bvC1bkDXCI1DOZ144Rx2IN98mL Sjd9AOFnC7ps9nLsFf4xjQOlNiVGyZUpLDrVSA2tlaHYzAqESC5DAYkD5jOTdi+DK/Li Az6l4WMdOaYIwMRlXlAz66xA0sNr2kDeVY92MIeN/WRu306/NozEDKUpJ3xHecHG7i/W hhDw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QZ0OQDGg; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id 00721157ae682-6ff32857a24si88492667b3.96.2025.03.18.03.48.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 03:48:06 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QZ0OQDGg; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 00E658129F; Tue, 18 Mar 2025 11:47:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QZ0OQDGg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 185CB80548; Tue, 18 Mar 2025 11:47:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9D1AB800B3 for ; Tue, 18 Mar 2025 11:47:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so31940785e9.3 for ; Tue, 18 Mar 2025 03:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742294844; x=1742899644; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TUPMXX+5sSwyIqdYqFFgUpRfjoD0n8qbhqt4q3YOLUA=; b=QZ0OQDGgOaMsA+X34dChb2rn3VTbAXHRPktikZCn2IymknNPJhk+xHujju6z/z0Jto pCF2DqZF56JRsmL+Jz/lqXPzR61D/QkIYOy8QMz4OAMU5QJJS+4ggb1wgWgBq4fTY+nl x5TLHoqORUYXEzeLOVCY0Z67lmZ0mwHRM0iCVW4QvzwZmH4s2r4IibTXQk9UXvUgN16X TJFFktA+RrDvUMJHIWzXV19wfeMdCd89KAbP5iG/8rG/iGjso34xvrruR3Sq0PaTej2v cg9WgGARLMLY4pk46B3gMF64JMOlPrp5xIdPicHs62pnqSb/4vcZOhpBMStASyg3Lzi6 HHMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742294844; x=1742899644; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TUPMXX+5sSwyIqdYqFFgUpRfjoD0n8qbhqt4q3YOLUA=; b=k0PP9y2eXcKUoyPCDXG2eD8AV3US5eMjD4XS3GWzi/gUhstNEhHgozrb8Lpnbc5LPC IbwXPpAcThIEPIHwEPnT7eVlwXUlMGU+za80BmLfhTsfaZrSlrQjYIoWYkNVpEioRISk KjkqrFikukG6IV+UodSSBWxXUbZg3rRM+IdEBTCrZxOi6D1TlHnZMV2BfJffIju1CnYx Fz94KNsQiQEZo6OKL07dDBbxNhMPHtWhf+IqxZJNn5yvD+/RV5uARt0XMFndMrSEOSKa Ee3LTa/yTHMBu9WPn+9eB83cq/7z4YFS4uxHBlxXD8WvXyl961R2IzXKNwOQtwPfeuqW grzA== X-Gm-Message-State: AOJu0YyJUE0MFCMzumyhraPCfclhn3HHyketo3XSVScyeg3oThdDYm3G BaOHFLMrh1rX0RQrG7Wd2mOqCrILBzsHB7awzol3hcPEZTzQeaDDajdyxICHcsMnb51S62kcOjp YHHrHsQ== X-Gm-Gg: ASbGncvH08sVOgxWW7Zv/epdAAA3yCHq9pKXuYcL902SQRt/PP3FPE4rB8z4iLFc5Tn d3D3iSq7veNPzAWriGbELp2wUMZ8u+ny9EsaZUaFhLqeKcto1M7cQsrvam52hDatNuOiMCPMXVp WfIIp/ZyinG0c/v9mJPvUXcAaFVGvfk7POlojqiMvPE3SET2T8+ej6FY2OLsMUunef/hkZD+fBl x25UznycKNfk0L9EMonLQEOMPLjsZXg01P14o3yb8X1xXi2OTZfoTHBJAwVkrvqngafZsdWO041 M5ZzDdnsm7PNp1+aHYgt763BpaGhLplv3hZsZj2Datqw1wFOYw2nKA== X-Received: by 2002:a05:600c:138b:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-43d3ba2962emr19332985e9.30.1742294843741; Tue, 18 Mar 2025 03:47:23 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:78bd:2e7e:120c:26bb]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fdda2dbsm131788185e9.2.2025.03.18.03.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 03:47:23 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Jerome Forissier , Simon Glass , Tom Rini Subject: [PATCH v4 04/14] sandbox: add initjmp() Date: Tue, 18 Mar 2025 11:46:40 +0100 Message-ID: <20250318104659.1114340-5-jerome.forissier@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250318104659.1114340-1-jerome.forissier@linaro.org> References: <20250318104659.1114340-1-jerome.forissier@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add ininijmp() to sandbox. The implementation is taken verbatim from barebox [1] with the exception of the additional stack_sz argument. It is quite complex because contrary to U-Boot platform code we don't know how the system's C library implements the jump buffer, so we can't just write the function and stack pointers into it. [1] https://github.com/barebox/barebox/blob/b2a15c383ddc/arch/sandbox/os/setjmp.c Signed-off-by: Jerome Forissier --- arch/sandbox/cpu/Makefile | 11 ++- arch/sandbox/cpu/initjmp.c | 175 +++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 arch/sandbox/cpu/initjmp.c diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile index bfcdc335d32..038ad78accc 100644 --- a/arch/sandbox/cpu/Makefile +++ b/arch/sandbox/cpu/Makefile @@ -5,7 +5,7 @@ # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-y := cache.o cpu.o state.o +obj-y := cache.o cpu.o state.o initjmp.o extra-y := start.o os.o extra-$(CONFIG_SANDBOX_SDL) += sdl.o obj-$(CONFIG_XPL_BUILD) += spl.o @@ -29,6 +29,15 @@ cmd_cc_eth-raw-os.o = $(CC) $(filter-out -nostdinc, \ $(obj)/eth-raw-os.o: $(src)/eth-raw-os.c FORCE $(call if_changed_dep,cc_eth-raw-os.o) +# initjmp.c is build in the system environment, so needs standard includes +# CFLAGS_REMOVE_initjmp.o cannot be used to drop header include path +quiet_cmd_cc_initjmp.o = CC $(quiet_modtag) $@ +cmd_cc_initjmp.o = $(CC) $(filter-out -nostdinc, \ + $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $< + +$(obj)/initjmp.o: $(src)/initjmp.c FORCE + $(call if_changed_dep,cc_initjmp.o) + # sdl.c fails to build with -fshort-wchar using musl cmd_cc_sdl.o = $(CC) $(filter-out -nostdinc -fshort-wchar, \ $(patsubst -I%,-idirafter%,$(c_flags))) -fno-lto -c -o $@ $< diff --git a/arch/sandbox/cpu/initjmp.c b/arch/sandbox/cpu/initjmp.c new file mode 100644 index 00000000000..6e72d32cb4b --- /dev/null +++ b/arch/sandbox/cpu/initjmp.c @@ -0,0 +1,175 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* + * An implementation of initjmp() in C, that plays well with the system's + * setjmp() and longjmp() functions. + * Taken verbatim from arch/sandbox/os/setjmp.c in the barebox project. + * Modified so that initjmp() accepts a stack_size argument. + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2011 Kevin Wolf + * Copyright (C) 2012 Alex Barcelo + * Copyright (C) 2021 Ahmad Fatoum, Pengutronix + * Copyright (C) 2025 Linaro Ltd. + * This file is partly based on pth_mctx.c, from the GNU Portable Threads + * Copyright (c) 1999-2006 Ralf S. Engelschall + */ + +/* XXX Is there a nicer way to disable glibc's stack check for longjmp? */ +#ifdef _FORTIFY_SOURCE +#undef _FORTIFY_SOURCE +#endif + +#include +#include +#include +#include +#include + +typedef sigjmp_buf _jmp_buf __attribute__((aligned((16)))); +_Static_assert(sizeof(_jmp_buf) <= 512, "sigjmp_buf size exceeds expectation"); + +/* + * Information for the signal handler (trampoline) + */ +static struct { + _jmp_buf *reenter; + void (*entry)(void); + volatile sig_atomic_t called; +} tr_state; + +/* + * "boot" function + * This is what starts the coroutine, is called from the trampoline + * (from the signal handler when it is not signal handling, read ahead + * for more information). + */ +static void __attribute__((noinline, noreturn)) +coroutine_bootstrap(void (*entry)(void)) +{ + for (;;) + entry(); +} + +/* + * This is used as the signal handler. This is called with the brand new stack + * (thanks to sigaltstack). We have to return, given that this is a signal + * handler and the sigmask and some other things are changed. + */ +static void coroutine_trampoline(int signal) +{ + /* Get the thread specific information */ + tr_state.called = 1; + + /* + * Here we have to do a bit of a ping pong between the caller, given that + * this is a signal handler and we have to do a return "soon". Then the + * caller can reestablish everything and do a siglongjmp here again. + */ + if (!sigsetjmp(*tr_state.reenter, 0)) { + return; + } + + /* + * Ok, the caller has siglongjmp'ed back to us, so now prepare + * us for the real machine state switching. We have to jump + * into another function here to get a new stack context for + * the auto variables (which have to be auto-variables + * because the start of the thread happens later). Else with + * PIC (i.e. Position Independent Code which is used when PTH + * is built as a shared library) most platforms would + * horrible core dump as experience showed. + */ + coroutine_bootstrap(tr_state.entry); +} + +int __attribute__((weak)) initjmp(_jmp_buf jmp, void (*func)(void), + void *stack_base, size_t stack_size) +{ + struct sigaction sa; + struct sigaction osa; + stack_t ss; + stack_t oss; + sigset_t sigs; + sigset_t osigs; + + /* The way to manipulate stack is with the sigaltstack function. We + * prepare a stack, with it delivering a signal to ourselves and then + * put sigsetjmp/siglongjmp where needed. + * This has been done keeping coroutine-ucontext (from the QEMU project) + * as a model and with the pth ideas (GNU Portable Threads). + * See coroutine-ucontext for the basics of the coroutines and see + * pth_mctx.c (from the pth project) for the + * sigaltstack way of manipulating stacks. + */ + + tr_state.entry = func; + tr_state.reenter = (void *)jmp; + + /* + * Preserve the SIGUSR2 signal state, block SIGUSR2, + * and establish our signal handler. The signal will + * later transfer control onto the signal stack. + */ + sigemptyset(&sigs); + sigaddset(&sigs, SIGUSR2); + pthread_sigmask(SIG_BLOCK, &sigs, &osigs); + sa.sa_handler = coroutine_trampoline; + sigfillset(&sa.sa_mask); + sa.sa_flags = SA_ONSTACK; + if (sigaction(SIGUSR2, &sa, &osa) != 0) { + return -1; + } + + /* + * Set the new stack. + */ + ss.ss_sp = stack_base; + ss.ss_size = stack_size; + ss.ss_flags = 0; + if (sigaltstack(&ss, &oss) < 0) { + return -1; + } + + /* + * Now transfer control onto the signal stack and set it up. + * It will return immediately via "return" after the sigsetjmp() + * was performed. Be careful here with race conditions. The + * signal can be delivered the first time sigsuspend() is + * called. + */ + tr_state.called = 0; + pthread_kill(pthread_self(), SIGUSR2); + sigfillset(&sigs); + sigdelset(&sigs, SIGUSR2); + while (!tr_state.called) { + sigsuspend(&sigs); + } + + /* + * Inform the system that we are back off the signal stack by + * removing the alternative signal stack. Be careful here: It + * first has to be disabled, before it can be removed. + */ + sigaltstack(NULL, &ss); + ss.ss_flags = SS_DISABLE; + if (sigaltstack(&ss, NULL) < 0) { + return -1; + } + sigaltstack(NULL, &ss); + if (!(oss.ss_flags & SS_DISABLE)) { + sigaltstack(&oss, NULL); + } + + /* + * Restore the old SIGUSR2 signal handler and mask + */ + sigaction(SIGUSR2, &osa, NULL); + pthread_sigmask(SIG_SETMASK, &osigs, NULL); + + /* + * jmp can now be used to enter the trampoline again, but not as a + * signal handler. Instead it's longjmp'd to directly. + */ + return 0; +} +