From patchwork Tue Mar 28 21:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinette Chatre X-Patchwork-Id: 76281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5323vqo; Tue, 28 Mar 2023 15:19:10 -0700 (PDT) X-Google-Smtp-Source: AK7set/EuTHvF2VxdbTjfVXy7UVRoyyDolWz6XKIm3LymrNWH7N1sDA3bRFk/WYBAnaXdF4tP1Fd X-Received: by 2002:a05:6a20:3b21:b0:cc:cc27:9185 with SMTP id c33-20020a056a203b2100b000cccc279185mr14564357pzh.50.1680041950357; Tue, 28 Mar 2023 15:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680041950; cv=none; d=google.com; s=arc-20160816; b=AOJ/So5S1OOEFTtnUcAloNXX6kgOH5Tb0ZRY+hRdEqY3LMikLI1ch8bu4S6ITAUjLG bH4K/RW7QkWtzsaEKdvzYBXasCUdgmQRtwc5e/HfEDJwEa7X3vCF9l1mDOXejzVRDSer 07+lk/W89zJmWw8UplQm3sD8WxsjKFFipRobntGeoroshEhXzHqSTZPs3SbBQezhmXsZ w5jHlB+RRM5CJNy7F32QAxTSoDPrdAe6Q+Af0PoexIT8XQrgAUq6Zbw7Xd7YYHQygSdH QjzFw8Ihepcz4ascGuHLHF/wTZJZ0gJ2H41XVAUHOP8bIBYIGV8DWkf2lQtaQ1H2Icjg kkpg== 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=Tx4PrERKb7krmKVRGybdm165r97HWZhP1uHMjIRNa9g=; b=CX/c5xm8Utb2KL5kpwdabw0osv3nAVKefl3ZakQBy2/NHl4O/y6kMUAEZV1N6oQefo vvtO9M2l2m8zXbdEMgaOkz9YN56D2zvIPPtjYKzHMDjRQNczF4isMGelLzuShScgwbny OkWx3s6TKk6SEQcSwkOOlfujjmOa6MDXr51rB8Sb2OehdO4mjy3qsKHO9Gl58EDF7K71 vwlVJLwtuvAau2cwmtKyjGUx9S/886HXv8mYF+y0Qc1e/KZ5EaVXxh6X0uU5aDcsvNzv 7s9sOCsBf7J+s/BhypCdOlAHLEN+eSbGM3JpPmNrZJRBVQbkpKyw2tKyf6BmENObDluy kvBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JuYNZG1L; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 85-20020a630158000000b005132381cfb9si11061300pgb.614.2023.03.28.15.18.57; Tue, 28 Mar 2023 15:19:10 -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=JuYNZG1L; 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 S230008AbjC1VyT (ORCPT + 99 others); Tue, 28 Mar 2023 17:54:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjC1VyO (ORCPT ); Tue, 28 Mar 2023 17:54:14 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 875052D63; Tue, 28 Mar 2023 14:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680040434; x=1711576434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qbu9sl+61RQBLYcvTOuWSLXfqQGA99BUZPMWL8q3o7A=; b=JuYNZG1LQ49rh16oQvD70YtMltdZZ/xcY3DM4yGyqMkIhjOVOuLnHZqx Q0HJ8/khaoLzIDVrMonJPOOAbtRerqiosbAa2phJvDFmaSkvtfSMtq53o zsd3ByVeZ3QFfbheay3+d/Rjj40NppYNTvTMa0dYZoYKy4FaJiupVipjd Yf7Keij7+sXirZq1ceHDflXUeaQDFs1Dcy6hDn22W5BQo3pJbnS5TEtrF IEZsX1JRlqGaEMpl0LGqXp7dQP0d+6WYkhL8TCop5Hzbk+M3stBDIJyC2 pMj5B1w5dX0ZCIjXONQO6zRSuONoVHSEtZxrtaNe7zvwYgVk/BAT5LUoQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="403316920" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="403316920" 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="748543768" X-IronPort-AV: E=Sophos;i="5.98,297,1673942400"; d="scan'208";a="748543768" 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 2/8] vfio/pci: Remove negative check on unsigned vector Date: Tue, 28 Mar 2023 14:53:29 -0700 Message-Id: <0dc2a0c8e25b13a3a41db75ab192f387a1548c80.1680038771.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.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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761651668266214889?= X-GMAIL-MSGID: =?utf-8?q?1761651668266214889?= User space provides the vector as an unsigned int that is checked early for validity (vfio_set_irqs_validate_and_prepare()). A later negative check of the provided vector is not necessary. Remove the negative check and ensure the type used for the vector is consistent as an unsigned int. Signed-off-by: Reinette Chatre --- drivers/vfio/pci/vfio_pci_intrs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index 6a9c6a143cc3..3f64ccdce69f 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -317,14 +317,14 @@ static int vfio_msi_enable(struct vfio_pci_core_device *vdev, int nvec, bool msi } static int vfio_msi_set_vector_signal(struct vfio_pci_core_device *vdev, - int vector, int fd, bool msix) + unsigned int vector, int fd, bool msix) { struct pci_dev *pdev = vdev->pdev; struct eventfd_ctx *trigger; int irq, ret; u16 cmd; - if (vector < 0 || vector >= vdev->num_ctx) + if (vector >= vdev->num_ctx) return -EINVAL; irq = pci_irq_vector(pdev, vector); @@ -399,7 +399,8 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_core_device *vdev, static int vfio_msi_set_block(struct vfio_pci_core_device *vdev, unsigned start, unsigned count, int32_t *fds, bool msix) { - int i, j, ret = 0; + int i, ret = 0; + unsigned int j; if (start >= vdev->num_ctx || start + count > vdev->num_ctx) return -EINVAL; @@ -420,7 +421,7 @@ static int vfio_msi_set_block(struct vfio_pci_core_device *vdev, unsigned start, static void vfio_msi_disable(struct vfio_pci_core_device *vdev, bool msix) { struct pci_dev *pdev = vdev->pdev; - int i; + unsigned int i; u16 cmd; for (i = 0; i < vdev->num_ctx; i++) { @@ -542,7 +543,7 @@ static int vfio_pci_set_msi_trigger(struct vfio_pci_core_device *vdev, unsigned index, unsigned start, unsigned count, uint32_t flags, void *data) { - int i; + unsigned int i; bool msix = (index == VFIO_PCI_MSIX_IRQ_INDEX) ? true : false; if (irq_is(vdev, index) && !count && (flags & VFIO_IRQ_SET_DATA_NONE)) {