From nobody Wed Oct 23 01:37:50 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729615876; cv=none; d=zohomail.com; s=zohoarc; b=Cd2eX7Py9TuTA05rgktx2WqXJmT4UC470LbntZ6veJ4GNjx8hWXDoOT5jdm/qp9gO95QRfVO5h63IIxxQtK9isPKJgUlXhYhOa47OuiAgvk4ONKoz3rXl3ZutaCcBcyMC9RlBE/R4qBAk6yR2WTJUSjYiOlNbqwxmU3KdvOpQhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729615876; 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=coP4cMorzzuJPcHDWFKzvM8HkyCGleUbY6fulomVjoI=; b=YhNKreEPj+/nPvxXFOP96fIxtgNreHfXSpP0PVywjNfvFQKWGbEq3k9xSmej/C8kePnJyF9pFDBvjOFffix1CXuVAS6G3osHGZdfx6cFGAOOXKPG55nGW93zlzg9RH7Fq1ER1QrWQkykyKqdPv9IB6LzbZyR9ep0FmZqnoBZRg8= 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+importer=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 1729615876494223.5969988576718; Tue, 22 Oct 2024 09:51:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3I4k-0000aX-Lp; Tue, 22 Oct 2024 12:49:42 -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 1t3I4f-0000VP-Kr for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3I4e-00068h-3G for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:37 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-t70UviaAO6eUjgRy_pLZnA-1; Tue, 22 Oct 2024 12:49:34 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5038A1955F57; Tue, 22 Oct 2024 16:49:33 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.70]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2DBA11955EA3; Tue, 22 Oct 2024 16:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729615775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=coP4cMorzzuJPcHDWFKzvM8HkyCGleUbY6fulomVjoI=; b=eepO61JYahkoC75BgQ226K6FN3GPg7IT6d09nm5ChTrFOh3634/t5yPU2pZ0+814iUDAMm MQGeov5ti3K/hgSJU5NwdbzwI878G8/vIINKE+G0bYT7zKOd/fYNZwr/2PK/V1ghP0UWt9 DkoVTeDBWpeDwP/LqmXt02bGZwmADIY= X-MC-Unique: t70UviaAO6eUjgRy_pLZnA-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 8/9] block-backend: per-device throttling of BLOCK_IO_ERROR reports Date: Tue, 22 Oct 2024 18:49:02 +0200 Message-ID: <20241022164903.282174-9-kwolf@redhat.com> In-Reply-To: <20241022164903.282174-1-kwolf@redhat.com> References: <20241022164903.282174-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.519, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.697, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729615877582116600 Content-Type: text/plain; charset="utf-8" From: Leonid Kaplan BLOCK_IO_ERROR events comes from guest, so we must throttle them. We still want per-device throttling, so let's use device id as a key. Signed-off-by: Leonid Kaplan Signed-off-by: Vladimir Sementsov-Ogievskiy Message-ID: <20241002151806.592469-3-vsementsov@yandex-team.ru> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- qapi/block-core.json | 2 ++ monitor/monitor.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index fe63ba6cbf..fd3bcc1c17 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5611,6 +5611,8 @@ # .. note:: If action is "stop", a STOP event will eventually follow # the BLOCK_IO_ERROR event. # +# .. note:: This event is rate-limited. +# # Since: 0.13 # # .. qmp-example:: diff --git a/monitor/monitor.c b/monitor/monitor.c index db52a9c7ef..56786c0ccc 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -308,6 +308,7 @@ int error_printf_unless_qmp(const char *fmt, ...) static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] =3D { /* Limit guest-triggerable events to 1 per second */ [QAPI_EVENT_RTC_CHANGE] =3D { 1000 * SCALE_MS }, + [QAPI_EVENT_BLOCK_IO_ERROR] =3D { 1000 * SCALE_MS }, [QAPI_EVENT_WATCHDOG] =3D { 1000 * SCALE_MS }, [QAPI_EVENT_BALLOON_CHANGE] =3D { 1000 * SCALE_MS }, [QAPI_EVENT_QUORUM_REPORT_BAD] =3D { 1000 * SCALE_MS }, @@ -493,7 +494,8 @@ static unsigned int qapi_event_throttle_hash(const void= *key) hash +=3D g_str_hash(qdict_get_str(evstate->data, "node-name")); } =20 - if (evstate->event =3D=3D QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE) { + if (evstate->event =3D=3D QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE || + evstate->event =3D=3D QAPI_EVENT_BLOCK_IO_ERROR) { hash +=3D g_str_hash(qdict_get_str(evstate->data, "qom-path")); } =20 @@ -519,7 +521,8 @@ static gboolean qapi_event_throttle_equal(const void *a= , const void *b) qdict_get_str(evb->data, "node-name")); } =20 - if (eva->event =3D=3D QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE) { + if (eva->event =3D=3D QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE || + eva->event =3D=3D QAPI_EVENT_BLOCK_IO_ERROR) { return !strcmp(qdict_get_str(eva->data, "qom-path"), qdict_get_str(evb->data, "qom-path")); } --=20 2.47.0