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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 31AC3C5519F for ; Wed, 18 Nov 2020 07:18:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 538372223D for ; Wed, 18 Nov 2020 07:18:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 538372223D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfHjM-0004N9-Or for qemu-devel@archiver.kernel.org; Wed, 18 Nov 2020 02:18:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfHeu-0002os-N4 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 02:13:41 -0500 Received: from 2.mo52.mail-out.ovh.net ([178.33.105.233]:59737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfHes-0003ZU-6M for qemu-devel@nongnu.org; Wed, 18 Nov 2020 02:13:40 -0500 Received: from mxplan5.mail.ovh.net (unknown [10.109.156.148]) by mo52.mail-out.ovh.net (Postfix) with ESMTPS id 4AE282057BB; Wed, 18 Nov 2020 08:13:25 +0100 (CET) Received: from kaod.org (37.59.142.97) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Wed, 18 Nov 2020 08:13:24 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-97G002c59daffc-bd03-44fd-96b5-a99ed1e0daf1, 350A0944D80A876CE3CDBF7AB1DB3CAFAF2C6382) smtp.auth=clg@kaod.org Subject: Re: [PATCH for-5.2] Revert series "spapr/xive: Allocate vCPU IPIs from the vCPU contexts" To: David Gibson , Greg Kurz References: <160554086275.1325084.12110142252189044646.stgit@bahia.lan> <20201118052442.GC411463@yekko.fritz.box> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: Date: Wed, 18 Nov 2020 08:13:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201118052442.GC411463@yekko.fritz.box> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [37.59.142.97] X-ClientProxiedBy: DAG4EX1.mxp5.local (172.16.2.31) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 14935951-43b8-4c5f-ac68-49da11184b01 X-Ovh-Tracer-Id: 14525234699555408745 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedujedrudefgedguddthecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefuvfhfhffkffgfgggjtgfgihesthekredttdefheenucfhrhhomhepveorughrihgtpgfnvggpifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeelgfekheejheejtdeuteetledujeeuvdeugeetfeduffefheffhfdtueejuefgkeenucffohhmrghinhepmhgrrhgtrdhinhhfohdpghhnuhdrohhrghdplhgruhhntghhphgrugdrnhgvthenucfkpheptddrtddrtddrtddpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehgrhhouhhgsehkrghougdrohhrgh Received-SPF: pass client-ip=178.33.105.233; envelope-from=clg@kaod.org; helo=2.mo52.mail-out.ovh.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 02:13:26 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Satheesh Rajendran , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Gustavo Romero Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 11/18/20 6:24 AM, David Gibson wrote: > On Mon, Nov 16, 2020 at 04:34:22PM +0100, Greg Kurz wrote: >> This series was largely built on the assumption that IPI numbers are >> numerically equal to vCPU ids. Even if this happens to be the case >> in practice with the default machine settings, this ceases to be true >> if VSMT is set to a different value than the number of vCPUs per core. >> This causes bogus IPI numbers to be created in KVM from a guest stand >> point. This leads to unknow results in the guest, including crashes >> or missing vCPUs (see BugLink) and even non-fatal oopses in current >> KVM that lacks a check before accessing misconfigured HW (see [1]). >> >> A tentative patch was sent (see [2]) but it seems too complex to be >> merged in an RC. Since the original changes are essentially an >> optimization, it seems safer to revert them for now. The damage is >> done by commit acbdb9956fe9 ("spapr/xive: Allocate IPIs independently >> from the other sources") but the previous patches in the series are >> really preparatory patches. So this reverts the whole series: >> >> eab0a2d06e97 ("spapr/xive: Allocate vCPU IPIs from the vCPU contexts") >> acbdb9956fe9 ("spapr/xive: Allocate IPIs independently from the other sources") >> fa94447a2cd6 ("spapr/xive: Use kvmppc_xive_source_reset() in post_load") >> 235d3b116213 ("spapr/xive: Modify kvm_cpu_is_enabled() interface") >> >> [1] https://marc.info/?l=kvm-ppc&m=160458409722959&w=4 >> [2] https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg03626.html >> >> Reported-by: Satheesh Rajendran >> Fixes: acbdb9956fe9 ("spapr/xive: Allocate IPIs independently from the other sources") >> BugLink: https://bugs.launchpad.net/qemu/+bug/1900241 >> Signed-off-by: Greg Kurz >> --- >> >> Peter, >> >> I'm Cc'ing you because we really want to fix this regression in 5.2. >> Reverting the culprit optimization seems a lot safer than the changes >> proposed in my other patch. David is on PTO right now and I'm not sure >> if he can post a PR anytime soon. Just in case: would it be acceptable >> to you if I send a PR after it got some positive feedback from the >> people on the Cc: list ? The better the sooner or do we wait for David >> to get a chance to step in ? > > I am indeed on holiday, and I'm not going to review this until next > week. I trust Greg's judgement, though, so I'm happy for this to be > applied directly. Acked-by: Cédric Le Goater C. > > >> --- >> hw/intc/spapr_xive_kvm.c | 102 ++++++++-------------------------------------- >> 1 file changed, 18 insertions(+), 84 deletions(-) >> >> diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c >> index 66bf4c06fe55..e8667ce5f621 100644 >> --- a/hw/intc/spapr_xive_kvm.c >> +++ b/hw/intc/spapr_xive_kvm.c >> @@ -36,9 +36,10 @@ typedef struct KVMEnabledCPU { >> static QLIST_HEAD(, KVMEnabledCPU) >> kvm_enabled_cpus = QLIST_HEAD_INITIALIZER(&kvm_enabled_cpus); >> >> -static bool kvm_cpu_is_enabled(unsigned long vcpu_id) >> +static bool kvm_cpu_is_enabled(CPUState *cs) >> { >> KVMEnabledCPU *enabled_cpu; >> + unsigned long vcpu_id = kvm_arch_vcpu_id(cs); >> >> QLIST_FOREACH(enabled_cpu, &kvm_enabled_cpus, node) { >> if (enabled_cpu->vcpu_id == vcpu_id) { >> @@ -146,45 +147,6 @@ int kvmppc_xive_cpu_synchronize_state(XiveTCTX *tctx, Error **errp) >> return s.ret; >> } >> >> -/* >> - * Allocate the vCPU IPIs from the vCPU context. This will allocate >> - * the XIVE IPI interrupt on the chip on which the vCPU is running. >> - * This gives a better distribution of IPIs when the guest has a lot >> - * of vCPUs. When the vCPUs are pinned, this will make the IPI local >> - * to the chip of the vCPU. It will reduce rerouting between interrupt >> - * controllers and gives better performance. >> - */ >> -typedef struct { >> - SpaprXive *xive; >> - Error *err; >> - int rc; >> -} XiveInitIPI; >> - >> -static void kvmppc_xive_reset_ipi_on_cpu(CPUState *cs, run_on_cpu_data arg) >> -{ >> - unsigned long ipi = kvm_arch_vcpu_id(cs); >> - XiveInitIPI *s = arg.host_ptr; >> - uint64_t state = 0; >> - >> - s->rc = kvm_device_access(s->xive->fd, KVM_DEV_XIVE_GRP_SOURCE, ipi, >> - &state, true, &s->err); >> -} >> - >> -static int kvmppc_xive_reset_ipi(SpaprXive *xive, CPUState *cs, Error **errp) >> -{ >> - XiveInitIPI s = { >> - .xive = xive, >> - .err = NULL, >> - .rc = 0, >> - }; >> - >> - run_on_cpu(cs, kvmppc_xive_reset_ipi_on_cpu, RUN_ON_CPU_HOST_PTR(&s)); >> - if (s.err) { >> - error_propagate(errp, s.err); >> - } >> - return s.rc; >> -} >> - >> int kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp) >> { >> ERRP_GUARD(); >> @@ -195,7 +157,7 @@ int kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp) >> assert(xive->fd != -1); >> >> /* Check if CPU was hot unplugged and replugged. */ >> - if (kvm_cpu_is_enabled(kvm_arch_vcpu_id(tctx->cs))) { >> + if (kvm_cpu_is_enabled(tctx->cs)) { >> return 0; >> } >> >> @@ -214,12 +176,6 @@ int kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp) >> return ret; >> } >> >> - /* Create/reset the vCPU IPI */ >> - ret = kvmppc_xive_reset_ipi(xive, tctx->cs, errp); >> - if (ret < 0) { >> - return ret; >> - } >> - >> kvm_cpu_enable(tctx->cs); >> return 0; >> } >> @@ -279,12 +235,6 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp) >> >> assert(xive->fd != -1); >> >> - /* >> - * The vCPU IPIs are now allocated in kvmppc_xive_cpu_connect() >> - * and not with all sources in kvmppc_xive_source_reset() >> - */ >> - assert(srcno >= SPAPR_XIRQ_BASE); >> - >> if (xive_source_irq_is_lsi(xsrc, srcno)) { >> state |= KVM_XIVE_LEVEL_SENSITIVE; >> if (xsrc->status[srcno] & XIVE_STATUS_ASSERTED) { >> @@ -296,28 +246,12 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp) >> true, errp); >> } >> >> -/* >> - * To be valid, a source must have been claimed by the machine (valid >> - * entry in the EAS table) and if it is a vCPU IPI, the vCPU should >> - * have been enabled, which means the IPI has been allocated in >> - * kvmppc_xive_cpu_connect(). >> - */ >> -static bool xive_source_is_valid(SpaprXive *xive, int i) >> -{ >> - return xive_eas_is_valid(&xive->eat[i]) && >> - (i >= SPAPR_XIRQ_BASE || kvm_cpu_is_enabled(i)); >> -} >> - >> static int kvmppc_xive_source_reset(XiveSource *xsrc, Error **errp) >> { >> SpaprXive *xive = SPAPR_XIVE(xsrc->xive); >> int i; >> >> - /* >> - * Skip the vCPU IPIs. These are created/reset when the vCPUs are >> - * connected in kvmppc_xive_cpu_connect() >> - */ >> - for (i = SPAPR_XIRQ_BASE; i < xsrc->nr_irqs; i++) { >> + for (i = 0; i < xsrc->nr_irqs; i++) { >> int ret; >> >> if (!xive_eas_is_valid(&xive->eat[i])) { >> @@ -399,7 +333,7 @@ static void kvmppc_xive_source_get_state(XiveSource *xsrc) >> for (i = 0; i < xsrc->nr_irqs; i++) { >> uint8_t pq; >> >> - if (!xive_source_is_valid(xive, i)) { >> + if (!xive_eas_is_valid(&xive->eat[i])) { >> continue; >> } >> >> @@ -582,7 +516,7 @@ static void kvmppc_xive_change_state_handler(void *opaque, int running, >> uint8_t pq; >> uint8_t old_pq; >> >> - if (!xive_source_is_valid(xive, i)) { >> + if (!xive_eas_is_valid(&xive->eat[i])) { >> continue; >> } >> >> @@ -610,7 +544,7 @@ static void kvmppc_xive_change_state_handler(void *opaque, int running, >> for (i = 0; i < xsrc->nr_irqs; i++) { >> uint8_t pq; >> >> - if (!xive_source_is_valid(xive, i)) { >> + if (!xive_eas_is_valid(&xive->eat[i])) { >> continue; >> } >> >> @@ -713,22 +647,22 @@ int kvmppc_xive_post_load(SpaprXive *xive, int version_id) >> } >> } >> >> - /* >> - * We can only restore the source config if the source has been >> - * previously set in KVM. Since we don't do that at reset time >> - * when restoring a VM, let's do it now. >> - */ >> - ret = kvmppc_xive_source_reset(&xive->source, &local_err); >> - if (ret < 0) { >> - goto fail; >> - } >> - >> /* Restore the EAT */ >> for (i = 0; i < xive->nr_irqs; i++) { >> - if (!xive_source_is_valid(xive, i)) { >> + if (!xive_eas_is_valid(&xive->eat[i])) { >> continue; >> } >> >> + /* >> + * We can only restore the source config if the source has been >> + * previously set in KVM. Since we don't do that for all interrupts >> + * at reset time anymore, let's do it now. >> + */ >> + ret = kvmppc_xive_source_reset_one(&xive->source, i, &local_err); >> + if (ret < 0) { >> + goto fail; >> + } >> + >> ret = kvmppc_xive_set_source_config(xive, i, &xive->eat[i], &local_err); >> if (ret < 0) { >> goto fail; >> >> >