From nobody Mon May 6 12:04:06 2024 Delivered-To: importer@patchew.org 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1577335071; cv=none; d=zohomail.com; s=zohoarc; b=So4t/dVMW3TaL4aPLico3jnw4yTD2pvBW6VaVVcJdqChNWa0HdPY5rMY6oKSZ4ICxQxF9AlQvmLE6WIPkrSgwQcrOT/rIZBI6Gyn3HsBOE2JYxiguCEo32hbhv5KYe4ZFWGMZwod3O16HZZOTZLbvaqSqvodsbovDH1DWaA+1FA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577335071; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=K7tbimO2/2dQv24tAym1UO0nhakXFIkSbfRgILSTGkY=; b=JVfs1OlfjGO5wgPmBtozqQJfHQnexYErjDuus+LF46cefLrVAoKlDVjl2hLywu1OVVofLCXg2vAEhhtEUBC9cmD3Zl+/Un5x8ity0EuNq/f99F5wSCM55lKuHOx+1m27sYey/0oxFKsvdKXU54kIoFmcYk+xzklrGsTrWf/LU40= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15773350715391008.4543393907994; Wed, 25 Dec 2019 20:37:51 -0800 (PST) Received: from localhost ([::1]:51116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikKuE-00010j-9h for importer@patchew.org; Wed, 25 Dec 2019 23:37:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54011) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikKtP-0000AK-CA for qemu-devel@nongnu.org; Wed, 25 Dec 2019 23:37:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ikKtO-0002sv-9s for qemu-devel@nongnu.org; Wed, 25 Dec 2019 23:36:59 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ikKtO-0002sa-4m for qemu-devel@nongnu.org; Wed, 25 Dec 2019 23:36:58 -0500 Received: by mail-wm1-x343.google.com with SMTP id t14so5259083wmi.5 for ; Wed, 25 Dec 2019 20:36:58 -0800 (PST) Received: from f2.redhat.com (bzq-79-182-106-171.red.bezeqint.net. [79.182.106.171]) by smtp.gmail.com with ESMTPSA id a1sm29428800wrr.80.2019.12.25.20.36.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Dec 2019 20:36:56 -0800 (PST) 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; bh=K7tbimO2/2dQv24tAym1UO0nhakXFIkSbfRgILSTGkY=; b=WPKq2bDqE1Q39BatoyzIXkba9o4yzP0kYibn8rxBL5luSyfCGqac9dSluwlcyH9kCc tDp+PrfNheVBymB2hGPMG/OqB6inZDSSye1LfrUeVT2KyKc5ADYBHE9KiwWb9yGrrOrY nWAXQk6RhaN5ftkNUo3LrT95pCC9HZcR5ZoEo+Y2GqJwZBWS8mFZNZ8SAjfJuGgcLHKY cY8Dx3/7ij0Cic5f/bLA7/7jbBfXk6mkcUh1EaURRGMIHTt1BDWq4Egimfm+VSUrNxeF RK0y3u74eL8Ffn9TXuPzQNixa0EGxlQMCMVYLpl2wu9mhKFwT5SHhOxJ/yZuC0YGvCVt PkLQ== 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; bh=K7tbimO2/2dQv24tAym1UO0nhakXFIkSbfRgILSTGkY=; b=gl8o41rYHJN1pF5Dq+K1eaTa1fNcSlCjZhGg9g6zLxrZ4W82PIS4S38Rdn7ncpde/S QdllkXTHhIaMQ6OtxbtqAn9TVPU0UXtERsOjGr4JKDnySQYbRhLzdyvVZNTDPnkKDesh 7bapzhlEU3UDpFrVMuaK5C3wLH7ppcuebGYIfHU4gV63hzlgPgUQa5X8Tmu4POYVQy4Y hfJ31WHGpU3DPV0zDBAeozRjGVSGbrvtENrrKDCWerEnPGpFr38n5Ecj70/7SbWs0Vot 4iMzgSU1mRezneXc07xb7QUKwdTPsshZARHkLmyh7qwzwpcTQwzMFbUc+fCRUdbnZmWL EUzw== X-Gm-Message-State: APjAAAVBq8dpiGiJCkazefMw25070NJo7W6H1NFxPMYIw0/2UHxXoKq/ Vp3YJoIo8JG0brXZWoCgtF4nPw== X-Google-Smtp-Source: APXvYqxvQAEwucxFmtpDLLFbBjyME4E0jQDbLLDLnnYZGhSJOJyTSbQGP2C8B8Izz8AgFlcR5nj5vg== X-Received: by 2002:a7b:cd07:: with SMTP id f7mr11495912wmj.37.1577335017228; Wed, 25 Dec 2019 20:36:57 -0800 (PST) From: Yuri Benditovich To: mst@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 1/2] virtio: reset region cache when on queue deletion Date: Thu, 26 Dec 2019 06:36:48 +0200 Message-Id: <20191226043649.14481-2-yuri.benditovich@daynix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191226043649.14481-1-yuri.benditovich@daynix.com> References: <20191226043649.14481-1-yuri.benditovich@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: yan@daynix.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @daynix-com.20150623.gappssmtp.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1708480 Fix leak of region reference that prevents complete device deletion on hot unplug. Signed-off-by: Yuri Benditovich --- hw/virtio/virtio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 04716b5f6c..baadec8abc 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2340,6 +2340,11 @@ void virtio_del_queue(VirtIODevice *vdev, int n) vdev->vq[n].vring.num_default =3D 0; vdev->vq[n].handle_output =3D NULL; vdev->vq[n].handle_aio_output =3D NULL; + /* + * with vring.num =3D 0 the queue will be ignored + * in later loops of region cache reset + */ + virtio_virtqueue_reset_region_cache(&vdev->vq[n]); g_free(vdev->vq[n].used_elems); } =20 --=20 2.17.1 From nobody Mon May 6 12:04:06 2024 Delivered-To: importer@patchew.org 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1577335129; cv=none; d=zohomail.com; s=zohoarc; b=ZMgfKRrOlvUU157HA813iiorEp3Zj1HRhQtRBZ+lajJMBcmoHCwGVaGAlQn3HxbzZUNzsRdrNx1zOQdbInjIbL0VX6Yxrv32g68/m+tMrvtclMfGvD/D/KhcO2q3QROeyW+sUnlsRnMzzwp8UJfhz3OHYsVEMMB76P8ydgYyikU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577335129; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=YtUVsfYfPI32c80SGOAiyBMd/9ynOy9lw1vc9As+J08=; b=anH1j/5rdm4+4+pzEWf99wiGpV/DTTxCmvctYXUKbNiJ77yQxt2jeN286jVLurbztWXN2PZXNFGQ2bFsKyx1BcHJjtDuHTe71+F84ZA5oUvvS65fJ4AKIH0z6an9e4fRUYoCbRbzpU8OKCBi0aak4jmVr5+US4C31gQd8JqsWsk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1577335129126254.92378072318434; Wed, 25 Dec 2019 20:38:49 -0800 (PST) Received: from localhost ([::1]:51124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikKvA-0002NR-An for importer@patchew.org; Wed, 25 Dec 2019 23:38:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54036) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikKtQ-0000AV-P7 for qemu-devel@nongnu.org; Wed, 25 Dec 2019 23:37:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ikKtP-0002tZ-Bk for qemu-devel@nongnu.org; Wed, 25 Dec 2019 23:37:00 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ikKtP-0002t3-5q for qemu-devel@nongnu.org; Wed, 25 Dec 2019 23:36:59 -0500 Received: by mail-wr1-x441.google.com with SMTP id z3so22819671wru.3 for ; Wed, 25 Dec 2019 20:36:59 -0800 (PST) Received: from f2.redhat.com (bzq-79-182-106-171.red.bezeqint.net. [79.182.106.171]) by smtp.gmail.com with ESMTPSA id a1sm29428800wrr.80.2019.12.25.20.36.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Dec 2019 20:36:57 -0800 (PST) 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; bh=YtUVsfYfPI32c80SGOAiyBMd/9ynOy9lw1vc9As+J08=; b=BqZJWxajH6ROdydX7EYEwrlQ8jSQL79WW2XjmQNV/SWH0JfYy2dzHdOc1X9rBLiJtj OEHJSCztzVwTaZSVp3+L4mhFjM2U4rGP9xcVEM65wHHN+an1vsXeM1fr+lGjkmnWCaWW glN53a5nhkLcF+piRVY8wOvtvlEF11pxcl6PlmfJcGs3rGwDl5LnXxRvnUQwVoSAon52 PzTpQXyMOU0RW7AoBGmsr0o+nyWKEIVqyuOMuu+35AS460nZ7wJZCvFcry6XKUzQFomS b5zigwX1BhA2E2neMiC1H+V5v3Y/wXIOJSyheu7AqIw5C7/gftplzU2C13iO4fi9q5Qx 1kvg== 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; bh=YtUVsfYfPI32c80SGOAiyBMd/9ynOy9lw1vc9As+J08=; b=YzZoBq30FGPyNoJNnFnM9g/Gaw27qHDRXPCY4f9ZLYZL2R2x7+7fWLJ32QScfI+oMA E/HFgOjpe0o4jEx3S8FPvHUnLPPRH96ShSkdAjebnFD2cgIHlnIP4EMlCytF1G3Okg4z luOvifxX8KpTxXzPOVV5iwO0CHLH2SFnC99l3+yajt3ksi9peqIaxVM8WZTGzCpqjHHX YjG7XYrb0eYS40HBgp66ryaVL+kPg7RpTBKRXjUP6I7xFVdQVtLEbOZwTozzn5fODkpa AyRCi13nHIuWyHHQZ+8NDnJqMTp1xqk7nU25eEA4PGV6ylATQbkl/LOIrjADryi6/lfN 0gew== X-Gm-Message-State: APjAAAWmYsHKY1oQCTTOL1C4fztjpHC0bIUK+I/taHtHqmMSPSEzwY0k zZpAz7i0D189wCWR1DYI8Tf/Tw== X-Google-Smtp-Source: APXvYqyLBhd5NfXP9oNc9d+bZVOqm62zi5BuCfLtRl6g4V/Gij3u12N1FrZ4Yj95j7roYACYL4lKlA== X-Received: by 2002:a5d:4847:: with SMTP id n7mr43129899wrs.30.1577335018238; Wed, 25 Dec 2019 20:36:58 -0800 (PST) From: Yuri Benditovich To: mst@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 2/2] virtio-net: delete also control queue when TX/RX deleted Date: Thu, 26 Dec 2019 06:36:49 +0200 Message-Id: <20191226043649.14481-3-yuri.benditovich@daynix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191226043649.14481-1-yuri.benditovich@daynix.com> References: <20191226043649.14481-1-yuri.benditovich@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: yan@daynix.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @daynix-com.20150623.gappssmtp.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1708480 If the control queue is not deleted together with TX/RX, it later will be ignored in freeing cache resources and hot unplug will not be completed. Signed-off-by: Yuri Benditovich --- hw/net/virtio-net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index db3d7c38e6..f325440d01 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3101,7 +3101,8 @@ static void virtio_net_device_unrealize(DeviceState *= dev, Error **errp) for (i =3D 0; i < max_queues; i++) { virtio_net_del_queue(n, i); } - + /* delete also control vq */ + virtio_del_queue(vdev, max_queues * 2); qemu_announce_timer_del(&n->announce_timer, false); g_free(n->vqs); qemu_del_nic(n->nic); --=20 2.17.1