From nobody Mon Feb 9 08:55:50 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 781BCC00140 for ; Fri, 5 Aug 2022 19:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241552AbiHETlO (ORCPT ); Fri, 5 Aug 2022 15:41:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241493AbiHETlF (ORCPT ); Fri, 5 Aug 2022 15:41:05 -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 B749012636 for ; Fri, 5 Aug 2022 12:41:02 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id s9so4056909ljs.6 for ; Fri, 05 Aug 2022 12:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=fJt+8ihDsvIqc3+fCTYKstbstOdW0KiHTWXF75LAIsc=; b=LwND4vNWX5iBHrLIpe8UPID7KoTe+AGnxN9IU0iE3UvNUsAAgXJOu+KcUIzZ0whOm9 MZUNqD8fDTdAo60iPWNNaZyzj+vXPwy8Mkz/ewUOfecAIJd5XVgaLk/rF0wVEY8nFtzX CJaKdVUBF0P2HoeoFFVq2tex2aZtQ1b+2mjSnP13bGPHhKSZOqyF9IdQhbAExAie8F+m AR23t1DeeYSHSqus3bgD6MgrKtMiCNEtpdlCUfBZyEjEuAkS/Rd06BabXuWAAG2QZd5T 61zTI5xXk5GWFPvVqydP/d+pdw562Ducic0q5xO0Z9ytEI6f2TXWNkLWqj8G73HAdnFI ODoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=fJt+8ihDsvIqc3+fCTYKstbstOdW0KiHTWXF75LAIsc=; b=aWFT4jTed9cImcFQk1A4vB0oLa5Ulf5XryZXUWMVqEz+zC2+NQctwmeVYOTF0uscdp DvB0uQilw213hM74k6Su1du6RSmqnhk8N6wkinU3f/t37tGgbpbi6v3OD82KSAPrTJDS kdQ9HBa/EAcSE2/FFTyB1RTGH/MkL/meqP9eWR4rY2yjkkcgv4qbQGEVQCobh2iOss/R mVbNJ9cTLAgO47j/29LI0X6sQQSCNEPwBhFRaLg/w6jzARPdENs4tA08QRpI2eJNpSvR rgDaeoHtxuJr62KlIn5wihQ3nINvGxiaswGjcm7+FnNQfEv+E532RTybOBQxtU8DARj2 dBTg== X-Gm-Message-State: ACgBeo0AypatCtmlT655oLs/mp8Pk+JluggoseL5d3EGZ1QLCztw9SzX EzNVLEaT1uXENh6gS6WVphNjlw== X-Google-Smtp-Source: AA6agR4D/lxlr4L+0FdtafVudGsXVZxfDnLZ5pKhbtzeGxYhZI79kjSKtslKXyeRzb7fqdDc9U/nVg== X-Received: by 2002:a2e:b88b:0:b0:25d:a15a:bba9 with SMTP id r11-20020a2eb88b000000b0025da15abba9mr2626624ljp.357.1659728460550; Fri, 05 Aug 2022 12:41:00 -0700 (PDT) Received: from dmaluka.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id o4-20020a056512230400b0048a407f41bbsm560079lfu.238.2022.08.05.12.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 12:41:00 -0700 (PDT) From: Dmytro Maluka To: Sean Christopherson , 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 , Rong L Liu , Zhenyu Wang , Tomasz Nowicki , Grzegorz Jaszczyk , upstream@semihalf.com, Dmitry Torokhov , Dmytro Maluka Subject: [PATCH v2 4/5] KVM: irqfd: Rename resampler->notifier Date: Fri, 5 Aug 2022 21:39:18 +0200 Message-Id: <20220805193919.1470653-5-dmy@semihalf.com> X-Mailer: git-send-email 2.37.1.559.g78731f0fdb-goog In-Reply-To: <20220805193919.1470653-1-dmy@semihalf.com> References: <20220805193919.1470653-1-dmy@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since resampler irqfd is now using a mask notifier along with an ack notifier, rename resampler->notifier to resampler->ack_notifier for clarity. Signed-off-by: Dmytro Maluka Reviewed-by: Eric Auger --- include/linux/kvm_irqfd.h | 2 +- virt/kvm/eventfd.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h index 01754a1abb9e..4df9e6bbd7db 100644 --- a/include/linux/kvm_irqfd.h +++ b/include/linux/kvm_irqfd.h @@ -37,7 +37,7 @@ struct kvm_kernel_irqfd_resampler { * RCU list modified under kvm->irqfds.resampler_lock */ struct list_head list; - struct kvm_irq_ack_notifier notifier; + struct kvm_irq_ack_notifier ack_notifier; struct kvm_irq_mask_notifier mask_notifier; bool masked; bool pending; diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index f98dcce3959c..72de942dbb9c 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -70,11 +70,11 @@ irqfd_resampler_ack(struct kvm_irq_ack_notifier *kian) bool notify =3D true; =20 resampler =3D container_of(kian, - struct kvm_kernel_irqfd_resampler, notifier); + struct kvm_kernel_irqfd_resampler, ack_notifier); kvm =3D resampler->kvm; =20 kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID, - resampler->notifier.gsi, 0, false); + resampler->ack_notifier.gsi, 0, false); =20 spin_lock(&resampler->lock); if (resampler->masked) { @@ -137,11 +137,11 @@ irqfd_resampler_shutdown(struct kvm_kernel_irqfd *irq= fd) =20 if (list_empty(&resampler->list)) { list_del(&resampler->link); - kvm_unregister_irq_ack_notifier(kvm, &resampler->notifier); + kvm_unregister_irq_ack_notifier(kvm, &resampler->ack_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); + resampler->ack_notifier.gsi, 0, false); kfree(resampler); } =20 @@ -390,7 +390,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *arg= s) =20 list_for_each_entry(resampler, &kvm->irqfds.resampler_list, link) { - if (resampler->notifier.gsi =3D=3D irqfd->gsi) { + if (resampler->ack_notifier.gsi =3D=3D irqfd->gsi) { irqfd->resampler =3D resampler; break; } @@ -407,8 +407,8 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *arg= s) =20 resampler->kvm =3D kvm; INIT_LIST_HEAD(&resampler->list); - resampler->notifier.gsi =3D irqfd->gsi; - resampler->notifier.irq_acked =3D irqfd_resampler_ack; + resampler->ack_notifier.gsi =3D irqfd->gsi; + resampler->ack_notifier.irq_acked =3D irqfd_resampler_ack; resampler->mask_notifier.func =3D irqfd_resampler_mask_notify; spin_lock_init(&resampler->lock); INIT_LIST_HEAD(&resampler->link); @@ -417,7 +417,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *arg= s) kvm_register_and_fire_irq_mask_notifier(kvm, irqfd->gsi, &resampler->mask_notifier); kvm_register_irq_ack_notifier(kvm, - &resampler->notifier); + &resampler->ack_notifier); irqfd->resampler =3D resampler; } =20 --=20 2.37.1.559.g78731f0fdb-goog