* [PATCH-for-8.2] backends/cryptodev: Do not ignore throttle/backends Errors
@ 2023-11-20 14:58 Philippe Mathieu-Daudé
2023-11-20 15:03 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-11-20 14:58 UTC (permalink / raw)
To: qemu-devel
Cc: Zhenwei Pi, Daniel P . Berrangé, Gonglei (Arei),
Markus Armbruster, Philippe Mathieu-Daudé, qemu-stable
Both cryptodev_backend_set_throttle() and CryptoDevBackendClass::init()
can set their Error** argument. Do not ignore them, return early on
failure.
Cc: qemu-stable@nongnu.org
Fixes: e7a775fd9f ("cryptodev: Account statistics")
Fixes: 2580b452ff ("cryptodev: support QoS")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
backends/cryptodev.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index e5006bd215..c0b2abc943 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;
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH-for-8.2] backends/cryptodev: Do not ignore throttle/backends Errors
2023-11-20 14:58 [PATCH-for-8.2] backends/cryptodev: Do not ignore throttle/backends Errors Philippe Mathieu-Daudé
@ 2023-11-20 15:03 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-11-20 15:03 UTC (permalink / raw)
To: qemu-devel
Cc: Zhenwei Pi, Daniel P . Berrangé, Gonglei (Arei),
Markus Armbruster, qemu-stable
On 20/11/23 15:58, Philippe Mathieu-Daudé wrote:
> Both cryptodev_backend_set_throttle() and CryptoDevBackendClass::init()
> can set their Error** argument. Do not ignore them, return early on
> failure.
>
> Cc: qemu-stable@nongnu.org
> Fixes: e7a775fd9f ("cryptodev: Account statistics")
> Fixes: 2580b452ff ("cryptodev: support QoS")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> backends/cryptodev.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/backends/cryptodev.c b/backends/cryptodev.c
> index e5006bd215..c0b2abc943 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) {
Posted too quick, sorry. V2 coming...
> + return;
> + }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-20 15:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20 14:58 [PATCH-for-8.2] backends/cryptodev: Do not ignore throttle/backends Errors Philippe Mathieu-Daudé
2023-11-20 15:03 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).