From patchwork Tue Jul 19 13:02:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 9237175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF3806075D for ; Tue, 19 Jul 2016 13:05:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D02DC26A4D for ; Tue, 19 Jul 2016 13:05:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3E0326B4A; Tue, 19 Jul 2016 13:05:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 723A226A4D for ; Tue, 19 Jul 2016 13:05:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753699AbcGSNE4 (ORCPT ); Tue, 19 Jul 2016 09:04:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38912 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753381AbcGSNDY (ORCPT ); Tue, 19 Jul 2016 09:03:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7628F7AEB9; Tue, 19 Jul 2016 13:03:23 +0000 (UTC) Received: from localhost.redhat.com (vpn1-4-201.ams2.redhat.com [10.36.4.201]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6JD2omU022501; Tue, 19 Jul 2016 09:03:18 -0400 From: Eric Auger To: eric.auger@redhat.com, eric.auger.pro@gmail.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, andre.przywara@arm.com, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, linux-arm-kernel@lists.infradead.org Cc: drjones@redhat.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, pbonzini@redhat.com, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, yehuday@marvell.com, Manish.Jaggi@caviumnetworks.com, robert.richter@caviumnetworks.com Subject: [PATCH v11 05/10] genirq/msi-doorbell: msi_doorbell_pages Date: Tue, 19 Jul 2016 13:02:42 +0000 Message-Id: <1468933367-23159-6-git-send-email-eric.auger@redhat.com> In-Reply-To: <1468933367-23159-1-git-send-email-eric.auger@redhat.com> References: <1468933367-23159-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Jul 2016 13:03:23 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP msi_doorbell_pages sum up the number of iommu pages of a given order requested to map all the registered doorbells. This function will allow to dimension the intermediate physical address (IPA) aperture requested to map the MSI doorbells. Signed-off-by: Eric Auger --- v10: creation --- include/linux/msi-doorbell.h | 14 ++++++++++++ kernel/irq/msi-doorbell.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/include/linux/msi-doorbell.h b/include/linux/msi-doorbell.h index c455e33..146bfbc 100644 --- a/include/linux/msi-doorbell.h +++ b/include/linux/msi-doorbell.h @@ -35,6 +35,14 @@ msi_doorbell_register_global(phys_addr_t base, size_t size, */ void msi_doorbell_unregister_global(struct irq_chip_msi_doorbell_info *db); +/** + * msi_doorbell_pages: compute the number of iommu pages of size 1 << order + * requested to map all the registered doorbells + * + * @order: iommu page order + */ +int msi_doorbell_pages(unsigned int order); + #else static inline struct irq_chip_msi_doorbell_info * @@ -47,6 +55,12 @@ msi_doorbell_register_global(phys_addr_t base, size_t size, static inline void msi_doorbell_unregister_global(struct irq_chip_msi_doorbell_info *db) {} +static inline int +msi_doorbell_pages(unsigned int order) +{ + return 0; +} + #endif /* CONFIG_MSI_DOORBELL */ #endif diff --git a/kernel/irq/msi-doorbell.c b/kernel/irq/msi-doorbell.c index 0ff541e..a5bde37 100644 --- a/kernel/irq/msi-doorbell.c +++ b/kernel/irq/msi-doorbell.c @@ -60,3 +60,55 @@ void msi_doorbell_unregister_global(struct irq_chip_msi_doorbell_info *dbinfo) mutex_unlock(&irqchip_doorbell_mutex); } EXPORT_SYMBOL_GPL(msi_doorbell_unregister_global); + +static int compute_db_mapping_requirements(phys_addr_t addr, size_t size, + unsigned int order) +{ + phys_addr_t offset, granule; + unsigned int nb_pages; + + granule = (uint64_t)(1 << order); + offset = addr & (granule - 1); + size = ALIGN(size + offset, granule); + nb_pages = size >> order; + + return nb_pages; +} + +static int +compute_dbinfo_mapping_requirements(struct irq_chip_msi_doorbell_info *dbinfo, + unsigned int order) +{ + int ret = 0; + + if (!dbinfo->doorbell_is_percpu) { + ret = compute_db_mapping_requirements(dbinfo->global_doorbell, + dbinfo->size, order); + } else { + phys_addr_t __percpu *pbase; + int cpu; + + for_each_possible_cpu(cpu) { + pbase = per_cpu_ptr(dbinfo->percpu_doorbells, cpu); + ret += compute_db_mapping_requirements(*pbase, + dbinfo->size, + order); + } + } + return ret; +} + +int msi_doorbell_pages(unsigned int order) +{ + struct irqchip_doorbell *db; + int ret = 0; + + mutex_lock(&irqchip_doorbell_mutex); + list_for_each_entry(db, &irqchip_doorbell_list, next) { + ret += compute_dbinfo_mapping_requirements(&db->info, order); + } + mutex_unlock(&irqchip_doorbell_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(msi_doorbell_pages);