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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 44F90CDB465 for ; Thu, 19 Oct 2023 19:33:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtYl9-0002n3-3t; Thu, 19 Oct 2023 15:32:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtYl6-0002mU-TQ for qemu-devel@nongnu.org; Thu, 19 Oct 2023 15:32:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtYl5-0006eP-9F for qemu-devel@nongnu.org; Thu, 19 Oct 2023 15:32:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697743958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Kl8dxuwJBJ3fF2zsQTuHM2/0TzJILVq7Whboy9VRfdU=; b=LRON59oG+mfPMNh9nqY4fn5lDRwIIWmVzLFcI23frhBP6DyqaHwj0XZa+8s4DvQDWdLRrd 22tWaEdR9TDNJ995QDYe9s8LNzvhVHS2qCdEW4iwoebO9NPVDdwlGQF+E37iBN6ntqdb/y PdGQm1Elc7RxBT1YmS4Bh9RNQ8YWzYk= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-8rMUAIPEPLeFM5pMxepOeA-1; Thu, 19 Oct 2023 15:32:27 -0400 X-MC-Unique: 8rMUAIPEPLeFM5pMxepOeA-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-53e305a5a1bso5419286a12.1 for ; Thu, 19 Oct 2023 12:32:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697743946; x=1698348746; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kl8dxuwJBJ3fF2zsQTuHM2/0TzJILVq7Whboy9VRfdU=; b=l8nfnHDhxgNjzYarW8NhEY6BjnZAps1uDClulzcLT0Xv6tQD9NG8FIGU9TfzYLRQeJ P1nkGOIZS9CEmzhrZyaaXI/1d4DPYtpjDRgyTf0hTzyRfnhnIhI/DemKBOlrhWnfPx/D IdPDeHL3QZIWHlZTqCRV/mBYXyaJ1hhrBColb5we7nWrG21QU8/iowxXwxo5VvxZDYr+ H1M8AyLHqtiQUFRmD9jKscCnYf+Wftn1SFyg/SBqrytOh99wp2TrC1mxEyiQ7NSOiW3F fZkBPDTEEyeQmM/G0bVUn4EydtAPrgMU4r7K1NZpoWRYxxtmNhcYyR9yCvjL4O3Uwp+v huoA== X-Gm-Message-State: AOJu0YyqC4uqD3B92wv8Fusz54MSmueD6/rCsPSyYSU8DRSNUgt9MHhm +CQX9NNe8P2sQe3H660dKi421aXT/6PsgIzQOLZr475KpRQPSeI/gIc7g75HQ7xLF2hZmACNg5N yGXSilig3sFC0JfU= X-Received: by 2002:a50:9ec4:0:b0:53e:332e:3e03 with SMTP id a62-20020a509ec4000000b0053e332e3e03mr2269904edf.4.1697743946217; Thu, 19 Oct 2023 12:32:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMfCtGLToZbB/EvUW9VIgN3BLet/yJfDMSMyUFfIF+KTfV2Dtl7C/ku6IkHf3FmXOFu1OEcg== X-Received: by 2002:a50:9ec4:0:b0:53e:332e:3e03 with SMTP id a62-20020a509ec4000000b0053e332e3e03mr2269887edf.4.1697743945824; Thu, 19 Oct 2023 12:32:25 -0700 (PDT) Received: from [192.168.0.5] (ip-109-43-176-141.web.vodafone.de. [109.43.176.141]) by smtp.gmail.com with ESMTPSA id 22-20020a508756000000b00532eba07773sm126594edv.25.2023.10.19.12.32.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Oct 2023 12:32:25 -0700 (PDT) Message-ID: <1fb044ef-2d63-4101-bc65-80133e9f7c5a@redhat.com> Date: Thu, 19 Oct 2023 21:32:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PULL 06/25] s390x/cpu topology: resetting the Topology-Change-Report Content-Language: en-US To: Nina Schoetterl-Glausch , Stefan Hajnoczi , Pierre Morel Cc: qemu-devel@nongnu.org, Stefan Hajnoczi , qemu-s390x@nongnu.org References: <20231018130716.286638-1-thuth@redhat.com> <20231018130716.286638-7-thuth@redhat.com> <991f3195f7e4e3989e43e45e9e1910cda410c444.camel@linux.ibm.com> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <991f3195f7e4e3989e43e45e9e1910cda410c444.camel@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 19/10/2023 19.55, Nina Schoetterl-Glausch wrote: > On Thu, 2023-10-19 at 09:35 -0700, Stefan Hajnoczi wrote: >> On Wed, 18 Oct 2023 at 06:09, Thomas Huth wrote: >>> >>> From: Pierre Morel >>> >>> During a subsystem reset the Topology-Change-Report is cleared >>> by the machine. >>> Let's ask KVM to clear the Modified Topology Change Report (MTCR) >>> bit of the SCA in the case of a subsystem reset. >>> >>> Signed-off-by: Pierre Morel >>> Reviewed-by: Thomas Huth >>> Reviewed-by: Nina Schoetterl-Glausch >>> Co-developed-by: Nina Schoetterl-Glausch >>> Signed-off-by: Nina Schoetterl-Glausch >>> Message-ID: <20231016183925.2384704-7-nsg@linux.ibm.com> >>> Signed-off-by: Thomas Huth >>> --- >>> include/hw/s390x/cpu-topology.h | 1 + >>> target/s390x/cpu.h | 1 + >>> target/s390x/kvm/kvm_s390x.h | 1 + >>> hw/s390x/cpu-topology.c | 11 +++++++++++ >>> hw/s390x/s390-virtio-ccw.c | 3 +++ >>> target/s390x/cpu-sysemu.c | 13 +++++++++++++ >>> target/s390x/kvm/kvm.c | 17 +++++++++++++++++ >>> 7 files changed, 47 insertions(+) >>> >>> diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h >>> index f95d26d37c..e33e7c66df 100644 >>> --- a/include/hw/s390x/cpu-topology.h >>> +++ b/include/hw/s390x/cpu-topology.h >>> @@ -56,6 +56,7 @@ static inline void s390_topology_setup_cpu(MachineState *ms, >>> #endif >>> >>> extern S390Topology s390_topology; >>> +void s390_topology_reset(void); >> >> Please take a look at the following CI failure: >> >> /usr/bin/ld: libqemu-s390x-softmmu.fa.p/hw_s390x_s390-virtio-ccw.c.o: >> in function `subsystem_reset': >> /home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/build/../hw/s390x/s390-virtio-ccw.c:128: >> undefined reference to `s390_topology_reset' >> >> https://gitlab.com/qemu-project/qemu/-/jobs/5330218593 > > I can replicate this with --disable-kvm, tho I don't think that's what the CI does. I think that was the wrong CI job that Stefan linked. It rather seemed to happen here: https://gitlab.com/qemu-project/qemu/-/jobs/5329820093#L5564 That job uses --enable-debug which turns off optimization, i.e. that was likely causing some code to be included that normally gets optimized away. > Fix looks something like this (copy pasted): > > --- a/include/hw/s390x/cpu-topology.h > +++ b/include/hw/s390x/cpu-topology.h > @@ -45,6 +45,7 @@ typedef QTAILQ_HEAD(, S390TopologyEntry) S390TopologyList; > #ifdef CONFIG_KVM > bool s390_has_topology(void); > void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp); > +void s390_topology_reset(void); > #else > static inline bool s390_has_topology(void) > { > @@ -53,10 +54,14 @@ static inline bool s390_has_topology(void) > static inline void s390_topology_setup_cpu(MachineState *ms, > S390CPU *cpu, > Error **errp) {} > +static inline void s390_topology_reset(void) > +{ > + /* Unreachable, CPU topology not implemented for TCG */ > + assert(false); > +} > #endif > > extern S390Topology s390_topology; > -void s390_topology_reset(void); > > static inline int s390_std_socket(int n, CpuTopology *smp) > { Thanks, that seems to fix the issue with --enable-debug, too. I'll squash that into the related patch (also fixing the indentation in s390_has_topology()) and respin the pull request. Thomas