From patchwork Sun Apr 1 21:17:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 894062 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40DpBB3gKFz9s0w for ; Mon, 2 Apr 2018 07:18:42 +1000 (AEST) Received: from localhost ([::1]:35950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2kN6-0001Pg-35 for incoming@patchwork.ozlabs.org; Sun, 01 Apr 2018 17:18:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2kMS-0001OF-9S for qemu-devel@nongnu.org; Sun, 01 Apr 2018 17:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2kMP-00061G-3t for qemu-devel@nongnu.org; Sun, 01 Apr 2018 17:18:00 -0400 Received: from mout.web.de ([212.227.15.14]:57529) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f2kMO-00060k-Pj for qemu-devel@nongnu.org; Sun, 01 Apr 2018 17:17:57 -0400 Received: from [192.168.2.11] ([92.76.39.170]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MdpWf-1esVe31oVR-00PeEq; Sun, 01 Apr 2018 23:17:54 +0200 To: Dmitry Fleytman , qemu-devel From: Jan Kiszka Openpgp: preference=signencrypt Message-ID: <79199357-38dc-4a2a-6e67-e80235448b31@web.de> Date: Sun, 1 Apr 2018 23:17:53 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Language: en-US X-Provags-ID: V03:K0:RYwjNBWTkrnTJmFpcyTy6JYmvvH//tEPc3eX3DxT/A1n756W49N r6D9IiwbPXzcvAsxPQ3pxeqJq+oZwpw5q8G4F80eNh6hucIHL8Rf/N8i10ReWzS1RPSUmYm Ol+vjTnw/K3wTaiwOND9eAEdx9U/YKvHvp8UDKIYAN4ZPtpNPSlcKMDEQzJClIReZKNcV7A 96wwYdOV3xsITNwDgBOFQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:zEFadtpTaIs=:0m5H01beyus3FUcLjADwFS FjC8tquhH+MfR9CRqndBFGbE5tlq/SmMpRVPI+ORrccXSrIErlSQwC7OwDgD1Xm3S5yQRmd7c SyMss/bBMEn1GLMgC1NvOOQPf4JhvE2LZ2D7ZGw/nvAEYRTm0LbhXlmNBciEvfUTQKpsrlpje pr5ul+98Y+12zchph/qLXVInS9WEf6RdLmZz6Dy5NOqOsyKZJe/O28RQS1dPFB+LpZIHq2x2d hrXhLxwwN7HfoLewtOj6rvgyOoQbS791itecAqjTAinaJWvxEzPoc4unwTSCUW9W6F/YLB8Hg F0gQ0eglh3vzzkQ/YXi/u8dkBkEXKZ4ZrVQc1IMgU/OH/ASpx4D9iJB1H35XkQuaFvRYfsmwy wgV1rh3a8AReb5GkSJhHVJYOyj1TgYdekPFgW12Zjsk8aLmfUM8eor/ZkWnZPx9YQdLRTpjtO p9YV3LNuFwV7cm3BWc5qiyeslA/x7PqQqJRPOFTzNA9CwQeVXwIWde3eRsEwtBS6txBwpEvxd 72vsI2PM31xOD9TAu6LcfhAjt3sGIgT+4fUcNsxmq8fLFJNLARuyrtbXF14wWrWrzcwp7sAw5 fUHHxOpeCTcJ5+qcSrdLLLAxU8G9RFYcukzLTck96S3+/sstjH/yRCG/C5sgykPcWGXWZ2jXe sZ/I8aAqUTwwXchYG+aR1RCpF1OJWRn+/b8Z+UVFyqTUTUH2RUKG0cSKV9aKaEp/64ctgCoa9 M7rnra4dJp9rHX6E4K/Rl+IMiMdxW0qNIknY9UgsxCiUucNCZ7Qyl/lw4+/I+ke2+CjRczwdI IMG9/AvpCleH+cnoZhrCJx9uP1jQPsu2kqqmwQ6dH3CFTgJx5k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.14 Subject: [Qemu-devel] [PATCH] e1000e: Prevent MSI/MSI-X storms X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jan Kiszka Only signal MSI/MSI-X events on rising edges. So far we re-triggered the interrupt sources even if the guest did no consumed the pending one, easily causing interrupt storms. Issue was observable with Linux 4.16 e1000e driver when MSI-X was used. Vector 2 was causing interrupt storms after the driver activated the device. Signed-off-by: Jan Kiszka --- hw/net/e1000e_core.c | 10 ++++++++++ hw/net/e1000e_core.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index c93c4661ed..ecf9b15555 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -2123,6 +2123,13 @@ e1000e_send_msi(E1000ECore *core, bool msix) { uint32_t causes = core->mac[ICR] & core->mac[IMS] & ~E1000_ICR_ASSERTED; + core->msi_causes_pending &= causes; + causes ^= core->msi_causes_pending; + if (causes == 0) { + return; + } + core->msi_causes_pending |= causes; + if (msix) { e1000e_msix_notify(core, causes); } else { @@ -2160,6 +2167,9 @@ e1000e_update_interrupt_state(E1000ECore *core) core->mac[ICS] = core->mac[ICR]; interrupts_pending = (core->mac[IMS] & core->mac[ICR]) ? true : false; + if (!interrupts_pending) { + core->msi_causes_pending = 0; + } trace_e1000e_irq_pending_interrupts(core->mac[ICR] & core->mac[IMS], core->mac[ICR], core->mac[IMS]); diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h index 7d8ff41890..63a15510cc 100644 --- a/hw/net/e1000e_core.h +++ b/hw/net/e1000e_core.h @@ -109,6 +109,8 @@ struct E1000Core { NICState *owner_nic; PCIDevice *owner; void (*owner_start_recv)(PCIDevice *d); + + uint32_t msi_causes_pending; }; void