From patchwork Tue Jan 23 10:28:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 765197 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1530307wrx; Tue, 23 Jan 2024 02:30:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFz1A+ZkPwZYLiSr4IUnnaB0pf0802dbaTobjxeWKPLiKqmoBzZ0zrqCGlCc+d2JvfZn4JK X-Received: by 2002:a81:738a:0:b0:5ff:a36b:55fb with SMTP id o132-20020a81738a000000b005ffa36b55fbmr5429360ywc.97.1706005842260; Tue, 23 Jan 2024 02:30:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706005842; cv=none; d=google.com; s=arc-20160816; b=NlIdrUlYMkWvAYyNyHpEh8diISTOE7ESk1Dgr5s/mLBpl1B1LQpgduS9WOIhVkV1Zd TgN3lNFxOlEUUQI8dgGYmhnexLS7tdHsmGPfnIpp9IEZZ49LalIHLKzan00sYYOn/M2j utvRfNwGkNiBISj4kQYkGf2p8l2ikBZJ3N1l1C1yFXyXfYoFVfhDTJG+zXSkL3WBz8m6 E8KkPxFOWDmxZYaEH1L/31gq4i94DEpbEH4qscrZUuCixUzvEpMByT5UnQ3Gz9jim2hh pOkUyrpTrHDaSQW2tm/eUIkGCru630qHmmINi5xLUEQlub/YFq+Xexh1ePOk/tNTuylf E03w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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; bh=TpfxteqUovi/RknrPGkNAkNaxfNwo2EUOAKg9qGqnpw=; fh=k5b5Oh4TsJsx1RRQS4r+y6BXFn6KjyetC2Ck18MVAw4=; b=0zTuga/t70HgMgtoFS5v+d42oUkdzLXOab2K1O5WOtj+uUlE6/+o3PDGtyZyCOUqNf iSWA3aYNxBAxKo+d53UJc/STL5Fqe3/s1w5u9AwOwFwUdubb1EsNnH1a+3if0XD4K3kY ayO8B5hX2H+EDYG+DkpfBAAqdjP4V1F2GGCc4P1oZKr322P8Q1nizMtanNJz1N9pSuxo 0Qy84CHiZSTGIn0hhXSkYJuPbFigdR8jCIQy5UkwBor2N3xhjGrwehxUKJHPeR4E5cwF ADVhZ2MoXh/EzWtsTn5g2BuOMdmsDl6fhdhWDiiJOkUHiw5C9RagyqpW2LbHFsj2LQtb 6RdA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o19-20020ac87c53000000b0042a501f08f4si825639qtv.170.2024.01.23.02.30.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 02:30:42 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSE1d-0006nI-PS; Tue, 23 Jan 2024 05:29:01 -0500 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 1rSE1a-0006lj-V4; Tue, 23 Jan 2024 05:28:58 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSE1Z-0005LL-AF; Tue, 23 Jan 2024 05:28:58 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 194F84674C; Tue, 23 Jan 2024 13:29:24 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id AE2ED69AE8; Tue, 23 Jan 2024 13:28:43 +0300 (MSK) Received: (nullmailer pid 3831707 invoked by uid 1000); Tue, 23 Jan 2024 10:28:43 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev , Paolo Bonzini Subject: [Stable-8.1.5 13/24] target/i386: Do not re-compute new pc with CF_PCREL Date: Tue, 23 Jan 2024 13:28:27 +0300 Message-Id: <20240123102843.3831660-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson With PCREL, we have a page-relative view of EIP, and an approximation of PC = EIP+CSBASE that is good enough to detect page crossings. If we try to recompute PC after masking EIP, we will mess up that approximation and write a corrupt value to EIP. We already handled masking properly for PCREL, so the fix in b5e0d5d2 was only needed for the !PCREL path. Cc: qemu-stable@nongnu.org Fixes: b5e0d5d22fbf ("target/i386: Fix 32-bit wrapping of pc/eip computation") Fixes: 5b2fd6cf3735 (b5e0d5d22fbf in 8.1.4) Reported-by: Michael Tokarev Signed-off-by: Richard Henderson Message-ID: <20240101230617.129349-1-richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini (cherry picked from commit a58506b748b8988a95f4fa1a2420ac5c17038b30) Signed-off-by: Michael Tokarev diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 93001fde7e..1d3c9a8be4 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2867,10 +2867,6 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) } } new_eip &= mask; - new_pc = new_eip + s->cs_base; - if (!CODE64(s)) { - new_pc = (uint32_t)new_pc; - } gen_update_cc_op(s); set_cc_op(s, CC_OP_DYNAMIC); @@ -2886,6 +2882,8 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) tcg_gen_andi_tl(cpu_eip, cpu_eip, mask); use_goto_tb = false; } + } else if (!CODE64(s)) { + new_pc = (uint32_t)(new_eip + s->cs_base); } if (use_goto_tb && translator_use_goto_tb(&s->base, new_pc)) { From patchwork Tue Jan 23 10:28:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 765196 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1530124wrx; Tue, 23 Jan 2024 02:30:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9cOgYNc6qmPHgN9mV0YfSqubzHh6atjETAgHdDbw7+ufD+K/NgNi3VG/bZKEz2S9ffDaS X-Received: by 2002:ac8:5f50:0:b0:42a:3c4e:a83f with SMTP id y16-20020ac85f50000000b0042a3c4ea83fmr866767qta.48.1706005815157; Tue, 23 Jan 2024 02:30:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706005815; cv=none; d=google.com; s=arc-20160816; b=cHgeWr6+kaPke2TqjpU7MLh5xt7JF3CmItIli1RCnxR1RYo3xCm0nVa34IefuEXTRA 8QEdPj6sH9qVMfzgNzbcal8659unU03pFRnDfbaplYB2PUHhqrSDp3B+Yb6IMbXj9MX3 rQL2APGeqZvUs7BIvpXo7H3x45S3WWuO4Kg7k7nO8r7ZD9xfSv6sKJiK0i0d0o64bYTh yUHIeiZh0sqPSEPz+REoIeDWDO4f4FeDurN4DjY7HDKYy/YORI8bVtdJwHoDY0KkUB+g FayQtzkIMW7EL0Cu/7Lrpu8xaCY/J2Ja5B/qj3QT1pmT757xti1bR23y3HglywXBT/tr ThIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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; bh=pkacqps7XAM7VdNrBLyfQpzFUHSUbjLgE/bn70yRv7k=; fh=vovulKOOEPtEUAefIa3xLdy/8Z9sLGgqEgHHDpSzEaU=; b=fy+DoQZQo3FRdj63uUr9hC8vTQe3J1rKVHxZ0vwoQWfRNSSMtdA7rmXJYecZJNVd4b XhlEpJaeFE0zXbWn9iYsnbpJ/i8uwlKiVkrhOCMQ/dIZXY6z9mcTC101fExsZWJ1f9Zx BcR1Q1pQcE+AmnMqPgu9F4RmgS53OCZyCY09LSkn86QKum200BylcmcJS6ZhII9jz7gu kSFcDx4AIgHEVR5OfhMEnJVJiHpNUXtqMr+LboSoGENwBZZA0tJpv70rbjer0YVWkjQm po54xu4k8B9TM4HmITdWHEXF8dujYR1TgJ9o3o1MWHz5MJlYqJeYDenaFqEMbcNsOSoz F/MQ== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d18-20020a05622a05d200b0042a2b9c0addsi7672037qtb.207.2024.01.23.02.30.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 02:30:15 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSE1g-0006pV-UG; Tue, 23 Jan 2024 05:29:05 -0500 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 1rSE1e-0006nz-R4; Tue, 23 Jan 2024 05:29:02 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSE1d-0005M2-6I; Tue, 23 Jan 2024 05:29:02 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5CFF14674F; Tue, 23 Jan 2024 13:29:24 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id EE82E69AEB; Tue, 23 Jan 2024 13:28:43 +0300 (MSK) Received: (nullmailer pid 3831716 invoked by uid 1000); Tue, 23 Jan 2024 10:28:43 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , zhenwei pi , Gonglei , Markus Armbruster , Michael Tokarev Subject: [Stable-8.1.5 16/24] backends/cryptodev: Do not ignore throttle/backends Errors Date: Tue, 23 Jan 2024 13:28:30 +0300 Message-Id: <20240123102843.3831660-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Both cryptodev_backend_set_throttle() and CryptoDevBackendClass::init() can set their Error** argument. Do not ignore them, return early on failure. Without that, running into another failure trips error_setv()'s assertion. Use the ERRP_GUARD() macro as suggested in commit ae7c80a7bd ("error: New macro ERRP_GUARD()"). Cc: qemu-stable@nongnu.org Fixes: e7a775fd9f ("cryptodev: Account statistics") Fixes: 2580b452ff ("cryptodev: support QoS") Reviewed-by: zhenwei pi Reviewed-by: Gonglei Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20231120150418.93443-1-philmd@linaro.org> (cherry picked from commit 484aecf2d3a75251b63481be2a0c3aef635002af) Signed-off-by: Michael Tokarev diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 4d183f7237..236c407ad0 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -398,6 +398,7 @@ static void cryptodev_backend_set_ops(Object *obj, Visitor *v, static void cryptodev_backend_complete(UserCreatable *uc, Error **errp) { + ERRP_GUARD(); CryptoDevBackend *backend = CRYPTODEV_BACKEND(uc); CryptoDevBackendClass *bc = CRYPTODEV_BACKEND_GET_CLASS(uc); uint32_t services; @@ -406,11 +407,20 @@ cryptodev_backend_complete(UserCreatable *uc, Error **errp) QTAILQ_INIT(&backend->opinfos); value = backend->tc.buckets[THROTTLE_OPS_TOTAL].avg; cryptodev_backend_set_throttle(backend, THROTTLE_OPS_TOTAL, value, errp); + if (*errp) { + return; + } value = backend->tc.buckets[THROTTLE_BPS_TOTAL].avg; cryptodev_backend_set_throttle(backend, THROTTLE_BPS_TOTAL, value, errp); + if (*errp) { + return; + } if (bc->init) { bc->init(backend, errp); + if (*errp) { + return; + } } services = backend->conf.crypto_services;