From patchwork Wed Nov 9 19:07:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuno Das Neves X-Patchwork-Id: 17766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp513661wru; Wed, 9 Nov 2022 11:11:24 -0800 (PST) X-Google-Smtp-Source: AMsMyM6abHFYGUWC+gkRGZNfebiEbrmLO6u6X7+vfeB8+4kjhyPYShwfrUxNFRZ9yLwJ/TcE9DLU X-Received: by 2002:a17:907:2c71:b0:79e:8603:72c6 with SMTP id ib17-20020a1709072c7100b0079e860372c6mr58916695ejc.172.1668021083981; Wed, 09 Nov 2022 11:11:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668021083; cv=none; d=google.com; s=arc-20160816; b=cO18trmZEBTmo8jMkdvF2FAUkDg2ApieVLdxse/jDJU0Kp4+Quq1aTAazEXhrlUxBk 1NXCxLwocZ7ZZLSnPvGXsHkVS49CZnZ4+woYHW3iCjZjmM0Ut+OxTGFfEiHMNNR+hxA7 i640H4gJt6ET7YcdV2XwXoVeGqml0HYxuHKdwlZa7/lPgVuwRIx02Afgv/O3Vjt1xhWF yrc9a7fnXL524dsqhZPR9HMiYLuE525pZKImiEOrtr3EFYkxD+p2weMPrQxsQVvcRVjE QX9Fl7ajz/UNI+FXU8P0nJBMdd+lrLwYYrFBdQA21+Q3UPvBZO/VRjD2Fs1UUUXTDpyD Uzxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=oKZaD4Qjvp917hAMIoauKzxyDhqCL2cTKsG7VBihYvA=; b=N3KIPBB1CCTHvJmxHbJ1HDcoPAIPGRJDvIu0plkF3vSPncvLPcQesHfjkIDHwMCKOl 35rg5ysSHcBz4LJxMzOPzpZ7J1MMmG3dbiUdA40urEM7VdLkat1azl/Nj73H0JfGElP3 Vx+RFyhZReJ1h+MKdZ33NO1aXh2/w56gKib8M57OHpMOLtzeyWYitPA8nRr9EnY8ZpEK 6IDZX7wpTfOnmf6vii3Dp2U+1Tt6EeuK3N8yKXZzzM7dL4oI+rMaaGAvo999XB7/TDMv mw7S3Wp3s24cJ0ldJGbKSyKRDEzqfO1nSM4A870bAvbZOMqIOXGCtbOHXWf0VH00wX6U 1FpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=lcmsxDcT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h8-20020a05640250c800b004593671898esi19507495edb.611.2022.11.09.11.10.57; Wed, 09 Nov 2022 11:11:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=lcmsxDcT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229714AbiKITHo (ORCPT + 99 others); Wed, 9 Nov 2022 14:07:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231256AbiKITHj (ORCPT ); Wed, 9 Nov 2022 14:07:39 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 98AAF25E8C; Wed, 9 Nov 2022 11:07:38 -0800 (PST) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 50C1F20B929F; Wed, 9 Nov 2022 11:07:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 50C1F20B929F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1668020858; bh=oKZaD4Qjvp917hAMIoauKzxyDhqCL2cTKsG7VBihYvA=; h=From:To:Cc:Subject:Date:From; b=lcmsxDcThq9edG7znbha1tIBUnNbQAh+M9zsf5/wezILs72dXw14K5pAsCoAt9Sz3 XwKpaJEuL2/2lHxkhgIi4QQS3A2RtPah6hBBJ+mOUcOQ7X1ikgt61uW5I3S5zutV0M R4DIyY44VnueKoN7G6GZd2vgZx7H0tDz+9kE8lVw= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev Cc: mikelley@microsoft.com, sunilmut@microsoft.com, wei.liu@kernel.org, kys@microsoft.com, Tianyu.Lan@microsoft.com, haiyangz@microsoft.com, decui@microsoft.com, dwmw2@infradead.org, joro@8bytes.org, will@kernel.org Subject: [PATCH] iommu/hyper-v: Allow hyperv irq remapping without x2apic Date: Wed, 9 Nov 2022 11:07:33 -0800 Message-Id: <1668020853-23950-1-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749046876327359280?= X-GMAIL-MSGID: =?utf-8?q?1749046876327359280?= If x2apic is not available, hyperv-iommu skips remapping irqs. This breaks root partition which always needs irqs remapped. Fix this by allowing irq remapping regardless of x2apic, and change hyperv_enable_irq_remapping() to return IRQ_REMAP_XAPIC_MODE in case x2apic is missing. Tested with root and non-root hyperv partitions. Signed-off-by: Nuno Das Neves Reviewed-by: Stanislav Kinsburskii --- drivers/iommu/Kconfig | 6 +++--- drivers/iommu/hyperv-iommu.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index dc5f7a156ff5..cf7433652db0 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -474,13 +474,13 @@ config QCOM_IOMMU Support for IOMMU on certain Qualcomm SoCs. config HYPERV_IOMMU - bool "Hyper-V x2APIC IRQ Handling" + bool "Hyper-V IRQ Handling" depends on HYPERV && X86 select IOMMU_API default HYPERV help - Stub IOMMU driver to handle IRQs as to allow Hyper-V Linux - guests to run with x2APIC mode enabled. + Stub IOMMU driver to handle IRQs to support Hyper-V Linux + guest and root partitions. config VIRTIO_IOMMU tristate "Virtio IOMMU driver" diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c index e190bb8c225c..abd1826a9e63 100644 --- a/drivers/iommu/hyperv-iommu.c +++ b/drivers/iommu/hyperv-iommu.c @@ -123,8 +123,7 @@ static int __init hyperv_prepare_irq_remapping(void) const struct irq_domain_ops *ops; if (!hypervisor_is_type(X86_HYPER_MS_HYPERV) || - x86_init.hyper.msi_ext_dest_id() || - !x2apic_supported()) + x86_init.hyper.msi_ext_dest_id()) return -ENODEV; if (hv_root_partition) { @@ -170,7 +169,9 @@ static int __init hyperv_prepare_irq_remapping(void) static int __init hyperv_enable_irq_remapping(void) { - return IRQ_REMAP_X2APIC_MODE; + if (x2apic_supported()) + return IRQ_REMAP_X2APIC_MODE; + return IRQ_REMAP_XAPIC_MODE; } struct irq_remap_ops hyperv_irq_remap_ops = {