Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp5010294rwl; Tue, 28 Mar 2023 14:55:13 -0700 (PDT) X-Google-Smtp-Source: AKy350ZGD1AnQdE0cDgIyGyZEIByktMxfH+ytLv276sHhhopTYC3EvAaF3OQ1gSwRXJYRJwlb6aM X-Received: by 2002:aa7:c947:0:b0:4fc:812a:ec25 with SMTP id h7-20020aa7c947000000b004fc812aec25mr15692288edt.16.1680040511614; Tue, 28 Mar 2023 14:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680040511; cv=none; d=google.com; s=arc-20160816; b=wpCAXWXt9vDRvEjWqRIXeeAPlWWrhaTxgaI7RisBK5ekRKzDmo/+seXiax1njOsbZI YNqxH5m5qm1AUp2iJUbSb0aH0iMu8iZdHBiQ6dI/MdvpBRvOlgHEqrz9iwF6Ymaws0Xw 14Or4LcgdGxGr1sFQSFS0x8fyAq9hwKo6c+Wt9A6PdT7wlZFFrAKzOpkToMK5gfXic9N KRXaBdPGeLC5V5DE2SK2owPqYvBEm+cZvr0ttWHVr29cBkCRVq39zHwldBqyQqThzCRH cCKGpR2FFAuGEKw9ogeYuHUk4+aaK3L5zgIiQL8QQyNPDaq0UqEMS7so7t8RyR0ohefN KDqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rn77HxnFrAS+rKKl2MieNXadcWaxGnJYHHONBhdAegs=; b=0VZ/8/Et84mbQI7I31AUHcO8hrfsOF61oxXpDFfNop2FWCgO7bwiEl/0DKwmnJ2b8u GWVPsdixgZbU13YepJIQR9Vnit8xB+38Y9FwoKmjvvkXj3+Eb0OvpwZfnaAItJge+g5b jRH/HCsjbge6thIlY0LC0pNi6Pj5t9sEQF1OeKfjFDlYrYbcvUVr4iYZhA8iz3mevcC4 sDgY41wBzqWLtDc0lAehZC+FQtUuPpXoMBZOWFVJE5A4hBs6R6lHO8KLi8VPlWyamfge 1S5taliz6OhmWXDhz8vtOnhZNa4bmCmBNne08mfmOBFzWUlTT7+goQNXVCa/cIdcVcuC hNcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W4uAsz4j; 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=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x16-20020aa7d6d0000000b004ad0287dbafsi31588548edr.203.2023.03.28.14.54.36; Tue, 28 Mar 2023 14:55:11 -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=@intel.com header.s=Intel header.b=W4uAsz4j; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229995AbjC1VyQ (ORCPT + 99 others); Tue, 28 Mar 2023 17:54:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229987AbjC1VyN (ORCPT ); Tue, 28 Mar 2023 17:54:13 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06B442D51; Tue, 28 Mar 2023 14:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680040433; x=1711576433; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XbkcLI4n2teEQCC6ULXx558MPH5O1I8KLnT+xl6+hk8=; b=W4uAsz4jPYoKm+auyAmjhJYI4GgB9ZRjr43+zYdz8knzAWfxd4i/92Bg iPlS3kZ9+hYHqmBkwaL/WGk3BWsEdugAdb+S7Vg43v6sqygkhRHYUUo3A qSgLXhPOgLnNw+88DRWE87YalnWHoCoY/dJ9VJm/bQtTFW6ZnvjUYiZkY KHdTa/GNzYcoVxu2BA+Lf759tWW87N6KgOAJPXkjxeE1lmY8hrNOFuAQD KrUiszH7M8fzRhW7xLJav0ERLPk3Gu/30Qmy9BR0PpMo/TRLAnCaBRjhO MdUR1iIHi35TSxRmxq3+tDJz5KkkiiBWLE7dtziPKyAAmZMiNnOfUascz Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="403316913" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="403316913" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 14:53:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="748543765" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="748543765" Received: from rchatre-ws.ostc.intel.com ([10.54.69.144]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2023 14:53:49 -0700 From: Reinette Chatre To: jgg@nvidia.com, yishaih@nvidia.com, shameerali.kolothum.thodi@huawei.com, kevin.tian@intel.com, alex.williamson@redhat.com Cc: tglx@linutronix.de, darwi@linutronix.de, kvm@vger.kernel.org, dave.jiang@intel.com, jing2.liu@intel.com, ashok.raj@intel.com, fenghua.yu@intel.com, tom.zanussi@linux.intel.com, reinette.chatre@intel.com, linux-kernel@vger.kernel.org Subject: [PATCH V2 1/8] vfio/pci: Consolidate irq cleanup on MSI/MSI-X disable Date: Tue, 28 Mar 2023 14:53:28 -0700 Message-Id: <4e1ac682c11a596a8b96ef5034674cda83eddbd2.1680038771.git.reinette.chatre@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable 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 vfio_msi_disable() releases all previously allocated state associated with each interrupt before disabling MSI/MSI-X. vfio_msi_disable() iterates twice over the interrupt state: first directly with a for loop to do virqfd cleanup, followed by another for loop within vfio_msi_set_block() that releases the interrupt and its state using vfio_msi_set_vector_signal(). Simplify interrupt cleanup by iterating over allocated interrupts once. Signed-off-by: Reinette Chatre --- drivers/vfio/pci/vfio_pci_intrs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index bffb0741518b..6a9c6a143cc3 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -426,10 +426,9 @@ static void vfio_msi_disable(struct vfio_pci_core_device *vdev, bool msix) for (i = 0; i < vdev->num_ctx; i++) { vfio_virqfd_disable(&vdev->ctx[i].unmask); vfio_virqfd_disable(&vdev->ctx[i].mask); + vfio_msi_set_vector_signal(vdev, i, -1, msix); } - vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix); - cmd = vfio_pci_memory_lock_and_enable(vdev); pci_free_irq_vectors(pdev); vfio_pci_memory_unlock_and_restore(vdev, cmd); -- 2.34.1