From patchwork Thu Aug 13 17:29:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1344372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=N+SZjVNF; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BSDG16FrXz9sTK for ; Fri, 14 Aug 2020 03:34:17 +1000 (AEST) Received: from localhost ([::1]:45088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6H7H-0001v6-L3 for incoming@patchwork.ozlabs.org; Thu, 13 Aug 2020 13:34:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6H3Z-0004wm-SS for qemu-devel@nongnu.org; Thu, 13 Aug 2020 13:30:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k6H3X-0008KW-U0 for qemu-devel@nongnu.org; Thu, 13 Aug 2020 13:30:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597339823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=16/8u8u4aSNC+TBsbyq8DSkALSFB26Shm2nwb6CzfCw=; b=N+SZjVNFjLOduptYmZhiMKs0FiwWhiSn7ckZnJxmoOdLS7/Zznl0VCVsXNajNesG3TaKVO kVA3hybgNm5EbwgBShda1EsVNiza/Z8CkjzHI0UTYcHFD2tWoIeYImrQueCWdyBF9u+kp7 np+aRjOHViuWsxzzhzVf1bwBMdHpw+I= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-557-ViVMnpYKMze7NXrl_0xr7w-1; Thu, 13 Aug 2020 13:30:21 -0400 X-MC-Unique: ViVMnpYKMze7NXrl_0xr7w-1 Received: by mail-wr1-f72.google.com with SMTP id b18so2353213wrn.6 for ; Thu, 13 Aug 2020 10:30:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=16/8u8u4aSNC+TBsbyq8DSkALSFB26Shm2nwb6CzfCw=; b=VcrOpNLwwnERuueL5SH4Sa43OVrcn2+XFX9SWneVDccWGDkl/7GCjf4k49Q6NSMiC4 fAHIUZ9duJ/9dUnDNsHpyR/JJ39CoBenETJPx8+h5Nkf0u9xFSLrdpcqdE6ss5e0K71Z nE3/ZXDZsIIus70JdFahpKSWPqab10aF0bIxkh7G1TgmBguSxtXjYJgkN22/4lRgIIKC +1jS9iZVnAcmPjux9/egchd39siS/I98zvPyPYOvNHwJd6UX2qLa8mxYV+T3kpePNxbB dm3JjcljdV3FTPhalQaOQk77oFUG8gfd9S4HsOrkFPm4fR3UUTMJCFnHy3KEaQ775Ig2 +nvQ== X-Gm-Message-State: AOAM530vTFuWorY/FR7aKwNU9+63Viiv2vLDO78aDFhK31a6ocVWm0D2 K8uugLXwVdRc0FSy3aWup/cdW+ssrJ+MqPD4J4rc/JBDR38QfSbZA9HgiW0v3OQjX90e0sRuS/A 7iJShbejFy6Xwmec= X-Received: by 2002:a5d:5445:: with SMTP id w5mr5353717wrv.342.1597339820069; Thu, 13 Aug 2020 10:30:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRrxCEfbhfAfBTKj0hhPG4BuEkNr7WLE1FFC/mH8l7PD2jgyfu9yjALhTZjkMplOeO5fqGEw== X-Received: by 2002:a5d:5445:: with SMTP id w5mr5353700wrv.342.1597339819890; Thu, 13 Aug 2020 10:30:19 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id l18sm11106929wrm.52.2020.08.13.10.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 10:30:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 4/7] util/vfio-helpers: Check the device allow up to 'irq_count' IRQs Date: Thu, 13 Aug 2020 19:29:54 +0200 Message-Id: <20200813172957.8289-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200813172957.8289-1-philmd@redhat.com> References: <20200813172957.8289-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/13 12:30:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Alex Williamson , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As we want to use more than one single IRQ, add a check that the device accept our request to use multiple IRQs. Signed-off-by: Philippe Mathieu-Daudé --- util/vfio-helpers.c | 6 ++++++ util/trace-events | 1 + 2 files changed, 7 insertions(+) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index bad60076f3..b81d4c70c2 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -335,6 +335,12 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const char *device, ret = -errno; goto fail; } + trace_qemu_vfio_init_pci(device_info.num_irqs); + if (device_info.num_irqs < irq_count) { + error_setg(errp, "Invalid device IRQ count"); + ret = -EINVAL; + goto fail; + } s->irq_type = irq_type; s->irq_count = irq_count; diff --git a/util/trace-events b/util/trace-events index 0ce42822eb..2e85555be3 100644 --- a/util/trace-events +++ b/util/trace-events @@ -83,3 +83,4 @@ qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size %zu iova 0x%"PRIx64 qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size %zu temporary %d iova %p" qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p" +qemu_vfio_init_pci(uint32_t count) "device interrupt count: %"PRIu32