Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp882691pxb; Tue, 3 Nov 2020 15:26:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4ud3QdPejx0adKBQXS+kn99oPwbhv/8rXIFI5meMcw99E95qFBM9tVnsNMf/Y+hx8LKQZ X-Received: by 2002:a17:906:b150:: with SMTP id bt16mr22994383ejb.257.1604446018207; Tue, 03 Nov 2020 15:26:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604446018; cv=none; d=google.com; s=arc-20160816; b=BKWXSgYh+woR9mwDhqBRHzaLO0i/s74xTTzHButd9HXfUT475ciTx9wAenzvfCfWkW /c1owEQZjR99884O1sEh3HIM4tmd0yl7UkyVPCcQMait7CAOrtwN7C/Nb8kuAixMjTdH jk0fqqZLfV6DLh+4Z2fvN53oLLwhxcs3TbCpLvXKggz84ZJR+rDW22zUNbpZ5l00JKXf hC54xWFPPZ3OO+50cU8LjhzvacvSGhHTqDKAM5FUz3pM9vdjaKNLmO2trzZ0TkC62k3O 8sG7/xgnP/AwElvu/uU5s0P+BGrvyWDRJRjIrG21cof2e8z9oLGkz5rpUDU76sTauMn7 lsIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=L7r6jWqLWPRsIpBBXe36+uLifo58ZMaqdWfcuF8rLmw=; b=A13NzjrtKf2G1Yzn54Q7FOeocwkxm97gEg7Yc4SOyffOfflnYZAn0qUo4d3i9uQVvx qv1tGxpnf5NJyQM6iKHyp7LQiUjweLNWf0xY2FKfQxQvSUWbJXQMH8Q+t+2eqNSdHJAW lzYBrEwCQT5O2mGZAJWOCBn1l0xELhBtNTSlQy8ukAt1712v4RCYLnbb9Mo0FXEHPwLQ IdVBH18pjiCw7Maml2EBLJT8bovI9Zg3JbZuapXVUVhyoP5iuZV/sUyAtTavvDPiQw55 kanRaBmT3qU80NhvFUf6EEr28XQJ8uBJfm/G+F/GOgyNl2JyEcgMRiVx0yOSEu7Z8RC3 1cPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vsciIt75; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jz8si249022ejb.312.2020.11.03.15.26.35; Tue, 03 Nov 2020 15:26:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vsciIt75; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388119AbgKCVZe (ORCPT + 99 others); Tue, 3 Nov 2020 16:25:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:39500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387647AbgKCVC2 (ORCPT ); Tue, 3 Nov 2020 16:02:28 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 594A0206B5; Tue, 3 Nov 2020 21:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437346; bh=Hh/l0rrPihXnG5PR95QFx/m3zb6A1XSWbQbzpW2b0Qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vsciIt75HR0KHc1NWCyMoz8dcmv3yv//4i7b9hsJA329MdDTTIjcsFHRt664KPeLx ETMWcGGgGTUd4FPzoKbP0ZayAmE3FYFMQkTOt7iWUXSlQk/8vUQVeMdEIElcmvFbO7 AbTfeGoauOWG9ANERiWFkj3vbQzKbdBSi2oHUDPI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juergen Gross , Stefan Bader , Boris Ostrovsky Subject: [PATCH 4.19 036/191] xen/events: dont use chip_data for legacy IRQs Date: Tue, 3 Nov 2020 21:35:28 +0100 Message-Id: <20201103203237.390761757@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juergen Gross commit 0891fb39ba67bd7ae023ea0d367297ffff010781 upstream. Since commit c330fb1ddc0a ("XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.") Xen is using the chip_data pointer for storing IRQ specific data. When running as a HVM domain this can result in problems for legacy IRQs, as those might use chip_data for their own purposes. Use a local array for this purpose in case of legacy IRQs, avoiding the double use. Cc: stable@vger.kernel.org Fixes: c330fb1ddc0a ("XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.") Signed-off-by: Juergen Gross Tested-by: Stefan Bader Reviewed-by: Boris Ostrovsky Link: https://lore.kernel.org/r/20200930091614.13660-1-jgross@suse.com Signed-off-by: Juergen Gross Signed-off-by: Greg Kroah-Hartman --- drivers/xen/events/events_base.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -90,6 +90,8 @@ static bool (*pirq_needs_eoi)(unsigned i /* Xen will never allocate port zero for any purpose. */ #define VALID_EVTCHN(chn) ((chn) != 0) +static struct irq_info *legacy_info_ptrs[NR_IRQS_LEGACY]; + static struct irq_chip xen_dynamic_chip; static struct irq_chip xen_percpu_chip; static struct irq_chip xen_pirq_chip; @@ -154,7 +156,18 @@ int get_evtchn_to_irq(unsigned evtchn) /* Get info for IRQ */ struct irq_info *info_for_irq(unsigned irq) { - return irq_get_chip_data(irq); + if (irq < nr_legacy_irqs()) + return legacy_info_ptrs[irq]; + else + return irq_get_chip_data(irq); +} + +static void set_info_for_irq(unsigned int irq, struct irq_info *info) +{ + if (irq < nr_legacy_irqs()) + legacy_info_ptrs[irq] = info; + else + irq_set_chip_data(irq, info); } /* Constructors for packed IRQ information. */ @@ -375,7 +388,7 @@ static void xen_irq_init(unsigned irq) info->type = IRQT_UNBOUND; info->refcnt = -1; - irq_set_chip_data(irq, info); + set_info_for_irq(irq, info); list_add_tail(&info->list, &xen_irq_list_head); } @@ -424,14 +437,14 @@ static int __must_check xen_allocate_irq static void xen_free_irq(unsigned irq) { - struct irq_info *info = irq_get_chip_data(irq); + struct irq_info *info = info_for_irq(irq); if (WARN_ON(!info)) return; list_del(&info->list); - irq_set_chip_data(irq, NULL); + set_info_for_irq(irq, NULL); WARN_ON(info->refcnt > 0); @@ -601,7 +614,7 @@ EXPORT_SYMBOL_GPL(xen_irq_from_gsi); static void __unbind_from_irq(unsigned int irq) { int evtchn = evtchn_from_irq(irq); - struct irq_info *info = irq_get_chip_data(irq); + struct irq_info *info = info_for_irq(irq); if (info->refcnt > 0) { info->refcnt--; @@ -1105,7 +1118,7 @@ int bind_ipi_to_irqhandler(enum ipi_vect void unbind_from_irqhandler(unsigned int irq, void *dev_id) { - struct irq_info *info = irq_get_chip_data(irq); + struct irq_info *info = info_for_irq(irq); if (WARN_ON(!info)) return; @@ -1139,7 +1152,7 @@ int evtchn_make_refcounted(unsigned int if (irq == -1) return -ENOENT; - info = irq_get_chip_data(irq); + info = info_for_irq(irq); if (!info) return -ENOENT; @@ -1167,7 +1180,7 @@ int evtchn_get(unsigned int evtchn) if (irq == -1) goto done; - info = irq_get_chip_data(irq); + info = info_for_irq(irq); if (!info) goto done;