From patchwork Fri Oct 6 16:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinette Chatre X-Patchwork-Id: 149335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp458112vqo; Fri, 6 Oct 2023 09:42:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVz0BQaOinGW+9e5Wbu+ZMWTXrqGvxdygECvBLk3COnPwmvs6YTvOPHPA2c2V3QgVVjNRc X-Received: by 2002:a17:902:ea0b:b0:1c7:22dd:dc43 with SMTP id s11-20020a170902ea0b00b001c722dddc43mr10829687plg.15.1696610522137; Fri, 06 Oct 2023 09:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696610522; cv=none; d=google.com; s=arc-20160816; b=TbWgp7YjiEBpkpt9tlRSMgqJ5kvj5ECZw13Vg5hkQUeq9N6BgrCaVf5GZYuobMe4aa gMETvXb9gqVDfris3xx3AfMc+nBg8Csg58/qeDiYrB4077NrdD57INCYsXfFWvBkUso+ g85XRU2MiZ8CjXg9301xMU7WQ7r4+2bIhbi+9SFoZuKzc0MPq0syDYLK83NTa4cHuTyD XgpRMf4c93m+NaX7Xxo12JBk5yfaJSl5ADMoYx/AcYihp+mdAmDQHdgxSFdYGIy3zpeF RGRAUMii4hyg7kqknePKJaVvznuDZd5S6oP358No+iNE0WnkoRAdq5NBBOsD7wXHkpno 34Zg== 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=Y1p3wctvSyViD9l7OD33xPq4JKHvnClt1ofoeENqWM8=; fh=k582jSlci6uTztoHpzXN2a6Foym20J+xbJc48KNsUhM=; b=YrTpHZTYrLkfr9fSwc7pJmKMakeSJA9LhQsMzzMU63YtiXY5rvsP8VNCqSFORf1L7/ uS4xrqx7/OzsLAQHlAt31UqAtTnC3BVhUyJh7+Rg7kl90g88kBhqZfGMwRqJ/9OVaUcu 2+wSvBRQj65wYWfOG26D8QiiEsLkvt347ntrKE+R5K50PZZRPi+KYbI4O1i0orBbxUZ4 MagXyZ9A8gR/GwExJjRQbYOidQRJMlFKsXqQdv83PdYvoETxrlgFEy13cSZVlQNQNoL7 XFoR7S0yZesXbWLSg+S4kG0CFPIr/QMuesjUcVV/cSFwQF124XoRlWUjLzDXxAC9XzvE pvcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eNZv36nc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id k12-20020a170902c40c00b001c7352c5482si4447650plk.373.2023.10.06.09.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 09:42:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eNZv36nc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 5637C80ABFFF; Fri, 6 Oct 2023 09:41:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232968AbjJFQl3 (ORCPT + 18 others); Fri, 6 Oct 2023 12:41:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232900AbjJFQl0 (ORCPT ); Fri, 6 Oct 2023 12:41:26 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52B21C5; Fri, 6 Oct 2023 09:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696610485; x=1728146485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E7b6MxJENrxyYMmSRzlDsTMhK6exMtnF17Bw1TQ8Ogs=; b=eNZv36ncxzKZfN+hEcDe/NAY1vEDO0bZ651UVhrLEE25e3bva41BZZkG NajGL+HBuOHCAR2TNouK3HbX1O/OTCwNLDWdz57GM0J0gOYZ21luGvCC7 2wwpjqLD65BIOewy/J5C406MbJj1tYGaUDyoWa4aKJb59yGqcKcjVI45U Xhf8pV/x/E/PTcYvWw6GklKR7bVOlG54prVn8Y3iSHGyGR3v+DuBRQ5jh LbrqBeXIFJnE6TC7w1TbBVnsngNaT/sUXvMXDkSH+EFJvwQ92iuQoAC0e cPgkhq8Fqmj4ONAUXiMUOana7IrtWdAxSvmk6wDcRKm6KbnZpB4MMf3Ao A==; X-IronPort-AV: E=McAfee;i="6600,9927,10855"; a="364063156" X-IronPort-AV: E=Sophos;i="6.03,204,1694761200"; d="scan'208";a="364063156" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2023 09:41:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10855"; a="842892842" X-IronPort-AV: E=Sophos;i="6.03,204,1694761200"; d="scan'208";a="842892842" Received: from rchatre-ws.ostc.intel.com ([10.54.69.144]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2023 09:41:23 -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: 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, patches@lists.linux.dev Subject: [RFC PATCH V2 02/18] vfio/pci: Move PCI specific check from wrapper to PCI function Date: Fri, 6 Oct 2023 09:40:57 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 09:41:55 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779025075283990091 X-GMAIL-MSGID: 1779025075283990091 vfio_pci_set_irqs_ioctl() uses a PCI device specific check to determine if PCI specific vfio_pci_set_err_trigger() should be called. Move the PCI device specific check into PCI specific vfio_pci_set_err_trigger() to make it easier for vfio_pci_set_irqs_ioctl() to become a frontend for interrupt backends for PCI devices as well as virtual devices. Signed-off-by: Reinette Chatre --- drivers/vfio/pci/vfio_pci_intrs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index cbb4bcbfbf83..b5b1c09bef25 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -758,6 +758,9 @@ static int vfio_pci_set_err_trigger(struct vfio_pci_core_device *vdev, unsigned index, unsigned start, unsigned count, uint32_t flags, void *data) { + if (!pci_is_pcie(vdev->pdev)) + return -ENOTTY; + if (index != VFIO_PCI_ERR_IRQ_INDEX || start != 0 || count > 1) return -EINVAL; @@ -813,8 +816,7 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_core_device *vdev, uint32_t flags, case VFIO_PCI_ERR_IRQ_INDEX: switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { case VFIO_IRQ_SET_ACTION_TRIGGER: - if (pci_is_pcie(vdev->pdev)) - func = vfio_pci_set_err_trigger; + func = vfio_pci_set_err_trigger; break; } break;