Received-SPF: pass (google.com: domain of linux-kernel+bounces-49205-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Reinette Chatre <reinette.chatre@intel.com>
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,
	ashok.raj@intel.com,
	reinette.chatre@intel.com,
	linux-kernel@vger.kernel.org,
	patches@lists.linux.dev
Subject: [PATCH 02/17] vfio/pci: Remove duplicate check from vfio_pci_set_ctx_trigger_single() wrappers
Date: Thu,  1 Feb 2024 20:56:56 -0800
Message-Id: <1429dd8025b6807e4d6951a18c813b94bbc52c0e.1706849424.git.reinette.chatre@intel.com>
In-Reply-To: <cover.1706849424.git.reinette.chatre@intel.com>
References: <cover.1706849424.git.reinette.chatre@intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Both wrappers of vfio_pci_set_ctx_trigger_single() perform the
same parameter checks before calling vfio_pci_set_ctx_trigger_single().

vfio_pci_set_ctx_trigger_single() only handles a single interrupt that
is expected to start from 0. Move parameter checks into
vfio_pci_set_ctx_trigger_single() instead of duplicated in its callers.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---
 drivers/vfio/pci/vfio_pci_intrs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index f9280e32972a..69ab11863282 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -704,9 +704,13 @@ static int vfio_pci_set_msi_trigger(struct vfio_pci_core_device *vdev,
 }
 
 static int vfio_pci_set_ctx_trigger_single(struct eventfd_ctx **ctx,
+					   unsigned int start,
 					   unsigned int count, uint32_t flags,
 					   void *data)
 {
+	if (start != 0 || count > 1)
+		return -EINVAL;
+
 	/* DATA_NONE/DATA_BOOL enables loopback testing */
 	if (flags & VFIO_IRQ_SET_DATA_NONE) {
 		if (*ctx) {
@@ -763,10 +767,10 @@ static int vfio_pci_set_err_trigger(struct vfio_pci_core_device *vdev,
 				    unsigned int count, uint32_t flags,
 				    void *data)
 {
-	if (index != VFIO_PCI_ERR_IRQ_INDEX || start != 0 || count > 1)
+	if (index != VFIO_PCI_ERR_IRQ_INDEX)
 		return -EINVAL;
 
-	return vfio_pci_set_ctx_trigger_single(&vdev->err_trigger,
+	return vfio_pci_set_ctx_trigger_single(&vdev->err_trigger, start,
 					       count, flags, data);
 }
 
@@ -775,10 +779,10 @@ static int vfio_pci_set_req_trigger(struct vfio_pci_core_device *vdev,
 				    unsigned int count, uint32_t flags,
 				    void *data)
 {
-	if (index != VFIO_PCI_REQ_IRQ_INDEX || start != 0 || count > 1)
+	if (index != VFIO_PCI_REQ_IRQ_INDEX)
 		return -EINVAL;
 
-	return vfio_pci_set_ctx_trigger_single(&vdev->req_trigger,
+	return vfio_pci_set_ctx_trigger_single(&vdev->req_trigger, start,
 					       count, flags, data);
 }
 
-- 
2.34.1