From patchwork Tue Nov 24 20:03:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11929805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35974C64E75 for ; Tue, 24 Nov 2020 20:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D64152086A for ; Tue, 24 Nov 2020 20:03:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HQrwKVZE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730000AbgKXUDb (ORCPT ); Tue, 24 Nov 2020 15:03:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28977 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729998AbgKXUDa (ORCPT ); Tue, 24 Nov 2020 15:03:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606248209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pruzrQouk9MyD9Ysfhx+ZPTNO+LhkPA5Pe+NxzsDRfw=; b=HQrwKVZE8jr4X9PQyZpuC6ujlATa1tPnyYrY/8DFFqJGsrDCVtbrjCiXLg36Y9f/KEKRhU IH2V+L15Xcox8zWZUaVKuRT4uPRc7jSpO9rRkhY84cs1uHO/i/NJGYoZB3gW3by1+wGqn0 3XKzN4QNGS/HsbJHVMyk6Q7mgia9h64= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-7YeQ_o1APmq2yKrCeuY72A-1; Tue, 24 Nov 2020 15:03:27 -0500 X-MC-Unique: 7YeQ_o1APmq2yKrCeuY72A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50C79107AD89; Tue, 24 Nov 2020 20:03:25 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-113-83.ams2.redhat.com [10.36.113.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E5D15D6AB; Tue, 24 Nov 2020 20:03:21 +0000 (UTC) From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Paul Mackerras , Benjamin Herrenschmidt , Michael Ellerman , linux-block@vger.kernel.org, "Michael S . Tsirkin" , Marc Zyngier , linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, Christoph Hellwig , Laurent Vivier Subject: [PATCH 2/2] powerpc/pseries: pass MSI affinity to irq_create_mapping() Date: Tue, 24 Nov 2020 21:03:08 +0100 Message-Id: <20201124200308.1110744-3-lvivier@redhat.com> In-Reply-To: <20201124200308.1110744-1-lvivier@redhat.com> References: <20201124200308.1110744-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org With virtio multiqueue, normally each queue IRQ is mapped to a CPU. But since commit 0d9f0a52c8b9f ("virtio_scsi: use virtio IRQ affinity") this is broken on pseries. The affinity is correctly computed in msi_desc but this is not applied to the system IRQs. It appears the affinity is correctly passed to rtas_setup_msi_irqs() but lost at this point and never passed to irq_domain_alloc_descs() (see commit 06ee6d571f0e ("genirq: Add affinity hint to irq allocation")) because irq_create_mapping() doesn't take an affinity parameter. As the previous patch has added the affinity parameter to irq_create_mapping() we can forward the affinity from rtas_setup_msi_irqs() to irq_domain_alloc_descs(). With this change, the virtqueues are correctly dispatched between the CPUs on pseries. This problem cannot be shown on x86_64 for two reasons: - the call path traverses arch_setup_msi_irqs() that is arch specific: virtscsi_probe() virtscsi_init() vp_modern_find_vqs() vp_find_vqs() vp_find_vqs_msix() pci_alloc_irq_vectors_affinity() __pci_enable_msix_range() pci_msi_setup_msi_irqs() arch_setup_msi_irqs() rtas_setup_msi_irqs() irq_create_mapping() irq_domain_alloc_descs() __irq_alloc_descs() - and x86_64 has CONFIG_PCI_MSI_IRQ_DOMAIN that uses another path: virtscsi_probe() virtscsi_init() vp_modern_find_vqs() vp_find_vqs() vp_find_vqs_msix() pci_alloc_irq_vectors_affinity() __pci_enable_msix_range() __msi_domain_alloc_irqs() __irq_domain_alloc_irqs() __irq_alloc_descs() Signed-off-by: Laurent Vivier --- arch/powerpc/platforms/pseries/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c index 42ba08eaea91..58197f92c6a2 100644 --- a/arch/powerpc/platforms/pseries/msi.c +++ b/arch/powerpc/platforms/pseries/msi.c @@ -458,7 +458,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type) return hwirq; } - virq = irq_create_mapping(NULL, hwirq, NULL); + virq = irq_create_mapping(NULL, hwirq, entry->affinity); if (!virq) { pr_debug("rtas_msi: Failed mapping hwirq %d\n", hwirq);