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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id ECBA4C4345F for ; Mon, 15 Apr 2024 09:20:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwIW3-0001C9-Jh; Mon, 15 Apr 2024 05:20:43 -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 1rwIVx-00010k-4d for qemu-devel@nongnu.org; Mon, 15 Apr 2024 05:20:40 -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 1rwIVt-0000sY-C6 for qemu-devel@nongnu.org; Mon, 15 Apr 2024 05:20:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713172832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KWlKZt4st1wISnVwGRDW2KD1FoNDY+WaIJSHCc/wY0M=; b=h8mE3OA52FBS7nYeHCFNOi0A6s1+v+p3Z6mpIttwij1lijNgmdXUYFuKkgtJlwcOzWJC2q RXf0EeP6ECf0Ajr2f9loXv7wXXrDydE/K92GQYxr40eyGoKoG4YOaIQIwwtJ5/oRI1qLiw WR2SSvdNELcVjJEHgLS+gmw7sAJkIP4= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-noUV3_PHOluXnTBWxaZPWw-1; Mon, 15 Apr 2024 05:20:31 -0400 X-MC-Unique: noUV3_PHOluXnTBWxaZPWw-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-343ee8b13aeso2539898f8f.2 for ; Mon, 15 Apr 2024 02:20:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713172829; x=1713777629; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KWlKZt4st1wISnVwGRDW2KD1FoNDY+WaIJSHCc/wY0M=; b=p5yJZEj9rL/0uWn+nGUbOK7hFBxBAnfgEmdUwEyfRQZ1Mf2IXbEguuar4c3ZOIsPul jAl4GkNXFHL8L/zQl5WTql9gTeX/EOUcEgLIMm5VTCTFnu/QGS1v3bV5qJ6+spj2rLgn 31wXbyWbKohyTTW4dqecwDLHiI3Ne4jYXc3J4j4TfEP0GscsnbGK5Nj+yb4dftSvjw4R iKYsl+SRIasGxKrIe3/TM1E5F7mAKLCXhVovn2p44oE23e1DDoTJvsMfjZm28+9VK052 7Dhu2GVAKaIY/87dfBnSKyZ8Ovp7s707IhmmRm/ZV9CIEr35nakVco4rLKSrREze2Em2 FtcA== X-Forwarded-Encrypted: i=1; AJvYcCXMC3EFdXjiI4NKJDus3zEedNFDogsMZMbzHXXuZc6i9m35aA4ekd/5EfnG6m6rJVdRvGy8k9jtinuWWgMNMAkW45/oBuY= X-Gm-Message-State: AOJu0Yz9Ka/Rgf6ec+AedV9ZXGL2/U6YtekNIJEuTBi+paXV9qR4IYTT fKIVaHT9SjKKThRirVEQO4ko29xJldyV6wMFDepe3wpvgnQRG76aOo2Eq11R9aXMaYs8uVmAAoh ggkKnnG3qZSZmZpMNlBiIFJh1+/H1Jo0rbUVIed15XHmNumK5vlxFYwORTh6T X-Received: by 2002:a5d:64e3:0:b0:346:4151:12c4 with SMTP id g3-20020a5d64e3000000b00346415112c4mr10585497wri.10.1713172829437; Mon, 15 Apr 2024 02:20:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBHPGven+3rCpBM34OtCsjZvdXGh+PQgW7Kg8iHRXVzBIhXnKyq7990lushCh3EBHmpzQrsQ== X-Received: by 2002:a5d:64e3:0:b0:346:4151:12c4 with SMTP id g3-20020a5d64e3000000b00346415112c4mr10585471wri.10.1713172828864; Mon, 15 Apr 2024 02:20:28 -0700 (PDT) Received: from redhat.com ([2a02:14f:172:a95b:a91:79d:72cd:ca48]) by smtp.gmail.com with ESMTPSA id g9-20020a5d5409000000b00343dc6a0019sm11493373wrv.68.2024.04.15.02.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 02:20:28 -0700 (PDT) Date: Mon, 15 Apr 2024 05:20:23 -0400 From: "Michael S. Tsirkin" To: Cindy Lu Cc: jasowang@redhat.com, qemu-devel@nongnu.org, qemu-stable@nongnu.org, Peter Maydell Subject: Re: [PATCH v6] virtio-pci: Fix the crash that the vector was used after released. Message-ID: <20240415051958-mutt-send-email-mst@kernel.org> References: <20240412062750.475180-1-lulu@redhat.com> <20240415042934-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.127, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, Apr 15, 2024 at 05:11:05PM +0800, Cindy Lu wrote: > On Mon, Apr 15, 2024 at 4:32 PM Michael S. Tsirkin wrote: > > > > On Fri, Apr 12, 2024 at 02:26:55PM +0800, Cindy Lu wrote: > > > During the booting process of the non-standard image, the behavior of the > > > called function in qemu is as follows: > > > > > > 1. vhost_net_stop() was triggered by guest image. This will call the function > > > virtio_pci_set_guest_notifiers() with assgin= false, > > > virtio_pci_set_guest_notifiers(） will release the irqfd for vector 0 > > > > > > 2. virtio_reset() was triggered, this will set configure vector to VIRTIO_NO_VECTOR > > > > > > 3.vhost_net_start() was called (at this time, the configure vector is > > > still VIRTIO_NO_VECTOR) and then call virtio_pci_set_guest_notifiers() with > > > assgin=true, so the irqfd for vector 0 is still not "init" during this process > > > > > > 4. The system continues to boot and sets the vector back to 0. After that > > > msix_fire_vector_notifier() was triggered to unmask the vector 0 and meet the crash > > > > > > To fix the issue, we need to support changing the vector after VIRTIO_CONFIG_S_DRIVER_OK is set. > > > > > > (gdb) bt > > > 0 __pthread_kill_implementation (threadid=, signo=signo@entry=6, no_tid=no_tid@entry=0) > > > at pthread_kill.c:44 > > > 1 0x00007fc87148ec53 in __pthread_kill_internal (signo=6, threadid=) at pthread_kill.c:78 > > > 2 0x00007fc87143e956 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26 > > > 3 0x00007fc8714287f4 in __GI_abort () at abort.c:79 > > > 4 0x00007fc87142871b in __assert_fail_base > > > (fmt=0x7fc8715bbde0 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x5606413efd53 "ret == 0", file=0x5606413ef87d "../accel/kvm/kvm-all.c", line=1837, function=) at assert.c:92 > > > 5 0x00007fc871437536 in __GI___assert_fail > > > (assertion=0x5606413efd53 "ret == 0", file=0x5606413ef87d "../accel/kvm/kvm-all.c", line=1837, function=0x5606413f06f0 <__PRETTY_FUNCTION__.19> "kvm_irqchip_commit_routes") at assert.c:101 > > > 6 0x0000560640f884b5 in kvm_irqchip_commit_routes (s=0x560642cae1f0) at ../accel/kvm/kvm-all.c:1837 > > > 7 0x0000560640c98f8e in virtio_pci_one_vector_unmask > > > (proxy=0x560643c65f00, queue_no=4294967295, vector=0, msg=..., n=0x560643c6e4c8) > > > at ../hw/virtio/virtio-pci.c:1005 > > > 8 0x0000560640c99201 in virtio_pci_vector_unmask (dev=0x560643c65f00, vector=0, msg=...) > > > at ../hw/virtio/virtio-pci.c:1070 > > > 9 0x0000560640bc402e in msix_fire_vector_notifier (dev=0x560643c65f00, vector=0, is_masked=false) > > > at ../hw/pci/msix.c:120 > > > 10 0x0000560640bc40f1 in msix_handle_mask_update (dev=0x560643c65f00, vector=0, was_masked=true) > > > at ../hw/pci/msix.c:140 > > > 11 0x0000560640bc4503 in msix_table_mmio_write (opaque=0x560643c65f00, addr=12, val=0, size=4) > > > at ../hw/pci/msix.c:231 > > > 12 0x0000560640f26d83 in memory_region_write_accessor > > > (mr=0x560643c66540, addr=12, value=0x7fc86b7bc628, size=4, shift=0, mask=4294967295, attrs=...) > > > at ../system/memory.c:497 > > > 13 0x0000560640f270a6 in access_with_adjusted_size > > > > > > (addr=12, value=0x7fc86b7bc628, size=4, access_size_min=1, access_size_max=4, access_fn=0x560640f26c8d , mr=0x560643c66540, attrs=...) at ../system/memory.c:573 > > > 14 0x0000560640f2a2b5 in memory_region_dispatch_write (mr=0x560643c66540, addr=12, data=0, op=MO_32, attrs=...) > > > at ../system/memory.c:1521 > > > 15 0x0000560640f37bac in flatview_write_continue > > > (fv=0x7fc65805e0b0, addr=4273803276, attrs=..., ptr=0x7fc871e9c028, len=4, addr1=12, l=4, mr=0x560643c66540) > > > at ../system/physmem.c:2714 > > > 16 0x0000560640f37d0f in flatview_write > > > (fv=0x7fc65805e0b0, addr=4273803276, attrs=..., buf=0x7fc871e9c028, len=4) at ../system/physmem.c:2756 > > > 17 0x0000560640f380bf in address_space_write > > > (as=0x560642161ae0 , addr=4273803276, attrs=..., buf=0x7fc871e9c028, len=4) > > > at ../system/physmem.c:2863 > > > 18 0x0000560640f3812c in address_space_rw > > > (as=0x560642161ae0 , addr=4273803276, attrs=..., buf=0x7fc871e9c028, len=4, is_write=true) at ../system/physmem.c:2873 > > > --Type for more, q to quit, c to continue without paging-- > > > 19 0x0000560640f8aa55 in kvm_cpu_exec (cpu=0x560642f205e0) at ../accel/kvm/kvm-all.c:2915 > > > 20 0x0000560640f8d731 in kvm_vcpu_thread_fn (arg=0x560642f205e0) at ../accel/kvm/kvm-accel-ops.c:51 > > > 21 0x00005606411949f4 in qemu_thread_start (args=0x560642f292b0) at ../util/qemu-thread-posix.c:541 > > > 22 0x00007fc87148cdcd in start_thread (arg=) at pthread_create.c:442 > > > 23 0x00007fc871512630 in clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 > > > (gdb) > > > > > > Fixes: f9a09ca3ea ("vhost: add support for configure interrupt") > > > Cc: qemu-stable@nongnu.org > > > > > > > empty line not needed here > > > will fix this > > > > Signed-off-by: Cindy Lu > > > > Reviewed-by: Michael S. Tsirkin > > > > It's guest triggerable so either we merge this before the release, > > or rely on stable process :( > > > thanks a lot for explain this, but I'm still not very clear about this > do you mean this can not be merged before 2024-04-23? > https://wiki.qemu.org/Planning/9.0#Release_Schedule > Really Thanks for your help > thanks > cindy > > > > --- > > > hw/virtio/virtio-pci.c | 43 ++++++++++++++++++++++++++++++++++++++++-- > > > 1 file changed, 41 insertions(+), 2 deletions(-) > > > > > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > > > index 1a7039fb0c..f83ec92990 100644 > > > --- a/hw/virtio/virtio-pci.c > > > +++ b/hw/virtio/virtio-pci.c > > > @@ -1423,6 +1423,36 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy, > > > > > > return offset; > > > } > > > +static void virtio_pci_set_and_change_vector(VirtIODevice *vdev, > > > + VirtIOPCIProxy *proxy, > > > + int queue_no, uint16_t old_vector, > > > + uint16_t new_vector) > > > +{ > > > + /* > > > + * If the device uses irqfd and the vector changes after DRIVER_OK is > > > + * set, we need to release the old vector and set up the new one. > > > + * others just need to set the new vector to device > > > + */ > > > + if ((vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) && > > > + (msix_enabled(&proxy->pci_dev) && kvm_msi_via_irqfd_enabled())) { > > > + if (old_vector != VIRTIO_NO_VECTOR) { > > > + kvm_virtio_pci_vector_release_one(proxy, queue_no); > > > + } > > > + } > > > + /*set the new vector to device*/ > > > + if (queue_no == VIRTIO_CONFIG_IRQ_IDX) { > > > + vdev->config_vector = new_vector; > > > + } else { > > > + virtio_queue_set_vector(vdev, queue_no, new_vector); > > > + } > > > + /* if the new vector chanegd need to set it up */ > > > > typo > > > sure will fix this > thanks > > cindy actually more issues. I posted v7 pls with most things fixed - pls start with that. > > > + if ((vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) && > > > + (msix_enabled(&proxy->pci_dev) && kvm_msi_via_irqfd_enabled())) { > > > + if (new_vector != VIRTIO_NO_VECTOR) { > > > + kvm_virtio_pci_vector_use_one(proxy, queue_no); > > > + } > > > + } > > > +} > > > > > > int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy, > > > uint8_t bar, uint64_t offset, uint64_t length, > > > @@ -1570,7 +1600,12 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr, > > > } else { > > > val = VIRTIO_NO_VECTOR; > > > } > > > - vdev->config_vector = val; > > > + vector = vdev->config_vector; > > > + /*check if need to change the vector*/ > > > + if (val != vector) { > > > + virtio_pci_set_and_change_vector(vdev, proxy, VIRTIO_CONFIG_IRQ_IDX, > > > + vector, val); > > > + } > > > break; > > > case VIRTIO_PCI_COMMON_STATUS: > > > if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) { > > > @@ -1610,7 +1645,11 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr, > > > } else { > > > val = VIRTIO_NO_VECTOR; > > > } > > > - virtio_queue_set_vector(vdev, vdev->queue_sel, val); > > > + /*check if need to change the vector*/ > > > + if (val != vector) { > > > + virtio_pci_set_and_change_vector(vdev, proxy, vdev->queue_sel, > > > + vector, val); > > > + } > > > break; > > > case VIRTIO_PCI_COMMON_Q_ENABLE: > > > if (val == 1) { > > > -- > > > 2.43.0 > >