From patchwork Fri Feb 11 01:30:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 541743 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp2703589imo; Thu, 10 Feb 2022 17:34:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzxBoIcGoyjJYbluX8F96K6R3ASGkAjrg0l226AoHpCtjluWxKyRlwWhYUXnmdZqv44D2ci X-Received: by 2002:a25:8511:: with SMTP id w17mr9325015ybk.199.1644543252639; Thu, 10 Feb 2022 17:34:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644543252; cv=none; d=google.com; s=arc-20160816; b=eOescoAAh/tZQSkgTHO/2nPmAWMplj6O1iZkgiFQkwASgxICSKqJdWWv8fPrThR8zQ OqdvCHB2FXZtdj/J+3RcwLr0BtcA6Pj3Vp2IVcxGXgw8QC0FhZvVibIrFxpHW1wUsOrr w7ulRuL8C2clB5ueazbiuXP7UXJaG/PvbZIGnMrzzD25QqAnzjudS0PkDwUCoEDMUSEn GTJ2NOK+XWqu6/cPYeP1ppx6xJsDB0Ll7HsiCN1PlAsbcfHy8L+uAablnP5r3cizYTXL rRauoHEiKdO+x5SfikLYpD2jUvRTnofUqfhFDZKOknxfao6xBD/R90OZdkSO6V5vLQja chlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=Uh058XUts6HPkXe97baHsy8/Ac7JrSk6cgbCWbIo3VY=; b=RY0Tsk53xgheQHD9FOcMg20RDl3BTlUOF6W++1zdrHSMs9TdXjZqCMfX5voBRh6Jzb 6wyMstUcl2Zt1tMfnr21RF/qc5vQwxcH20rKXegcInJT3LQTKdNXTtHoBHsjBNchshFE q3JmY+CkqxttKYNadGZfQYw3N2LHq3yFCX+/WjlLW3l2+J0jQQWfyZHBz9yhM9RMkJLv xnwgww8NfVtBsBsJltVstETTPcYel3SnaCjX7s1YAaIEf8x8Wom1k6Djgvz6atxYM3x8 kxjcv8CD3Ld8wyS2rdkHemJvGR4gcg4IQbcdTt7dBu+metqBtk6bZMku31/wXk0yfehj 8PKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wdT5wqOH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f66si15308000ybc.513.2022.02.10.17.34.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Feb 2022 17:34:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wdT5wqOH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIKpA-0003sz-2q for patch@linaro.org; Thu, 10 Feb 2022 20:34:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIKmh-0003rb-9l for qemu-devel@nongnu.org; Thu, 10 Feb 2022 20:31:39 -0500 Received: from [2607:f8b0:4864:20::430] (port=33299 helo=mail-pf1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIKmf-0007Gm-DD for qemu-devel@nongnu.org; Thu, 10 Feb 2022 20:31:38 -0500 Received: by mail-pf1-x430.google.com with SMTP id t36so2649569pfg.0 for ; Thu, 10 Feb 2022 17:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uh058XUts6HPkXe97baHsy8/Ac7JrSk6cgbCWbIo3VY=; b=wdT5wqOHtCK00lz8qk8V6QiN3qsPta+212aIV78F2/wVMq3GHMnJesZDipXC5KqlAF vlUHhveWbf6k2jf1clTTVp9cW9F/JCAKSzvRGSJEYkweeS1gyIzXAA3nuuiLL67QVN8l nDcrQxZ9XbbcqaoGd2YTpfd6a6+6kZ2xzB7CFT0bO+nz1esH4H7M5HUg2nlUvxShpWrK QGxPs/tjoQxXQ0b/HtBvuKt6o2AYIFORKC/2j8RTmbj/q9RvHMGItgYqEXNxX/fJSbfR GAwAl2VGAnwNbPbkNSUo9A1alMMpbuMvZa/BE02dnwj2iA27tpKpxLG7WaYQ5/0b715H 1Iwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uh058XUts6HPkXe97baHsy8/Ac7JrSk6cgbCWbIo3VY=; b=UnXSmSiJgapENL9rMWkkoOjhyEX4DyHRTcd2983tRqxLFuGCkCyXsMqSzr0U9P9szt falTs4nt6OVK8U+LzbIn6/w2GZzO4cSW1qnDtKh9laQQk7T4llCLtvr2qWlL6jXukTuU ZgNwLuLOpDGhmXqixdM9xCmX0yx6+GVyeJNHkA7oXDf/nTuGDLDwpKf+1mADJiJk2JGr 0xBdXilSNA1XSKKuelCh2211XqKFXhsDShaxTwtrllLotd5uL+yNQAIMFt8lSlxrfME1 fT6Zg9PPWxI8jqWRkjdUzvGTS2i2QphUA/NhqyAD5rXW+hCPRyaQJIOViSpzwEXmKbCB 2iJg== X-Gm-Message-State: AOAM533WLMCExIeTfBR+ZHN0kcEVYrGbQu6xMNsf9oZICedIFnGETCyx OPUjyZR7scyYWbmdZRXncRQqxwMFSJArd/TO X-Received: by 2002:a63:64c:: with SMTP id 73mr4441615pgg.360.1644543096015; Thu, 10 Feb 2022 17:31:36 -0800 (PST) Received: from localhost.localdomain ([124.189.222.164]) by smtp.gmail.com with ESMTPSA id h5sm25738788pfi.111.2022.02.10.17.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 17:31:35 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/34] common-user/host/sparc64: Fix safe_syscall_base Date: Fri, 11 Feb 2022 12:30:26 +1100 Message-Id: <20220211013059.17994-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220211013059.17994-1-richard.henderson@linaro.org> References: <20220211013059.17994-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::430 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use the "retl" instead of "ret" instruction alias, since we do not allocate a register window in this function. Fix the offset to the first stacked parameter, which lies beyond the register window save area. Fixes: 95c021dac835 ("linux-user/host/sparc64: Add safe-syscall.inc.S") Signed-off-by: Richard Henderson --- common-user/host/sparc64/safe-syscall.inc.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common-user/host/sparc64/safe-syscall.inc.S b/common-user/host/sparc64/safe-syscall.inc.S index a2f2b9c967..c7be8f2d25 100644 --- a/common-user/host/sparc64/safe-syscall.inc.S +++ b/common-user/host/sparc64/safe-syscall.inc.S @@ -24,7 +24,8 @@ .type safe_syscall_end, @function #define STACK_BIAS 2047 -#define PARAM(N) STACK_BIAS + N*8 +#define WINDOW_SIZE 16 * 8 +#define PARAM(N) STACK_BIAS + WINDOW_SIZE + N * 8 /* * This is the entry point for making a system call. The calling @@ -74,7 +75,7 @@ safe_syscall_end: /* code path for having successfully executed the syscall */ bcs,pn %xcc, 1f nop - ret + retl nop /* code path when we didn't execute the syscall */