From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 608FEC47095 for ; Wed, 9 Jun 2021 10:01:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9D3B6128A for ; Wed, 9 Jun 2021 10:01:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9D3B6128A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqv1W-0008Ra-Pn for qemu-devel@archiver.kernel.org; Wed, 09 Jun 2021 06:01:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lquzU-00058G-RN for qemu-devel@nongnu.org; Wed, 09 Jun 2021 05:59:16 -0400 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]:33284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lquzQ-0002u1-Fq for qemu-devel@nongnu.org; Wed, 09 Jun 2021 05:59:16 -0400 Received: by mail-lf1-x12a.google.com with SMTP id bp38so1535985lfb.0 for ; Wed, 09 Jun 2021 02:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cynhB7H844usO/w7q82Q6cxltDJPQ4Zf1PvkeKtrTf0=; b=IRNUHyTf4y7Mdijcy82BwMO+ryphNeDci32XDifug2O3nb9lYr+TCx1eAwu+JrQK8h hqGlj3h96FBA4oNCwZD2fYu5yF6Mg0kLRHlcqf7Z1SEC8IGeqJz4WMsPh1PsXRxXPMTs PNugZJ2yu3KGE4sucmEVTVNqBEZazhvh53pUK7Ra66oEfa+nH3RJxBYpBicMVYMKslN9 Ekv2q/PQu/oGUyU8qawkjTAionuJRGr53pB0EWNoE6YwzDZZRBbpnFOMAxVCC8UqHA92 sR7JMnabLz9dpyUdKyN0wMv1zcB2ehb1orU50xpYm1zmW+GS0qAz77qn0TFnmtgMlg3M XGBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cynhB7H844usO/w7q82Q6cxltDJPQ4Zf1PvkeKtrTf0=; b=CRxbufzyBTeGQznGqy4dG1+PDHI30YAlGYfuMhISqdtI5yZtDT2B4D+pfO9lceuBYq W1SjNjFqcH9wI1167wNY/8r78eHOZ7OaMiJrZShJpjuQeNocNcqK9IQgLiGxP5/mD5pq 0Pdnud9ti9XjxMDnCskgVk0V8Ud8zrQyWw8l6l6gKfuycH8mjy43S3cwmYOVdrGPITCn g4VBc+NAV2guLRKQtShInKj5rGL8B/iHQatWGr4BSrGoAzO/d6c+oI9s0zRdumIm36V0 7GOatPipoepesQYZlXAAELLLhdCcSUEsP9g6+jBpYiHx3TCKUrLRCM+piy4TT6yr39Yj CmGg== X-Gm-Message-State: AOAM530HThEJagbZUm3rE8nRAAf1bI6jRzUuO4Uk1/9aawDwxQaBAMpE 85VKdUgNG3hvVEBoAG0ibW9bhg== X-Google-Smtp-Source: ABdhPJw+SgwrzbFMEF/eVSC3WKjlgBJqG1w6pNvEPNEqZA4yZmdpoRZrp6VA2l0qtkXNtzH+pn+JQw== X-Received: by 2002:a05:6512:39ca:: with SMTP id k10mr11700483lfu.473.1623232750724; Wed, 09 Jun 2021 02:59:10 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id q6sm218751lfj.88.2021.06.09.02.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 02:59:10 -0700 (PDT) From: Andrew Melnychenko To: mst@redhat.com Subject: [PATCH 1/3] virtio-pci: Added check for virtio device presence in mm callbacks. Date: Wed, 9 Jun 2021 12:58:41 +0300 Message-Id: <20210609095843.141378-2-andrew@daynix.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609095843.141378-1-andrew@daynix.com> References: <20210609095843.141378-1-andrew@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2a00:1450:4864:20::12a; envelope-from=andrew@daynix.com; helo=mail-lf1-x12a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" During unplug the virtio device is unplugged from virtio-bus on pci. In some cases, requests to virtio-pci mm may acquire during/after unplug. Added check that virtio device is on the bus, for "common" memory region. Signed-off-by: Andrew Melnychenko --- hw/virtio/virtio-pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index b321604d9b..05865b1fcb 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1146,6 +1146,10 @@ static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr, uint32_t val = 0; int i; + if (vdev == NULL) { + return UINT64_MAX; + } + switch (addr) { case VIRTIO_PCI_COMMON_DFSELECT: val = proxy->dfselect; @@ -1229,6 +1233,10 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr, VirtIOPCIProxy *proxy = opaque; VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); + if (vdev == NULL) { + return; + } + switch (addr) { case VIRTIO_PCI_COMMON_DFSELECT: proxy->dfselect = val; -- 2.31.1