Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3527308pxf; Mon, 15 Mar 2021 11:32:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdqd8+SM4LfB/4OV+CI59w2g3xdy+ZpuUcmMP2RNXl14XcVXwNlYLLwPW0znRimQt9yl1i X-Received: by 2002:a17:906:68c5:: with SMTP id y5mr25457486ejr.371.1615833150600; Mon, 15 Mar 2021 11:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833150; cv=none; d=google.com; s=arc-20160816; b=DPsUrgRPUtE/MwarSVn4eEq6bJhcAZ1XwtmChPIQie/GgBDE/zt/Fbnb7oKABTDyit 5TURW4uDZ/ay5CjTbuiw85GnNNlC4pgSr6u9vENPX087d/BP+t1zlKa7QOFyl84Zj89I cZnPckab2+X1UGbkS6/cKhQAl5CPB/3BhfkyURQ6g0oJ2nVA3WAlsfQWOQQfT+uFEoYC 304l0Vh5FEy7qJRsNavAW4kr04Uy1hflPO7C46MdjW+y7B/8SDe6k0i8KkePJv6B9o3F GcIPR1E60Nc27ZiudaQtJ1gDvV4DEFClE+sqPQKkBVj3bQs0zXakwj/QbyaThSIorX3j Vg2A== 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=hNMWdLJ8SwKBtwf2eGnGbCWKyGoSlxxQJT41ICghspU=; b=ZIe/AFa3USXvf4FXx3uhGJR8eX2ouRw+PbdTAqwe3asjdbKcRtvUbh7gprGg/zrkIk EjVjsUlRUfw/bOTNkNEdybet5gmVyklvnyq1vdD6iuE4ab5RDG5ZMvVDx4JpiyeiAvfQ oj/iiRA8jvlrubzmnlsM1wmjiG1Y0zNbdenrZgi99WzrS/4IO0jij2avUxaQMUpD4f07 yl2YWtmrIePZ8E9+1whb5FcYNsUddS6mCdHWUDbhtIe4HTG0H8+qqBzsNO7Cc0q7tsu3 +sxpNpSO88ggc4rn9jPGvXTYVRAIbaoqetVE4Is6Cxg5efg3E/p2FlSvQFZ1m3P2wZpK DhmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ai6rVCDm; 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=pass (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 e7si8450893edk.222.2021.03.15.11.32.08; Mon, 15 Mar 2021 11:32:30 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=ai6rVCDm; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240247AbhCOOh0 (ORCPT + 99 others); Mon, 15 Mar 2021 10:37:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:37522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233373AbhCOOBh (ORCPT ); Mon, 15 Mar 2021 10:01:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A21C764FA5; Mon, 15 Mar 2021 14:01:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816866; bh=0YZbGA7eDVAKAWK1KBKD6n0riqc/6+pK3ROtEnl+Gak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ai6rVCDmS6zT4FyfWnh2aw5mbixcfJ+9qLX9QDD5tRFHQUhC+GLs/BsB1y72F11Qd uuc0Fq1sqkm2L53c4Yt3dlIsukx9jW5Vdpf/5lrE6fqd4F93V865s3BMYI+TDetupv kdOBpmJrJ6aQNxWqteG1ucr+KoGmHmYX7c2nx3u0= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julien Grall , Juergen Gross , Julien Grall , Boris Ostrovsky Subject: [PATCH 4.19 118/120] xen/events: reset affinity of 2-level event when tearing it down Date: Mon, 15 Mar 2021 14:57:49 +0100 Message-Id: <20210315135723.843649212@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135720.002213995@linuxfoundation.org> References: <20210315135720.002213995@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: Greg Kroah-Hartman From: Juergen Gross commit 9e77d96b8e2724ed00380189f7b0ded61113b39f upstream. When creating a new event channel with 2-level events the affinity needs to be reset initially in order to avoid using an old affinity from earlier usage of the event channel port. So when tearing an event channel down reset all affinity bits. The same applies to the affinity when onlining a vcpu: all old affinity settings for this vcpu must be reset. As percpu events get initialized before the percpu event channel hook is called, resetting of the affinities happens after offlining a vcpu (this is working, as initial percpu memory is zeroed out). Cc: stable@vger.kernel.org Reported-by: Julien Grall Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Link: https://lore.kernel.org/r/20210306161833.4552-2-jgross@suse.com Signed-off-by: Boris Ostrovsky Signed-off-by: Greg Kroah-Hartman --- drivers/xen/events/events_2l.c | 15 +++++++++++++++ drivers/xen/events/events_base.c | 1 + drivers/xen/events/events_internal.h | 8 ++++++++ 3 files changed, 24 insertions(+) --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c @@ -47,6 +47,11 @@ static unsigned evtchn_2l_max_channels(v return EVTCHN_2L_NR_CHANNELS; } +static void evtchn_2l_remove(evtchn_port_t evtchn, unsigned int cpu) +{ + clear_bit(evtchn, BM(per_cpu(cpu_evtchn_mask, cpu))); +} + static void evtchn_2l_bind_to_cpu(struct irq_info *info, unsigned cpu) { clear_bit(info->evtchn, BM(per_cpu(cpu_evtchn_mask, info->cpu))); @@ -354,9 +359,18 @@ static void evtchn_2l_resume(void) EVTCHN_2L_NR_CHANNELS/BITS_PER_EVTCHN_WORD); } +static int evtchn_2l_percpu_deinit(unsigned int cpu) +{ + memset(per_cpu(cpu_evtchn_mask, cpu), 0, sizeof(xen_ulong_t) * + EVTCHN_2L_NR_CHANNELS/BITS_PER_EVTCHN_WORD); + + return 0; +} + static const struct evtchn_ops evtchn_ops_2l = { .max_channels = evtchn_2l_max_channels, .nr_channels = evtchn_2l_max_channels, + .remove = evtchn_2l_remove, .bind_to_cpu = evtchn_2l_bind_to_cpu, .clear_pending = evtchn_2l_clear_pending, .set_pending = evtchn_2l_set_pending, @@ -366,6 +380,7 @@ static const struct evtchn_ops evtchn_op .unmask = evtchn_2l_unmask, .handle_events = evtchn_2l_handle_events, .resume = evtchn_2l_resume, + .percpu_deinit = evtchn_2l_percpu_deinit, }; void __init xen_evtchn_2l_init(void) --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -285,6 +285,7 @@ static int xen_irq_info_pirq_setup(unsig static void xen_irq_info_cleanup(struct irq_info *info) { set_evtchn_to_irq(info->evtchn, -1); + xen_evtchn_port_remove(info->evtchn, info->cpu); info->evtchn = 0; } --- a/drivers/xen/events/events_internal.h +++ b/drivers/xen/events/events_internal.h @@ -67,6 +67,7 @@ struct evtchn_ops { unsigned (*nr_channels)(void); int (*setup)(struct irq_info *info); + void (*remove)(evtchn_port_t port, unsigned int cpu); void (*bind_to_cpu)(struct irq_info *info, unsigned cpu); void (*clear_pending)(unsigned port); @@ -109,6 +110,13 @@ static inline int xen_evtchn_port_setup( return 0; } +static inline void xen_evtchn_port_remove(evtchn_port_t evtchn, + unsigned int cpu) +{ + if (evtchn_ops->remove) + evtchn_ops->remove(evtchn, cpu); +} + static inline void xen_evtchn_port_bind_to_cpu(struct irq_info *info, unsigned cpu) {