From patchwork Fri Oct 27 17:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinette Chatre X-Patchwork-Id: 159027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp752425vqb; Fri, 27 Oct 2023 10:04:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLqZR4DVDCiiGB83Z9dh0khVEJfhmU2c32y7TP4aQkdE0R1MY2zyFw1e3Ip3RnJH5Sn3Ge X-Received: by 2002:a67:e149:0:b0:452:918f:3b33 with SMTP id o9-20020a67e149000000b00452918f3b33mr3039650vsl.25.1698426240284; Fri, 27 Oct 2023 10:04:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698426240; cv=none; d=google.com; s=arc-20160816; b=qND9EGSO5nkPPams3BBGelrNyIXlRVKXfl3X8hoFwv35FzQEnc+Bi9fAXGAYKJeNbT 9KEBox0/s9Ia2f6AuBhRNvL7HcyqburRDSUstjdI69ad0Bck7EIl44PfInn8Xvur9X46 Ud+yinDId64hZY0cSXmQWtImJkp2ax6WNzMSTveVLNFwerDquFlb/cAarblMdts9U0IO KQISs0YKwdHNggyOUGEVTWR1WLzDvkJS7Mlla5wIpln5c2FAjh00PZ3xPs0zncZd2aqh OZwCs7edh/T40vYHkdpP5bWJdgYDk62wfVXjZuaYIFIAxb+jUIUy0SVO0YNjK6ZxcnFK 6iCQ== 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=LzdMUAnckkYX1yUu1c/6GrfgEhlDIZAKYj5Csz29pks=; fh=k582jSlci6uTztoHpzXN2a6Foym20J+xbJc48KNsUhM=; b=dYWQAHcP1NcmUo5OvR8EC3kHlBX0sp9u7xH49vwtRetf6fud3y1g9frHMt2yl+shH8 EiAGvLYVpbwL2VHwS/0+8B9VFtlmSpIh+Z/+AOsQ9TtphGZd/lXYym+T5vbr25Yu4MDo QSUP5bGuRGwr/QcOrXQlZ1PKI0xEI2np3N3G733Ff8eWsKASEKUAkXkuMBHYbnt0hp2A Ky1Pu1cC9BmG7YG6416WZGjo2yaOK7hyzzMUCpyo6VK/aE5qQUEmV/CHYUdBN0sPT45g ZEixh1gjEcfN748WodsTKUC3a85AS/KT/54e3HBLlPiG6X/3rkab3ACnbqGKEZyIGEST YExw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lwSo3Zc4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n23-20020a67fb97000000b0044356f0005csi343902vsr.505.2023.10.27.10.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 10:04:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lwSo3Zc4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 661A38045963; Fri, 27 Oct 2023 10:01:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232305AbjJ0RBg (ORCPT + 25 others); Fri, 27 Oct 2023 13:01:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345948AbjJ0RBa (ORCPT ); Fri, 27 Oct 2023 13:01:30 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 400441A5; Fri, 27 Oct 2023 10:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698426087; x=1729962087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RMArCxGqHD+3tMudRHMvYRNJuBVfq4KK4WYAG6z1Fl4=; b=lwSo3Zc4CW1vwbOiECbplUSh4UR6hshZD2a6f4LEUJCVoQmn1WTQNnm9 dcRE1H9Mse8/kfDvDhC039+mEDS3nhKV91dMUAfNYyT1Pcq+Mg8QsNogL bCnYmOTTZ/cEX3STlQks6HqhRczMD+x5jz9fR+1tNtYlOvZEUvm8F7Jxa lGM2zUS/BR8lotcKlTCDkxE62If/8ej494PhzXwS029Xmgh+x0657QOXG M6fey5F08vnkzBpmLbXU9G8Tl+ZKwNlJ2ZIG0vX02T5N2t2EuCIgJTuq5 88ozw69CxJRaTwOj8e/cWjEvctsEoew+VVh3KZXKP89ci9PqKHh0UiMHL g==; X-IronPort-AV: E=McAfee;i="6600,9927,10876"; a="611832" X-IronPort-AV: E=Sophos;i="6.03,256,1694761200"; d="scan'208";a="611832" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2023 10:01:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10876"; a="1090988146" X-IronPort-AV: E=Sophos;i="6.03,256,1694761200"; d="scan'208";a="1090988146" Received: from rchatre-ws.ostc.intel.com ([10.54.69.144]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2023 10:01:13 -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 V3 02/26] vfio/pci: Move PCI specific check from wrapper to PCI function Date: Fri, 27 Oct 2023 10:00:34 -0700 Message-Id: <53d90183704bf3bd633a70983ef9ca8c7c341777.1698422237.git.reinette.chatre@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 10:01:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780928993382000052 X-GMAIL-MSGID: 1780928993382000052 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 --- No changes since RFC V2. 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;