From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=unavailable 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 B3691C4360F for ; Fri, 1 Mar 2019 07:04:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82BC3218AE for ; Fri, 1 Mar 2019 07:04:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oa0sykLz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727707AbfCAHET (ORCPT ); Fri, 1 Mar 2019 02:04:19 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34655 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725978AbfCAHET (ORCPT ); Fri, 1 Mar 2019 02:04:19 -0500 Received: by mail-pf1-f193.google.com with SMTP id u9so10995645pfn.1; Thu, 28 Feb 2019 23:04:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=9jiSmIy2XvOyKHktn45GYTCjY4Ykk4hpHmMs6RaJ9ys=; b=oa0sykLzeHHlx9VNm7FVNyQsDq4m7ifp5U9O46SyOgktqA6R/G25GkUbcsmd9VN+9H s/nOC+8Abz60uVUM4uPIsrbqymO5CZ87XANOMWuID5ZFqG4TwOGLUZbguL7lsQj+YEZF XfnOVToaN6QPUqtjVUVkVphEqypDjq+ooE9NuhyzZ/8Zlplg8rxax7wJVAW9AhwEoSOu mY/1+ZZh0uyzmPOAE5tf7iwtTmtmGmSNGj2+ZayNSDqtndKlwSW1uDMLhiNrVTORABsw AHuXjSgbEqc2GTes7OJNtzArPdwn9n9IjorKKf5QetwaInAKmU6cj5S9lR5ZZKN0gcdr Y1jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=9jiSmIy2XvOyKHktn45GYTCjY4Ykk4hpHmMs6RaJ9ys=; b=QUI4YTqTXbLwb79xUaFKvUOpGpWsyuXXUg3wmJAoblozU36jD4jC3CTgSn33yNqlYD afMhO67H1IaE+xilINCnkQH/n6+sM9aTpXGgWLrjlL/QAzX+NMv542LsGVNj6hr+C38S zqUgZqEXHF6rkqSoKvUmrvZPE43uT5trBaRLxxWI3gf/Y0Qc1KiF6eG41QNCqtC3dmY+ Jd+4+Lq60REvrOGRUTrXS0L4yE62dW+gP87g+vTda3k/jrvYqrYUPcVSCdbB5ZKMlVIw C5I8WQICeBhyC+hXzIEVzEvGFRu69z76/TzYXAVV8pa+8TLDVA7gEUh7wXk8aeprS+va X/Nw== X-Gm-Message-State: AHQUAuZisa9t6GPeftU3p7pcLYWfrK0a91LH7LJN8kcHl5x0ct4i4D1L 4xv2TVNouNdN+7tUZg3NerA= X-Google-Smtp-Source: AHgI3IYKyPZUeblVIfUsPALkmGb1d7VO6npqOB9aNLay+MvB6nBa96/PQmZ5BVcQTuABUHz6p+zdRw== X-Received: by 2002:aa7:9141:: with SMTP id 1mr4072133pfi.38.1551423858697; Thu, 28 Feb 2019 23:04:18 -0800 (PST) Received: from maya190131 ([52.247.206.249]) by smtp.gmail.com with ESMTPSA id g2sm16439738pfm.144.2019.02.28.23.04.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 23:04:18 -0800 (PST) Date: Fri, 1 Mar 2019 07:04:17 +0000 From: Maya Nakamura To: lorenzo.pieralisi@arm.com, bhelgaas@google.com, linux-pci@vger.kernel.org, kys@microsoft.com, sthemmin@microsoft.com, olaf@aepfle.de, apw@canonical.com, jasowang@redhat.com, mikelley@microsoft.com, Alexander.Levin@microsoft.com Cc: linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, haiyangz@microsoft.com, vkuznets@redhat.com, marcelo.cerri@canonical.com Subject: [PATCH v5 3/3] PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset() Message-ID: <74ad5e69506a1bc791539712cc0203abfdf89428.1551421809.git.m.maya.nakamura@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Remove the duplicate implementation of cpumask_to_vpset() and use the shared implementation. Export hv_max_vp_index, which is required by cpumask_to_vpset(). Signed-off-by: Maya Nakamura Reviewed-by: Michael Kelley Reviewed-by: Vitaly Kuznetsov Tested-by: Vitaly Kuznetsov --- Changes in v5: - Revise the commit message to clarify the changes based on feedback. - Add the Reviewed-by and Tested-by tags. Changes in v4: - Replace GFP_KERNEL with GFP_ATOMIC for alloc_cpumask_var(). - Update the commit message. Changes in v3: - Modify to catch all failures from cpumask_to_vpset(). - Correct the v2 change log about the commit message. Changes in v2: - Remove unnecessary nr_bank initialization. - Delete two unnecessary dev_err()'s. - Unlock before returning. - Update the commit message. arch/x86/hyperv/hv_init.c | 1 + drivers/pci/controller/pci-hyperv.c | 38 +++++++++++++---------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 7abb09e2eeb8..7f2eed1fc81b 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -96,6 +96,7 @@ void __percpu **hyperv_pcpu_input_arg; EXPORT_SYMBOL_GPL(hyperv_pcpu_input_arg); u32 hv_max_vp_index; +EXPORT_SYMBOL_GPL(hv_max_vp_index); static int hv_cpu_init(unsigned int cpu) { diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index d71695db1ba0..95441a35eceb 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -391,8 +391,6 @@ struct hv_interrupt_entry { u32 data; }; -#define HV_VP_SET_BANK_COUNT_MAX 5 /* current implementation limit */ - /* * flags for hv_device_interrupt_target.flags */ @@ -908,12 +906,12 @@ static void hv_irq_unmask(struct irq_data *data) struct retarget_msi_interrupt *params; struct hv_pcibus_device *hbus; struct cpumask *dest; + cpumask_var_t tmp; struct pci_bus *pbus; struct pci_dev *pdev; unsigned long flags; u32 var_size = 0; - int cpu_vmbus; - int cpu; + int cpu, nr_bank; u64 res; dest = irq_data_get_effective_affinity_mask(data); @@ -953,29 +951,27 @@ static void hv_irq_unmask(struct irq_data *data) */ params->int_target.flags |= HV_DEVICE_INTERRUPT_TARGET_PROCESSOR_SET; - params->int_target.vp_set.valid_bank_mask = - (1ull << HV_VP_SET_BANK_COUNT_MAX) - 1; + + if (!alloc_cpumask_var(&tmp, GFP_ATOMIC)) { + res = 1; + goto exit_unlock; + } + + cpumask_and(tmp, dest, cpu_online_mask); + nr_bank = cpumask_to_vpset(¶ms->int_target.vp_set, tmp); + free_cpumask_var(tmp); + + if (nr_bank <= 0) { + res = 1; + goto exit_unlock; + } /* * var-sized hypercall, var-size starts after vp_mask (thus * vp_set.format does not count, but vp_set.valid_bank_mask * does). */ - var_size = 1 + HV_VP_SET_BANK_COUNT_MAX; - - for_each_cpu_and(cpu, dest, cpu_online_mask) { - cpu_vmbus = hv_cpu_number_to_vp_number(cpu); - - if (cpu_vmbus >= HV_VP_SET_BANK_COUNT_MAX * 64) { - dev_err(&hbus->hdev->device, - "too high CPU %d", cpu_vmbus); - res = 1; - goto exit_unlock; - } - - params->int_target.vp_set.bank_contents[cpu_vmbus / 64] |= - (1ULL << (cpu_vmbus & 63)); - } + var_size = 1 + nr_bank; } else { for_each_cpu_and(cpu, dest, cpu_online_mask) { params->int_target.vp_mask |= -- 2.17.1