From patchwork Thu Feb 14 12:23:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 1042056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 440bDc2h5Zz9sN8 for ; Thu, 14 Feb 2019 23:24:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436643AbfBNMYW (ORCPT ); Thu, 14 Feb 2019 07:24:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45480 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436634AbfBNMYW (ORCPT ); Thu, 14 Feb 2019 07:24:22 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C51A581DE5; Thu, 14 Feb 2019 12:24:21 +0000 (UTC) Received: from localhost (ovpn-8-24.pek2.redhat.com [10.72.8.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E56F5C582; Thu, 14 Feb 2019 12:24:16 +0000 (UTC) From: Ming Lei To: Christoph Hellwig , Bjorn Helgaas , Thomas Gleixner Cc: Jens Axboe , linux-block@vger.kernel.org, Sagi Grimberg , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Keith Busch , Ming Lei Subject: [PATCH V4 4/4] PCI: Document .calc_sets as required in case of multiple interrupt sets Date: Thu, 14 Feb 2019 20:23:47 +0800 Message-Id: <20190214122347.17372-5-ming.lei@redhat.com> In-Reply-To: <20190214122347.17372-1-ming.lei@redhat.com> References: <20190214122347.17372-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 14 Feb 2019 12:24:21 +0000 (UTC) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Now NVMe has implemented the .calc_sets callback for calculating size of interrupt set. For other cases of multiple IRQ sets, pre-calculating each set's size before allocating IRQ vectors can't work too because the available interrupt number for this device is unknown at that time. So document .calc_sets as required explicitly for multiple interrupt sets. Reviewed-by: Jens Axboe Acked-by: Bjorn Helgaas Signed-off-by: Ming Lei --- drivers/pci/msi.c | 14 ++++++++------ include/linux/interrupt.h | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 96978459e2a0..64383ab5f53f 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1036,10 +1036,11 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, return -ERANGE; /* - * If the caller is passing in sets, we can't support a range of - * vectors. The caller needs to handle that. + * If the caller requests multiple sets of IRQs where each set + * requires different affinity, it must also supply a ->calc_sets() + * callback to compute size of each interrupt set */ - if (affd && affd->nr_sets && minvec != maxvec) + if (affd && affd->nr_sets > 1 && !affd->calc_sets) return -EINVAL; if (WARN_ON_ONCE(dev->msi_enabled)) @@ -1094,10 +1095,11 @@ static int __pci_enable_msix_range(struct pci_dev *dev, return -ERANGE; /* - * If the caller is passing in sets, we can't support a range of - * supported vectors. The caller needs to handle that. + * If the caller requests multiple sets of IRQs where each set + * requires different affinity, it must also supply a ->calc_sets() + * callback to compute size of each interrupt set */ - if (affd && affd->nr_sets && minvec != maxvec) + if (affd && affd->nr_sets > 1 && !affd->calc_sets) return -EINVAL; if (WARN_ON_ONCE(dev->msix_enabled)) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index acb9c5ad6bc1..0da2a5cea8f3 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -269,7 +269,8 @@ struct irq_affinity_notify { * the MSI(-X) vector space * @nr_sets: Length of passed in *sets array * @set_size: Number of affinitized sets - * @calc_sets: Callback for caculating interrupt sets size + * @calc_sets: Callback for caculating set size, required for + * multiple interrupt sets. * @priv: Private data of @calc_sets */ struct irq_affinity {