Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp6544070rwb; Tue, 9 Aug 2022 18:10:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR5NyBFv6aqpn2tGobzfUkLOrSawJ0xIVhAAMOXTTpgMoulJ+859PdPqfVc/dS6aXfWvDIgm X-Received: by 2002:a17:90a:bb14:b0:1f3:5f1:6de9 with SMTP id u20-20020a17090abb1400b001f305f16de9mr1177795pjr.148.1660093841471; Tue, 09 Aug 2022 18:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660093841; cv=none; d=google.com; s=arc-20160816; b=PgUF1+0IPEpYQUJhVvP8YiShm0V/QHb30s3fujP2Aytdhq3Mvwe4zhRmz/BdhNCW+Z Qkm7neRIGL1uXmAoI07ccbsYmYa2+S4SDA0ziHIJExcQALwzh7cKk9wmTNyYUNdknxhh VExqoTmOX0trua9dY/OJLbkNzESe9+2hwlmIJgjxm0dcjZcuh3fmA/UBtEahQNktYUk5 GHy97NpZi9mN3tkJPk18iPzfferfjo+izX27auLu6WA2i+uGbX54g5PKKUZFcTmJnvkg Tb3M5bGCtCmogePe0IpETEIvbIGFeEO1nIgtupUKVCDYE0NfShB/U2gl+zUZd9aDdcTL 5oKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=SLcFSQNPNT7pTao9Pwew1YyMS0g7osPVOKjEw6zICXI=; b=fU82HOksu0qTvNs5sBWWTCHMFUZG1YUhIR3oROi468PiS7ARrJVV3vZCeTE76xbscF 1Ix8VGD/p5gG75MmiRvVECdATDGnEdPxzCUh7iGQbe8Bn0Fomb+xgPnO8OXcVnmd8PWX R8Xb8Yc14RsVb7pXA7ejU1z4ygDzW4YuIToMqqaitOQIBquJGOImXpp35Z6mEYps9JfW y0vBJXoiO/eiNi2Kwf+e/jHCBvi/wascwlxPc4W7ouI+5K9CUW3Le0F3cEDS8zEXWGTj NXUtUaiKn+oRoxeiSkqrQXvwesDEdQVHIub+jzOg5nv53uVcui7mU+L8kJdktOY4dX/7 ts8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@semihalf.com header.s=google header.b=kzGkPrfw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=semihalf.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x71-20020a63864a000000b0041b2f37c570si2681463pgd.752.2022.08.09.18.10.21; Tue, 09 Aug 2022 18:10:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@semihalf.com header.s=google header.b=kzGkPrfw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=semihalf.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229819AbiHJA4i (ORCPT + 99 others); Tue, 9 Aug 2022 20:56:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbiHJA4g (ORCPT ); Tue, 9 Aug 2022 20:56:36 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B0687E838 for ; Tue, 9 Aug 2022 17:56:34 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id l21so3164046ljj.2 for ; Tue, 09 Aug 2022 17:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject:from:to:cc; bh=SLcFSQNPNT7pTao9Pwew1YyMS0g7osPVOKjEw6zICXI=; b=kzGkPrfw+ipWSaMn6FDYsbNGUXniBEZv5Ti5Cn3Tj1bFI0Sryuz06zBiv+ZghPU5oS sLk68sIfIF5o3v+U3MJm04cm9eoFGtrtdcuA+i+NcUTpOH87qA80rl/wrAy2JtNHr0aK 8tzRFR4BJrUPsVsSFu2yv3yItpIuPsEtc8GVxAI7a1NyLwXllJxqE7DlLGGo0CkMjvtt dk02qp5MNSJbsx/WeHi8l+X2kM2aEWyWi5boSlaKK8pe9gn0ZiPw6HdmaM32WIg67JiF mPaR7BJZBeu02uKCG3bHHXuUDD5gqHesWDy+SU0ykBmo7VQCpdU2N9482e9h7vCMC0Pe SymA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :x-gm-message-state:from:to:cc; bh=SLcFSQNPNT7pTao9Pwew1YyMS0g7osPVOKjEw6zICXI=; b=rb4zeOb7fgiiemQ87boOqYAQaGNdufk5K9DgKHZKrtnNfIJaUfAmC6zFvcYtvs+7YL LqV2RMQgvzOCvyAWfd27OM7Kh26hAcLndIRCWEZiMTVT1Ea8kOoA+sbKuYEg1eQP49em YZzaecjKEFUMR5KdlxH9fUZAGHioAhERwxfoCRUbD0usyzYAhbROim91xjIfMd9gyz/O 5Xt6ryOarHdLwzhLCsYEOr3uAZLfstrYzO3BKVQmpuyE4+JwC93MsMWVyNa3Wy0p9g13 dB1bMNLj12VIzS4TuGlLI2EBDjd3beA0orKHnpcrtApBnLVDojaw+ILmkey+xTjbJJMS owHA== X-Gm-Message-State: ACgBeo3Ljf5WCGU0MpARPcQ5KenDgXerZzpm8OsFHTftj9mJRqzXb0Ua +WyYEFAVCl0mzGIOU48CBdvvEw== X-Received: by 2002:a05:651c:168f:b0:25e:59f6:24d3 with SMTP id bd15-20020a05651c168f00b0025e59f624d3mr8697470ljb.456.1660092992336; Tue, 09 Aug 2022 17:56:32 -0700 (PDT) Received: from ?IPv6:2a02:a31b:33d:9c00:463a:87e3:44fc:2b2f? ([2a02:a31b:33d:9c00:463a:87e3:44fc:2b2f]) by smtp.gmail.com with ESMTPSA id f28-20020a2eb5bc000000b0025dfe45c031sm195517ljn.27.2022.08.09.17.56.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Aug 2022 17:56:31 -0700 (PDT) Subject: Re: [PATCH 3/3] KVM: irqfd: Postpone resamplefd notify for oneshot interrupts To: "Liu, Rong L" , "Christopherson,, Sean" , Paolo Bonzini , "kvm@vger.kernel.org" Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "x86@kernel.org" , "H. Peter Anvin" , "linux-kernel@vger.kernel.org" , Eric Auger , Alex Williamson , Zhenyu Wang , Tomasz Nowicki , Grzegorz Jaszczyk , Dmitry Torokhov References: <20220715155928.26362-1-dmy@semihalf.com> <20220715155928.26362-4-dmy@semihalf.com> <923b0e08-6e19-69c1-a9a2-4127c619e707@semihalf.com> From: Dmytro Maluka Message-ID: <1d1555fd-eea6-95a6-e396-a6907322b778@semihalf.com> Date: Wed, 10 Aug 2022 02:56:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rong, On 8/10/22 12:02 AM, Liu, Rong L wrote: > Hi Dmytro, > >> -----Original Message----- >> From: Dmytro Maluka >> Sent: Saturday, July 30, 2022 7:35 AM >> To: Liu, Rong L ; Christopherson,, Sean >> ; Paolo Bonzini ; >> kvm@vger.kernel.org >> Cc: Thomas Gleixner ; Ingo Molnar >> ; Borislav Petkov ; Dave Hansen >> ; x86@kernel.org; H. Peter Anvin >> ; linux-kernel@vger.kernel.org; Eric Auger >> ; Alex Williamson >> ; Zhenyu Wang >> ; Tomasz Nowicki ; >> Grzegorz Jaszczyk ; Dmitry Torokhov >> >> Subject: Re: [PATCH 3/3] KVM: irqfd: Postpone resamplefd notify for >> oneshot interrupts >> >> On 7/29/22 10:48 PM, Liu, Rong L wrote: >>> Hi Dmytro, >>> >>>> -----Original Message----- >>>> From: Dmytro Maluka >>>> Sent: Tuesday, July 26, 2022 7:08 AM >>>> To: Liu, Rong L ; Christopherson,, Sean >>>> ; Paolo Bonzini ; >>>> kvm@vger.kernel.org >>>> Cc: Thomas Gleixner ; Ingo Molnar >>>> ; Borislav Petkov ; Dave Hansen >>>> ; x86@kernel.org; H. Peter Anvin >>>> ; linux-kernel@vger.kernel.org; Eric Auger >>>> ; Alex Williamson >>>> ; Zhenyu Wang >>>> ; Tomasz Nowicki ; >>>> Grzegorz Jaszczyk ; Dmitry Torokhov >>>> >>>> Subject: Re: [PATCH 3/3] KVM: irqfd: Postpone resamplefd notify for >>>> oneshot interrupts >>>> >>>> Hi Rong, >>>> >>>> On 7/26/22 01:44, Liu, Rong L wrote: >>>>> Hi Dmytro, >>>>> >>>>>> -----Original Message----- >>>>>> From: Dmytro Maluka >>>>>> Sent: Friday, July 15, 2022 8:59 AM >>>>>> To: Christopherson,, Sean ; Paolo Bonzini >>>>>> ; kvm@vger.kernel.org >>>>>> Cc: Thomas Gleixner ; Ingo Molnar >>>>>> ; Borislav Petkov ; Dave >> Hansen >>>>>> ; x86@kernel.org; H. Peter Anvin >>>>>> ; linux-kernel@vger.kernel.org; Eric Auger >>>>>> ; Alex Williamson >>>>>> ; Liu, Rong L ; >>>>>> Zhenyu Wang ; Tomasz Nowicki >>>>>> ; Grzegorz Jaszczyk ; >> Dmitry >>>>>> Torokhov ; Dmytro Maluka >> >>>>>> Subject: [PATCH 3/3] KVM: irqfd: Postpone resamplefd notify for >>>> oneshot >>>>>> interrupts >>>>>> >>>>>> The existing KVM mechanism for forwarding of level-triggered >>>> interrupts >>>>>> using resample eventfd doesn't work quite correctly in the case of >>>>>> interrupts that are handled in a Linux guest as oneshot interrupts >>>>>> (IRQF_ONESHOT). Such an interrupt is acked to the device in its >>>>>> threaded irq handler, i.e. later than it is acked to the interrupt >>>>>> controller (EOI at the end of hardirq), not earlier. >>>>>> >>>>>> Linux keeps such interrupt masked until its threaded handler >> finishes, >>>>>> to prevent the EOI from re-asserting an unacknowledged interrupt. >>>>>> However, with KVM + vfio (or whatever is listening on the >> resamplefd) >>>>>> we don't check that the interrupt is still masked in the guest at the >>>>>> moment of EOI. Resamplefd is notified regardless, so vfio >> prematurely >>>>>> unmasks the host physical IRQ, thus a new (unwanted) physical >>>> interrupt >>>>>> is generated in the host and queued for injection to the guest. >>>>>> >>>>>> The fact that the virtual IRQ is still masked doesn't prevent this new >>>>>> physical IRQ from being propagated to the guest, because: >>>>>> >>>>>> 1. It is not guaranteed that the vIRQ will remain masked by the time >>>>>> when vfio signals the trigger eventfd. >>>>>> 2. KVM marks this IRQ as pending (e.g. setting its bit in the virtual >>>>>> IRR register of IOAPIC on x86), so after the vIRQ is unmasked, this >>>>>> new pending interrupt is injected by KVM to the guest anyway. >>>>>> >>>>>> There are observed at least 2 user-visible issues caused by those >>>>>> extra erroneous pending interrupts for oneshot irq in the guest: >>>>>> >>>>>> 1. System suspend aborted due to a pending wakeup interrupt from >>>>>> ChromeOS EC (drivers/platform/chrome/cros_ec.c). >>>>>> 2. Annoying "invalid report id data" errors from ELAN0000 >> touchpad >>>>>> (drivers/input/mouse/elan_i2c_core.c), flooding the guest dmesg >>>>>> every time the touchpad is touched. >>>>>> >>>>>> This patch fixes the issue on x86 by checking if the interrupt is >>>>>> unmasked when we receive irq ack (EOI) and, in case if it's masked, >>>>>> postponing resamplefd notify until the guest unmasks it. >>>>>> >>>>>> Important notes: >>>>>> >>>>>> 1. It doesn't fix the issue for other archs yet, due to some missing >>>>>> KVM functionality needed by this patch: >>>>>> - calling mask notifiers is implemented for x86 only >>>>>> - irqchip ->is_masked() is implemented for x86 only >>>>>> >>>>>> 2. It introduces an additional spinlock locking in the resample notify >>>>>> path, since we are no longer just traversing an RCU list of irqfds >>>>>> but also updating the resampler state. Hopefully this locking won't >>>>>> noticeably slow down anything for anyone. >>>>>> >>>>> >>>>> Instead of using a spinlock waiting for the unmask event, is it >> possible >>>> to call >>>>> resampler notify directly when unmask event happens, instead of >>>> calling it on >>>>> EOI? >>>> >>>> In this patch, resampler notify is already called directly when unmask >>>> happens: e.g. with IOAPIC, when the guest unmasks the interrupt by >>>> writing to IOREDTBLx register, ioapic_write_indirect() calls >>>> kvm_fire_mask_notifiers() which calls irqfd_resampler_mask() which >>>> notifies the resampler. On EOI we postpone it just by setting >>>> resampler->pending to true, not by waiting. The spinlock is needed >>>> merely to synchronize reading & updating resampler->pending and >>>> resampler->masked values between possibly concurrently running >>>> instances >>>> of irqfd_resampler_ack() and/or irqfd_resampler_mask(). >>>> >>>> Thanks, >>>> Dmytro >>>> >>> >>> I mean the organization of the code. In current implementation, >>> kvm_ioapic_update_eoi_one() calls kvm_notify_acked_irq(), in your >> patch, why not >>> call kvm_notify_acked_irq() from ioapic_write_indirect() (roughly at >> the same >>> place where kvm_fire_mask_notifiers is called), instead of calling it >> from >>> kvm_ioapic_update_eoi_one, since what your intention here is to >> notify >>> vfio of the end of interrupt at the event of ioapic unmask, instead of >>> EOI? >> >> Ah ok, got your point. >> >> That was my initial approach in my PoC patch posted in [1]. But then I >> dropped it, for 2 reasons: >> >> 1. Upon feedback from Sean I realized that kvm_notify_acked_irq() is >> also doing some other important things besides notifying vfio. In >> particular, in irqfd_resampler_ack() we also de-assert the vIRQ via >> kvm_set_irq(). In case of IOAPIC it means clearing its bit in IRR >> register. If we delay that until unmasking, it means that we change >> the way how KVM emulates the interrupt controller. That would seem >> inconsistent. >> > > Thanks for clarification. I totally agree that it is important to keep the way > how KVM emulates the interrupt controller. > >> Also kvm_notify_acked_irq() notifies the emulated PIT timer via >> kvm_pit_ack_irq(). I haven't analyzed how exactly that PIT stuff >> works, so I'm not sure if delaying that until unmask wouldn't cause >> any unwanted effects. >> >> So the idea is to postpone eventfd_signal() only, to fix interaction >> with vfio while keeping the rest of the KVM behavior intact. Because >> the KVM job is to emulate the interrupt controller (which it already >> does correctly), not the external device which is the job of vfio*. >> > > I made a mistake in my last post. I mean just to delay the notification of > vfio, but keep the rest of the code as intact as possible. Hmm, thanks, until now I wasn't thinking about another possibility: call delayed eventfd_signal() directly from ioapic_write_indirect(). However, now thinking about that, I don't really see advantages. We wouldn't need to use mask notifiers then, but we would still need the same logic and synchronization in irqfd_resampler_ack() for checking whether we should delay the notification. Moreover, I'm not sure how would I then address the resampler->masked initialization race issue, which I addressed in v2 by implementing kvm_register_and_fire_irq_mask_notifier() in [1]. [1] https://lore.kernel.org/lkml/20220805193919.1470653-3-dmy@semihalf.com/ > >> 2. kvm_notify_acked_irq() can't be called under ioapic->lock, so in [1] >> I was unlocking ioapic->lock in ioapic_write_indirect() with a naive >> assumption that it was as safe as doing it in >> kvm_ioapic_update_eoi_one(). That was probably racy, and I hadn't >> figured out how to rework it in a race-free way. >> >> [1] https://lore.kernel.org/kvm/31420943-8c5f-125c-a5ee- >> d2fde2700083@semihalf.com/ >> >> [*] By "vfio" I always mean "vfio or any other resamplefd user". >> >> Thanks, >> Dmytro >> >>> >>>>> >>>>>> Regarding #2, there may be an alternative solution worth >> considering: >>>>>> extend KVM irqfd (userspace) API to send mask and unmask >>>> notifications >>>>>> directly to vfio/whatever, in addition to resample notifications, to >>>>>> let vfio check the irq state on its own. There is already locking on >>>>>> vfio side (see e.g. vfio_platform_unmask()), so this way we would >>>> avoid >>>>>> introducing any additional locking. Also such mask/unmask >>>> notifications >>>>>> could be useful for other cases. >>>>>> >>>>>> Link: https://lore.kernel.org/kvm/31420943-8c5f-125c-a5ee- >>>>>> d2fde2700083@semihalf.com/ >>>>>> Suggested-by: Sean Christopherson >>>>>> Signed-off-by: Dmytro Maluka >>>>>> --- >>>>>> include/linux/kvm_irqfd.h | 14 ++++++++++++ >>>>>> virt/kvm/eventfd.c | 45 >>>>>> +++++++++++++++++++++++++++++++++++++++ >>>>>> 2 files changed, 59 insertions(+) >>>>>> >>>>>> diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h >>>>>> index dac047abdba7..01754a1abb9e 100644 >>>>>> --- a/include/linux/kvm_irqfd.h >>>>>> +++ b/include/linux/kvm_irqfd.h >>>>>> @@ -19,6 +19,16 @@ >>>>>> * resamplefd. All resamplers on the same gsi are de-asserted >>>>>> * together, so we don't need to track the state of each individual >>>>>> * user. We can also therefore share the same irq source ID. >>>>>> + * >>>>>> + * A special case is when the interrupt is still masked at the >> moment >>>>>> + * an irq ack is received. That likely means that the interrupt has >>>>>> + * been acknowledged to the interrupt controller but not >>>> acknowledged >>>>>> + * to the device yet, e.g. it might be a Linux guest's threaded >>>>>> + * oneshot interrupt (IRQF_ONESHOT). In this case notifying >> through >>>>>> + * resamplefd is postponed until the guest unmasks the interrupt, >>>>>> + * which is detected through the irq mask notifier. This prevents >>>>>> + * erroneous extra interrupts caused by premature re-assert of an >>>>>> + * unacknowledged interrupt by the resamplefd listener. >>>>>> */ >>>>>> struct kvm_kernel_irqfd_resampler { >>>>>> struct kvm *kvm; >>>>>> @@ -28,6 +38,10 @@ struct kvm_kernel_irqfd_resampler { >>>>>> */ >>>>>> struct list_head list; >>>>>> struct kvm_irq_ack_notifier notifier; >>>>>> + struct kvm_irq_mask_notifier mask_notifier; >>>>>> + bool masked; >>>>>> + bool pending; >>>>>> + spinlock_t lock; >>>>>> /* >>>>>> * Entry in list of kvm->irqfd.resampler_list. Use for sharing >>>>>> * resamplers among irqfds on the same gsi. >>>>>> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c >>>>>> index 50ddb1d1a7f0..9ff47ac33790 100644 >>>>>> --- a/virt/kvm/eventfd.c >>>>>> +++ b/virt/kvm/eventfd.c >>>>>> @@ -75,6 +75,44 @@ irqfd_resampler_ack(struct >>>> kvm_irq_ack_notifier >>>>>> *kian) >>>>>> kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID, >>>>>> resampler->notifier.gsi, 0, false); >>>>>> >>>>>> + spin_lock(&resampler->lock); >>>>>> + if (resampler->masked) { >>>>>> + resampler->pending = true; >>>>>> + spin_unlock(&resampler->lock); >>>>>> + return; >>>>>> + } >>>>>> + spin_unlock(&resampler->lock); >>>>>> + >>>>>> + idx = srcu_read_lock(&kvm->irq_srcu); >>>>>> + >>>>>> + list_for_each_entry_srcu(irqfd, &resampler->list, >> resampler_link, >>>>>> + srcu_read_lock_held(&kvm->irq_srcu)) >>>>>> + eventfd_signal(irqfd->resamplefd, 1); >>>>>> + >>>>>> + srcu_read_unlock(&kvm->irq_srcu, idx); >>>>>> +} >>>>>> + >>>>>> +static void >>>>>> +irqfd_resampler_mask(struct kvm_irq_mask_notifier *kimn, bool >>>>>> masked) >>>>>> +{ >>>>>> + struct kvm_kernel_irqfd_resampler *resampler; >>>>>> + struct kvm *kvm; >>>>>> + struct kvm_kernel_irqfd *irqfd; >>>>>> + int idx; >>>>>> + >>>>>> + resampler = container_of(kimn, >>>>>> + struct kvm_kernel_irqfd_resampler, >> mask_notifier); >>>>>> + kvm = resampler->kvm; >>>>>> + >>>>>> + spin_lock(&resampler->lock); >>>>>> + resampler->masked = masked; >>>>>> + if (masked || !resampler->pending) { >>>>>> + spin_unlock(&resampler->lock); >>>>>> + return; >>>>>> + } >>>>>> + resampler->pending = false; >>>>>> + spin_unlock(&resampler->lock); >>>>>> + >>>>>> idx = srcu_read_lock(&kvm->irq_srcu); >>>>>> >>>>>> list_for_each_entry_srcu(irqfd, &resampler->list, >> resampler_link, >>>>>> @@ -98,6 +136,8 @@ irqfd_resampler_shutdown(struct >>>>>> kvm_kernel_irqfd *irqfd) >>>>>> if (list_empty(&resampler->list)) { >>>>>> list_del(&resampler->link); >>>>>> kvm_unregister_irq_ack_notifier(kvm, &resampler- >>> notifier); >>>>>> + kvm_unregister_irq_mask_notifier(kvm, resampler- >>>>>>> mask_notifier.irq, >>>>>> + &resampler->mask_notifier); >>>>>> kvm_set_irq(kvm, >> KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID, >>>>>> resampler->notifier.gsi, 0, false); >>>>>> kfree(resampler); >>>>>> @@ -367,11 +407,16 @@ kvm_irqfd_assign(struct kvm *kvm, >> struct >>>>>> kvm_irqfd *args) >>>>>> INIT_LIST_HEAD(&resampler->list); >>>>>> resampler->notifier.gsi = irqfd->gsi; >>>>>> resampler->notifier.irq_acked = >> irqfd_resampler_ack; >>>>>> + resampler->mask_notifier.func = >> irqfd_resampler_mask; >>>>>> + kvm_irq_is_masked(kvm, irqfd->gsi, &resampler- >>>>>>> masked); >>>>>> + spin_lock_init(&resampler->lock); >>>>>> INIT_LIST_HEAD(&resampler->link); >>>>>> >>>>>> list_add(&resampler->link, &kvm- >>> irqfds.resampler_list); >>>>>> kvm_register_irq_ack_notifier(kvm, >>>>>> &resampler->notifier); >>>>>> + kvm_register_irq_mask_notifier(kvm, irqfd->gsi, >>>>>> + &resampler->mask_notifier); >>>>>> irqfd->resampler = resampler; >>>>>> } >>>>>> >>>>>> -- >>>>>> 2.37.0.170.g444d1eabd0-goog >>>>>