From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750925; cv=none; d=zohomail.com; s=zohoarc; b=R9eA6L7NNZwy0cKn8DAOSYK9ZM98AZSLP/CCodPPTtsm5+EiCiCLO1ncXfFmnvV+Up+TaGIK8lvPr4RqFDWlgrq1yGqGoDC3tTwuV8bbPNjizZJS3eVtzT9T3Z1JjNgputs6jA1Z6IZPjePxSfUaFBINRtFJZ+Bssan1DduXl1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750925; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qF+Rh4Z//XloQGlanOoCz61ZgUvkOnM9tqWX1k+rwd4=; b=hDFOTi0dDxnE3k7zO/pYOwPSV+KRYr/bHyX88xmiowusS01wxdf+l+jhphAG4pUch8hc1H0nejZPnAtVwvr+S0oZVGGcOmjHrd2KhfPMytZJJNND/M/3aV+vGtnXhLIo3i5RpJCsU0czz0c7ckAFUR2hbuGbwq2b8jymAVcLykw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711750925703407.4569044224794; Fri, 29 Mar 2024 15:22:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKad-00055T-Pf; Fri, 29 Mar 2024 18:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKab-00054x-Qh for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:45 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKaa-0001ou-7L for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:45 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6e6ee9e3cffso1660052b3a.1 for ; Fri, 29 Mar 2024 15:20:43 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750842; x=1712355642; darn=nongnu.org; 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=qF+Rh4Z//XloQGlanOoCz61ZgUvkOnM9tqWX1k+rwd4=; b=Xz7eHbhUkCd9TyXkGaZ+qKhgXg9FwIw29oA9BIPtTuV+Q9oIZ5/wsCdwt0DEN2avJS v4F3xqvcKqJs8oISaYN9lUfHFyQlIwIh2lBCF6fa0TTLDxrMmQfivQyG++cLbdPJPyyY 5xuUkRk1jKTUjdrdAHmcFiwX3/DZUY1jKP5dPvzpwjqkWVgoWEFp3Xkqdd24ffFQgX9j XOY6O/OTAvh8AKZ0CAsdLiX9rxNI43gffYEpbmPvfyXFvQU3RYfisNSR4YpsyfdyWvuq zI5qFYIMtrn0+Yi6YaiKXYY6iE0Q0sIs9hqXqbAlli7TS/TWI8gOf9nwO++0OGlsp2AE DYZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750842; x=1712355642; 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=qF+Rh4Z//XloQGlanOoCz61ZgUvkOnM9tqWX1k+rwd4=; b=OwT1nGCzT25Bs1bxPZ0MCPylINSPaxiLJlB8A5W1Sjw836b1jkh/CDVdztQ3dcjFi5 i/fdilNGSw7aBRIjV5NHey8NzBkxNjFqP9PsMSiZOo/YTjl64rSEWDnDIZnTVlcGPAlO u1BWxMSdYgHtevAMXmJXv/p30u4Js2kgdeRcPZigI3UNi6fK90dsD47gYO/1lMGhUgg7 PwET+dpaCYaGRR0vKWr7PQjB/pBdExujDiil+vxlSHhHkNR92/46ec4ThvU9X9Tjr51F esz7sEOcRsqKYDFys9COsdHq+pl6jlmKEXM2RelG5KevRmdb2LcPEbS8Nmsz8MibKet/ JaYA== X-Gm-Message-State: AOJu0YxFcSAY05H6fUGCea9fZ7tjuGvEqzEmJokIhn2uWSKdzH/r4Idu JR/Ji2Qm/bMAmts7uib6FX89QoKkJWaubc20KZl+lBmgtgEgi95eblctehdLvzAjqEOzAQ3Jhk8 N X-Google-Smtp-Source: AGHT+IG0RhdooewXZV5S7wSZqjvQgtG2LAV/IdTuEFq5PWQN37a1i8WimxMt8cqQSbl0cZAwIMtKAA== X-Received: by 2002:a05:6a00:2e22:b0:6e6:fb9a:fb45 with SMTP id fc34-20020a056a002e2200b006e6fb9afb45mr5145614pfb.1.1711750842349; Fri, 29 Mar 2024 15:20:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich Subject: [PULL 1/7] linux-user: Fix semctl() strace Date: Fri, 29 Mar 2024 12:20:31 -1000 Message-Id: <20240329222037.1735350-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750927547100003 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich The indices of arguments used with semctl() are all off-by-1, because arg1 is the ipc() command. Fix them. While at it, reuse print_semctl(). New output (for a small test program): 3540333 semctl(999,888,SEM_INFO,0x00007fe5051ee9a0) =3D -1 errno=3D14 (= Bad address) Fixes: 7ccfb2eb5f9d ("Fix warnings that would be caused by gcc flag -Wwrite= -strings") Reviewed-by: Richard Henderson Signed-off-by: Ilya Leoshkevich Message-Id: <20240325192436.561154-2-iii@linux.ibm.com> Signed-off-by: Richard Henderson --- linux-user/strace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 8d13e55a5b..51a5bdd95f 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -657,7 +657,6 @@ print_newselect(CPUArchState *cpu_env, const struct sys= callname *name, } #endif =20 -#ifdef TARGET_NR_semctl static void print_semctl(CPUArchState *cpu_env, const struct syscallname *name, abi_long arg1, abi_long arg2, abi_long arg3, @@ -668,7 +667,6 @@ print_semctl(CPUArchState *cpu_env, const struct syscal= lname *name, print_ipc_cmd(arg3); qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); } -#endif =20 static void print_shmat(CPUArchState *cpu_env, const struct syscallname *name, @@ -698,10 +696,8 @@ print_ipc(CPUArchState *cpu_env, const struct syscalln= ame *name, { switch(arg1) { case IPCOP_semctl: - qemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", - arg1, arg2); - print_ipc_cmd(arg3); - qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); + print_semctl(cpu_env, &(const struct syscallname){ .name =3D "semc= tl" }, + arg2, arg3, arg4, arg5, 0, 0); break; case IPCOP_shmat: print_shmat(cpu_env, &(const struct syscallname){ .name =3D "shmat= " }, --=20 2.34.1 From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750917; cv=none; d=zohomail.com; s=zohoarc; b=GBOWWdQsxSe0rEC93C4uWeHQl0k9u1lxAWUmjo4SyWZwyxtsVJBRsJxYXkEgdvmo3MUBNQ24kSxyUCcjZEGtIiOlNbsPOeKRxkIvb+3WyAYi0i8CknYBk2DqzR1++5+9t8WiY+pfQTdrHTdYM8LNH8FfI+84YWmEzGwXzKzdRew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750917; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vLgHs0lHF4uZkMVrK5zDEoSHxG5H5AOQOiZmQyJc1i4=; b=J0PYq70fAO0yPZ4LwwC0OMDr4I+QdmmzYxMPjp/fdcN7ne34Ruxl8qccFVeC86dlhuDt1W8e0cAzUYyScR7T8QItYELlxLoVT/y4Zk/sEEsgSbGygMlTO90H3wuX6iTvX3iltOiLF+3GB880kJTkoz0PnoMf0fB8T2WLbV8vMrg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711750917251986.5465818877873; Fri, 29 Mar 2024 15:21:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKae-00055e-Cn; Fri, 29 Mar 2024 18:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKac-000555-Hl for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:46 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKab-0001oz-41 for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:46 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6eaf1005fcaso340711b3a.3 for ; Fri, 29 Mar 2024 15:20:44 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750844; x=1712355644; darn=nongnu.org; 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=vLgHs0lHF4uZkMVrK5zDEoSHxG5H5AOQOiZmQyJc1i4=; b=L3rbRcnRU37YopaavvC0LPVDLo74+HkRRKxSgjIyIzxLkJETfQJeqDukH+Xu+cTf2F p5HtKh3bCO7qRyMkJMHzbUmMdD8gBYMGfB6UkU4OWYgdKnuzCty4Fd7IsB6PQOVB8aYt CgDNQ2aOg1jfl0CsQUkhBA+Uh4nmOL2vN2Z4JGO75V8cc8WGfC3Baaw/eyDfJ0YxksgE +Fskm1H6/tqSj6mamxDqDZ6LuvxNgreNbNMyhmW9wGVMWfFvgGGZwp5Hd6vpcB8ctI8V qqY4aMN511OPDw2wjJKMdPvw74dV4ztuW0cWm6bXtsAlYCodR6GwCiIyHdOZWStCJQN+ 0a5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750844; x=1712355644; 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=vLgHs0lHF4uZkMVrK5zDEoSHxG5H5AOQOiZmQyJc1i4=; b=f8zDPMg8WVYdh1waAvDRZU5fF8Bq09hyIjFGXmrNui5JcTQ0FyEJrnx9eI/OaJhc4N Z0lEOYIOPURUDa8IdMrra9TfHIzwh7Lxon9vrI1kJ0BaZ/COkFfhR4G3kHRb+u3OPBZz nyeBAelAXtelyRd4h7rY9PHegsiqtMEMPjw2tzPuWSJFQblS95uomChB6zYFTB2qaAEo ePIqPmcyXIX/o6EzHnYCnIoIcTmaGv/gHZSzwxcS7hFfM751BW2VEiOTcUZcgzGh7TAv 6/ra5uPJLn2fsUOa0Y9DmK/O9J7gAJ/aQ3GSZCdaghpdwxu+P+wvVE6wGL+z1eMrUMCb tQlA== X-Gm-Message-State: AOJu0YwNZJgQ5A14VLE3fGP+ytzyfnJe5oxB/7qC+xnE2snIn0UAksnd mNXKxmwuG9zzRIE+Q0FPFJJ6p36zmVmI3sPgUasR9oWeoy4LECdicbsTyU15uCA1ydPlWu9K/0k f X-Google-Smtp-Source: AGHT+IHN59+by1kIong4yHUfgIuSfRFMHf1n2EmLUVLGCxvDf6ks61L3QSP90pJnYZnvhPb35MNbSw== X-Received: by 2002:a05:6a20:ae86:b0:1a3:dc19:e5a0 with SMTP id do6-20020a056a20ae8600b001a3dc19e5a0mr2851946pzb.41.1711750843638; Fri, 29 Mar 2024 15:20:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich Subject: [PULL 2/7] linux-user: Fix shmat() strace Date: Fri, 29 Mar 2024 12:20:32 -1000 Message-Id: <20240329222037.1735350-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750917509100001 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich The indices of arguments passed to print_shmat() are all off-by-1, because arg1 is the ipc() command. Fix them. New output for linux-shmat-maps test: 3501769 shmat(4784214,0x0000000000800000,SHM_RND) =3D 0 Fixes: 9f7c97324c27 ("linux-user: Add strace for shmat") Reviewed-by: Richard Henderson Signed-off-by: Ilya Leoshkevich Message-Id: <20240325192436.561154-3-iii@linux.ibm.com> Signed-off-by: Richard Henderson --- linux-user/strace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 51a5bdd95f..b4d1098170 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -701,7 +701,7 @@ print_ipc(CPUArchState *cpu_env, const struct syscallna= me *name, break; case IPCOP_shmat: print_shmat(cpu_env, &(const struct syscallname){ .name =3D "shmat= " }, - arg1, arg4, arg2, 0, 0, 0); + arg2, arg5, arg3, 0, 0, 0); break; default: qemu_log(("%s(" --=20 2.34.1 From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750929; cv=none; d=zohomail.com; s=zohoarc; b=D7RBSNkicJhFwSQYG2jGQGJHA4EX8sdH6P7taUScqzf3gsPUvHo57fW14e7OJX5/48fVRIsW1HSwId8wDIA6tvi0ka0ZXXZsbhXm3UOLlCheYN60q+9i87gdBF1ObKyTOJOGC+6xb6DaaGpnBDpGY4BlH+WgRzoqjmJrqGc6+z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750929; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HtUHg09UOjxxYBJJEpdXT1anxY6jjxQxzEq5yXQbAXE=; b=CppQ/rx0P0/qlMEaVehak8eQDLFEA6TKFQGycJuSBuCwRwkKuQNludxPmERLzogH47+wMWvl2tbWWACJffG/M0CBKWkIfxIpE97LTRgYl3vXexL9WujIamPjM4p7eaoCXCHPGkg6IEDGY9eVo94d7OoKzPhESeplZvt8gFQBx1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711750929536761.7554954176231; Fri, 29 Mar 2024 15:22:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKae-00055n-Ss; Fri, 29 Mar 2024 18:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKad-00055U-PG for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:47 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKac-0001p9-9T for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:47 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6e74bd85f26so2032981b3a.1 for ; Fri, 29 Mar 2024 15:20:45 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750845; x=1712355645; darn=nongnu.org; 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=HtUHg09UOjxxYBJJEpdXT1anxY6jjxQxzEq5yXQbAXE=; b=yBJGaOdrjxNQNBorSTQqmPpBX4T4sd3LXvM2cI1rJX+8fCHqOMYiRWupAHDFL1+lJB vYukkFzzMz/qP2Ht9Rn6HF0LD1zg29tyoNxlVmyk27bQgAbV7w116SyLpiCs4qICIkru a//h8CKsi+/oZRk/6JKFTw7LSrqnN2PvvFXRBGSG+ibN6YVr5yyqVpDDQ3Z9Km6i0Esr zsnvevkFBoRegLZV2qOFw16vgIsTBHhKajHR7AjrT4J9SWXhPitXDU6bmxc9fJ8pfxIF 2Ph2e/9RCeSBSaWIr9drZo06fv15xcXn6/F9N0pg8bTGXRxnp6lOvSQX22+QwtHWPWPF feyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750845; x=1712355645; 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=HtUHg09UOjxxYBJJEpdXT1anxY6jjxQxzEq5yXQbAXE=; b=uy+aVsv8+5hMTe6B3KLjT5T1xAp7D4W8XNxY2E3sCf57xjTngGI9QUroVDv/lLIo3P smL7uxHtYh+ucJb1Qb9npY8vaWOp8ops/ImqaYz2THsdX+bGdMo1XNzHiPXspWGwhT+Q vmDiZ0G1uy0ecRx5IGTxzUQfBZy5TURWSHd+l5iQlRoqnxxfQn9azIuPNnuJSkHvjC6c TJ1/ZXgXEzcazpPENqL4/PBiGPKAbHpLlxnfuGznJ5+HCO+CbqkbLXqzyTQr88HBaYqb 5GnSPHcmfjlhIvdVPjelu4zZ7MT4hnB6YP3BdLMNGHCKzMOMktDAWfVblthkIWX9o9oB XLMA== X-Gm-Message-State: AOJu0YxAI7oilD/G6bru9aP7lD3sfvM0LdL3dClBVRBKr6lfVM7Amd5v PmTDnwRj7I0Bz/i3V+EbA+2uIqEtOMpM9qnJLp5TWOMXTnRTDnr8dYUOhRBvwoL2RHvEuIXI4co o X-Google-Smtp-Source: AGHT+IEjgiztimZl+umzBvIB4PXvgwmlAsCEtEh0MwE+tdRYfYwCpG08/cOs52K0LU9o9F18Mh8m3Q== X-Received: by 2002:a05:6a00:1910:b0:6ea:ca90:3459 with SMTP id y16-20020a056a00191000b006eaca903459mr3588812pfi.32.1711750844955; Fri, 29 Mar 2024 15:20:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich Subject: [PULL 3/7] linux-user: Fix shmat(NULL) for h != g Date: Fri, 29 Mar 2024 12:20:33 -1000 Message-Id: <20240329222037.1735350-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750931521100011 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich In the h !=3D g && shmaddr =3D=3D NULL && !reserved_va case, target_shmat() incorrectly mmap()s the initial anonymous range with MAP_FIXED_NOREPLACE, even though the earlier mmap_find_vma() has already reserved the respective address range. Fix by using MAP_FIXED when "mapped", which is set after mmap_find_vma(), is true. Fixes: 78bc8ed9a8f0 ("linux-user: Rewrite target_shmat") Reviewed-by: Richard Henderson Signed-off-by: Ilya Leoshkevich Message-Id: <20240325192436.561154-4-iii@linux.ibm.com> Signed-off-by: Richard Henderson --- linux-user/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 4505fd7376..be3b9a68eb 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -1354,7 +1354,7 @@ abi_ulong target_shmat(CPUArchState *cpu_env, int shm= id, if (h_len !=3D t_len) { int mmap_p =3D PROT_READ | (shmflg & SHM_RDONLY ? 0 : PROT_WRI= TE); int mmap_f =3D MAP_PRIVATE | MAP_ANONYMOUS - | (reserved_va || (shmflg & SHM_REMAP) + | (reserved_va || mapped || (shmflg & SHM_REMAP) ? MAP_FIXED : MAP_FIXED_NOREPLACE); =20 test =3D mmap(want, m_len, mmap_p, mmap_f, -1, 0); --=20 2.34.1 From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750911; cv=none; d=zohomail.com; s=zohoarc; b=joaFDGXrlJ/O2oqNav9M703kb4OUJ4I9ktuX0arXAIvcthd4rPq5yb4IcyA2bu65kAqszz4x/cRu7b3JoQUMQoQBw3O5/A/wOmgIdXyK1LdV54PMGGJklS6xX8Q1GYQ0aJwmgaPZJ31dEiSEuxc4uOmLDPprEWy1ictrSyeV+fw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750911; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mqnAymu0Pceh1YCimgMze24poYMrVWuaKl+QjHlACqk=; b=F1JbvoNPZSto0wsvg76coRbx04Srd2jrShl9sL5Fj+jaubISRlQU1oXjPFOSdj9yO2rwGNKLG/UntkiGMqiQjhvScWoIwq7ge/FzjeKG050LMoaUMZ+Jo4ylLUThGOlTRUo71tqvXmxCKICEfZS1rm1LAQEAggbkujUWoSpx6o8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711750911238101.67198518486816; Fri, 29 Mar 2024 15:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKag-00056k-LG; Fri, 29 Mar 2024 18:20:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKaf-00056J-IG for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:49 -0400 Received: from mail-oa1-x30.google.com ([2001:4860:4864:20::30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKae-0001pR-0Y for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:49 -0400 Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-229b7ada9e8so980647fac.0 for ; Fri, 29 Mar 2024 15:20:47 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750846; x=1712355646; darn=nongnu.org; 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=mqnAymu0Pceh1YCimgMze24poYMrVWuaKl+QjHlACqk=; b=c7dTs2JwE0gy2Q8yHxazYc7sPPaBgrCh2EDRtBJdHAwRz3zTnOi0N6yUzE3g8N4bm7 TBJE6tryTOBnknZyYihdFhq5k454FUefOst9YxtBQ991Q1yQaTT/x5vCr6j2esiFswo1 DAysLqzti4QsxFgewjO7m1lhGXubFHBU6+z/r0FOHV6y+CNNQyaEeWF+PCEBhVqRSjQ7 UJf6bnC2NArSZUJt+k5RBZZal6D0rY2s2zNdi9gViBc2xgGOX/0c7OydCfOFw3ZQDFSc Uw7cKspc6L/A3XWEsVukN6EkVNLXrjIcZxnLxAhwgZK2y4aqXGvf83M1lgWKyXwkDrtj yfxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750846; x=1712355646; 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=mqnAymu0Pceh1YCimgMze24poYMrVWuaKl+QjHlACqk=; b=Is5hau9MXInH+WK40584xk9QpbV6y3/E5cGEsZv8g1NjJXGGVMUkJlH0+8d9T/Gudl fDzw81Xh2flTCprDVAFcAGdQG5ETYUQst/qrFLGoEEFdHkSNTv5vjVWrRfU0RTVbTMoK BwW6H2TsmJp8ylDwXD1AAVkfHr0XmRYFFVs8nCydcTjiCfIJlQ3Z0raCo8rCxcNhGokO 2LLrwQ4kqTGWyKhhhpDYUxCXT4t6/xLz4ddBBz4ia/MmJ3dt4BTKTDOggrTrVcewqB+s wbZ1XnZo/9/xUVxgt+uRPDF4m3NsH97j3xsS9RGBHT+OLbJ9ptQaGkn8aniGkElCDqBz Xkeg== X-Gm-Message-State: AOJu0YzV/+i2nck+OS1Q+FmIDHMfH/jaStrCirfCHFuGqbac4wCGs8UZ sl9lwBHPfKdN5dK71edNTC5RV8ljwoXo8l2D9PPXIJiZqpQuyl4fWoZTBtRkLLJXFAabl0bQSSV G X-Google-Smtp-Source: AGHT+IFlXXXhM1VOpGgvpAkX18QsqI+8kcCxlj6jIUPjXxQJqrVMqthFhTV6DCMkhjgSuHjRcBdsOQ== X-Received: by 2002:a05:6871:340c:b0:22a:551c:3170 with SMTP id nh12-20020a056871340c00b0022a551c3170mr3672097oac.23.1711750846598; Fri, 29 Mar 2024 15:20:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich Subject: [PULL 4/7] tests/tcg: Test shmat(NULL) Date: Fri, 29 Mar 2024 12:20:34 -1000 Message-Id: <20240329222037.1735350-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::30; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750911682100002 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Add a small test to prevent regressions. Reviewed-by: Richard Henderson Signed-off-by: Ilya Leoshkevich Message-Id: <20240325192436.561154-5-iii@linux.ibm.com> Signed-off-by: Richard Henderson --- tests/tcg/multiarch/linux/linux-shmat-null.c | 38 ++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tests/tcg/multiarch/linux/linux-shmat-null.c diff --git a/tests/tcg/multiarch/linux/linux-shmat-null.c b/tests/tcg/multi= arch/linux/linux-shmat-null.c new file mode 100644 index 0000000000..94eaaec371 --- /dev/null +++ b/tests/tcg/multiarch/linux/linux-shmat-null.c @@ -0,0 +1,38 @@ +/* + * Test shmat(NULL). + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include +#include + +int main(void) +{ + int shmid; + char *p; + int err; + + /* Create, attach and intialize shared memory. */ + shmid =3D shmget(IPC_PRIVATE, 1, IPC_CREAT | 0600); + assert(shmid !=3D -1); + p =3D shmat(shmid, NULL, 0); + assert(p !=3D (void *)-1); + *p =3D 42; + + /* Reattach, check that the value is still there. */ + err =3D shmdt(p); + assert(err =3D=3D 0); + p =3D shmat(shmid, NULL, 0); + assert(p !=3D (void *)-1); + assert(*p =3D=3D 42); + + /* Detach. */ + err =3D shmdt(p); + assert(err =3D=3D 0); + err =3D shmctl(shmid, IPC_RMID, NULL); + assert(err =3D=3D 0); + + return EXIT_SUCCESS; +} --=20 2.34.1 From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750910; cv=none; d=zohomail.com; s=zohoarc; b=G3DaKJw+TxMbP6uTz+6StZA5zbPu/h2J6OtZiLfOAXkjxvjEpOg2Ek/bPLHDU0YOURaGHxmXYyScye4Yw5+SwoshhgNz2X2jnc//ZH2+IKMh/AVZWp6PwEx9qq1Sl+gCcHAzm7Gbr7LlI9NyZwJB+IBPREYk8K7o1zjk/5etGKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750910; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3dondGlVn7Nspk+b15ZO4C68ipaZNt0/1iWHRvOdtfQ=; b=ZamakLRJDh9poY96Vi6EYWWPNGMV1WIU9ITwZl8eEIvIbISc5S/nHrClNgml2BL3MFHL23dsRWGe2zj0YTnUQD4vnAOJe9EGhx3x6rKpPKia/fr9l3XaBktjw4bOvL9jI40FB0wUM4lFNvq2VrKdTSbMZqZQ+sh3E+mpBDfqCn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711750910432544.4527634073252; Fri, 29 Mar 2024 15:21:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKai-00057e-Hj; Fri, 29 Mar 2024 18:20:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKah-000578-6B for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:51 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKaf-0001pg-BU for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:50 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6e6b3dc3564so1993113b3a.2 for ; Fri, 29 Mar 2024 15:20:48 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750848; x=1712355648; darn=nongnu.org; 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=3dondGlVn7Nspk+b15ZO4C68ipaZNt0/1iWHRvOdtfQ=; b=OI4rJQbdxIVAbSx4eeo2MEJTvpoQR3eUpSVzIO3au2bpnntTqCb9ra1X0iyT3ossu1 IFSQF+jXkUTUV0JdlwDLVaY6Dod/hnYZZBFJOehUccd+rbE1wDc2uc3tkcXDWBWS8Vo9 Y76TVb/cvWsX3tCpVt2GSgG7DPdp2Y+V1ofT+9r824CU/85oAu292AW5u01O5HIrCOKQ zxH7Jn5e1g+OsOR2JX7OMLv8MPeeHOksHt2EENdD3u0XhtLgyRAt7BMwcvccP7xtvLTc eyNq4p+kDUxmWTm9YITQugMmslJRWOJXd677kH7HN6QMbig8pqn0w1v5UJ56Qf6GTosY YN9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750848; x=1712355648; 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=3dondGlVn7Nspk+b15ZO4C68ipaZNt0/1iWHRvOdtfQ=; b=csePmz6DPygQPAUHSB2NM5EFc44f6sEN8rRARGZ1iNciry6lAIHKBjdE8OKOsQ8CkM nU9YfZvScmXFnemQBpb4oCKAP+DFWZm2yrp4KaoVw77x41NgGZQvpP9951UqxybywAqw 5Gcc5aV6nNLym1uSGA9ymY5JUUCuawWF/ixSw+fu6wlo145mX0ZrUwG+VoebscQimk6T H+JtxSZ2T50iwexAb3EdWR4Qm7KqoA3Pxn/iPsjuu5pwFZ+p9FITvyUmkW/eDJ7r73GC LNBg/HFJl9l9DorGdTLX7dHngGgqLNTUV+TkaO+KgLSTaCJyvWu3jRGQV4T/pmzMzeyU wzXg== X-Gm-Message-State: AOJu0YyXWW8QDkW81xIwS3++rnf1M5V7NDYwQdlJfu8uxyg0B+KPSAuj pFcn09/z4v3cp11hUx8M/Jcmvc88SXCwR4UszIy4dhSM2EB5qB2gaYdrysfl4KqBVMeVWUcTJNw Y X-Google-Smtp-Source: AGHT+IGeX5GRebwui29cyYkcdUNHVjR1I4j0jmsgX5pZdTMA6305JtVxbijAhRVWLgdURj9ED3v/Qg== X-Received: by 2002:a05:6a00:4fc6:b0:6ea:ab48:5dd9 with SMTP id le6-20020a056a004fc600b006eaab485dd9mr3564600pfb.6.1711750847953; Fri, 29 Mar 2024 15:20:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/7] tcg/optimize: Fix sign_mask for logical right-shift Date: Fri, 29 Mar 2024 12:20:35 -1000 Message-Id: <20240329222037.1735350-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750911673100001 The 'sign' computation is attempting to locate the sign bit that has been repeated, so that we can test if that bit is known zero. That computation can be zero if there are no known sign repetitions. Cc: qemu-stable@nongnu.org Fixes: 93a967fbb57 ("tcg/optimize: Propagate sign info for shifting") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2248 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/optimize.c | 2 +- tests/tcg/aarch64/test-2248.c | 28 ++++++++++++++++++++++++++++ tests/tcg/aarch64/Makefile.target | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/aarch64/test-2248.c diff --git a/tcg/optimize.c b/tcg/optimize.c index 752cc5c56b..275db77b42 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -2376,7 +2376,7 @@ static bool fold_shift(OptContext *ctx, TCGOp *op) * will not reduced the number of input sign repetitions. */ sign =3D (s_mask & -s_mask) >> 1; - if (!(z_mask & sign)) { + if (sign && !(z_mask & sign)) { ctx->s_mask =3D s_mask; } break; diff --git a/tests/tcg/aarch64/test-2248.c b/tests/tcg/aarch64/test-2248.c new file mode 100644 index 0000000000..aac2e17836 --- /dev/null +++ b/tests/tcg/aarch64/test-2248.c @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* See https://gitlab.com/qemu-project/qemu/-/issues/2248 */ + +#include + +__attribute__((noinline)) +long test(long x, long y, long sh) +{ + long r; + asm("cmp %1, %2\n\t" + "cset x12, lt\n\t" + "and w11, w12, #0xff\n\t" + "cmp w11, #0\n\t" + "csetm x14, ne\n\t" + "lsr x13, x14, %3\n\t" + "sxtb %0, w13" + : "=3Dr"(r) + : "r"(x), "r"(y), "r"(sh) + : "x11", "x12", "x13", "x14"); + return r; +} + +int main() +{ + long r =3D test(0, 1, 2); + assert(r =3D=3D -1); + return 0; +} diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index ea3e232e65..0efd565f05 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -10,6 +10,7 @@ VPATH +=3D $(AARCH64_SRC) =20 # Base architecture tests AARCH64_TESTS=3Dfcvt pcalign-a64 lse2-fault +AARCH64_TESTS +=3D test-2248 =20 fcvt: LDFLAGS+=3D-lm =20 --=20 2.34.1 From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750938; cv=none; d=zohomail.com; s=zohoarc; b=DBgabnyJ7TwVJvtSQqpMkSn02QDxWwRodx6DbiBmwhvUszIlZNEqr0rdC10OT8TJTEyu9CAUOg1pB8s0ZQIESuB7KtdLC8ydTWkB5i8Qsxpgye5P9R42oVpUvR6M5y1AS1HmrNjjtPTARnDxAE2lFiLig6FxlVLX14MhJdgdMcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750938; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=1pFViSSelBLDC7jQWPNWKQ58HUVyc3Kf8+NgXdrfBUc=; b=IJ5a6xB+xjcvpQj2pm8bcOEGXhtXAUHh+FqG0dBAEHQPvp7oX5Dr7miKFk4Au/J3VeF5AT+2ZyEg/N/ccxsAZN0uMEMI37Zzz4uYfFqMyrwriQ3SI6t56l/FM2aH7tfuuNYdjOPA/QMzm0nMwDVaX+6tg/ZvyxDTDOwxWx9EGkM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711750938205158.9639219142632; Fri, 29 Mar 2024 15:22:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKam-00058o-J8; Fri, 29 Mar 2024 18:20:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKai-00057f-Kt for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:53 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKah-0001q2-5R for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:52 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6e740fff1d8so2012850b3a.1 for ; Fri, 29 Mar 2024 15:20:50 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750849; x=1712355649; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1pFViSSelBLDC7jQWPNWKQ58HUVyc3Kf8+NgXdrfBUc=; b=Tva+OfnKh9KR7OktjPfOxSJAsP6pAvXCA2q9RtdmrT2s+KqhHQkmxCcLMLAI9hcM8k mZxmy02efutIBEecJ6Cr1EEmsLd1Ul6jdRZnfDrF0O8Dw+1Obuy173nGJMoNIPTugwxj uA3b3uxmpivHUSy1q8NsiM3UJBYRIUkNLsA/RxmyciOn3zU//qZWun0ABEDQdTkv9g3z Axx7fkJbEsmeG1ARCjsfihBjPdnFM0FvNPkq4ERP3xygoMLqaMx5jT0TL6P44y14tdQb d/OBoENRTIGytuyhfeExy8WdGkzwZZAWdh21ju5GT5Jk9US4SiRPYL8w2Yr/d8QI+LKm DKdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750849; x=1712355649; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1pFViSSelBLDC7jQWPNWKQ58HUVyc3Kf8+NgXdrfBUc=; b=XVJzL2Th15il8bP5W8J32SoUpN51LaTB73r/t+vdr5PKekn9eUEjKAp3ADhnuoqVNE 8h2tX5GcZBoKG3bmAzBu99HxnGMpYfQZt+URWE+usPADggD7CEBvmRtCRUkrK0/RxtCw dRGfLAVwHRIaw6FyJ9o5aPsr2CgJiPZ5bD0YZFJqPnWrRNAWT2p5+e8HhUuxzr3lWvpk Y6njmOyyzt7D30ZnzHj87sazD3h6PSoXCv8LO99dng2c9lSlvJ73z/Le2siULzlKLicr 9mG88hphtLlp2br5f7KuRXXRH5ZVGO0+1G2RGlDUoB0cw7uupnR3q4Ff9Nx19Y2fQ9pI FGug== X-Gm-Message-State: AOJu0YwhZtcslby7Lb5Oc13Y96IUTahY0obaiYz6oijScYXBEl1I3hox 809ZVByMNttu1vxdbJv+SOxuSdMPTArm+x3lEKfeUS0wWfd0fhvnC1pj35HJjcPNI6us/GChVqL S X-Google-Smtp-Source: AGHT+IGIIGOGD3pPzUhhIIkKoxv0HYorUl//Y/yg7POhEYJ2TNpwl+bNLGaX81FxBFQiZPQ1BZEz9g== X-Received: by 2002:a05:6a00:4b50:b0:6e7:6a7d:5a58 with SMTP id kr16-20020a056a004b5000b006e76a7d5a58mr3560406pfb.25.1711750849554; Fri, 29 Mar 2024 15:20:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 6/7] disas: Show opcodes for target_disas and monitor_disas Date: Fri, 29 Mar 2024 12:20:36 -1000 Message-Id: <20240329222037.1735350-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_OTHER_BAD_TLD=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750939603100001 Content-Type: text/plain; charset="utf-8" Fixes: 83b4613ba83 ("disas: introduce show_opcodes") Signed-off-by: Richard Henderson --- disas/disas-mon.c | 1 + disas/disas.c | 1 + 2 files changed, 2 insertions(+) diff --git a/disas/disas-mon.c b/disas/disas-mon.c index 48ac492c6c..5d6d9aa02d 100644 --- a/disas/disas-mon.c +++ b/disas/disas-mon.c @@ -34,6 +34,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t = pc, disas_initialize_debug_target(&s, cpu); s.info.fprintf_func =3D disas_gstring_printf; s.info.stream =3D (FILE *)ds; /* abuse this slot */ + s.info.show_opcodes =3D true; =20 if (is_physical) { s.info.read_memory_func =3D physical_read_memory; diff --git a/disas/disas.c b/disas/disas.c index 17170d291e..7e3b0bb46c 100644 --- a/disas/disas.c +++ b/disas/disas.c @@ -211,6 +211,7 @@ void target_disas(FILE *out, CPUState *cpu, uint64_t co= de, size_t size) s.info.stream =3D out; s.info.buffer_vma =3D code; s.info.buffer_length =3D size; + s.info.show_opcodes =3D true; =20 if (s.info.cap_arch >=3D 0 && cap_disas_target(&s.info, code, size)) { return; --=20 2.34.1 From nobody Sun May 19 13:00:11 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711750927; cv=none; d=zohomail.com; s=zohoarc; b=QlZIIMVhrDuWVlHuwzQxcXTDZUmTTEfWxrP04kcvI/u5IxQebI6f5mcTNciCeDIqJMukuNsaPiLBixSKr31dDgCV1fLE9z7dzfkhJRoZbeT9LN1hqhnCv1sWYMhfZI1NKLsb5ba8uPmoQvFRH4utTXAwdUu+JY0dy5ERiPNIJNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711750927; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=jV8lRmyE1nYiHDA6XG/3kMjYCRh7ilYhDNaFWksdOb7WomgfsJWCMmZfHGfarMswHtX86M96/0rKiToBogLiaOBT/aiPVU/oDNJTJz8ISxd2NMobiuQPuQ5PqX3kd/shgwU35dlKpNLfAVMmmw7xDIkbzpfV0Rkl4/McmLCJQ+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171175092775697.34964798427279; Fri, 29 Mar 2024 15:22:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqKan-00059G-8u; Fri, 29 Mar 2024 18:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqKak-000588-Gg for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:54 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqKai-0001qU-CW for qemu-devel@nongnu.org; Fri, 29 Mar 2024 18:20:53 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6e704078860so2085719b3a.0 for ; Fri, 29 Mar 2024 15:20:52 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id lc24-20020a056a004f5800b006eaacc63435sm3579811pfb.173.2024.03.29.15.20.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 15:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711750851; x=1712355651; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=CoDIdmARNX9vqrG7PCuHKbASUQSfwM8lwRwiE/l49KUiSqt3+NTdLTBCUxsQpEOMXX 8U6fLY/qdG3vG1LJeyHEVb51MPFVmcYO6SOXWXPv743Em3DgAcZ70WbAc9aYiHGqRaKH 0F6uFQ+5RkjZkiWEzsCEDeSQJX6RHtnxy++BQ1gqHT3tdFP1EcUFVE1w3dbiANTMm526 W2duqXeBG5vpOPAIZOGV+hIPa+62zVx+LFPqBQnOW+UK9lDfs3Ndmu5W+62KMj4e3xgG n+CI1cn01JPMUH+uR9yh32hDHXzI8JlO4gC0gKH+Nukv64bLGOzUoXaIgaUWw2tVs2p7 xcJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711750851; x=1712355651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aXBZFu2s4VI4gx6Rv0AU3SgCaeiACnYHqJQpFd1hK8k=; b=HTgm1ud5c0FeRA74Qwwdjg9hqo2I6gqAGPwBYbbynG3pP2cLhWOK+LYkF/zK3F0qeV aVVpTmLZTUqXfaY5ekPDHMekvqglAMq2RVHA4sJ1phvYUX0DfjmYxcPXB4ARmqPLjKoz BFEdJe2YEuCH0i7v3zCNJMwE5+F2bY75J9Yzi1Srs1iiK/YD+CcVSjGWdkaahVLo1enf h5lyHIUP5Z+yqbwy46qZFUtlzguDWvgzo+OuA44cESXCeCDZI2AGWHetNaWsjyukir9r bIVkj0LN052c3C/xnuHul46t3rjTTNPDzYPyOm6DKZf6+3OoZYCd/l1lrvJyR7YMhm7h lQ9g== X-Gm-Message-State: AOJu0YwEysyjLq5WDotDLGMyVwmhXaJNjjGe/XTSMbiP/JElyZf5zQKQ k6x78ood7d4djLiylvK33Z5VbPOT2Vn9Ip4cDsEFdDyI1qaDL/FYxaLQ0f5beuFDnYS7W6v3eIb / X-Google-Smtp-Source: AGHT+IFHV3WfRDx95GuCPsok8RbFGkoAr/OZwyT+oyYoeU1rML6qNe/YHyD5EOhCiFujBlWbD1b6Cw== X-Received: by 2002:a05:6a00:4f82:b0:6e6:970f:a809 with SMTP id ld2-20020a056a004f8200b006e6970fa809mr4312957pfb.20.1711750850944; Fri, 29 Mar 2024 15:20:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 7/7] accel/tcg: Use CPUState.get_pc in cpu_io_recompile Date: Fri, 29 Mar 2024 12:20:37 -1000 Message-Id: <20240329222037.1735350-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org> References: <20240329222037.1735350-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711750929533100007 Content-Type: text/plain; charset="utf-8" Using log_pc produces the pc at the beginning of TB, not the actual pc installed by cpu_restore_state_from_tb, which could be any of the guest instructions within TB. Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index c1f57e894a..83cc14fbde 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -634,7 +634,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) cpu->cflags_next_tb =3D curr_cflags(cpu) | CF_MEMI_ONLY | n; =20 if (qemu_loglevel_mask(CPU_LOG_EXEC)) { - vaddr pc =3D log_pc(cpu, tb); + vaddr pc =3D cpu->cc->get_pc(cpu); if (qemu_log_in_addr_range(pc)) { qemu_log("cpu_io_recompile: rewound execution of TB to %016" VADDR_PRIx "\n", pc); --=20 2.34.1