From patchwork Fri Jan 19 11:34:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 763921 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp399045wrq; Fri, 19 Jan 2024 03:42:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRUom5uGXdPNXZMeMLjmzudADFg1aEVDbZneDL6iAHnDNV6TonDVGVlkDn9+yCuU2gWb7R X-Received: by 2002:a81:6cd8:0:b0:5ff:846c:7081 with SMTP id h207-20020a816cd8000000b005ff846c7081mr2351972ywc.13.1705664527310; Fri, 19 Jan 2024 03:42:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705664527; cv=none; d=google.com; s=arc-20160816; b=SQ7qC6fXjFJHERHg1ig+RW/rf7GujcLxE5Cpa4zWYFFMqA5hdnPcxnG1pTwrmXJyLp yWUmdv6tRqgGq/IRECXvt7BoqL1uCbw6TKcXBtjqdTlT3uQGth6Q9faxZeCO/vAWXJqb yv6GRKXUkUxidOpa8pMduh2nbKmdFUuwQChazMzqF/y8KRxdreNv/e0EFi6hLvgIuZvx JGZz/LQ+44vb5R+5NC6n6G51m5rNATvULnZBeH3A2z/FJccZp/kacGj60Y5sVYL7TuEV 2nAMbyxodBUw/GuKKCHgK8Pr7sXDKrr8+1N4uEUBXI0LjdgSqUi0JoOxFCHPbc5AtGfI 95vg== 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:dkim-signature; bh=aQOkcaUpM1nuG7GogvbsKjXDm4q63jaSl49eYjwL8qs=; fh=yQ/y9OmnwFXi95mZAMEr2IiKs0KiIaQjwmU10ttUeGw=; b=Bsx1p1oMO+3KTOfkFQFtr7lrNTxO61sm3GfQgmkVlWPFmW7+s8i+f+WsVR/gcDIIOK 9Zz+Nm9lYWp73OyV3lKDbIa4b5rCav7GepD1AGKW5GBEY0I8Ki0gvvL7RDD6bQn4lcIH fVsC+ScDXe3jhjTjHwvzXeWpQY9eqSbtIc3jJcp1QXMMu9qrumXE7LbX8ljnv2MRMqhQ JE73vSFSI5bLJOot5q+R/s8WU4KBrfw4Eg+PQLitvof7zlwT5GoSmToJLUZKC6x+g/gb v77ImJNyw+svPoYMBQ1m/SlQITovH0rWLQgP1ECoQJ7fVbZ4P4B6HTO0K0K23LSNXhn0 RP3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TWWaWAaF; 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 c17-20020a05622a059100b00429836a9ca8si16217543qtb.453.2024.01.19.03.42.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 03:42:07 -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=TWWaWAaF; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQn9f-0001U5-9s; Fri, 19 Jan 2024 06:35:23 -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 1rQn9e-0001T2-Er for qemu-devel@nongnu.org; Fri, 19 Jan 2024 06:35:22 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQn9b-0007U0-Qc for qemu-devel@nongnu.org; Fri, 19 Jan 2024 06:35:22 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40e9101b5f9so7115515e9.3 for ; Fri, 19 Jan 2024 03:35:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705664118; x=1706268918; 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=aQOkcaUpM1nuG7GogvbsKjXDm4q63jaSl49eYjwL8qs=; b=TWWaWAaFUL/aJWTt2pX0vHl/EAjgfFf/ZhlhNBPPGpTtwOXQYfmXs5CY6UTkdcZQgZ N5fY4OFJ4vbSdgyqeelKLwBh4td2D8GIvVgJZXBo1tQVprjg07ujGhfagYijBKH0sIlA PnDlBAWIu7obPRS4Kr1sTmhKQIsaDo1J1L533oIuSR3ZjbCIzK8LJxTrywZalMl7i+A6 P2iZFmf9AyeXxtM8BAqG9JP303E/DCMDGEBRysE1DNveUiaPgJMaFBa/CVi3EW55N+G6 b7BfOdU1g2dpGsBVKGVPlgb+ZtdHmRKKMXxNjYbPEUVx6yMEnj21I+0fgpKeWD0a5a1C FBsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705664118; x=1706268918; 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=aQOkcaUpM1nuG7GogvbsKjXDm4q63jaSl49eYjwL8qs=; b=I1hzRWFxPL+jj/oH3q+3afxdGJZ8t/JFHCDPpBemnxiAVXf4/5RL/dJJqu9rsVIK7q C++HCZNC1BfsRg/5ugNWgJWtlR/8Kl9DVaerxkN99RN8aKGk9aiTXYHv7tf85p71+r1E xULtVnp8EDjfq+sKdOQMNuL4/WAb7ihZS6olVVF12UsR2sUd6YU7bhAYwKdc+ZIm10Nv drBQPDrfQ7RK3vutQzmpQkkD2DfJRsyS6/F6Zl7ePVwqrBpB0Hma3FPbysmRnnqUcx4J ZQfE4dixHwsug8dDaF9mFFSMBnpJYHkfsO2Gpxupmw8TJYdlWNJxGTZRmPvU+gAiQeLB VDGQ== X-Gm-Message-State: AOJu0YxrYMQKdJj8/5+QwmkOzNk7+/pstfbdkzENsgm82cYuav+yrB+7 QknFDDyyLDl/rEL1n1TJiUpnpYG1Nmv3G7Ua2sFC2SxkL0rd+TKgz2IF/cpPMkoT8A9byxEr49f rgZJyVw== X-Received: by 2002:a05:600c:3317:b0:40d:7c42:5de9 with SMTP id q23-20020a05600c331700b0040d7c425de9mr1478936wmp.126.1705664118017; Fri, 19 Jan 2024 03:35:18 -0800 (PST) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id m26-20020a05600c3b1a00b0040e4c1dade4sm33037802wms.36.2024.01.19.03.35.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Jan 2024 03:35:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org, zhenwei pi , Gonglei , Markus Armbruster Subject: [PULL 02/36] backends/cryptodev: Do not ignore throttle/backends Errors Date: Fri, 19 Jan 2024 12:34:31 +0100 Message-ID: <20240119113507.31951-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240119113507.31951-1-philmd@linaro.org> References: <20240119113507.31951-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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> --- backends/cryptodev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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;