From patchwork Tue Jan 23 15:46:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 765199 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1674589wrx; Tue, 23 Jan 2024 07:48:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFqD2pMip0XYunQc5O+olAAEL1sBUuPil5iedRKz6ZwV8WQtGU9AVcY3DBX5XQEK4+2DSVt X-Received: by 2002:a05:620a:55b0:b0:783:2262:1081 with SMTP id vr16-20020a05620a55b000b0078322621081mr6531916qkn.33.1706024911249; Tue, 23 Jan 2024 07:48:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706024911; cv=none; d=google.com; s=arc-20160816; b=K8WZg3RFRVbNqNs70N6shjqnHcDioZycUwummjrnDOrfEO688PgpO/Kr7lSHZQVWJO yK1pT52WpwUeTo8i4E03n2itwVNMv6sBAG9yoUSsjLTnQ2SKLzt9Deycadl0GPVQJS8j 6o1D4uxNRQYZ1ricmTGusFI1tATMHBWWwsfwHetE2H0Pv2970YcstSeBtfKcG8PSh6Ah KSFcjzCe4xF1KQELOpyMMctJCo932ZzdYMVZckVJlQ+9skvbDlmpcLnjLz56tBVgAbDp 4rPtoWEbD0e4CB5/a1tHvKddvn64z9GmEHjrfceYhOTCs+dP4b3/KdOOttmVfBtvBW2p HPIg== 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=A41KhUFj+kKzyMFALghnqCSiz8AFquoY2sRdvYnXmRE=; fh=k5b5Oh4TsJsx1RRQS4r+y6BXFn6KjyetC2Ck18MVAw4=; b=EWtpLla3mlVUigRnNYb7JR5saI92GxdddCbUmbefYz1kSuov47Pl7Iv2QL8usHcJFD DOItG9tibB+3u2abSxdp3aylhJexdgsZQwGGCm5y8e7mT/UlZfQEel6BpURnbLIuTjPc ofuVXpBeO9htO9HTMYSZZ3hjVmiyrL6mnAD5+Pwt+p8VlEBaV6GHEkoR0r53eIxbLbiD P4HZR6IXhDG/lFZyJdqmPpH3KQIKm7YdcO35nAxXuDmuC88i5MUC+qirCRTtlfp51B9n /hS8dZX3p7yduxyFGUd7M8atWPjCfGg8zSYqHusfKvDLi76eSCntVDLEckthtgLV88oK oSAA== 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 h5-20020a05620a10a500b007833aafe7b4si8084113qkk.621.2024.01.23.07.48.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 07:48:31 -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 1rSJ0G-0002pt-Rz; Tue, 23 Jan 2024 10:47:58 -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 1rSIzq-0002ne-9Y; Tue, 23 Jan 2024 10:47:32 -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 1rSIzl-0000gM-50; Tue, 23 Jan 2024 10:47:27 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 282BB4691F; Tue, 23 Jan 2024 18:47:50 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D0A0769EAE; Tue, 23 Jan 2024 18:47:08 +0300 (MSK) Received: (nullmailer pid 3847900 invoked by uid 1000); Tue, 23 Jan 2024 15:47:08 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev , Paolo Bonzini Subject: [Stable-8.2.1 40/54] target/i386: Do not re-compute new pc with CF_PCREL Date: Tue, 23 Jan 2024 18:46:41 +0300 Message-Id: <20240123154708.3847837-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") 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 037bc47e7c..e68375b19d 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2845,10 +2845,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); @@ -2864,6 +2860,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 15:46:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 765200 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1675161wrx; Tue, 23 Jan 2024 07:49:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEX9zF+u5JQdPPoms6zZwbSH8wZmQjeiggXDMrF+NvFl5GlLJcpafixhGIsNHDCwxVPpkPu X-Received: by 2002:a05:6830:3b0b:b0:6d8:74e2:c092 with SMTP id dk11-20020a0568303b0b00b006d874e2c092mr72510otb.68.1706024978630; Tue, 23 Jan 2024 07:49:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706024978; cv=none; d=google.com; s=arc-20160816; b=bMBeQszSJ7EAaGiFDZVO4KgVa3tFdJse1gOV6wxalNFZMdIL22SHG4TxOi45DNui9M pXJD7wpTPad+XHSmcfi+9TTsmnuN2USL75DJmZwQM1whg2hMhs8Gi8dQSkQyl7pXUHFF WS/xthHDy2e2U31xQInEN3sYEhnuWPNVBeFxU1bNspQbkIVprlu4mSWpWtT7aHTWjvCR pcUI2E7LoxZNeFij8dWQV82oifkvfNrtkmLtD9PzD1hPyrHhFKGmhANGfNAs5VMgKzii Wjdlb0CuUrY8rpj6i+M2ToJ00NeDC2jk52vgmWRDj0730pa8XWd676puD+H0bizvmnbh esUg== 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=SouaReSttLmsMUYUuYgEwekez5Hbk+Kcl7y6pzTuix8=; fh=vovulKOOEPtEUAefIa3xLdy/8Z9sLGgqEgHHDpSzEaU=; b=bE9lPXDDa8m3KJrsRao3S0h6A9mzygvfkVj5jke2D1Gmz0t3//hdhN0ic6oKEh+n6n r3TCKTqk48p0cwlQ8gNOHEohgxyG8VR5CuaV9jLU8VmoDAp4o/6lDqBtwBvMG7u3GP8d mkqAcJOHph66PqSylRuGKbAtF9MTvumrpCJN11cM3lhcPgvzP5/P5IZiPOhfySXH9FAD WExt/of+SchGap4Lv3OB3Pwdw/EL2jEn5CnLWJ+1HaIGg+5wdTk7+M9ty7ts+XTv7d9l 7fkkZkJ0q3IsrS+u6imxChL3E4+6qwCTx3XnPqRsRZQIW2f9XKgvBJwx7bVSC5vdjYQ2 mFgA== 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 d7-20020a05622a05c700b00429e3202babsi8236208qtb.261.2024.01.23.07.49.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 07:49:38 -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 1rSJ0Z-00032j-0B; Tue, 23 Jan 2024 10:48:15 -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 1rSIzx-0002oU-03; Tue, 23 Jan 2024 10:47:37 -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 1rSIzu-0000hE-F8; Tue, 23 Jan 2024 10:47:36 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 894DA46922; Tue, 23 Jan 2024 18:47:50 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 8B40569EB1; Tue, 23 Jan 2024 18:47:09 +0300 (MSK) Received: (nullmailer pid 3847909 invoked by uid 1000); Tue, 23 Jan 2024 15:47:08 -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.2.1 43/54] backends/cryptodev: Do not ignore throttle/backends Errors Date: Tue, 23 Jan 2024 18:46:44 +0300 Message-Id: <20240123154708.3847837-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 e5006bd215..fff89fd62a 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;