From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745542; cv=none; d=zohomail.com; s=zohoarc; b=GYg4ndDAM1DqcdvVwS00wEMAruETxB+K/+PodZVWaMez0q2seUTvgeWRl7dwO8kmvHiE8A5vPb1y8zg5dZreqyKH/JAv9u3V6S3lVGHUYSCvujZksEj6CPcyRTRUoZog2T36V7JtBvLoI/wxX7iOHlQ8iod3Do5PiUfPP0A9BtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745542; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3rAU4eV4gEL1nE9JTrIdiAlrOHj3+NJ35GVTPTdgm+I=; b=TJiPDxQ1Vl+aKRJh3uPIoW9iXCXYaj+tI/53DiRIjryfOIolPsunb69n/JITk5eLAUP3m3Y1gU1BouukxpDYUIyMeLNfk0g+Wfm1MJsaS5F8llwVQfVUg9pvbPpbFjExnMy+tPouP9KB6Jus1NNX2+D9HtZp8Xz0KCbEylLYrzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745542107251.4199577983403; Thu, 2 Mar 2023 00:25:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeEx-000264-48; Thu, 02 Mar 2023 03:24:39 -0500 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 1pXeEv-00025e-G9 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeEt-0001wR-Tw for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:37 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-50-JfTjt08SO_yV4tk2cA3gHg-1; Thu, 02 Mar 2023 03:24:33 -0500 Received: by mail-wr1-f70.google.com with SMTP id i18-20020a05600011d200b002c94d861113so2982138wrx.16 for ; Thu, 02 Mar 2023 00:24:33 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id o2-20020a05600c510200b003e208cec49bsm5792606wms.3.2023.03.02.00.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745475; 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: in-reply-to:in-reply-to:references:references; bh=3rAU4eV4gEL1nE9JTrIdiAlrOHj3+NJ35GVTPTdgm+I=; b=FjRaDsIHv3GgsBsXuskNs2mOrt/WhiJO0mjIJw2SLRD9ISviZguxy6j5t3ZGDjSgbJYmVd qrFYaxntnQpnN88RuKooNGFoehZzXiPKEk7p0YNWGFsEpdrqF0bQ0/rvMryEhDEN5HmNRB DA1mYih4JMwYeKkDa9FIZ3dvInoZcW0= X-MC-Unique: JfTjt08SO_yV4tk2cA3gHg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745471; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3rAU4eV4gEL1nE9JTrIdiAlrOHj3+NJ35GVTPTdgm+I=; b=k0uKeo5X/4FfpFzhx1Kd+1BuiYokAFjtYpLJOziUVmSXdKy0TUNmlCdwnWcl6obu6w EKitEpiuphw976Tr2srNo3sYhJhv5xn7PnzYe7gANDCO1LthvJNkgBJtiogQ3gOyyeVO c5Y/p4WC9Eir7cCvjbo68AjBnv8B/pFO5LU6DJiCxkOXfgcZTGNMPs92hLpxlBWgc9mI SxE5d7aSioFi9SGDOmgmctwf3kw1a24LfMwJMspbjTWGO8A+wSh5EvPIqS6dZ0SRgzqC mIZjmpUIN39/AOe5sdhy+I1WAcXzklKu6el2YloxglR1Q/CQdJAR3RLqgRVa/fXF8QGo GFZA== X-Gm-Message-State: AO0yUKXP4Aia0CXjveP8nHORLxtlwW7o/QGDxlP11QjVHxCKSocCCObb dDP4E9Nii7/xNmcduXzcZmEuZeIiCJ27qW0zJA6b0ZV/l6ob+wuY2WzJLDpIqI8JaogIZuxOy9y ab8ulsYRJ54U7x/ptEWqwHqHFqL7dSH4iOsR/xG+sDXb9TP6AGLWqA+8qzV1wyKTlVA== X-Received: by 2002:a05:600c:5125:b0:3ea:d601:976f with SMTP id o37-20020a05600c512500b003ead601976fmr6338117wms.23.1677745471635; Thu, 02 Mar 2023 00:24:31 -0800 (PST) X-Google-Smtp-Source: AK7set9rHTOT/nfn2YT/ELSmTPYKImys2PQy9yXfecvZJq4rwH2HOYW8Hxu4NiNrMjcEVC0vykQS2w== X-Received: by 2002:a05:600c:5125:b0:3ea:d601:976f with SMTP id o37-20020a05600c512500b003ead601976fmr6338097wms.23.1677745471268; Thu, 02 Mar 2023 00:24:31 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:28 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Julia Suvorova , Igor Mammedov , Ani Sinha Subject: [PULL 01/53] hw/smbios: fix field corruption in type 4 table Message-ID: <20230302082343.560446-2-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745542612100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Julia Suvorova Since table type 4 of SMBIOS version 2.6 is shorter than 3.0, the strings which follow immediately after the struct fields have been overwritten by unconditional filling of later fields such as core_count2. Make these fields dependent on the SMBIOS version. Fixes: 05e27d74c7 ("hw/smbios: add core_count2 to smbios table type 4") Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2169904 Signed-off-by: Julia Suvorova Message-Id: <20230223125747.254914-1-jusual@redhat.com> Reviewed-by: Igor Mammedov Reviewed-by: Ani Sinha Reviewed-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/smbios/smbios.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 4869566cf5..d2007e70fb 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -750,14 +750,16 @@ static void smbios_build_type_4_table(MachineState *m= s, unsigned instance) t->core_count =3D (ms->smp.cores > 255) ? 0xFF : ms->smp.cores; t->core_enabled =3D t->core_count; =20 - t->core_count2 =3D t->core_enabled2 =3D cpu_to_le16(ms->smp.cores); - t->thread_count =3D (ms->smp.threads > 255) ? 0xFF : ms->smp.threads; - t->thread_count2 =3D cpu_to_le16(ms->smp.threads); =20 t->processor_characteristics =3D cpu_to_le16(0x02); /* Unknown */ t->processor_family2 =3D cpu_to_le16(0x01); /* Other */ =20 + if (tbl_len =3D=3D SMBIOS_TYPE_4_LEN_V30) { + t->core_count2 =3D t->core_enabled2 =3D cpu_to_le16(ms->smp.cores); + t->thread_count2 =3D cpu_to_le16(ms->smp.threads); + } + SMBIOS_BUILD_TABLE_POST; smbios_type4_count++; } --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745535; cv=none; d=zohomail.com; s=zohoarc; b=PqrAni+4MtXBDS2L3NQ2fPfEAMje1OnrA6WsggD8kXjFBBvjwM75M+kDARkaiLwcaGWTVeIP+WsObvMT7dzbvPNChRsbV5W9IOjTs5g0D94OVBfFyJcH7Se++A5iCWCsJwUHQZAg+au+5saMr3KZgAal3XMD99JwUHzUxk3sP0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745535; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fj0JjOh3EVaVcEff6iS06pouY7kJbuHeajzLUv4MEtw=; b=GB1uOtuI/FJ2XrS8qtTC6mAm/0WhbLbSYwvlPYUqot5+RqK01KRJ9pta0R0rbyROsqon+wdj113w10qt5y8L+3PPo3CfwTdlianHSVkNI6fpnVlzpnVytTB4hu1jZ+ubqxwx7ASLr7tWYhEjNXEmwtD16ziwJsnQ4HmwFiCQO3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745535880317.71147702035637; Thu, 2 Mar 2023 00:25:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeF2-00026O-4G; Thu, 02 Mar 2023 03:24:44 -0500 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 1pXeEz-00026E-NE for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeEx-0001wu-K2 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:41 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-240-6dPdk2YsM5mqh18t97q6vw-1; Thu, 02 Mar 2023 03:24:37 -0500 Received: by mail-wm1-f72.google.com with SMTP id j6-20020a05600c1c0600b003eaf882cb85so737341wms.9 for ; Thu, 02 Mar 2023 00:24:37 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id p2-20020adfe602000000b002c561805a4csm14923641wrm.45.2023.03.02.00.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745478; 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; bh=fj0JjOh3EVaVcEff6iS06pouY7kJbuHeajzLUv4MEtw=; b=HLp2wSefH4caStLmaa2TZGm0lJZ2RAkNHf2gDm8+FbVrefzK/JO2ZLgPITujWUjgCIIwcm uI5KjBa5mdyl7dOMWVnv4m8UPvzm8DPTlpkJZvPhThk3fhf5mSPqX98WxZdgZHUzTBZzmv qLwrLxe96BNnUeNj2XJ4EwiiI8M0ukY= X-MC-Unique: 6dPdk2YsM5mqh18t97q6vw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745475; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fj0JjOh3EVaVcEff6iS06pouY7kJbuHeajzLUv4MEtw=; b=JOKjSwfOJaxqYWFlSN7P7h/l9osVsGe0YPsZiiitx13IXOv/t8yLyW4RnGLyp7kZ/I 2XYQSGZbgAoKfif3zde37IHLVpKBqfnpHIc8Wkhe5hGvaA16KOGMxtD+b1Tlm0h/wadN MlYzIP7Jy7ms5ChvE/5T9QDTQmXgWEiPqd2owfeSX7LXBFs3yX4UuJ4+QR1GCSAyZ7pP zm1rQ8IWzmLKSsAQLthVp0Answu9YK+RmitUQ8H1wf8r7mPlqVD+fRgCOAYFdbsVgIKh lUoNtixGV0/MBw4l7qucXMpkEeej8WE3+ebZ/Qs/MhftQslQWOuSTl7FSCJrQ489Je2n F3Ig== X-Gm-Message-State: AO0yUKVUq6zCWiEGBXI+l8uo54Ue6pbhgRrCRcMlRCyNXq2aqnqERG9x pdYprrkgU4Shonze1UfTOoJ7LkSOpvPIK0BzaQRO40jtTzImCyilp4y1WwtRwtu0KtLk+yV6En1 A22Hv5FOtU7PQwoWcwAFbVwr52GkfxpiX0dS/Tyc7iTI3QR1XyoV+R2vZL4Bgynj5Sg== X-Received: by 2002:adf:ffcd:0:b0:2c5:5ff8:93e5 with SMTP id x13-20020adfffcd000000b002c55ff893e5mr6215423wrs.44.1677745475525; Thu, 02 Mar 2023 00:24:35 -0800 (PST) X-Google-Smtp-Source: AK7set8T9xdi0GaOIIGTwJ/glmZxh4+3mXWLTewhuThwHQpWihUNp51fjO5hQyAkrS559z2Hy67Sgw== X-Received: by 2002:adf:ffcd:0:b0:2c5:5ff8:93e5 with SMTP id x13-20020adfffcd000000b002c55ff893e5mr6215400wrs.44.1677745475278; Thu, 02 Mar 2023 00:24:35 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:31 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Sergio Lopez , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PULL 02/53] Revert "x86: don't let decompressed kernel image clobber setup_data" Message-ID: <20230302082343.560446-3-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745536704100011 This reverts commit eac7a7791bb6d719233deed750034042318ffd56. Fixes: eac7a7791b ("x86: don't let decompressed kernel image clobber setup_= data") Signed-off-by: Michael S. Tsirkin Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/i386/microvm.h | 5 ++-- include/hw/nvram/fw_cfg.h | 9 ------- hw/i386/microvm.c | 15 ++++------- hw/i386/x86.c | 52 ++++++++++++++++++--------------------- hw/nvram/fw_cfg.c | 9 ------- 5 files changed, 31 insertions(+), 59 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index e8af61f194..fad97a891d 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -50,9 +50,8 @@ */ =20 /* Platform virtio definitions */ -#define VIRTIO_MMIO_BASE 0xfeb00000 -#define VIRTIO_CMDLINE_MAXLEN 64 -#define VIRTIO_CMDLINE_TOTAL_MAX_LEN ((VIRTIO_CMDLINE_MAXLEN + 1) * 16) +#define VIRTIO_MMIO_BASE 0xfeb00000 +#define VIRTIO_CMDLINE_MAXLEN 64 =20 #define GED_MMIO_BASE 0xfea00000 #define GED_MMIO_BASE_MEMHP (GED_MMIO_BASE + 0x100) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 990dcdbb2e..2e503904dc 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -139,15 +139,6 @@ void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t= key, void *data, size_t len, bool read_only); =20 -/** - * fw_cfg_read_bytes_ptr: - * @s: fw_cfg device being modified - * @key: selector key value for new fw_cfg item - * - * Reads an existing fw_cfg data pointer. - */ -void *fw_cfg_read_bytes_ptr(FWCfgState *s, uint16_t key); - /** * fw_cfg_add_string: * @s: fw_cfg device being modified diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 68c22016d2..6680530555 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -376,8 +376,7 @@ static void microvm_fix_kernel_cmdline(MachineState *ma= chine) MicrovmMachineState *mms =3D MICROVM_MACHINE(machine); BusState *bus; BusChild *kid; - char *cmdline, *existing_cmdline; - size_t len; + char *cmdline; =20 /* * Find MMIO transports with attached devices, and add them to the ker= nel @@ -386,8 +385,7 @@ static void microvm_fix_kernel_cmdline(MachineState *ma= chine) * Yes, this is a hack, but one that heavily improves the UX without * introducing any significant issues. */ - existing_cmdline =3D fw_cfg_read_bytes_ptr(x86ms->fw_cfg, FW_CFG_CMDLI= NE_DATA); - cmdline =3D g_strdup(existing_cmdline); + cmdline =3D g_strdup(machine->kernel_cmdline); bus =3D sysbus_get_default(); QTAILQ_FOREACH(kid, &bus->children, sibling) { DeviceState *dev =3D kid->child; @@ -411,12 +409,9 @@ static void microvm_fix_kernel_cmdline(MachineState *m= achine) } } =20 - len =3D strlen(cmdline); - if (len > VIRTIO_CMDLINE_TOTAL_MAX_LEN + strlen(existing_cmdline)) { - fprintf(stderr, "qemu: virtio mmio cmdline too large, skipping\n"); - } else { - memcpy(existing_cmdline, cmdline, len + 1); - } + fw_cfg_modify_i32(x86ms->fw_cfg, FW_CFG_CMDLINE_SIZE, strlen(cmdline) = + 1); + fw_cfg_modify_string(x86ms->fw_cfg, FW_CFG_CMDLINE_DATA, cmdline); + g_free(cmdline); } =20 diff --git a/hw/i386/x86.c b/hw/i386/x86.c index c44846f47b..9b7476158c 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -49,7 +49,6 @@ #include "hw/intc/i8259.h" #include "hw/rtc/mc146818rtc.h" #include "target/i386/sev.h" -#include "hw/i386/microvm.h" =20 #include "hw/acpi/cpu_hotplug.h" #include "hw/irq.h" @@ -815,18 +814,12 @@ void x86_load_linux(X86MachineState *x86ms, const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; const char *dtb_filename =3D machine->dtb; - char *kernel_cmdline; + const char *kernel_cmdline =3D machine->kernel_cmdline; SevKernelLoaderContext sev_load_ctx =3D {}; enum { RNG_SEED_LENGTH =3D 32 }; =20 - /* - * Add the NUL terminator, some padding for the microvm cmdline fiddli= ng - * hack, and then align to 16 bytes as a paranoia measure - */ - cmdline_size =3D (strlen(machine->kernel_cmdline) + 1 + - VIRTIO_CMDLINE_TOTAL_MAX_LEN + 16) & ~15; - /* Make a copy, since we might append arbitrary bytes to it later. */ - kernel_cmdline =3D g_strndup(machine->kernel_cmdline, cmdline_size); + /* Align to 16 bytes as a paranoia measure */ + cmdline_size =3D (strlen(kernel_cmdline) + 16) & ~15; =20 /* load the kernel header */ f =3D fopen(kernel_filename, "rb"); @@ -967,6 +960,12 @@ void x86_load_linux(X86MachineState *x86ms, initrd_max =3D x86ms->below_4g_mem_size - acpi_data_size - 1; } =20 + fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr); + fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, strlen(kernel_cmdline) + 1= ); + fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA, kernel_cmdline); + sev_load_ctx.cmdline_data =3D (char *)kernel_cmdline; + sev_load_ctx.cmdline_size =3D strlen(kernel_cmdline) + 1; + if (protocol >=3D 0x202) { stl_p(header + 0x228, cmdline_addr); } else { @@ -1093,24 +1092,27 @@ void x86_load_linux(X86MachineState *x86ms, exit(1); } =20 - setup_data_offset =3D cmdline_size; - cmdline_size +=3D sizeof(SetupData) + dtb_size; - kernel_cmdline =3D g_realloc(kernel_cmdline, cmdline_size); - setup_data =3D (void *)kernel_cmdline + setup_data_offset; + setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); + kernel_size =3D setup_data_offset + sizeof(SetupData) + dtb_size; + kernel =3D g_realloc(kernel, kernel_size); + + + setup_data =3D (SetupData *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); - first_setup_data =3D cmdline_addr + setup_data_offset; + first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_DTB); setup_data->len =3D cpu_to_le32(dtb_size); + load_image_size(dtb_filename, setup_data->data, dtb_size); } =20 - if (!legacy_no_rng_seed && protocol >=3D 0x209) { - setup_data_offset =3D cmdline_size; - cmdline_size +=3D sizeof(SetupData) + RNG_SEED_LENGTH; - kernel_cmdline =3D g_realloc(kernel_cmdline, cmdline_size); - setup_data =3D (void *)kernel_cmdline + setup_data_offset; + if (!legacy_no_rng_seed) { + setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); + kernel_size =3D setup_data_offset + sizeof(SetupData) + RNG_SEED_L= ENGTH; + kernel =3D g_realloc(kernel, kernel_size); + setup_data =3D (SetupData *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); - first_setup_data =3D cmdline_addr + setup_data_offset; + first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); @@ -1121,12 +1123,6 @@ void x86_load_linux(X86MachineState *x86ms, fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); } =20 - fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, cmdline_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_CMDLINE_DATA, kernel_cmdline, cmdline_= size); - sev_load_ctx.cmdline_data =3D (char *)kernel_cmdline; - sev_load_ctx.cmdline_size =3D cmdline_size; - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); sev_load_ctx.kernel_data =3D (char *)kernel; @@ -1139,7 +1135,7 @@ void x86_load_linux(X86MachineState *x86ms, * kernel on the other side of the fw_cfg interface matches the hash o= f the * file the user passed in. */ - if (!sev_enabled() && first_setup_data) { + if (!sev_enabled()) { SetupDataFixup *fixup =3D g_malloc(sizeof(*fixup)); =20 memcpy(setup, header, MIN(sizeof(header), setup_size)); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 432754eda4..a00881bc64 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -741,15 +741,6 @@ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, voi= d *data, size_t len) fw_cfg_add_bytes_callback(s, key, NULL, NULL, NULL, data, len, true); } =20 -void *fw_cfg_read_bytes_ptr(FWCfgState *s, uint16_t key) -{ - int arch =3D !!(key & FW_CFG_ARCH_LOCAL); - - key &=3D FW_CFG_ENTRY_MASK; - assert(key < fw_cfg_max_entry(s)); - return s->entries[arch][key].data; -} - void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value) { size_t sz =3D strlen(value) + 1; --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745534; cv=none; d=zohomail.com; s=zohoarc; b=hc0pMWADhYFErkA3ovB+o44EiC6/zddebeJX0uayhJGjXvZsRqIfjMgw3Q/nCaficKLPGDSNyNq6OTuGkIWtJK+7RixxX6eoYdy0ubWb9OR/gA+PqKhx3i6vIoG/U/pkODrfKsxjoVoaGnQIgFzNgYfEkI4Uf9kKmdJntfHoG7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745534; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jBP0wti6dxnPnGnJO6+cFlFJmnT0gtydblFYaomrsJw=; b=ClqN8us0Yea7cWjrIdZUHRPqNd7FVMlWWv+U/B6mr/kZzz+t/aofbcg5+T341W577gALximvCmplhoPenpw8f6HMPwdo/VQFBnrR2LVrqTZdkoIqCLb19AIPVJiP0Dt77vIZw3QThI7sv33WxtH01zXvG31vAn6yid8MYAh5A7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745534295293.60536174172137; Thu, 2 Mar 2023 00:25:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFN-00028R-El; Thu, 02 Mar 2023 03:25:06 -0500 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 1pXeF7-00027A-QR for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:50 -0500 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 1pXeF6-0001xZ-2L for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:49 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-619-YjvDHT8xNoa6oQjfWH2-ew-1; Thu, 02 Mar 2023 03:24:42 -0500 Received: by mail-wm1-f72.google.com with SMTP id l23-20020a7bc457000000b003e206cbce8dso5461329wmi.7 for ; Thu, 02 Mar 2023 00:24:41 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id p16-20020a05600c359000b003e209b45f6bsm2356022wmq.29.2023.03.02.00.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745487; 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; bh=jBP0wti6dxnPnGnJO6+cFlFJmnT0gtydblFYaomrsJw=; b=RzE9ceamVUl4iAdBFNiUPtTV+UV92kH//azXPccdYrBaDDd9B16/636xkWD7b5Cnu8TbWz 0srKJuqAkQH9mfAeF6Fq0GNdnab7/K9Qx6oAVdkpgYKjOr4rGSVZ6OXpZN9o+KMm73VR18 7GXnzJ9htfm6BzxvtL29g3AHUTWhKEc= X-MC-Unique: YjvDHT8xNoa6oQjfWH2-ew-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745480; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jBP0wti6dxnPnGnJO6+cFlFJmnT0gtydblFYaomrsJw=; b=M6fOvVwbz0jqjcDV7r+YjZZ1HRue9Ug/Wxxp54ZqywOdpdnH6U6rZEvnZMndcrXW8R EjIi1v0fybruO+gxqwSXhX5oztOwpevoJWrXSmdQd9mZQyWsFPQb1uuqFSYYPEOoPpIj 9LkYIm+Pcwzv563yqbX4QCUz9bhcsgnEyY2jtf3tiMQX8b/2/8965JPx/PFfSyWlH8hJ pxKTyTttqm2542d2xqpPpH4uPPcVL3OHagiS9Aqy7mvQFSCXTtcrepIabgPR9KtHi+LU o4a9/QFk4/YER5u5gTWc9YnC/mz3MNKy6CwixYTAfQdqOb52nbSyydl6ogA6TMOZOEj6 MBqA== X-Gm-Message-State: AO0yUKVbnwPX5mpYfTnd8jCkhdFUyOi4zQBivR4dKZoi0/jfDubAxhKD UaKk43+y0cR3Lp9ZgMoZViSMOmv7WWVmqLLYsoT+gkuHfrTyKOZtetF2Uedd0VJBVqZJTrdar1v Ca/iNGdZ92KIZ7aZDfU2fQedrDJWAOMRR7Qwd61B57VN4eCtrc0xrKb4JYX3eTNbSDg== X-Received: by 2002:a05:600c:4f13:b0:3eb:2b88:867e with SMTP id l19-20020a05600c4f1300b003eb2b88867emr7237313wmq.10.1677745480461; Thu, 02 Mar 2023 00:24:40 -0800 (PST) X-Google-Smtp-Source: AK7set+O1M3+ccqgKkcM3Ie5+sQqLvSIhXGgrL8tdyNrDBpphR9jhKKj+5M7MJYGuztLnUDcepw+Yg== X-Received: by 2002:a05:600c:4f13:b0:3eb:2b88:867e with SMTP id l19-20020a05600c4f1300b003eb2b88867emr7237288wmq.10.1677745480191; Thu, 02 Mar 2023 00:24:40 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:35 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PULL 03/53] Revert "x86: do not re-randomize RNG seed on snapshot load" Message-ID: <20230302082343.560446-4-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745534966100001 This reverts commit 14b29fea742034186403914b4d013d0e83f19e78. Signed-off-by: Michael S. Tsirkin Fixes: 14b29fea74 ("x86: do not re-randomize RNG seed on snapshot load") Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/i386/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 9b7476158c..7a128a2899 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -1116,7 +1116,7 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); - qemu_register_reset_nosnapshotload(reset_rng_seed, setup_data); + qemu_register_reset(reset_rng_seed, setup_data); fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_se= ed, NULL, setup_data, kernel, kernel_size, true); } else { --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745533; cv=none; d=zohomail.com; s=zohoarc; b=brtfapamuYUUtYV0t3k2RC5/6t9ic3TAzWH1lplNqI1TM5DTlmLASO+lTIBU02y1dV2RhT5LkSCqortduKdw/O3QqNt8Aqrl6ztxcZihwgAOX7xLmZnh8lBYNX9zx80BB9kZyrPdyQEsgydRzliDuG/wCShWKjsFSTbq6j1zO4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745533; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oRF1a+d0ww1PZsoSqWCORzl39PgabxYGdz1wRV2D1qo=; b=Tvyz5PoetmxpJaECXrllc/9SCO3rL907KyfpK+M+uJe3TMQrkrt3DPdfBhIC00nKwSnk0zgMq/A0BDWq1NRUIds0i5zYyVJikPc2D3qxpZA4/4VYMdUQ/KrZGlO23w0aaiI2sdtvE3xheUQ+XhgrtMX+ORQS9OokbmvtknQOkVc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745533151607.3103200410259; Thu, 2 Mar 2023 00:25:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFG-00027w-5n; Thu, 02 Mar 2023 03:25:01 -0500 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 1pXeF7-000274-9I for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeF4-0001xR-Rv for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:48 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-582-G_w4AkFNPWW01zXfPwRwIw-1; Thu, 02 Mar 2023 03:24:45 -0500 Received: by mail-wm1-f70.google.com with SMTP id bi21-20020a05600c3d9500b003e836e354e0so742306wmb.5 for ; Thu, 02 Mar 2023 00:24:45 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id n2-20020a1c7202000000b003e21f20b646sm2092526wmc.21.2023.03.02.00.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745486; 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; bh=oRF1a+d0ww1PZsoSqWCORzl39PgabxYGdz1wRV2D1qo=; b=jNMyqB+R/Xb5hhPmz8ll1X4XZali7iw2WbuyCwY7z1cHUH70OywTQrTUQwcucjTAwruJMs 5VXCsVBew02G6GEKyV6ZYOP6pflY1RtmK/aS2pqdVcQcVRVXfGpN1OcytdWR+rMQPfznF/ V/e0gVvBS5lQ7ww/L42qh+3N0tEgHtU= X-MC-Unique: G_w4AkFNPWW01zXfPwRwIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745483; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oRF1a+d0ww1PZsoSqWCORzl39PgabxYGdz1wRV2D1qo=; b=axbKIZE9hySFU55T1QqK9lEeK0KbWkIk8cEXoSMTFBcrXJJw1P2wrKXRlzaR7+npgg S1BBJyyXeEf2CFEFRaEaL3xHffzjZEx9DcCZDUaci8kmoFAHdk7+WRyUu/jFFuf0oYuB D9aJYjtoQNz4SED3hN8Guspc5bkQQyoYzu4f7pKeYciT4YEiMGacRaYJVG7aIkNiUAJM YOGqa92ZYe0XlirbGCFeveJqSyjctLh5c+rfa6I+8tscA10QNLjlu60IiGT0TlLexPLW vt+eoq/COAYwf6TEJtuZRSdKgBVumGjj/ItkcilMyg/uqY1Fp4SfPgk3YOiA/j338Rnb doMw== X-Gm-Message-State: AO0yUKWbVJF89yRynspH7IpQ+ABBJqYqBuAqKSHZ4n4tuc6KhveuI5hQ 8ZoDSjLwht7igh/VzNFC58bhw9yoVx4Y2lHkD5C2H/uuqG+QkVqcWcsKh6fW3NyRwISOo5ehPZr uPZ1yVpwLf9q/D0MPf83beIbqT+xm+LOtbScqDvPcBKQoWimWSPdE5OpOQaGP1l9PbQ== X-Received: by 2002:adf:f304:0:b0:2ca:f680:cbf4 with SMTP id i4-20020adff304000000b002caf680cbf4mr7322608wro.39.1677745483739; Thu, 02 Mar 2023 00:24:43 -0800 (PST) X-Google-Smtp-Source: AK7set+qc1/sKdOafIP+7xGDz6vS4Sfj8CWTcqd1rIp4kN8hDIM+x+Hp0RZca51p+aaXDKRtyZVOjg== X-Received: by 2002:adf:f304:0:b0:2ca:f680:cbf4 with SMTP id i4-20020adff304000000b002caf680cbf4mr7322585wro.39.1677745483479; Thu, 02 Mar 2023 00:24:43 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:40 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PULL 04/53] Revert "x86: re-initialize RNG seed when selecting kernel" Message-ID: <20230302082343.560446-5-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745534967100002 This reverts commit cc63374a5a7c240b7d3be734ef589dabbefc7527. Fixes: cc63374a5a ("x86: re-initialize RNG seed when selecting kernel") Signed-off-by: Michael S. Tsirkin Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/i386/x86.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 7a128a2899..ec9c343cdb 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -1117,14 +1117,11 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); qemu_register_reset(reset_rng_seed, setup_data); - fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_se= ed, NULL, - setup_data, kernel, kernel_size, true); - } else { - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); } =20 fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); sev_load_ctx.kernel_data =3D (char *)kernel; sev_load_ctx.kernel_size =3D kernel_size; =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745729; cv=none; d=zohomail.com; s=zohoarc; b=TukRLZo5z4YjLSKxfQT4xRbjG4+IL/KqWgJ9XdYiPv9zF8CS5PuPrqtsv3tviYDx7XfNT3vvXIK1SkeyA6YnCBVuLjRKNrJ1t6pQDAOBaM6m7t5iz9n20wSiSykt/qte3lNPCl01BK9LdJiXA1nE8HqGuUSA/TbTzwKWWLSvgOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745729; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZkzltoAQslA9URaPLAQaSc2HpeO+s5E1uf8WjlsvQRk=; b=RUMQCrmJTwpChwDNjXYKAQmUKl3Me6kIBywo/dENQhbF4kWXDr1N2csQ04B/AM9n0v5HAinN1r4uI+ZpCeUHFBoLFtzao4cRjsOMkyhEXT1bi0R7XtbwD0CPYh6SLypR4xJtm8eAanX4C7SVOJJ7LJ7FodCtunVSlvsqbqTpVXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745729465927.0549274483811; Thu, 2 Mar 2023 00:28:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFm-0002T1-4k; Thu, 02 Mar 2023 03:25:30 -0500 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 1pXeFA-00027b-Li for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeF8-0001y1-Q9 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:51 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-554-cLBV7qzlOZ2BYhDagim2qA-1; Thu, 02 Mar 2023 03:24:48 -0500 Received: by mail-wm1-f69.google.com with SMTP id az39-20020a05600c602700b003e97eb80524so925057wmb.4 for ; Thu, 02 Mar 2023 00:24:48 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id o11-20020a05600c4fcb00b003e8f0334db8sm2339046wmq.5.2023.03.02.00.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745490; 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; bh=ZkzltoAQslA9URaPLAQaSc2HpeO+s5E1uf8WjlsvQRk=; b=gvIgtByCJG+DrA1WBwpc/rZ8IxiE6LqfG/DLRPO34lkSyLcLTezUWw77F0BT9KIncSQxhw grflYzqzf//Z+R21XX2GLI0h5WWWhwUfSLv4NSDftIwYlvYctJ6vJlKG340K1hpnYCggQS 9lth8GyA9EDD6Jtymc1V6xhwmNBjmOo= X-MC-Unique: cLBV7qzlOZ2BYhDagim2qA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745487; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZkzltoAQslA9URaPLAQaSc2HpeO+s5E1uf8WjlsvQRk=; b=1Oy0hre3i+wL3U4JJARjCwitYv2edjfWSpcTyVQDT5q64peXIYV/ZtSomd1f0u+KMq DSZ1bpA9jwq1BnkhaV9fsN1VXrtnUzs6dgE49polaKb8EvkLcaI+1sutTTswa9kEb6Cl o7WP/u8WiIU6WsUX+C99RiS0KaHXurHv1f/HwNLhZDxdrV1Oeo0g6ZKAfOQKzJVrsoCn NnnGa2FBgd7xIyAZCwnPNtBPYiO/vcjKxuQx10YClkGO8wOEG/SeX4d4cyQ4fShFmrTf tqop/mY7M+SWuOB4Tvmowebe14BxRws5lJN5yt+8PX3pQeAAMo8O9bPY9MMbrTrmLoP5 pjmg== X-Gm-Message-State: AO0yUKUfb7jTAwWP0oakVUR2Y9wP920/Gr++w+CbFhljEJeYoZAoeQAn 07JoQqpuaZ4xE9LBHZ9v02XNIvrygcDtKIDlsn7uLtg8nhgZp1/tAHuJL0rwqX4eJa9qR57Up9T XGmdUW2s0FPdje9cZGxtEflh4I6f32ZCunu6Fzynjqgn3NbOaIuGXa1RU9UQp6oSzDw== X-Received: by 2002:a05:600c:181a:b0:3ea:d611:f8 with SMTP id n26-20020a05600c181a00b003ead61100f8mr7927531wmp.38.1677745487298; Thu, 02 Mar 2023 00:24:47 -0800 (PST) X-Google-Smtp-Source: AK7set8uzZzoT/baKkkWG1Z71G6KGV9d4kFKbGQ6+pRi2R0GGeqermuOp5Ib/yuFJj7PJo7VuU8YpA== X-Received: by 2002:a05:600c:181a:b0:3ea:d611:f8 with SMTP id n26-20020a05600c181a00b003ead61100f8mr7927502wmp.38.1677745486977; Thu, 02 Mar 2023 00:24:46 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:43 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 05/53] Revert "x86: reinitialize RNG seed on system reboot" Message-ID: <20230302082343.560446-6-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745729968100004 This reverts commit 763a2828bf313ed55878b09759dc435355035f2e. Fixes: 763a2828bf ("x86: reinitialize RNG seed on system reboot") Signed-off-by: Michael S. Tsirkin Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/i386/x86.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index ec9c343cdb..278dd54830 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -788,12 +788,6 @@ static void reset_setup_data(void *opaque) stq_p(fixup->pos, fixup->orig_val); } =20 -static void reset_rng_seed(void *opaque) -{ - SetupData *setup_data =3D opaque; - qemu_guest_getrandom_nofail(setup_data->data, le32_to_cpu(setup_data->= len)); -} - void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, @@ -1116,7 +1110,6 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); - qemu_register_reset(reset_rng_seed, setup_data); } =20 fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745632; cv=none; d=zohomail.com; s=zohoarc; b=XywRQISQHbX2n9rmC7L2cxDAerq//d7dEkfL7p28ZmCJxYVdJhJjRkbMbT39QpTiDIM8D6drICR0GQ50XUDywSfwCZcmukc6DxViUD8RLyeqdO/1UdE135z7mfdu9argnUDCjuI85/ZlHoSpjmSx0vImDFuCyZc32IaJXL4lO2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745632; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zPrRco/19b/UwmPHQphBosqDOoUGzra1uvANevhWyQY=; b=mLRi8VPelUuoj4pGtyIDPX1U/1PopN7zXs17ktmitxTMsTaLZz3GHuN7Ea5FW0ajf5vwSymB1Gj0cJjP5joNGqGiZBD4Quv0klxLguF6lgEhOZoBYZu0TwfdCZ7UEkn8SnQURZut4sMKCe3Dz/glQIxg2pRYi3d2Q2nLx3WbS9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745632033156.2604954311447; Thu, 2 Mar 2023 00:27:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFv-0003P8-HM; Thu, 02 Mar 2023 03:25:39 -0500 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 1pXeFD-00028A-R3 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFC-0001yR-Au for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:55 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-626-ceIDXq5JPLCZpfLuOkDbFQ-1; Thu, 02 Mar 2023 03:24:52 -0500 Received: by mail-wr1-f70.google.com with SMTP id o15-20020a05600002cf00b002c54a27803cso3050129wry.22 for ; Thu, 02 Mar 2023 00:24:51 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id f3-20020a0560001b0300b002c70e60abd4sm14789134wrz.2.2023.03.02.00.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745493; 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; bh=zPrRco/19b/UwmPHQphBosqDOoUGzra1uvANevhWyQY=; b=hInC7zWU9fR0SkwnG3evd8Brztu1WqSsvy785tWiY+zOwLk8i/G2tyu5LE+SRlcZQ3fctU vW2wWbZkKjfyFcUIeYDVI3HDyTofXojvG8Co72CRxPKTi9z0WEmhQuWf7FnP+mPi84UdEO X6jnTTr1jYxifbFzvyL3bmbMmiYxmNY= X-MC-Unique: ceIDXq5JPLCZpfLuOkDbFQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745490; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zPrRco/19b/UwmPHQphBosqDOoUGzra1uvANevhWyQY=; b=RPo6D16wsD2zllUNtKVgnf+c/qYFLPS41BWYmDIqSi6AfPDZTtsL92bUYMd/8suPe8 vzY9gMPClOH3vno5Y7yRd6iR5juTxxNow2OpIO2fhxkBNuoTwiwjD0E2TfIEGInxlQzd pqYL7Hgr0d3g03VF3U5+2KqenuhI054kTeGWvHH1BnkTl8Z8Dod27AJYqn0zKdxb+fY7 QDwqZpfLVDR0CQ0JmFxh5Kd+Nzy2RRDPQ64eWX7qG06/sphHRc4D6dhAWil74fqvWZZO yIZHCCzKuKtOu6zcT+hawpIhKKp8fzIeKQikNke9uc9pwh8ATcGDVPVcwo44v3GkSp2t Qjdg== X-Gm-Message-State: AO0yUKW+ZG4HGCwN3+6e1EowpkWTFhM0U1wsWMW1GR0D86rc/p5zlBjh rZex/IX/77aBJsg+BWUhNkQ95O1y1x0ihDs8sh26msXSAtofUXqdAG+8QQacLRrQDeCByuD6ZMt /6w9/HOs8ggrVweVXyzL8cDGK8x+jHZESDQKlq/VuilXYRBpUBvDSaRpTEFUBsU9/gA== X-Received: by 2002:adf:e745:0:b0:2c5:a38f:ca3a with SMTP id c5-20020adfe745000000b002c5a38fca3amr791304wrn.10.1677745490527; Thu, 02 Mar 2023 00:24:50 -0800 (PST) X-Google-Smtp-Source: AK7set994MK8bkfabCkt/AVi3AU+femKVeo0OwLef79HDaKr68InBeS91G85A8jzmYGO7LzAEXE3kw== X-Received: by 2002:adf:e745:0:b0:2c5:a38f:ca3a with SMTP id c5-20020adfe745000000b002c5a38fca3amr791282wrn.10.1677745490189; Thu, 02 Mar 2023 00:24:50 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:47 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 06/53] Revert "x86: use typedef for SetupData struct" Message-ID: <20230302082343.560446-7-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745633133100003 This reverts commit eebb38a5633a77f5fa79d6486d5b2fcf8fbe3c07. Fixes: eebb38a563 ("x86: use typedef for SetupData struct") Signed-off-by: Michael S. Tsirkin Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/i386/x86.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 278dd54830..66cf171ace 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -658,12 +658,12 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_stat= e) return dev; } =20 -typedef struct SetupData { +struct setup_data { uint64_t next; uint32_t type; uint32_t len; uint8_t data[]; -} __attribute__((packed)) SetupData; +} __attribute__((packed)); =20 =20 /* @@ -804,7 +804,7 @@ void x86_load_linux(X86MachineState *x86ms, FILE *f; char *vmode; MachineState *machine =3D MACHINE(x86ms); - SetupData *setup_data; + struct setup_data *setup_data; const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; const char *dtb_filename =3D machine->dtb; @@ -1087,11 +1087,11 @@ void x86_load_linux(X86MachineState *x86ms, } =20 setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(SetupData) + dtb_size; + kernel_size =3D setup_data_offset + sizeof(struct setup_data) + dt= b_size; kernel =3D g_realloc(kernel, kernel_size); =20 =20 - setup_data =3D (SetupData *)(kernel + setup_data_offset); + setup_data =3D (struct setup_data *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_DTB); @@ -1102,9 +1102,9 @@ void x86_load_linux(X86MachineState *x86ms, =20 if (!legacy_no_rng_seed) { setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(SetupData) + RNG_SEED_L= ENGTH; + kernel_size =3D setup_data_offset + sizeof(struct setup_data) + RN= G_SEED_LENGTH; kernel =3D g_realloc(kernel, kernel_size); - setup_data =3D (SetupData *)(kernel + setup_data_offset); + setup_data =3D (struct setup_data *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746241; cv=none; d=zohomail.com; s=zohoarc; b=UxvS+baPbCIhv9mxBjJlJjmhAI+SY3VGG/vswpfIW0ezS/zHEN4T770cC3T/Z6+ihEUrQa7+9hefILQymp92JB1pp6S7d0UxgbARprsn4jAdU7ogozD2abc6teAMYIGY1+bR+010Gbew14brf9Sl/dhfr7yxO63q3YuMAtAwvF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QSfx4EEhKWxIZHb7NirlnEOJXXkyWmFVrE3AW0rFTkI=; b=TlvOwFk21d1KcfXg+mTN3sHz3118cQSBRQ8ss/LlTq/Yj/GXajpsXMV+pX2mdpQZ68ampHgRCitHkrFdL+1tQzREHi8WpEZIq/jDUON9iwOv8a/soveJIgwY//bNUJ4mweFgJSWbp4Kg6YKh5mNvsc1U5xbmf7/bJZ44BlWxlGw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746241667109.32063875004508; Thu, 2 Mar 2023 00:37:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFn-0002Zj-5C; Thu, 02 Mar 2023 03:25:31 -0500 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 1pXeFK-0002Br-5R for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:05 -0500 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 1pXeFF-0001ye-QH for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:24:59 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-443-9LLhoPA_MiKTD41DCgAR0Q-1; Thu, 02 Mar 2023 03:24:55 -0500 Received: by mail-wm1-f70.google.com with SMTP id r7-20020a05600c35c700b003eb3f2c4fb4so741496wmq.6 for ; Thu, 02 Mar 2023 00:24:55 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id i13-20020adfe48d000000b002c5539171d1sm14818363wrm.41.2023.03.02.00.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745497; 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; bh=QSfx4EEhKWxIZHb7NirlnEOJXXkyWmFVrE3AW0rFTkI=; b=XY5vcgD+ONPKtDjvjVzLbpmk8wZoRceX/okVgHKyJX+DyVM8Rzw6c1aDbFXGk4tEoqgrPb 6GCdZ0+u7MrdmPnpvPZ0JMc/5t1I/vBLOfoCUMEal+eCtQZfIF1FnTGoeCjzfeFdXDDWCs f6sokEjUXZxhRVQpiAHP6r3V9aiie0k= X-MC-Unique: 9LLhoPA_MiKTD41DCgAR0Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745494; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QSfx4EEhKWxIZHb7NirlnEOJXXkyWmFVrE3AW0rFTkI=; b=RaASmwh/toWHafPVZZQTUAZkdNuE3SF6pX+iqi6q2XSm2/yaDwFlYTV+BoAOten8Zg BvQH7MOuCfW/IuOgGKV2oNWA/K+q8CeJ5tQ4GaZJM1nJZRrGanXresh2d8lqMZTuURCV TUqP//JvyS9yZfrGBkOtkUxED4Dun6ehneLK5YXw3B3QFvGLlWUC2UB4xSegsKEGKyrg LsIQLB4UC+5OSxE110KOtzYbeCSdBcRfCygQ6PoD71bMiILkLkTe5GGFY5RV+k6zYaPE FnMQFCCGFaTyOBgiWiqTyGIrXvPqH02ulgtEVfxMj6oIST3jZJ2wJhvoqH5T6n+GxE5W yHOg== X-Gm-Message-State: AO0yUKVoQfahtPFd2DO/MuWJpcFeZd5X3fuzjXpUW1wS2hN1FMhuJTH2 Lki30YUxg+sjqvAM59U1N9yFe0mEvFkjYuRuwLqlaWjbJeF1V97OhV0VxoFy9D2TV35+Pi5UkKg bUDvMT7atVxmN65akTnpx523DKM2VWgop/BNd1eMtu8htD/oM57u9LoCN+yQLSpAfqA== X-Received: by 2002:adf:e5cf:0:b0:2c3:f00c:ebaa with SMTP id a15-20020adfe5cf000000b002c3f00cebaamr7052171wrn.4.1677745494018; Thu, 02 Mar 2023 00:24:54 -0800 (PST) X-Google-Smtp-Source: AK7set9WXeNoTj+8QQmeOslswSFhGTEfZgpHGkBkfLflMdtF8DlFous1xHqiBh/IFpsx2Kr8f/UDpw== X-Received: by 2002:adf:e5cf:0:b0:2c3:f00c:ebaa with SMTP id a15-20020adfe5cf000000b002c3f00cebaamr7052145wrn.4.1677745493625; Thu, 02 Mar 2023 00:24:53 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:50 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PULL 07/53] Revert "x86: return modified setup_data only if read as memory, not as file" Message-ID: <20230302082343.560446-8-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746242819100004 This reverts commit e935b735085dfa61d8e6d276b6f9e7687796a3c7. Fixes: e935b73508 ("x86: return modified setup_data only if read as memory,= not as file") Signed-off-by: Michael S. Tsirkin Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/nvram/fw_cfg.h | 22 ------------------- hw/i386/x86.c | 46 +++++++++------------------------------ hw/nvram/fw_cfg.c | 12 +++++----- 3 files changed, 16 insertions(+), 64 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 2e503904dc..c1f81a5f13 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -117,28 +117,6 @@ struct FWCfgMemState { */ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len); =20 -/** - * fw_cfg_add_bytes_callback: - * @s: fw_cfg device being modified - * @key: selector key value for new fw_cfg item - * @select_cb: callback function when selecting - * @write_cb: callback function after a write - * @callback_opaque: argument to be passed into callback function - * @data: pointer to start of item data - * @len: size of item data - * @read_only: is file read only - * - * Add a new fw_cfg item, available by selecting the given key, as a raw - * "blob" of the given size. The data referenced by the starting pointer - * is only linked, NOT copied, into the data structure of the fw_cfg devic= e. - */ -void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, - FWCfgWriteCallback write_cb, - void *callback_opaque, - void *data, size_t len, - bool read_only); - /** * fw_cfg_add_string: * @s: fw_cfg device being modified diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 66cf171ace..ed161a3409 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -36,7 +36,6 @@ #include "sysemu/whpx.h" #include "sysemu/numa.h" #include "sysemu/replay.h" -#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "sysemu/cpu-timers.h" #include "sysemu/xen.h" @@ -770,24 +769,6 @@ static bool load_elfboot(const char *kernel_filename, return true; } =20 -typedef struct SetupDataFixup { - void *pos; - hwaddr orig_val, new_val; - uint32_t addr; -} SetupDataFixup; - -static void fixup_setup_data(void *opaque) -{ - SetupDataFixup *fixup =3D opaque; - stq_p(fixup->pos, fixup->new_val); -} - -static void reset_setup_data(void *opaque) -{ - SetupDataFixup *fixup =3D opaque; - stq_p(fixup->pos, fixup->orig_val); -} - void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, @@ -1112,11 +1093,8 @@ void x86_load_linux(X86MachineState *x86ms, qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); } =20 - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); - sev_load_ctx.kernel_data =3D (char *)kernel; - sev_load_ctx.kernel_size =3D kernel_size; + /* Offset 0x250 is a pointer to the first setup_data link. */ + stq_p(header + 0x250, first_setup_data); =20 /* * If we're starting an encrypted VM, it will be OVMF based, which use= s the @@ -1126,20 +1104,16 @@ void x86_load_linux(X86MachineState *x86ms, * file the user passed in. */ if (!sev_enabled()) { - SetupDataFixup *fixup =3D g_malloc(sizeof(*fixup)); - memcpy(setup, header, MIN(sizeof(header), setup_size)); - /* Offset 0x250 is a pointer to the first setup_data link. */ - fixup->pos =3D setup + 0x250; - fixup->orig_val =3D ldq_p(fixup->pos); - fixup->new_val =3D first_setup_data; - fixup->addr =3D cpu_to_le32(real_addr); - fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_SETUP_ADDR, fixup_setup_d= ata, NULL, - fixup, &fixup->addr, sizeof(fixup->addr)= , true); - qemu_register_reset(reset_setup_data, fixup); - } else { - fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); } + + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); + sev_load_ctx.kernel_data =3D (char *)kernel; + sev_load_ctx.kernel_size =3D kernel_size; + + fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); sev_load_ctx.setup_data =3D (char *)setup; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index a00881bc64..29a5bef1d5 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -693,12 +693,12 @@ static const VMStateDescription vmstate_fw_cfg =3D { } }; =20 -void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, - FWCfgWriteCallback write_cb, - void *callback_opaque, - void *data, size_t len, - bool read_only) +static void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, + FWCfgCallback select_cb, + FWCfgWriteCallback write_cb, + void *callback_opaque, + void *data, size_t len, + bool read_only) { int arch =3D !!(key & FW_CFG_ARCH_LOCAL); =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745730; cv=none; d=zohomail.com; s=zohoarc; b=Vk9u0vuioIgKD2cIK2MnysFJ4Bj0gn90aWrBb9bqFfiytHWNQf7myBfBw1f0Sre58JPAds4x1u4Yq1G+nLMnz6M1pTjyZaAvBIrjD96Sgn/N609kiIAo/UsgSWWGJt7fRuuZ710obwsdIwpryeQLZO11C+KzzdHpGVhL2/ycudk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745730; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2BtzFadEwzXaromacvlD/2WEbU0qUeJEQQVk3445Qx0=; b=F+ol65rOWchrkUINOzSRhAGDXUN0tXPFULsqLQ3Rq5jcGktsBZUbZShJD6AfAKADk/hYS1ojYSoaPyiXYmfmgbjtc1nwCtC3lmsnD0sJpje5uV1CG6QedJxDDuWGLAWKkRI4/JrJKrVKHTG0AJEB7F+EAzVpiqoFnEOFMt6uN9E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745729949175.32690341660202; Thu, 2 Mar 2023 00:28:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFw-0003Uj-F9; Thu, 02 Mar 2023 03:25:40 -0500 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 1pXeFN-0002CI-Ot for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFK-0001zd-S7 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:05 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-480-P0qeczfnPVOzAafQs7M-VA-1; Thu, 02 Mar 2023 03:25:01 -0500 Received: by mail-wm1-f69.google.com with SMTP id 4-20020a05600c024400b003eb2e295c05so5482389wmj.0 for ; Thu, 02 Mar 2023 00:25:00 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id d6-20020a05600c3ac600b003e6efc0f91csm2026930wms.42.2023.03.02.00.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745502; 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; bh=2BtzFadEwzXaromacvlD/2WEbU0qUeJEQQVk3445Qx0=; b=fUzhLUaa2D4DoWGi4XAPXAlCFFaQIgQwEno/HavhU8D+bL39bcnmds0pwc4QOik43AcadL ESglgVAwE2ptbav1oqyuKW4AJTTdpnp6ukVFgFSg3BVWUR/MHmG6spWCMLE99VCJhZtba/ zKL1Bw6QWxyHSHXZgCToG7OU8zZNMaw= X-MC-Unique: P0qeczfnPVOzAafQs7M-VA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745497; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2BtzFadEwzXaromacvlD/2WEbU0qUeJEQQVk3445Qx0=; b=UBHobzWMAtcTstMKQdQ6sOylebVu2fN0q05VLQWy81HsxWjyt7g4+VaFo0glOHzeiB EcQg4qfAoRNhYYzhcj2JHUVp7020ml9UxnrJzXWdA7tSVbN+4pyOhCmrRp31VrfaHTNN GfW05NRXla3h6V2zdpkG+50FSzG05cOPxznlb9wHxka8ddZVDm8Rg+VBnjV0OhiymqAw i62cP/5ujDaMLcFUTywEXsJp3z9S93szeXveWR9+P0lYOohW9yr/2gRmZunzNqDsIu6X YT9o9E6kQmz+Cc7IEsuQPvQ9Yrqred+nIx260dGgeCMjWZ9m3k5/5O9uU/LUFZhmZmy8 ITdg== X-Gm-Message-State: AO0yUKWbA4oYN4xhS4o1aAUpU5WfFiymjaN2ye8OHLBESCCw7VuaA5Qd MIQVgPO/yr76NtPM9/YbVXqNE3RoOKpRLAMH6hfCBeIAoaz8ZDvyKfMHTRAbbCTOFGm1+bzepJe 8OY5FHHh9kXUFD9xM4CkDI/G5h/wibFCCeacEWr/LoObAOoOjJgeBbGxkGCmKGVAEPA== X-Received: by 2002:a05:600c:538b:b0:3eb:2b88:8682 with SMTP id hg11-20020a05600c538b00b003eb2b888682mr7764266wmb.17.1677745497511; Thu, 02 Mar 2023 00:24:57 -0800 (PST) X-Google-Smtp-Source: AK7set8bYxYzSCJBY9VuU3cDsYCbY5QwIRb6tIvuqV4DkCd++JKR9yvoNvPMoRolSNCJl392yklWIw== X-Received: by 2002:a05:600c:538b:b0:3eb:2b88:8682 with SMTP id hg11-20020a05600c538b00b003eb2b888682mr7764245wmb.17.1677745497239; Thu, 02 Mar 2023 00:24:57 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:53 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Nathan Chancellor , Dov Murik , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Sergio Lopez , Paolo Bonzini , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost Subject: [PULL 08/53] Revert "hw/i386: pass RNG seed via setup_data entry" Message-ID: <20230302082343.560446-9-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745731748100017 This reverts commit 67f7e426e53833a5db75b0d813e8d537b8a75bd2. Additionally to the automatic revert, I went over the code and dropped all mentions of legacy_no_rng_seed manually, effectively reverting a combination of 2 additional commits: commit ffe2d2382e5f1aae1abc4081af407905ef380311 Author: Jason A. Donenfeld Date: Wed Sep 21 11:31:34 2022 +0200 x86: re-enable rng seeding via SetupData commit 3824e25db1a84fadc50b88dfbe27047aa2f7f85d Author: Gerd Hoffmann Date: Wed Aug 17 10:39:40 2022 +0200 x86: disable rng seeding via setup_data Fixes: 67f7e426e5 ("hw/i386: pass RNG seed via setup_data entry") Signed-off-by: Michael S. Tsirkin Tested-by: Nathan Chancellor Tested-by: Dov Murik Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/i386/pc.h | 3 --- include/hw/i386/x86.h | 3 +-- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 4 ++-- hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 2 -- hw/i386/x86.c | 26 ++++---------------------- 7 files changed, 8 insertions(+), 34 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 66e3d059ef..44b08554fa 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -127,9 +127,6 @@ struct PCMachineClass { =20 /* create kvmclock device even when KVM PV features are not exposed */ bool kvmclock_create_always; - - /* skip passing an rng seed for legacy machines */ - bool legacy_no_rng_seed; }; =20 #define TYPE_PC_MACHINE "generic-pc-machine" diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 890dfad23e..0b337a036c 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -123,8 +123,7 @@ void x86_bios_rom_init(MachineState *ms, const char *de= fault_firmware, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool legacy_no_rng_seed); + bool pvh_enabled); =20 bool x86_machine_is_smm_enabled(const X86MachineState *x86ms); bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 6680530555..3d606a20b4 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -328,7 +328,7 @@ static void microvm_memory_init(MicrovmMachineState *mm= s) rom_set_fw(fw_cfg); =20 if (machine->kernel_filename !=3D NULL) { - x86_load_linux(x86ms, fw_cfg, 0, true, false); + x86_load_linux(x86ms, fw_cfg, 0, true); } =20 if (mms->option_roms) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 992951c107..8b1ddc8d99 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -806,7 +806,7 @@ void xen_load_linux(PCMachineState *pcms) rom_set_fw(fw_cfg); =20 x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->legacy_no_rng_seed); + pcmc->pvh_enabled); for (i =3D 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || @@ -1126,7 +1126,7 @@ void pc_memory_init(PCMachineState *pcms, =20 if (linux_boot) { x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->legacy_no_rng_seed); + pcmc->pvh_enabled); } =20 for (i =3D 0; i < nb_option_roms; i++) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 126b6c11df..2f16011bab 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -477,9 +477,7 @@ DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL, =20 static void pc_i440fx_7_1_machine_options(MachineClass *m) { - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_i440fx_7_2_machine_options(m); - pcmc->legacy_no_rng_seed =3D true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 09004f3f1f..797ba347fd 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -395,9 +395,7 @@ DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL, =20 static void pc_q35_7_1_machine_options(MachineClass *m) { - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_q35_7_2_machine_options(m); - pcmc->legacy_no_rng_seed =3D true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/x86.c b/hw/i386/x86.c index ed161a3409..a33c879598 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -26,7 +26,6 @@ #include "qemu/cutils.h" #include "qemu/units.h" #include "qemu/datadir.h" -#include "qemu/guest-random.h" #include "qapi/error.h" #include "qapi/qapi-visit-common.h" #include "qapi/clone-visitor.h" @@ -772,8 +771,7 @@ static bool load_elfboot(const char *kernel_filename, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool legacy_no_rng_seed) + bool pvh_enabled) { bool linuxboot_dma_enabled =3D X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma= _enabled; uint16_t protocol; @@ -781,7 +779,7 @@ void x86_load_linux(X86MachineState *x86ms, int dtb_size, setup_data_offset; uint32_t initrd_max; uint8_t header[8192], *setup, *kernel; - hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr =3D 0, first_se= tup_data =3D 0; + hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr =3D 0; FILE *f; char *vmode; MachineState *machine =3D MACHINE(x86ms); @@ -791,7 +789,6 @@ void x86_load_linux(X86MachineState *x86ms, const char *dtb_filename =3D machine->dtb; const char *kernel_cmdline =3D machine->kernel_cmdline; SevKernelLoaderContext sev_load_ctx =3D {}; - enum { RNG_SEED_LENGTH =3D 32 }; =20 /* Align to 16 bytes as a paranoia measure */ cmdline_size =3D (strlen(kernel_cmdline) + 16) & ~15; @@ -1071,31 +1068,16 @@ void x86_load_linux(X86MachineState *x86ms, kernel_size =3D setup_data_offset + sizeof(struct setup_data) + dt= b_size; kernel =3D g_realloc(kernel, kernel_size); =20 + stq_p(header + 0x250, prot_addr + setup_data_offset); =20 setup_data =3D (struct setup_data *)(kernel + setup_data_offset); - setup_data->next =3D cpu_to_le64(first_setup_data); - first_setup_data =3D prot_addr + setup_data_offset; + setup_data->next =3D 0; setup_data->type =3D cpu_to_le32(SETUP_DTB); setup_data->len =3D cpu_to_le32(dtb_size); =20 load_image_size(dtb_filename, setup_data->data, dtb_size); } =20 - if (!legacy_no_rng_seed) { - setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(struct setup_data) + RN= G_SEED_LENGTH; - kernel =3D g_realloc(kernel, kernel_size); - setup_data =3D (struct setup_data *)(kernel + setup_data_offset); - setup_data->next =3D cpu_to_le64(first_setup_data); - first_setup_data =3D prot_addr + setup_data_offset; - setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); - setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); - qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); - } - - /* Offset 0x250 is a pointer to the first setup_data link. */ - stq_p(header + 0x250, first_setup_data); - /* * If we're starting an encrypted VM, it will be OVMF based, which use= s the * efi stub for booting and doesn't require any values to be placed in= the --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745536; cv=none; d=zohomail.com; s=zohoarc; b=Yyw42R2t1uGwdRv8YrPSKgqf3dnl7YIjBvK6lrWXPiU9YkGqrG5NGC97XV/hJ37Ks6aBLGNOBxDtTPJNjC0wOy78F5mXHW+3tB3EBF7MAul1F+LB73riLsvNcaj8UhuRWPfDaAEYDSSBj8QkNgValll6De1xvOCDjmN0pbn94xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745536; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Mr/+lpYnMTtiBjikeXiFvYyM8pHNwpDb7mnocI1lohU=; b=nG+XIIrrnj+kjzbNGetLY+5u6V9S3Ml7hhldzo1k+aR8jM0pPwfZfbqq7hNJ37NB1zTGwlLeysnuO6sDieJ/0lmbNdoGRyhNICcovDXfvKxHReT+IGUCaFYU4VhrOAtrXSZ33rz27arfMqn87son1g/+nFw/nbk7bGPk/nVKCXU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745536153417.12939635056534; Thu, 2 Mar 2023 00:25:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFl-0002RS-Vc; Thu, 02 Mar 2023 03:25:30 -0500 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 1pXeFP-0002Cc-9c for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:09 -0500 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 1pXeFN-0002AC-HI for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:07 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-193-IaJ3a3mJOF-fzaQPgPFH8Q-1; Thu, 02 Mar 2023 03:25:03 -0500 Received: by mail-wm1-f69.google.com with SMTP id e22-20020a05600c219600b003e000facbb1so913492wme.9 for ; Thu, 02 Mar 2023 00:25:03 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id h12-20020a05600c314c00b003dfee43863fsm2237031wmo.26.2023.03.02.00.24.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745504; 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; bh=Mr/+lpYnMTtiBjikeXiFvYyM8pHNwpDb7mnocI1lohU=; b=Zg52Sq9+P+FkpatUjEjE5cyaris9fkqzGsIIwPyfayvwOruU7MCYY8IT6D9GyuQv1MTH6S 8dEfb8/Vj1VskYgFtV1doftcnWEgO0jO0i18IYjGp3KjvdCje5A6poiXUz3u9M2Q5meucR gJnte8wXVfqGySjmO1WLyBw1qVrcfzc= X-MC-Unique: IaJ3a3mJOF-fzaQPgPFH8Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745501; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Mr/+lpYnMTtiBjikeXiFvYyM8pHNwpDb7mnocI1lohU=; b=vD9GyRrNDTlBBTkyYOVYIlE9Da74aX1mnK+9wrUcXOSMKFpNbp1YL1EzazWRH8mV0+ aLTuGKOuq9YuPSLKm8A4yi+TH6tVW0KO9I2CZUCER9J8vAjSuvmsj6EoH/jg1XDTQ4Pq QwuONLQzTxO+1zPes+i27whddKBL9Gkg9IG3ivJIUGWXmjkKJRkqbV9Luf/y0N2r106K hSzlO/VBB2dCDEZh1ni3eCub/ruzUfGWqmKt3U5CaxPtTEMMd99jhIemn7v6ipx2FV/I lIx58guX3dFqVgtFha/daAr0Zwi7leBrsFzrHLP1oMWCatUrQdD4/wY/YOINF70n5ymA P3NQ== X-Gm-Message-State: AO0yUKUDHGxe4o5u7n2ZGO0ZDOEPshtlVKJTU0vr3x/Ppfqy+eY576dz 0KKPmsqcWrM2juXq01ZTPCXKQTr4vUDaLdEcb/hnMaeshfnoMkv1aPropSmlk9O9/tYus9y1NBm jpO75fcAK7xb/5gKMEoTDeIc+pdNrtHwxOJn5VnmlBqdpGblbG6QeCy7iuvjaME7Oxg== X-Received: by 2002:a5d:6187:0:b0:2ca:e8c2:6d25 with SMTP id j7-20020a5d6187000000b002cae8c26d25mr7521943wru.60.1677745501608; Thu, 02 Mar 2023 00:25:01 -0800 (PST) X-Google-Smtp-Source: AK7set8g33orueGkXR7A1blpxKt8OE3+2AzWPiAiaDi6jZ/NIg20LEngCKw1/CfcLg62eJ7hjUyc8Q== X-Received: by 2002:a5d:6187:0:b0:2ca:e8c2:6d25 with SMTP id j7-20020a5d6187000000b002cae8c26d25mr7521924wru.60.1677745501360; Thu, 02 Mar 2023 00:25:01 -0800 (PST) Date: Thu, 2 Mar 2023 03:24:58 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Eugenio =?utf-8?B?UMOpcmV6?= , Dawar@redhat.com, Gautam , David Edmondson , Lei Yang , Jason Wang Subject: [PULL 09/53] virtio-net: clear guest_announce feature if no cvq backend Message-ID: <20230302082343.560446-10-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745536570100009 From: Eugenio P=C3=A9rez Since GUEST_ANNOUNCE is emulated the feature bit could be set without backend support. This happens in the vDPA case. However, backend vDPA parent may not have CVQ support. This causes an incoherent feature set, and the driver may refuse to start. This happens in virtio-net Linux driver. This may be solved differently in the future. Qemu is able to emulate a CVQ just for guest_announce purposes, helping guest to notify the new location with vDPA devices that does not support it. However, this is left as a TODO as it is way more complex to backport. Tested with vdpa_net_sim, toggling manually VIRTIO_NET_F_CTRL_VQ in the driver and migrating it with x-svq=3Don. Fixes: 980003debddd ("vdpa: do not handle VIRTIO_NET_F_GUEST_ANNOUNCE in vh= ost-vdpa") Reported-by: Dawar, Gautam Signed-off-by: Eugenio P=C3=A9rez Message-Id: <20230124161159.2182117-1-eperezma@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: David Edmondson Reviewed-by: Gautam Dawar Tested-by: Gautam Dawar Tested-by: Lei Yang --- hw/net/virtio-net.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3ae909041a..09d5c7a664 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -820,6 +820,21 @@ static uint64_t virtio_net_get_features(VirtIODevice *= vdev, uint64_t features, features |=3D (1ULL << VIRTIO_NET_F_MTU); } =20 + /* + * Since GUEST_ANNOUNCE is emulated the feature bit could be set witho= ut + * enabled. This happens in the vDPA case. + * + * Make sure the feature set is not incoherent, as the driver could re= fuse + * to start. + * + * TODO: QEMU is able to emulate a CVQ just for guest_announce purpose= s, + * helping guest to notify the new location with vDPA devices that doe= s not + * support it. + */ + if (!virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_CTRL_VQ))= { + virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_ANNOUNCE); + } + return features; } =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745537; cv=none; d=zohomail.com; s=zohoarc; b=h4vgONM8LrXLwJPlIuW/O2SjuL+wtgNmZL88VKMpaDq+QsUa3p70feQHK7Wt5b3Ao+gBzZE5AlwMmcLCpU33v3Q7C9w9B0H5hWgqZtREd5x6s9+NavjAyN0954Pds0pH+AQkjptkrOYlXm9totFrlDjAZFm+nt5jx6UognDeibs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745537; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2zjerUZt8B5fT3PtlV+vANrfuJpkyirv+ZgJLhS/Hnw=; b=Sf1LJKog/B3uiYfEzROSwsNeOAUcSJ1+f0SuZozz/Kn10zRDUQu3Nl6Ev02Iku52yNUAd+RBXkM/UhyMNOlWiJc/O7dZR2QgcC+EgmfJx+Xks9qwsRb4CEUSOS3PrBxbsgubpl8DleYWD0y44ryXTQ4m2ahjOVaBy5BMN8YQ4oQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745537649508.2665173614388; Thu, 2 Mar 2023 00:25:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFo-0002iK-Ba; Thu, 02 Mar 2023 03:25:32 -0500 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 1pXeFS-0002Ex-1H for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:14 -0500 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 1pXeFQ-0002B0-6Q for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:09 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-241-PTKf2_uUPKeNIR4WNJN6aA-1; Thu, 02 Mar 2023 03:25:06 -0500 Received: by mail-wr1-f71.google.com with SMTP id bh3-20020a05600005c300b002c70d6e2014so3054356wrb.10 for ; Thu, 02 Mar 2023 00:25:06 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id he11-20020a05600c540b00b003daf7721bb3sm2198394wmb.12.2023.03.02.00.25.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745507; 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; bh=2zjerUZt8B5fT3PtlV+vANrfuJpkyirv+ZgJLhS/Hnw=; b=ahp9JQCGD7pvqKz5hS6ArsSdnXNEDEe8g8TlTmUV3acmMzUc+uDRSR60ZnrKwq+zohBGUr t77jJxzjJ7OBvHca0AWHddGPph1SVZJ6yUGcBfAC6yZkX9guto8LRKku0NGn61gfOXbfYy n6UzSHc9dDD4RmTzqxwTeoTtGAWcfTY= X-MC-Unique: PTKf2_uUPKeNIR4WNJN6aA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745504; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2zjerUZt8B5fT3PtlV+vANrfuJpkyirv+ZgJLhS/Hnw=; b=2OCgiCZf7llmVB/bS4pCQlaSLeiLAMckbQI8sve9aHCuMn4yxVPzOMDug6JdxFU62a rh+rZ130+u3yjVQ+kfLAC/HUdmTwz/DbmEmrSYceoHvzP3BekB+JkF5GrPAeEdl+QVXe IPt7wTGPK37bk0qzhTCZhqqzqW9/vNAYInsylput/hv8D2JC6MpT1zy2XLo9ZY8VLwCO O0G2KI9T9huSnFj5p5VtB+awCEhP8wM7Ny0ezklk3wr7HgubkV6CCVpaZjpQ2cPI+sZr ZeDSwStHx9Oc+Z3jep8QNN0eq4Ow97XQ1Oa4uoWVQWk+zivsACInvyLN7Vz/yQUKajBV VfCg== X-Gm-Message-State: AO0yUKXRJEwIinK2CueaNqvlxKK0ZGEBpJXy3enhyM40e7tvMOo3I2eD LmLLT2pVmICaRUfHlCD6HkM0yi2wv9CojkSvixrBdSGNG1SyGlMNoTmhRcyI/uToIsXERMPtwxO jyQ27T24xncGCKAA8ssYWtfx4N/jEVi7m8c/Dt0r2xmAeJ9/DT5s/BooMnNPKAy2jRA== X-Received: by 2002:a05:600c:92a:b0:3ea:c100:e974 with SMTP id m42-20020a05600c092a00b003eac100e974mr7734175wmp.26.1677745504754; Thu, 02 Mar 2023 00:25:04 -0800 (PST) X-Google-Smtp-Source: AK7set9a9Xnd8c/SsJqLPgwexWfPxlCzd/RzIkQpuWEhwgY5bpUWyxbR9VoJgPhvga4TVwz/mRg5lg== X-Received: by 2002:a05:600c:92a:b0:3ea:c100:e974 with SMTP id m42-20020a05600c092a00b003eac100e974mr7734159wmp.26.1677745504539; Thu, 02 Mar 2023 00:25:04 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:01 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Alex =?utf-8?Q?Benn=C3=A9e?= , Gerd Hoffmann , Stefan Hajnoczi Subject: [PULL 10/53] backends/vhost-user: remove the ioeventfd check Message-ID: <20230302082343.560446-11-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745538542100015 From: Alex Benn=C3=A9e While ioeventfds are needed for good performance with KVM guests it should not be a gating requirement. We can run vhost-user backends using simulated ioeventfds or inband signalling. With this change I can run: $QEMU $OPTS \ -display gtk,gl=3Don \ -device vhost-user-gpu-pci,chardev=3Dvhgpu \ -chardev socket,id=3Dvhgpu,path=3Dvhgpu.sock with: ./contrib/vhost-user-gpu/vhost-user-gpu \ -s vhgpu.sock \ -v and at least see things start-up - although the display gets rotated by 180 degrees. Once lightdm takes over we never make it to the login prompt and just get a blank screen. Signed-off-by: Alex Benn=C3=A9e Cc: Gerd Hoffmann Message-Id: <20221202132231.1048669-1-alex.bennee@linaro.org> Message-Id: <20230130124728.175610-1-alex.bennee@linaro.org> Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- backends/vhost-user.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/backends/vhost-user.c b/backends/vhost-user.c index 0596223ac4..94c6a82d52 100644 --- a/backends/vhost-user.c +++ b/backends/vhost-user.c @@ -20,12 +20,6 @@ #include "io/channel-command.h" #include "hw/virtio/virtio-bus.h" =20 -static bool -ioeventfd_enabled(void) -{ - return kvm_enabled() && kvm_eventfds_enabled(); -} - int vhost_user_backend_dev_init(VhostUserBackend *b, VirtIODevice *vdev, unsigned nvqs, Error **errp) @@ -34,11 +28,6 @@ vhost_user_backend_dev_init(VhostUserBackend *b, VirtIOD= evice *vdev, =20 assert(!b->vdev && vdev); =20 - if (!ioeventfd_enabled()) { - error_setg(errp, "vhost initialization failed: requires kvm"); - return -1; - } - if (!vhost_user_init(&b->vhost_user, &b->chr, errp)) { return -1; } --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745647; cv=none; d=zohomail.com; s=zohoarc; b=VoaQ51smjQQfRIr+Dh6buWlgU9wECk1iPyOLWPrVcuO5jAFmiLFxJiVVNjLllY/GCG70QaAWaQtWqoGtRDychDe+7wJNGBIkKo6DvaaVig7Chpih2yAtBS8uMlfzbKdcuVbEAmOgL8YjLri3Bs0A3JkgeHiBSl2bVJo0tlAYl8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745647; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TCSYqJbo9EsXx3sz7ebfc0MQ5H8efRMAzVObswWYkt0=; b=T5diridAeZTSbFe17Cb5PKHyoxT+wN/Udtxy4xnDD2k5P/HzYrJU7hDUhZMhLPZnRiuGx/ZokeNWSLS48Jiq0Gd20S7tTNoQbq4uTuvFShlWQjoM9KO08wMngSyHOEYH0GkOuBHH/wgIvNmOqlHkN+66rbGpD/APHr7ikoSNSRs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745647800875.3863037320153; Thu, 2 Mar 2023 00:27:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFm-0002S2-0T; Thu, 02 Mar 2023 03:25:30 -0500 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 1pXeFV-0002FP-UJ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:16 -0500 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 1pXeFT-0002Bg-Qx for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:13 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-475-6icMR7s4PtKcmPpXvow22A-1; Thu, 02 Mar 2023 03:25:10 -0500 Received: by mail-wm1-f69.google.com with SMTP id l23-20020a7bc457000000b003e206cbce8dso5461652wmi.7 for ; Thu, 02 Mar 2023 00:25:09 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id u4-20020adfed44000000b002c563b124basm14710344wro.103.2023.03.02.00.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745511; 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; bh=TCSYqJbo9EsXx3sz7ebfc0MQ5H8efRMAzVObswWYkt0=; b=EQSIDD8Ze76D4wWqgDfuXsRcb5lVAAtwvhR61uvXc2jKowLy+IWjov0/Nuf3tAiVN5iBau N3W0qChhTTZuG0q1CvyRiWNqLLRgwZM0u34onv/M2cCBmqf0Oc/+/Kn4irCwmMJ7CO2gI/ ryMUJjI6C+k9uA9qiTKVsvVtkA1bX0M= X-MC-Unique: 6icMR7s4PtKcmPpXvow22A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745508; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TCSYqJbo9EsXx3sz7ebfc0MQ5H8efRMAzVObswWYkt0=; b=dUQXDdDi0d4jfj9CVpfLJ934XaV8wSDxO2QcoTckGUOb8kijn92MRDN44tCyjMbHmx joZ0oxuPEp3VsotsNIZh48DqEP7q6rIoeWt5oSmluuUpDA9U4rj/8Rd3/WvNULh90fRT HJGzwH7D0iL3W9i/fmEoBsLHaIUdXhJIqZch3RLR8L9KE2p0BhvogNW1SFVonsCtikY8 9f1JIrrSgGlembwQz7G0cBNj8fqLmsNwz4vlRJNDYf0j/YBVvu2mLuA24IR0spk7C2Hn krSxpFvEC7slJVFAPFwR//eixQXtRWSgvP6M3VFf0jCKO/BB/410ljZ3Fm94rBg2DYvh tU5Q== X-Gm-Message-State: AO0yUKU/aGz4viUGyFcFliB23dYD9zXpWsUPaQNy2/87VsFAP9jBSzcw PSqxnUCxv82Q5XkATz7Zhql5DLA3eTIvR3/VZeqVLq5REsUQb4SOFHDRvkzXYoK1q2goGfZ9WxA s7vNQgHxbU7HYXuVcDshgcctc+iLU/YFXL+fpkag9aR3Jliqm8epjsFQTF/59JP0q5w== X-Received: by 2002:a05:6000:120b:b0:2c7:17dd:ed6a with SMTP id e11-20020a056000120b00b002c717dded6amr6916465wrx.33.1677745508429; Thu, 02 Mar 2023 00:25:08 -0800 (PST) X-Google-Smtp-Source: AK7set9uE+NA736YKjGbN1si1U/5ZcsuV5oWfhNPQibx4NmQgCTNEpdlLXYbS5NiVcYXXS+DkvMV1g== X-Received: by 2002:a05:6000:120b:b0:2c7:17dd:ed6a with SMTP id e11-20020a056000120b00b002c717dded6amr6916448wrx.33.1677745508198; Thu, 02 Mar 2023 00:25:08 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:04 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Akihiko Odaki , Viresh Kumar , Alex =?utf-8?Q?Benn=C3=A9e?= Subject: [PULL 11/53] vhost-user-gpio: Configure vhost_dev when connecting Message-ID: <20230302082343.560446-12-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745649196100003 From: Akihiko Odaki vhost_dev_cleanup(), called from vu_gpio_disconnect(), clears vhost_dev so vhost-user-gpio must set the members of vhost_dev each time connecting. do_vhost_user_cleanup() should also acquire the pointer to vqs directly from VHostUserGPIO instead of referring to vhost_dev as it can be called after vhost_dev_cleanup(). Fixes: 27ba7b027f ("hw/virtio: add boilerplate for vhost-user-gpio device") Signed-off-by: Akihiko Odaki Message-Id: <20230130140320.77999-1-akihiko.odaki@daynix.com> Reviewed-by: Viresh Kumar Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost-user-gpio.h | 2 +- hw/virtio/vhost-user-gpio.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/vhost-user-gpio.h b/include/hw/virtio/vhost-= user-gpio.h index a9305c5e6c..a9d3f9b049 100644 --- a/include/hw/virtio/vhost-user-gpio.h +++ b/include/hw/virtio/vhost-user-gpio.h @@ -23,7 +23,7 @@ struct VHostUserGPIO { VirtIODevice parent_obj; CharBackend chardev; struct virtio_gpio_config config; - struct vhost_virtqueue *vhost_vq; + struct vhost_virtqueue *vhost_vqs; struct vhost_dev vhost_dev; VhostUserState vhost_user; VirtQueue *command_vq; diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c index fe3da32c74..d6927b610a 100644 --- a/hw/virtio/vhost-user-gpio.c +++ b/hw/virtio/vhost-user-gpio.c @@ -16,6 +16,7 @@ #include "trace.h" =20 #define REALIZE_CONNECTION_RETRIES 3 +#define VHOST_NVQS 2 =20 /* Features required from VirtIO */ static const int feature_bits[] =3D { @@ -208,8 +209,7 @@ static void do_vhost_user_cleanup(VirtIODevice *vdev, V= HostUserGPIO *gpio) { virtio_delete_queue(gpio->command_vq); virtio_delete_queue(gpio->interrupt_vq); - g_free(gpio->vhost_dev.vqs); - gpio->vhost_dev.vqs =3D NULL; + g_free(gpio->vhost_vqs); virtio_cleanup(vdev); vhost_user_cleanup(&gpio->vhost_user); } @@ -229,6 +229,9 @@ static int vu_gpio_connect(DeviceState *dev, Error **er= rp) vhost_dev_set_config_notifier(vhost_dev, &gpio_ops); gpio->vhost_user.supports_config =3D true; =20 + gpio->vhost_dev.nvqs =3D VHOST_NVQS; + gpio->vhost_dev.vqs =3D gpio->vhost_vqs; + ret =3D vhost_dev_init(vhost_dev, &gpio->vhost_user, VHOST_BACKEND_TYPE_USER, 0, errp); if (ret < 0) { @@ -347,10 +350,9 @@ static void vu_gpio_device_realize(DeviceState *dev, E= rror **errp) =20 virtio_init(vdev, VIRTIO_ID_GPIO, sizeof(gpio->config)); =20 - gpio->vhost_dev.nvqs =3D 2; gpio->command_vq =3D virtio_add_queue(vdev, 256, vu_gpio_handle_output= ); gpio->interrupt_vq =3D virtio_add_queue(vdev, 256, vu_gpio_handle_outp= ut); - gpio->vhost_dev.vqs =3D g_new0(struct vhost_virtqueue, gpio->vhost_dev= .nvqs); + gpio->vhost_vqs =3D g_new0(struct vhost_virtqueue, VHOST_NVQS); =20 gpio->connected =3D false; =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745566; cv=none; d=zohomail.com; s=zohoarc; b=Tdlw2f4e9IZYVf444KjG5+FNK+9fAtxjy3PzDLI65CGKgIxGW9v2lFvvLw/17amwAiGVhvuc5TNxgVvvNw0hQGkzOpUkhsPxLOvFqE0f1Qb8rwE3nCSSQoiQXtsm16y9A6Ga6aKbhCl0OpTsTltyiEygrAB9onDxZUa1Ju3Lm5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745566; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mHgZzuUR8eKxbjo0rCrirNhTNqh5oYr9Fm8k8gMJ5Xw=; b=WvA//Hmi1OqkRQa62A9kTJNpFcFpT2w3eWs4ZzpFfEphPcgEyhNJ7DBQWKl8sFseDHYUjYy/rV8bF4x5oQqW0oQmkwIaAEV0YxYGRJK9TX2UeDnor9NKhIu2yBd6JNliKJ5qH9nFCPgmcy7a7i8iUfxA3r9aAmmq1eJ0GzSZ39Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745566597185.08631281950306; Thu, 2 Mar 2023 00:26:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFo-0002hx-9u; Thu, 02 Mar 2023 03:25:32 -0500 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 1pXeFZ-0002Fv-QS for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:18 -0500 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 1pXeFX-0002CI-GE for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:17 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-327-U8yKUTfSMrO6O2pRJKPE2w-1; Thu, 02 Mar 2023 03:25:13 -0500 Received: by mail-wr1-f69.google.com with SMTP id x3-20020a5d6503000000b002c8c421fdfaso3030058wru.15 for ; Thu, 02 Mar 2023 00:25:12 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id v16-20020a05600c445000b003dd1bd66e0dsm2341373wmn.3.2023.03.02.00.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745514; 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: in-reply-to:in-reply-to:references:references; bh=mHgZzuUR8eKxbjo0rCrirNhTNqh5oYr9Fm8k8gMJ5Xw=; b=Ns2u8YUmZu8FbhgC9CDRCDb1ChKNh+lbh7HLEhjdsA+v8ppXdCHC/y962v4ffqXHhSlBzu S9Xxc0cpFAJQFTvmT8rLgpVFYrmKed2UjOd0svsURU6IJdljgTf7tgUDBYBxSu5pA4P/l0 RSuqw4stsPaPKWqVQ1Vyr2Yfk8Vkzlw= X-MC-Unique: U8yKUTfSMrO6O2pRJKPE2w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745511; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mHgZzuUR8eKxbjo0rCrirNhTNqh5oYr9Fm8k8gMJ5Xw=; b=er6WDlptX3eLYMUbn7CBB972irkCv5caLusBHCktiIEbucPVG8ihjTttwrm2poM5ex EqR0/Q2yaToq6KLxIz/p58Q5xtfo+Q8Zj3QDQHRMzTq072pBTj3xBkZ0n3bYEpwzD0ep YzaNkyCboS4RqUh72i4IczJuMx4mNciresRMYQq9jBaZwIV2Mmh1V32LPGKCzEgBgMvc XA6SIkHi6u+RRpVOYEflsjLWmbvZkd3vn2CEM/QuTPx1f/bLg+8XD7s+3DKQXPyc3M3s 2Wbjqug0+AlHfhMMxpj8tIKY3nVmLDHCNSTedqYqq1Cl8GYB7B7oUnde586DxzAeeOa8 BMuA== X-Gm-Message-State: AO0yUKUubjlSM1Uzk9GofDZ+ELk15z73ppi88iL7JCFTQ7Ur2xDso9S9 MVz6VqkWM3+18RE2tKbSwlNvJLr26LQVPFulRbJm22aWFuyu0cIAMZBmbLS+GRRpMqNH6sOB4iQ tr7TZv4l6mzZE3zYzroPQ6yMWx/oCHQg/0HXJtKRIBkkJsQYLTSCZFnGw1p5a5L67sg== X-Received: by 2002:a05:600c:310e:b0:3eb:3148:a1b7 with SMTP id g14-20020a05600c310e00b003eb3148a1b7mr7192619wmo.12.1677745511338; Thu, 02 Mar 2023 00:25:11 -0800 (PST) X-Google-Smtp-Source: AK7set8aO1L6RIiyFhrvx7PidP0hOyyww16YnHhJ5idmMjAHu/36Q6rvzeXzPiLrzIV7obY9EJpZeA== X-Received: by 2002:a05:600c:310e:b0:3eb:3148:a1b7 with SMTP id g14-20020a05600c310e00b003eb3148a1b7mr7192603wmo.12.1677745511018; Thu, 02 Mar 2023 00:25:11 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:08 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Akihiko Odaki Subject: [PULL 12/53] vhost-user-i2c: Back up vqs before cleaning up vhost_dev Message-ID: <20230302082343.560446-13-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745566847100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki vhost_dev_cleanup() clears vhost_dev so back up its vqs member to free the memory pointed by the member. Fixes: 7221d3b634 ("hw/virtio: add boilerplate for vhost-user-i2c device") Signed-off-by: Akihiko Odaki Message-Id: <20230130140435.78049-1-akihiko.odaki@daynix.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user-i2c.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c index dc5c828ba6..60eaf0d95b 100644 --- a/hw/virtio/vhost-user-i2c.c +++ b/hw/virtio/vhost-user-i2c.c @@ -143,8 +143,6 @@ static void do_vhost_user_cleanup(VirtIODevice *vdev, V= HostUserI2C *i2c) vhost_user_cleanup(&i2c->vhost_user); virtio_delete_queue(i2c->vq); virtio_cleanup(vdev); - g_free(i2c->vhost_dev.vqs); - i2c->vhost_dev.vqs =3D NULL; } =20 static int vu_i2c_connect(DeviceState *dev) @@ -228,6 +226,7 @@ static void vu_i2c_device_realize(DeviceState *dev, Err= or **errp) ret =3D vhost_dev_init(&i2c->vhost_dev, &i2c->vhost_user, VHOST_BACKEND_TYPE_USER, 0, errp); if (ret < 0) { + g_free(i2c->vhost_dev.vqs); do_vhost_user_cleanup(vdev, i2c); } =20 @@ -239,10 +238,12 @@ static void vu_i2c_device_unrealize(DeviceState *dev) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VHostUserI2C *i2c =3D VHOST_USER_I2C(dev); + struct vhost_virtqueue *vhost_vqs =3D i2c->vhost_dev.vqs; =20 /* This will stop vhost backend if appropriate. */ vu_i2c_set_status(vdev, 0); vhost_dev_cleanup(&i2c->vhost_dev); + g_free(vhost_vqs); do_vhost_user_cleanup(vdev, i2c); } =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746241; cv=none; d=zohomail.com; s=zohoarc; b=BtH5siUI0wewDszL2fZ+FKWe1SsWZbFvGv1v6G6kMGHhwov5SgEbRhtCVc4iSOlPy6teBpCkg8OXWmLDwnunsqOEyvZVx3u3UviaNZlmNeqTZmwyt+MQ8lkci4+RBTefMe2NTGdsU2K2XLcild/ke67ox0P2wFg9KtONeqIwoks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746241; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sRn8nbOLvbg1RpQOABWdg5Az4dJPZXr4HCT32fm1f4w=; b=K9cEBMXexweSxnvVQ8sMXCEjg/eKb3r6XVsyPgdPWYtF5owxnpBR9UKgeXwaIMAbzAzHWEEfZkSsPcoHfumrZ1YOpxmcKbR+emSSWQ6pnlU3CCX8CsI83jODQLDa9tjoh8fBHalN6mPd7tAs0cIcKyrjRXio866Y73J6xJ9d3bI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167774624193517.59574640271785; Thu, 2 Mar 2023 00:37:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFn-0002Zm-4R; Thu, 02 Mar 2023 03:25:31 -0500 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 1pXeFb-0002Gl-FA for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFa-0002Cg-11 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:19 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-380-cUAjxOGPPQiupIU6lI8L_g-1; Thu, 02 Mar 2023 03:25:15 -0500 Received: by mail-wm1-f70.google.com with SMTP id e17-20020a05600c219100b003e21fa60ec1so747396wme.2 for ; Thu, 02 Mar 2023 00:25:15 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id ja20-20020a05600c557400b003eb596cbc54sm2234104wmb.0.2023.03.02.00.25.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745517; 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: in-reply-to:in-reply-to:references:references; bh=sRn8nbOLvbg1RpQOABWdg5Az4dJPZXr4HCT32fm1f4w=; b=KB8sgfcl3om+poS/4dDgVSmqskZg0Fv3fjL93gdSMMmzxQ3s9gmdukqJZ9ho4VJU+/zE0F QKPU2dTp3w0uXXrC8CkAGKeX1/uWecz1xGnxA5riX0N4FMj+Wy6KEH8pvglfR0iGZgrtmx /UJao/WrXrNp4H2SZmyy+j5UqNYu+PE= X-MC-Unique: cUAjxOGPPQiupIU6lI8L_g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745514; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sRn8nbOLvbg1RpQOABWdg5Az4dJPZXr4HCT32fm1f4w=; b=y8BNHHyANjsOFcBRjLPh9F85UgreMvFI8EbA1HIps/+VopWol9BPSLkJQeS9dKvz77 V/FNby+ba5gpaviFdEg7OcLUH5EmgCkVduvUS4SRrQGS85HU4g3NYNV0IFmxfVTpTbR4 BiU1Kf9ts11oiYMb2YwOSMKGP+zuNPw4CxsltwJcYRQYRKjFgtB3DpAb2vobDWHM1e6S GcdAIgLs0MxMmD0LADTjlU5NdklwM6KQv1/K3G8gNFsv8ePVIxsH2lrmHurcptS2qJsO Zm9jiYmrC73hsx2QC+XmPX5Ps1uBc/XBn8viCbfj8+QXMTWNmjdq0+GRM4wUYgSh7atC SsCw== X-Gm-Message-State: AO0yUKXwCcQ1NGo9JdC1yHEa11CLTvqb7oecx8dw+3KalxYJkr6gjsg1 WH77qMSRYvC1F6k9+GCUbw1j7Ehttd9qJSy3WHsK3u6PJp8G+H6nd6My/HTSa1EGEnzb2I09Yuc oAB+oRaDXP3lMpafHN+OamSmhUPnpdv5H7cRCj49YFsA/16GLjCE2STUOG/s3WoXMZg== X-Received: by 2002:a05:600c:1d16:b0:3df:9858:c030 with SMTP id l22-20020a05600c1d1600b003df9858c030mr840800wms.5.1677745514275; Thu, 02 Mar 2023 00:25:14 -0800 (PST) X-Google-Smtp-Source: AK7set/p2BlBnZcNOsUEUA8Mt3m0X7kkgetFZThKekdGkJBDzJvCGnRX9Zo3u0NjFPyiUJ7mBea6IQ== X-Received: by 2002:a05:600c:1d16:b0:3df:9858:c030 with SMTP id l22-20020a05600c1d1600b003df9858c030mr840785wms.5.1677745514014; Thu, 02 Mar 2023 00:25:14 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:11 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Akihiko Odaki , Mathieu Poirier Subject: [PULL 13/53] vhost-user-rng: Back up vqs before cleaning up vhost_dev Message-ID: <20230302082343.560446-14-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746242799100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki vhost_dev_cleanup() clears vhost_dev so back up its vqs member to free the memory pointed by the member. Fixes: 821d28b88f ("vhost-user-rng: Add vhost-user-rng implementation") Signed-off-by: Akihiko Odaki Message-Id: <20230130140516.78078-1-akihiko.odaki@daynix.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user-rng.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c index 201a39e220..efc54cd3fb 100644 --- a/hw/virtio/vhost-user-rng.c +++ b/hw/virtio/vhost-user-rng.c @@ -229,6 +229,7 @@ static void vu_rng_device_realize(DeviceState *dev, Err= or **errp) return; =20 vhost_dev_init_failed: + g_free(rng->vhost_dev.vqs); virtio_delete_queue(rng->req_vq); virtio_add_queue_failed: virtio_cleanup(vdev); @@ -239,12 +240,12 @@ static void vu_rng_device_unrealize(DeviceState *dev) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VHostUserRNG *rng =3D VHOST_USER_RNG(dev); + struct vhost_virtqueue *vhost_vqs =3D rng->vhost_dev.vqs; =20 vu_rng_set_status(vdev, 0); =20 vhost_dev_cleanup(&rng->vhost_dev); - g_free(rng->vhost_dev.vqs); - rng->vhost_dev.vqs =3D NULL; + g_free(vhost_vqs); virtio_delete_queue(rng->req_vq); virtio_cleanup(vdev); vhost_user_cleanup(&rng->vhost_user); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745730; cv=none; d=zohomail.com; s=zohoarc; b=SWJUtF1Xk3pZST+9y5S2BJghBVksYZNsNHU+9ettX3KCK+O9ssHIHXJIWCjlYNj0OZQnBvC32OFbnf0y1ZAcZn2m/1SJFPp3RNiPDeRIlIIlBZ/Qf2Dyxj8Xf690MHJje7NJvFKTF95+Qe43S1ZcquA4eWNy1xq7P8j3BBcImUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745730; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9lh/lr2hakq6E/VKG0k7kjdQSKbHg/RTFjaRttdp51E=; b=b0y1z2X/9ZuUIxsb7TA3UapOZAQ8Mq0e4Yy0N8cfuVjFCEFEbKRtskYlksoz5xWbHtm0nYdZF+1gUX1zIPrXabH644lYtE9aCznnGqPOfGw1FVHLTBuXtRQZkcc8GTvSVCCiTxBVyj5g8tjN7GeXXIZddI5yNM7Xm8QyeBVLyts= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745730207655.5184388749806; Thu, 2 Mar 2023 00:28:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFq-0002ro-Cy; Thu, 02 Mar 2023 03:25:34 -0500 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 1pXeFe-0002K5-O8 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:25 -0500 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 1pXeFd-0002Df-1Z for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:22 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-439-gq67WOqBNMKNj8ZvaFCHMg-1; Thu, 02 Mar 2023 03:25:19 -0500 Received: by mail-wr1-f72.google.com with SMTP id l5-20020a5d6745000000b002c91cb49949so2982798wrw.14 for ; Thu, 02 Mar 2023 00:25:19 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id a4-20020a5d5084000000b002cdbb26bb48sm3601930wrt.33.2023.03.02.00.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745520; 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: in-reply-to:in-reply-to:references:references; bh=9lh/lr2hakq6E/VKG0k7kjdQSKbHg/RTFjaRttdp51E=; b=g6grDu4t14IhlTn6XcpR2QSiJH/QxGE7qdEffdR9NPl3ahhGVLtdSZzcJLd4cSM7Wra1tG STT55EbswQ7FPt8BE+nDnGa8MuFEBLWS5KXWPUk74obdH6nlL17Vs8eVcmjfLYOvslUI3I V5iuoCRirczLrRNvX0zLEnQZVsBJ5A0= X-MC-Unique: gq67WOqBNMKNj8ZvaFCHMg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745517; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9lh/lr2hakq6E/VKG0k7kjdQSKbHg/RTFjaRttdp51E=; b=IrIcRbYrMzwW/nwMIFv/MtAbwgl5aFaaLX3R9IUDGtQ52M6Nr+EbplrKOn4mS82efl XcMUq9fzOR7j+HoGRVeUb7zTjXfrQa0KwbbJQBhc3pLhQRhAmwMY5uy53kZDe0V56BF+ Aw+SvklnIIJKNl5jxtF+Hy/GLmy8bV4tkAyadZwqpwL7vlcr9We0BtmIghfznG8T5BR4 OvO55fUTLYuwPqAkS26Qw1S5k9CNa3GmCSJMVGbCN3SBL63cUkrxH8Mt/Woh390UB9tm 7iV4kIxC+ojs+5d2JuLf27/8NmeL50uvLMAvfEn5L3tiT6zrXm4TwXKK8OsxSj3Yg6bl VgwA== X-Gm-Message-State: AO0yUKXOtG4VU2NhzR2O4fu3sP0osM8Q/1ixZyD/WRVtKJdoNq5LGS5Z +ik2gVp6GNF+0ERnld8IcpwattzVFjdzGN4oG8Y1gNrUPVQpBj/Iq/zILMmp2vrMRkl4hooOtX9 0dJ2gQu3pscQ6/2eodr9Uo/ZnNKtfIGQcQeEqmeQuSkv4cO5GCJUWKE1qSkh3pcsydA== X-Received: by 2002:adf:e543:0:b0:2c5:594f:121d with SMTP id z3-20020adfe543000000b002c5594f121dmr6239310wrm.12.1677745517667; Thu, 02 Mar 2023 00:25:17 -0800 (PST) X-Google-Smtp-Source: AK7set/Aedcfn7ToxcNjLe/ujsXCJhRthqHPryFUYBNNVJ2W1G/bZVKtUWohyy+HIAI8DCfxjdkRsg== X-Received: by 2002:adf:e543:0:b0:2c5:594f:121d with SMTP id z3-20020adfe543000000b002c5594f121dmr6239291wrm.12.1677745517409; Thu, 02 Mar 2023 00:25:17 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:14 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , "Dr. David Alan Gilbert" , Eduardo Habkost , Marcel Apfelbaum , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Yanan Wang Subject: [PULL 14/53] virtio-rng-pci: fix transitional migration compat for vectors Message-ID: <20230302082343.560446-15-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745731716100015 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" In bad9c5a516 ("virtio-rng-pci: fix migration compat for vectors") I fixed the virtio-rng-pci migration compatibility, but it was discovered that we also need to fix the other aliases of the device for the transitional cases. Fixes: 9ea02e8f1 ('virtio-rng-pci: Allow setting nvectors, so we can use MS= I-X') bz: https://bugzilla.redhat.com/show_bug.cgi?id=3D2162569 Signed-off-by: Dr. David Alan Gilbert Message-Id: <20230207174944.138255-1-dgilbert@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/core/machine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index f29e700ee4..1cf6822e06 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -47,6 +47,8 @@ const size_t hw_compat_7_2_len =3D G_N_ELEMENTS(hw_compat= _7_2); GlobalProperty hw_compat_7_1[] =3D { { "virtio-device", "queue_reset", "false" }, { "virtio-rng-pci", "vectors", "0" }, + { "virtio-rng-pci-transitional", "vectors", "0" }, + { "virtio-rng-pci-non-transitional", "vectors", "0" }, }; const size_t hw_compat_7_1_len =3D G_N_ELEMENTS(hw_compat_7_1); =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745546; cv=none; d=zohomail.com; s=zohoarc; b=oK9ogjtoEWfG91Dy9ZVAA2onKHviZA6RkwULcZgvY0xvHkwXpbwtqW9K7rILnUqLhPWaO0XgdzjokeSvBXekQbUQZOtLDAJnzOiO2QO5XrzlYIyCeAxJBDm1AF4o+GPs9KzHrRydyG9jkEKXctl74bD3MH18C0ydksf1cI9AAlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745546; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GleSwhwfl4eNCQkaTj5UeA1Cyi3863D6aHKVVtWLf3c=; b=AmvYt+Szij0l3hnWYF1PRr0NlMSy0Mk/VriFWZLxO2cJ3Zy7Gng95gF+bSx/OXpvORmmAWwlI4a0QrCXvaDY/eK+YMUVsCuYaOagQNfjw5FFBKeHttFDvxwmCLFB8ihfeg8x+3u0e8EHuHn9UZTh4D15ehhVJyvgAVI8C4Hvmd0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745546823562.9690042249722; Thu, 2 Mar 2023 00:25:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFw-0003Vw-Rx; Thu, 02 Mar 2023 03:25:41 -0500 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 1pXeFh-0002Ql-Pj for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFf-0002ED-Vp for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:25 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-622-rQ5obEAuPpe2uL9y71pbTQ-1; Thu, 02 Mar 2023 03:25:22 -0500 Received: by mail-wm1-f71.google.com with SMTP id m28-20020a05600c3b1c00b003e7d4662b83so949389wms.0 for ; Thu, 02 Mar 2023 00:25:22 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id p14-20020a05600c468e00b003e9ae2a8cbfsm2403868wmo.2.2023.03.02.00.25.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745523; 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: in-reply-to:in-reply-to:references:references; bh=GleSwhwfl4eNCQkaTj5UeA1Cyi3863D6aHKVVtWLf3c=; b=Om/6kTzH3pch1ppmzvIaHQFV4WCCxN2ONn9pGv7ZZFz0e2JXg4BGBBOhkt3OXgAGMrmdxV /ZB9t0I2PncSqN/zilk0mN7hQFQmI/AgLNPI+otOq7KSxJaS2oPnvAxwzSTxPkVJF/dKd/ T8EcvEMPGvsEO6fjsYvHS61qsrps9/g= X-MC-Unique: rQ5obEAuPpe2uL9y71pbTQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745520; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GleSwhwfl4eNCQkaTj5UeA1Cyi3863D6aHKVVtWLf3c=; b=fH0b5J9b4ThYbodwCzCkawJqFAYrCh57HGnPNIQGnVzGE9yhTvqIjb+tEDCVsElU8Q ZenADmKWGSjcdPzLzhcDhAJruWBvg9lt8c/5zwnv2ZvWWKK7Je1iLBrjJbAtAqvPuNfT sgcml7+4fFBRT7ZKMLAMxHd7ENXG6f1l7aNUIkGWLDPC9SNZnjuxMADqjaLHA6quib74 u31WsjU2c8H6lsBAk2qcFTVQkw6aWTJGwQIR2YJHec6ng54Q7BdPdzshyUmM3DnGnlDh v6ERQ6wAIWG6wHnHOnSN+AQ7hldEwOtCTD6K3D6p4t90pNBbaKNLJWJ/7HNMcAXc8mSR luNg== X-Gm-Message-State: AO0yUKUGUVjgjBkSOumEhU1FExbRSmeR3A5uZjTc6CdDGbGS5bMUyi7a JDAxGpVZkMZR6N3eg5xOTAy/TdCMmq8RW1umF9Fqgr4RqnBNCnEkwLTVrXR+XPZxIMPu9qVbGV9 lCbCyEzyJuOcHPHx4W2KRWpoTOgrQglFhOETWsQhj1xrjxrXqf7SHQIgoPWmqfyaTPg== X-Received: by 2002:a05:600c:3acd:b0:3e2:a8e:ba4a with SMTP id d13-20020a05600c3acd00b003e20a8eba4amr7681202wms.21.1677745520498; Thu, 02 Mar 2023 00:25:20 -0800 (PST) X-Google-Smtp-Source: AK7set+5GnAQB7E9DY0dG2myRTVotusVI5XWAbLh26EQqNLwCUco/0PHkeUxWt49j+iZJ4O93Kmr0w== X-Received: by 2002:a05:600c:3acd:b0:3e2:a8e:ba4a with SMTP id d13-20020a05600c3acd00b003e20a8eba4amr7681190wms.21.1677745520287; Thu, 02 Mar 2023 00:25:20 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:17 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Akihiko Odaki , Paolo Bonzini Subject: [PULL 15/53] hw/timer/hpet: Fix expiration time overflow Message-ID: <20230302082343.560446-16-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745548731100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki The expiration time provided for timer_mod() can overflow if a ridiculously large value is set to the comparator register. The resulting value can represent a past time after rounded, forcing the timer to fire immediately. If the timer is configured as periodic, it will rearm the timer again, and form an endless loop. Check if the expiration value will overflow, and if it will, stop the timer instead of rearming the timer with the overflowed time. This bug was found by Alexander Bulekov when fuzzing igb, a new network device emulation: https://patchew.org/QEMU/20230129053316.1071513-1-alxndr@bu.edu/ The fixed test case is: fuzz/crash_2d7036941dcda1ad4380bb8a9174ed0c949bcefd Fixes: 16b29ae180 ("Add HPET emulation to qemu (Beth Kon)") Signed-off-by: Akihiko Odaki Acked-by: Michael S. Tsirkin Message-Id: <20230131030037.18856-1-akihiko.odaki@daynix.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/timer/hpet.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 214d6a0501..6998094233 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -353,6 +353,16 @@ static const VMStateDescription vmstate_hpet =3D { } }; =20 +static void hpet_arm(HPETTimer *t, uint64_t ticks) +{ + if (ticks < ns_to_ticks(INT64_MAX / 2)) { + timer_mod(t->qemu_timer, + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ticks_to_ns(tick= s)); + } else { + timer_del(t->qemu_timer); + } +} + /* * timer expiration callback */ @@ -375,13 +385,11 @@ static void hpet_timer(void *opaque) } } diff =3D hpet_calculate_diff(t, cur_tick); - timer_mod(t->qemu_timer, - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (int64_t)ti= cks_to_ns(diff)); + hpet_arm(t, diff); } else if (t->config & HPET_TN_32BIT && !timer_is_periodic(t)) { if (t->wrap_flag) { diff =3D hpet_calculate_diff(t, cur_tick); - timer_mod(t->qemu_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)= + - (int64_t)ticks_to_ns(diff)); + hpet_arm(t, diff); t->wrap_flag =3D 0; } } @@ -408,8 +416,7 @@ static void hpet_set_timer(HPETTimer *t) t->wrap_flag =3D 1; } } - timer_mod(t->qemu_timer, - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (int64_t)ticks_= to_ns(diff)); + hpet_arm(t, diff); } =20 static void hpet_del_timer(HPETTimer *t) --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746241; cv=none; d=zohomail.com; s=zohoarc; b=Sjr9sG3Z9F201qfqYhvJdtLikGbsXhdJPh59XYS7Mc0Z7D6bM8MwknRKqB0o8JBGMCcE9mVv8YlePMbOR4Xo3VpofN1/Dkg++mYAx741sd+Jf/RnbNHwGuRUE1LVPb+6lkH/hQu2L3Tzs4LzrTD02vYFOhujRAInrvk0jMd/ejc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1H0m5LQV+iRLN8dzfFusNfvI8XB9DmtU6FymbtKRqAI=; b=FlsXc12TS4vfeO22YmLPpvLw9RdwndvbP/372xGH1qsY6uPqKNoXvX68Ey9NRzol852VLe3snXJYZKna5ecI2Y/u48eL8Q7Swk7qrAvUm431EsVMhdts/1DhNMXDfJrKnL8rxBrr4UFhGrxQohhrhxja/4hCYimBGB7BhhE7R7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746241572673.8716168062278; Thu, 2 Mar 2023 00:37:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFn-0002b3-A6; Thu, 02 Mar 2023 03:25:31 -0500 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 1pXeFl-0002S3-B8 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:29 -0500 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 1pXeFj-0002Fa-8p for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:28 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-179-FfToVJ_ENxS3WDFpGJqo_w-1; Thu, 02 Mar 2023 03:25:25 -0500 Received: by mail-wr1-f69.google.com with SMTP id x3-20020a5d6503000000b002c8c421fdfaso3030144wru.15 for ; Thu, 02 Mar 2023 00:25:25 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id i16-20020a05600c355000b003dc4480df80sm2304607wmq.34.2023.03.02.00.25.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745526; 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; bh=1H0m5LQV+iRLN8dzfFusNfvI8XB9DmtU6FymbtKRqAI=; b=dBIt1GVPOUv+3Wjc5ndDPhh/UWYORwuPLPrSZDDDZqBS+RMRVP5l2lwgBFCIMtPkLZx2JR VhtmADRJVzo9qzaLC6bee3ObEzcoORpFSkVengqKyYCyAyV55dB/h+ZDgyVAnTDDNWB+lh 4NV67KLEvfhPNIaVoj7scaM1tXIZT0w= X-MC-Unique: FfToVJ_ENxS3WDFpGJqo_w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745523; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1H0m5LQV+iRLN8dzfFusNfvI8XB9DmtU6FymbtKRqAI=; b=m+nnLj77inRHLipHMZJL5NArgMQRlkgZEk6FLhuqQQJbR5NcQzNDOLvbQ9Boa4II6N hhT/brtj6xkcErXTQDkUtQHPLhNaSBBSKmD5sqgZMSDhLjaVbF54i19dTGtf6NYRBLDk xFqhK4IbHoFWwA1O2MNtoh4nJqkFmdE4XFr+4JYhxJP27Y6sGob/LhYzR6t3W3KzLnvx 53qetHXHwoGQTgj9rgaAMgjQFBK5d4i8MkHOzEHnjop+etdWNAcRaex3xubUnOhxZaws o6raC+3Y1DxRHEo87YRdoYCxwb8NpEfYTOLgkXsMEtayXbK4qMuhm/7RNvHiJ4c3+oaF QBfQ== X-Gm-Message-State: AO0yUKViCUO7deTD1zouAdUA5pASb9+sl+R68AwR9dnFJf9ahZMGauU1 LWT3P/29aWzTuMd154WUebQmATMwN7uEW/YWdBBlBn8FlcV/sirPK/XDUxIp+sQuOtJQePeJcdq vIbxNx7V0iPB2VRUqgYkaljBYKLoWW7/gxrrtUBK98gGEKe3KkVCGrN+FE2LqI8QR4A== X-Received: by 2002:a05:600c:3583:b0:3eb:399d:ab1d with SMTP id p3-20020a05600c358300b003eb399dab1dmr7161254wmq.16.1677745523617; Thu, 02 Mar 2023 00:25:23 -0800 (PST) X-Google-Smtp-Source: AK7set+wKWDPL6ohMSll1zUqVpDa7hp1PuwwDfX18PrXN2cwWGrQiwZoQQ4oSovQgjuIvbidPrI0dg== X-Received: by 2002:a05:600c:3583:b0:3eb:399d:ab1d with SMTP id p3-20020a05600c358300b003eb399dab1dmr7161235wmq.16.1677745523281; Thu, 02 Mar 2023 00:25:23 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:20 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Maxime Coquelin , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: [PULL 16/53] docs: vhost-user: replace _SLAVE_ with _BACKEND_ Message-ID: <20230302082343.560446-17-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746242824100005 From: Maxime Coquelin Backend's message and protocol features names were still using "_SLAVE_" naming. For consistency with the new naming convention, replace it with _BACKEND_. Signed-off-by: Maxime Coquelin Message-Id: <20230208203259.381326-2-maxime.coquelin@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- docs/interop/vhost-user.rst | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index 3f18ab424e..8a5924ea75 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -315,7 +315,7 @@ in the ancillary data: * ``VHOST_USER_SET_VRING_KICK`` * ``VHOST_USER_SET_VRING_CALL`` * ``VHOST_USER_SET_VRING_ERR`` -* ``VHOST_USER_SET_SLAVE_REQ_FD`` +* ``VHOST_USER_SET_BACKEND_REQ_FD`` (previous name ``VHOST_USER_SET_SLAVE_= REQ_FD``) * ``VHOST_USER_SET_INFLIGHT_FD`` (if ``VHOST_USER_PROTOCOL_F_INFLIGHT_SHMF= D``) =20 If *front-end* is unable to send the full message or receives a wrong @@ -516,7 +516,7 @@ expected to reply with a zero payload, non-zero otherwi= se. =20 The back-end relies on the back-end communication channel (see :ref:`Back-= end communication ` section below) to send IOTLB miss -and access failure events, by sending ``VHOST_USER_SLAVE_IOTLB_MSG`` +and access failure events, by sending ``VHOST_USER_BACKEND_IOTLB_MSG`` requests to the front-end with a ``struct vhost_iotlb_msg`` as payload. For miss events, the iotlb payload has to be filled with the miss message type (1), the I/O virtual address and the permissions @@ -540,15 +540,15 @@ Back-end communication ---------------------- =20 An optional communication channel is provided if the back-end declares -``VHOST_USER_PROTOCOL_F_SLAVE_REQ`` protocol feature, to allow the +``VHOST_USER_PROTOCOL_F_BACKEND_REQ`` protocol feature, to allow the back-end to make requests to the front-end. =20 -The fd is provided via ``VHOST_USER_SET_SLAVE_REQ_FD`` ancillary data. +The fd is provided via ``VHOST_USER_SET_BACKEND_REQ_FD`` ancillary data. =20 -A back-end may then send ``VHOST_USER_SLAVE_*`` messages to the front-end +A back-end may then send ``VHOST_USER_BACKEND_*`` messages to the front-end using this fd communication channel. =20 -If ``VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD`` protocol feature is +If ``VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD`` protocol feature is negotiated, back-end can send file descriptors (at most 8 descriptors in each message) to front-end via ancillary data using this fd communication channel. @@ -835,7 +835,7 @@ Note that due to the fact that too many messages on the= sockets can cause the sending application(s) to block, it is not advised to use this feature unless absolutely necessary. It is also considered an error to negotiate this feature without also negotiating -``VHOST_USER_PROTOCOL_F_SLAVE_REQ`` and ``VHOST_USER_PROTOCOL_F_REPLY_ACK`= `, +``VHOST_USER_PROTOCOL_F_BACKEND_REQ`` and ``VHOST_USER_PROTOCOL_F_REPLY_AC= K``, the former is necessary for getting a message channel from the back-end to the front-end, while the latter needs to be used with the in-band notification messages to block until they are processed, both to avoid @@ -855,12 +855,12 @@ Protocol features #define VHOST_USER_PROTOCOL_F_RARP 2 #define VHOST_USER_PROTOCOL_F_REPLY_ACK 3 #define VHOST_USER_PROTOCOL_F_MTU 4 - #define VHOST_USER_PROTOCOL_F_SLAVE_REQ 5 + #define VHOST_USER_PROTOCOL_F_BACKEND_REQ 5 #define VHOST_USER_PROTOCOL_F_CROSS_ENDIAN 6 #define VHOST_USER_PROTOCOL_F_CRYPTO_SESSION 7 #define VHOST_USER_PROTOCOL_F_PAGEFAULT 8 #define VHOST_USER_PROTOCOL_F_CONFIG 9 - #define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 + #define VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD 10 #define VHOST_USER_PROTOCOL_F_HOST_NOTIFIER 11 #define VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD 12 #define VHOST_USER_PROTOCOL_F_RESET_DEVICE 13 @@ -1059,8 +1059,8 @@ Front-end message types in the ancillary data. This signals that polling will be used instead of waiting for the call. Note that if the protocol features ``VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS`` and - ``VHOST_USER_PROTOCOL_F_SLAVE_REQ`` have been negotiated this message - isn't necessary as the ``VHOST_USER_SLAVE_VRING_CALL`` message can be + ``VHOST_USER_PROTOCOL_F_BACKEND_REQ`` have been negotiated this message + isn't necessary as the ``VHOST_USER_BACKEND_VRING_CALL`` message can be used, it may however still be used to set an event file descriptor or to enable polling. =20 @@ -1077,8 +1077,8 @@ Front-end message types invalid FD flag. This flag is set when there is no file descriptor in the ancillary data. Note that if the protocol features ``VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS`` and - ``VHOST_USER_PROTOCOL_F_SLAVE_REQ`` have been negotiated this message - isn't necessary as the ``VHOST_USER_SLAVE_VRING_ERR`` message can be + ``VHOST_USER_PROTOCOL_F_BACKEND_REQ`` have been negotiated this message + isn't necessary as the ``VHOST_USER_BACKEND_VRING_ERR`` message can be used, it may however still be used to set an event file descriptor (which will be preferred over the message). =20 @@ -1139,7 +1139,7 @@ Front-end message types respond with zero in case the specified MTU is valid, or non-zero otherwise. =20 -``VHOST_USER_SET_SLAVE_REQ_FD`` +``VHOST_USER_SET_BACKEND_REQ_FD`` (previous name ``VHOST_USER_SET_SLAVE_RE= Q_FD``) :id: 21 :equivalent ioctl: N/A :request payload: N/A @@ -1150,7 +1150,7 @@ Front-end message types =20 This request should be sent only when ``VHOST_USER_F_PROTOCOL_FEATURES`` has been negotiated, and protocol - feature bit ``VHOST_USER_PROTOCOL_F_SLAVE_REQ`` bit is present in + feature bit ``VHOST_USER_PROTOCOL_F_BACKEND_REQ`` bit is present in ``VHOST_USER_GET_PROTOCOL_FEATURES``. If ``VHOST_USER_PROTOCOL_F_REPLY_ACK`` is negotiated, the back-end must respond with zero for success, non-zero otherwise. @@ -1429,7 +1429,7 @@ Back-end message types For this type of message, the request is sent by the back-end and the reply is sent by the front-end. =20 -``VHOST_USER_SLAVE_IOTLB_MSG`` +``VHOST_USER_BACKEND_IOTLB_MSG`` (previous name ``VHOST_USER_SLAVE_IOTLB_M= SG``) :id: 1 :equivalent ioctl: N/A (equivalent to ``VHOST_IOTLB_MSG`` message type) :request payload: ``struct vhost_iotlb_msg`` @@ -1444,7 +1444,7 @@ is sent by the front-end. ``VIRTIO_F_IOMMU_PLATFORM`` feature has been successfully negotiated. =20 -``VHOST_USER_SLAVE_CONFIG_CHANGE_MSG`` +``VHOST_USER_BACKEND_CONFIG_CHANGE_MSG`` (previous name ``VHOST_USER_SLAVE= _CONFIG_CHANGE_MSG``) :id: 2 :equivalent ioctl: N/A :request payload: N/A @@ -1459,7 +1459,7 @@ is sent by the front-end. ``VHOST_USER_NEED_REPLY`` flag, the front-end must respond with zero when operation is successfully completed, or non-zero otherwise. =20 -``VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG`` +``VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG`` (previous name ``VHOST_USER= _SLAVE_VRING_HOST_NOTIFIER_MSG``) :id: 3 :equivalent ioctl: N/A :request payload: vring area description @@ -1482,7 +1482,7 @@ is sent by the front-end. ``VHOST_USER_PROTOCOL_F_HOST_NOTIFIER`` protocol feature has been successfully negotiated. =20 -``VHOST_USER_SLAVE_VRING_CALL`` +``VHOST_USER_BACKEND_VRING_CALL`` (previous name ``VHOST_USER_SLAVE_VRING_= CALL``) :id: 4 :equivalent ioctl: N/A :request payload: vring state description @@ -1496,7 +1496,7 @@ is sent by the front-end. =20 The state.num field is currently reserved and must be set to 0. =20 -``VHOST_USER_SLAVE_VRING_ERR`` +``VHOST_USER_BACKEND_VRING_ERR`` (previous name ``VHOST_USER_SLAVE_VRING_E= RR``) :id: 5 :equivalent ioctl: N/A :request payload: vring state description --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745792; cv=none; d=zohomail.com; s=zohoarc; b=QVBNu4RxwrpY9kfHBTrlPFboGo8ShajUnpg3agYXTexF5nANqwr4+5sSNocjIoeTFhoEl8xTaFOCu0x9Y4LxK1tG7HhKQPm6Ormc4CvaxiiuN5KBv2IGA1IS2e6rm8qHRMdxQeTyVr4V59lLb+ReRlMXaarjEphMYIWuam10e44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745792; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fXxj5h0qQ8uhuKbUYFn8UPh6HW6hOOdETJzf90gxJPU=; b=KSRsD8yvsguVyh5xJsn+GYnleR6mMD7Ad/tv+h9V0gAIOjxEV3B9s/xfgl33pYSboN+NcNsiiiu23qprL0WvbzUBkhgt6O7eyMo8MoATdjxNf1kKg+nFgMv+hWotR73tu6fe0LD4uMUt7aHAVt8fOIHESu+KCQfbhAfgMyCPRzE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745792068235.2720781084397; Thu, 2 Mar 2023 00:29:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFr-0002x2-8F; Thu, 02 Mar 2023 03:25:35 -0500 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 1pXeFn-0002ez-Oi for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFl-0002Hm-RE for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:31 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-154-FSCz492VMtWoV4hUn7VWLQ-1; Thu, 02 Mar 2023 03:25:28 -0500 Received: by mail-wm1-f71.google.com with SMTP id s18-20020a7bc392000000b003deaf780ab6so745460wmj.4 for ; Thu, 02 Mar 2023 00:25:28 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id d16-20020adff850000000b002c55306f6edsm14480963wrq.54.2023.03.02.00.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745529; 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; bh=fXxj5h0qQ8uhuKbUYFn8UPh6HW6hOOdETJzf90gxJPU=; b=B0QXzsp/H+AORS4UfDtdmLTdW5RL5+RXFiu3Z4hgspSaIWXu3hG2I0r4bH5LV8HNZ6qBZc zXGZRd6JEdtDhTEtUwmpjIAk9hpO9Pqay5AM98Wc4jsabyXD9yL8MeBGRGg3Z1CMKyGwWX 1Pt+GyKKWze4ciY98JyLzxp+hGbjF3Y= X-MC-Unique: FSCz492VMtWoV4hUn7VWLQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745526; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fXxj5h0qQ8uhuKbUYFn8UPh6HW6hOOdETJzf90gxJPU=; b=ATH/antQYQocZPcKsffVGC5iIQekOSdSS8axEDfjtOss+sMkHJYwdZ0qJOiEFtHd27 BQRcdHK5yqZ17+LagdF9V9KSEkqCe4qfZpF6HgER70eJnCfbEsC/sazmicJiLoE0Oil8 i0vbjXvNl8oJm1MRuG4Cjy6mqbdiel3S0Yo5T/GiyXT3qI/B2m2wtkmCPpmq/X8tLJD8 r2E8Nnm3kcnyHMsg8dOiF/KyequrthZwgoTum/IUp7qEK2xu23MfsZtwGXTctv8QN0gN iZ6eax0hzBUwQ/gWXNjUv8IArodF6aFFeI3fINh/36Q+Neioi8vrI4Mcy5E6OzEo+WJI /wfw== X-Gm-Message-State: AO0yUKW8azT5KiIWRCd1CoCODCDNIPBkehIXM7Bnnmax7GXG0Jvd1pJj QT0DjJFRxhFsXm1RtkldhOESWkK9UjjS5u1ZY7LmSJ5bV5jw71UHvMjgivcoD6k1yLWB3W0MDNk BTzZEtw1cBIlvz7/STc/SEdB/4SDq4Hb8TmIu67/SI/pajxKau7D/8LXulMvisiDFZQ== X-Received: by 2002:a05:600c:1554:b0:3eb:38b0:e757 with SMTP id f20-20020a05600c155400b003eb38b0e757mr808080wmg.10.1677745526548; Thu, 02 Mar 2023 00:25:26 -0800 (PST) X-Google-Smtp-Source: AK7set8VdPLsZ+irPfrO8AhSnABQ0eilgA+gjXMwoVslHMUEO5pexyK1GvrRapR0swiZZZ4YVuqokg== X-Received: by 2002:a05:600c:1554:b0:3eb:38b0:e757 with SMTP id f20-20020a05600c155400b003eb38b0e757mr808069wmg.10.1677745526310; Thu, 02 Mar 2023 00:25:26 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:23 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Maxime Coquelin , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: [PULL 17/53] libvhost-user: Adopt new backend naming Message-ID: <20230302082343.560446-18-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745794203100007 From: Maxime Coquelin The Vhost-user specification changed feature and request naming from _SLAVE_ to _BACKEND_. This patch adopts the new naming convention. Signed-off-by: Maxime Coquelin Message-Id: <20230208203259.381326-3-maxime.coquelin@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- subprojects/libvhost-user/libvhost-user.h | 20 ++++++++++---------- subprojects/libvhost-user/libvhost-user.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/subprojects/libvhost-user/libvhost-user.h b/subprojects/libvho= st-user/libvhost-user.h index 8cda9b8f57..8c5a2719e3 100644 --- a/subprojects/libvhost-user/libvhost-user.h +++ b/subprojects/libvhost-user/libvhost-user.h @@ -54,12 +54,12 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_RARP =3D 2, VHOST_USER_PROTOCOL_F_REPLY_ACK =3D 3, VHOST_USER_PROTOCOL_F_NET_MTU =3D 4, - VHOST_USER_PROTOCOL_F_SLAVE_REQ =3D 5, + VHOST_USER_PROTOCOL_F_BACKEND_REQ =3D 5, VHOST_USER_PROTOCOL_F_CROSS_ENDIAN =3D 6, VHOST_USER_PROTOCOL_F_CRYPTO_SESSION =3D 7, VHOST_USER_PROTOCOL_F_PAGEFAULT =3D 8, VHOST_USER_PROTOCOL_F_CONFIG =3D 9, - VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD =3D 10, + VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD =3D 10, VHOST_USER_PROTOCOL_F_HOST_NOTIFIER =3D 11, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD =3D 12, VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS =3D 14, @@ -92,7 +92,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE =3D 18, VHOST_USER_SEND_RARP =3D 19, VHOST_USER_NET_SET_MTU =3D 20, - VHOST_USER_SET_SLAVE_REQ_FD =3D 21, + VHOST_USER_SET_BACKEND_REQ_FD =3D 21, VHOST_USER_IOTLB_MSG =3D 22, VHOST_USER_SET_VRING_ENDIAN =3D 23, VHOST_USER_GET_CONFIG =3D 24, @@ -113,13 +113,13 @@ typedef enum VhostUserRequest { } VhostUserRequest; =20 typedef enum VhostUserSlaveRequest { - VHOST_USER_SLAVE_NONE =3D 0, - VHOST_USER_SLAVE_IOTLB_MSG =3D 1, - VHOST_USER_SLAVE_CONFIG_CHANGE_MSG =3D 2, - VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG =3D 3, - VHOST_USER_SLAVE_VRING_CALL =3D 4, - VHOST_USER_SLAVE_VRING_ERR =3D 5, - VHOST_USER_SLAVE_MAX + VHOST_USER_BACKEND_NONE =3D 0, + VHOST_USER_BACKEND_IOTLB_MSG =3D 1, + VHOST_USER_BACKEND_CONFIG_CHANGE_MSG =3D 2, + VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG =3D 3, + VHOST_USER_BACKEND_VRING_CALL =3D 4, + VHOST_USER_BACKEND_VRING_ERR =3D 5, + VHOST_USER_BACKEND_MAX } VhostUserSlaveRequest; =20 typedef struct VhostUserMemoryRegion { diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvho= st-user/libvhost-user.c index fc69783d2b..f661af7c85 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -140,7 +140,7 @@ vu_request_to_string(unsigned int req) REQ(VHOST_USER_SET_VRING_ENABLE), REQ(VHOST_USER_SEND_RARP), REQ(VHOST_USER_NET_SET_MTU), - REQ(VHOST_USER_SET_SLAVE_REQ_FD), + REQ(VHOST_USER_SET_BACKEND_REQ_FD), REQ(VHOST_USER_IOTLB_MSG), REQ(VHOST_USER_SET_VRING_ENDIAN), REQ(VHOST_USER_GET_CONFIG), @@ -1365,7 +1365,7 @@ bool vu_set_queue_host_notifier(VuDev *dev, VuVirtq *= vq, int fd, int qidx =3D vq - dev->vq; int fd_num =3D 0; VhostUserMsg vmsg =3D { - .request =3D VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG, + .request =3D VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG, .flags =3D VHOST_USER_VERSION | VHOST_USER_NEED_REPLY_MASK, .size =3D sizeof(vmsg.payload.area), .payload.area =3D { @@ -1383,7 +1383,7 @@ bool vu_set_queue_host_notifier(VuDev *dev, VuVirtq *= vq, int fd, =20 vmsg.fd_num =3D fd_num; =20 - if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)= ) { + if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_BACKEND_SEND_F= D)) { return false; } =20 @@ -1461,9 +1461,9 @@ vu_get_protocol_features_exec(VuDev *dev, VhostUserMs= g *vmsg) */ uint64_t features =3D 1ULL << VHOST_USER_PROTOCOL_F_MQ | 1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD | - 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ | + 1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ | 1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER | - 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD | + 1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD | 1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK | 1ULL << VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS; =20 @@ -1494,7 +1494,7 @@ vu_set_protocol_features_exec(VuDev *dev, VhostUserMs= g *vmsg) =20 if (vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS= ) && - (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_SLAVE_REQ) || + (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_BACKEND_REQ) = || !vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_REPLY_ACK))) { /* * The use case for using messages for kick/call is simulation, to= make @@ -1507,7 +1507,7 @@ vu_set_protocol_features_exec(VuDev *dev, VhostUserMs= g *vmsg) * that actually enables the simulation case. */ vu_panic(dev, - "F_IN_BAND_NOTIFICATIONS requires F_SLAVE_REQ && F_REPLY_= ACK"); + "F_IN_BAND_NOTIFICATIONS requires F_BACKEND_REQ && F_REPL= Y_ACK"); return false; } =20 @@ -1910,7 +1910,7 @@ vu_process_message(VuDev *dev, VhostUserMsg *vmsg) return vu_get_queue_num_exec(dev, vmsg); case VHOST_USER_SET_VRING_ENABLE: return vu_set_vring_enable_exec(dev, vmsg); - case VHOST_USER_SET_SLAVE_REQ_FD: + case VHOST_USER_SET_BACKEND_REQ_FD: return vu_set_slave_req_fd(dev, vmsg); case VHOST_USER_GET_CONFIG: return vu_get_config(dev, vmsg); @@ -2416,9 +2416,9 @@ static void _vu_queue_notify(VuDev *dev, VuVirtq *vq,= bool sync) if (vq->call_fd < 0 && vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS= ) && - vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_SLAVE_REQ)) { + vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_BACKEND_REQ)) { VhostUserMsg vmsg =3D { - .request =3D VHOST_USER_SLAVE_VRING_CALL, + .request =3D VHOST_USER_BACKEND_VRING_CALL, .flags =3D VHOST_USER_VERSION, .size =3D sizeof(vmsg.payload.state), .payload.state =3D { --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745887; cv=none; d=zohomail.com; s=zohoarc; b=CRm/DR+GDkup1fL1Bw7fqCX2Uv0jHTceBfLRJsD/xJCBRb5pvSaBkoYu7188k4gmv4MDwG8gZuEg2liR2E9ZN3F3HrKXaQPIsnnG06SDARc/GVsuVdgDxQNEZADg4rWBnkUxCTQFGHZvvKMTg/yiUJT/KNWc9eq/GJ6wfyUMM3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745887; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xpHv1sDqC6NygLP0zl9CacgM4K8/lko9ZbzQDaG876Y=; b=n8jj+hVOglpwrTjlcHvcOm/ra2be7eJmzw34aiEa0TzCQ9wS92GD6GIFBbLJSuxGH+6wZgqtdy+k7WDd0obPsYrzAkca0H/+0riMiHLrgxWdVKT2FzRCYO2aOiQEmvz3MNwunBN2eSmVAQmaO7jfUWEYKHIsya36G1NaeQtq7xA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745887606765.9232683724496; Thu, 2 Mar 2023 00:31:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFw-0003Vk-Qw; Thu, 02 Mar 2023 03:25:40 -0500 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 1pXeFq-0002uc-S5 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:34 -0500 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 1pXeFp-0002Ju-2R for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:34 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-609-rmh6fyXdNriTbco6aloFXw-1; Thu, 02 Mar 2023 03:25:31 -0500 Received: by mail-wm1-f70.google.com with SMTP id l23-20020a7bc457000000b003e206cbce8dso5461977wmi.7 for ; Thu, 02 Mar 2023 00:25:31 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id o11-20020a05600c4fcb00b003e8f0334db8sm2342046wmq.5.2023.03.02.00.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745532; 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; bh=xpHv1sDqC6NygLP0zl9CacgM4K8/lko9ZbzQDaG876Y=; b=Dp+d8a6WRvi5N+tifkaJe8K827tevS/y7qCCPCqvAzEP40kt/QxVa/SfWD2laEOAxJIyWU kCbrOZZKunfEKb6jxgWG+cEObP52HbfAWdieQx6cEH3qIh1dJqB1zpLe2mwPhcGGXGxYze xvl5ifrBwDzVIbeIO/YC8g09fvTf/Wk= X-MC-Unique: rmh6fyXdNriTbco6aloFXw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745529; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xpHv1sDqC6NygLP0zl9CacgM4K8/lko9ZbzQDaG876Y=; b=M6TxkTu/HrP1bN8whwGtfTzTEA/pc1k0DGb4ZS2Lpvg13lUP4mbwq4c1+/24amrC86 Jl+dBljrlbofynsDlyz3jn17k+aKzeAbGXKfl4VYAWKP4yEOPLe0L+lF+4foApva4vSN S6P2+n5qfSOQHiivGGxTqQmf9XqNU7zg70IybhyUJqRHc3JyqE7WGJwCQpegCx2c2kKQ 81FzCzhOifnUipO+5b2lUGApjhCw55wpPNgaWpEAGSJLVDB711ciSvpbmp1W4xKoBqOm CxWscKKncpDXs35zlw7zGFwbl5VWmlT3x+N94zy3PfIt92aELjZUwST2pLUak584BkkO luDA== X-Gm-Message-State: AO0yUKXJHHiVQ6tfhmjerj40fn8gqZpmPCEn+0rzW4pXRNVu+EcP7Qx2 NYyEWQPMtMRXHYzPMw+IV56IDMskdBLRBPDldOovWXBzAqJHKxeFZAef60QzUHrntESX2VLojZ6 JbXlmv4+N2pIaAjuq2B6G/d/P7iPK7sw4A/9y2iMtDNH23X3AxeSHB/gsE33JcavpcQ== X-Received: by 2002:a05:600c:81b:b0:3e2:6ec:61ea with SMTP id k27-20020a05600c081b00b003e206ec61eamr7238663wmp.28.1677745529333; Thu, 02 Mar 2023 00:25:29 -0800 (PST) X-Google-Smtp-Source: AK7set8hXhPvDyWtZ3gSQHpOUfB3cBJGx0MP5PsByDNyjxjUnw9O5EiLL+UhWYKYLE4Yd0Q2rOB3Fw== X-Received: by 2002:a05:600c:81b:b0:3e2:6ec:61ea with SMTP id k27-20020a05600c081b00b003e206ec61eamr7238648wmp.28.1677745529043; Thu, 02 Mar 2023 00:25:29 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:26 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Maxime Coquelin , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: [PULL 18/53] vhost-user: Adopt new backend naming Message-ID: <20230302082343.560446-19-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745889031100003 From: Maxime Coquelin The Vhost-user specification changed feature and request naming from _SLAVE_ to _BACKEND_. This patch adopts the new naming convention. Signed-off-by: Maxime Coquelin Message-Id: <20230208203259.381326-4-maxime.coquelin@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user.c | 30 +++++++++++++++--------------- hw/virtio/virtio-qmp.c | 12 ++++++------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index e68daa35d4..8968541514 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -40,7 +40,7 @@ =20 #define VHOST_MEMORY_BASELINE_NREGIONS 8 #define VHOST_USER_F_PROTOCOL_FEATURES 30 -#define VHOST_USER_SLAVE_MAX_FDS 8 +#define VHOST_USER_BACKEND_MAX_FDS 8 =20 /* * Set maximum number of RAM slots supported to @@ -71,12 +71,12 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_RARP =3D 2, VHOST_USER_PROTOCOL_F_REPLY_ACK =3D 3, VHOST_USER_PROTOCOL_F_NET_MTU =3D 4, - VHOST_USER_PROTOCOL_F_SLAVE_REQ =3D 5, + VHOST_USER_PROTOCOL_F_BACKEND_REQ =3D 5, VHOST_USER_PROTOCOL_F_CROSS_ENDIAN =3D 6, VHOST_USER_PROTOCOL_F_CRYPTO_SESSION =3D 7, VHOST_USER_PROTOCOL_F_PAGEFAULT =3D 8, VHOST_USER_PROTOCOL_F_CONFIG =3D 9, - VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD =3D 10, + VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD =3D 10, VHOST_USER_PROTOCOL_F_HOST_NOTIFIER =3D 11, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD =3D 12, VHOST_USER_PROTOCOL_F_RESET_DEVICE =3D 13, @@ -110,7 +110,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE =3D 18, VHOST_USER_SEND_RARP =3D 19, VHOST_USER_NET_SET_MTU =3D 20, - VHOST_USER_SET_SLAVE_REQ_FD =3D 21, + VHOST_USER_SET_BACKEND_REQ_FD =3D 21, VHOST_USER_IOTLB_MSG =3D 22, VHOST_USER_SET_VRING_ENDIAN =3D 23, VHOST_USER_GET_CONFIG =3D 24, @@ -134,11 +134,11 @@ typedef enum VhostUserRequest { } VhostUserRequest; =20 typedef enum VhostUserSlaveRequest { - VHOST_USER_SLAVE_NONE =3D 0, - VHOST_USER_SLAVE_IOTLB_MSG =3D 1, - VHOST_USER_SLAVE_CONFIG_CHANGE_MSG =3D 2, - VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG =3D 3, - VHOST_USER_SLAVE_MAX + VHOST_USER_BACKEND_NONE =3D 0, + VHOST_USER_BACKEND_IOTLB_MSG =3D 1, + VHOST_USER_BACKEND_CONFIG_CHANGE_MSG =3D 2, + VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG =3D 3, + VHOST_USER_BACKEND_MAX } VhostUserSlaveRequest; =20 typedef struct VhostUserMemoryRegion { @@ -1638,13 +1638,13 @@ static gboolean slave_read(QIOChannel *ioc, GIOCond= ition condition, } =20 switch (hdr.request) { - case VHOST_USER_SLAVE_IOTLB_MSG: + case VHOST_USER_BACKEND_IOTLB_MSG: ret =3D vhost_backend_handle_iotlb_msg(dev, &payload.iotlb); break; - case VHOST_USER_SLAVE_CONFIG_CHANGE_MSG : + case VHOST_USER_BACKEND_CONFIG_CHANGE_MSG: ret =3D vhost_user_slave_handle_config_change(dev); break; - case VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG: + case VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG: ret =3D vhost_user_slave_handle_vring_host_notifier(dev, &payload.= area, fd ? fd[0] : -1); break; @@ -1696,7 +1696,7 @@ fdcleanup: static int vhost_setup_slave_channel(struct vhost_dev *dev) { VhostUserMsg msg =3D { - .hdr.request =3D VHOST_USER_SET_SLAVE_REQ_FD, + .hdr.request =3D VHOST_USER_SET_BACKEND_REQ_FD, .hdr.flags =3D VHOST_USER_VERSION, }; struct vhost_user *u =3D dev->opaque; @@ -1707,7 +1707,7 @@ static int vhost_setup_slave_channel(struct vhost_dev= *dev) QIOChannel *ioc; =20 if (!virtio_has_feature(dev->protocol_features, - VHOST_USER_PROTOCOL_F_SLAVE_REQ)) { + VHOST_USER_PROTOCOL_F_BACKEND_REQ)) { return 0; } =20 @@ -2065,7 +2065,7 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, =20 if (virtio_has_feature(features, VIRTIO_F_IOMMU_PLATFORM) && !(virtio_has_feature(dev->protocol_features, - VHOST_USER_PROTOCOL_F_SLAVE_REQ) && + VHOST_USER_PROTOCOL_F_BACKEND_REQ) && virtio_has_feature(dev->protocol_features, VHOST_USER_PROTOCOL_F_REPLY_ACK))) { error_setg(errp, "IOMMU support requires reply-ack and " diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index e4d4bece2d..b70148aba9 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -42,12 +42,12 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_RARP =3D 2, VHOST_USER_PROTOCOL_F_REPLY_ACK =3D 3, VHOST_USER_PROTOCOL_F_NET_MTU =3D 4, - VHOST_USER_PROTOCOL_F_SLAVE_REQ =3D 5, + VHOST_USER_PROTOCOL_F_BACKEND_REQ =3D 5, VHOST_USER_PROTOCOL_F_CROSS_ENDIAN =3D 6, VHOST_USER_PROTOCOL_F_CRYPTO_SESSION =3D 7, VHOST_USER_PROTOCOL_F_PAGEFAULT =3D 8, VHOST_USER_PROTOCOL_F_CONFIG =3D 9, - VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD =3D 10, + VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD =3D 10, VHOST_USER_PROTOCOL_F_HOST_NOTIFIER =3D 11, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD =3D 12, VHOST_USER_PROTOCOL_F_RESET_DEVICE =3D 13, @@ -101,8 +101,8 @@ static const qmp_virtio_feature_map_t vhost_user_protoc= ol_map[] =3D { "supported"), FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_NET_MTU, \ "VHOST_USER_PROTOCOL_F_NET_MTU: Expose host MTU to guest suppo= rted"), - FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_SLAVE_REQ, \ - "VHOST_USER_PROTOCOL_F_SLAVE_REQ: Socket fd for back-end initi= ated " + FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_BACKEND_REQ, \ + "VHOST_USER_PROTOCOL_F_BACKEND_REQ: Socket fd for back-end ini= tiated " "requests supported"), FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_CROSS_ENDIAN, \ "VHOST_USER_PROTOCOL_F_CROSS_ENDIAN: Endianness of VQs for leg= acy " @@ -116,8 +116,8 @@ static const qmp_virtio_feature_map_t vhost_user_protoc= ol_map[] =3D { FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_CONFIG, \ "VHOST_USER_PROTOCOL_F_CONFIG: Vhost-user messaging for virtio= " "device configuration space supported"), - FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD, \ - "VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD: Slave fd communication " + FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD, \ + "VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD: Slave fd communication= " "channel supported"), FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_HOST_NOTIFIER, \ "VHOST_USER_PROTOCOL_F_HOST_NOTIFIER: Host notifiers for speci= fied " --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745565; cv=none; d=zohomail.com; s=zohoarc; b=EL/TPSFvnO44OSBLDGJdb6zIscH4W2S5zpgIY6Jlr096kC7Rr4UWKmUlGPYxfMRfpfAkzHMcf+3OSXfcmVAeHaN7OnJsnE4u+jWkvrVp1qEsnF2Kbqjr6eMTfms2ZT5hi/nD3HqomEsOoeAhVih0RL3pDmpp/I5YkkEguEadd1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745565; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+ZksbsNOv/+hJ85tBQeNhtUAxT46QdRsXOaorVG1pUQ=; b=H7/znV7OCuc+hAer0bbJOGxAgwDW9b5McvTmKC2IvxWYGADTTgFghmUR87zRr2hquZ4ArKsg8ciueJ2nMZaG45nc7t6ldspfUD9+AgGl59UvYTDLx1WMhcKCk1bAqVungEdmq4XupMRj3K6iTjtULl8lDX/YK6nRhhF2TjTmtng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745565954220.5515869379276; Thu, 2 Mar 2023 00:26:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeFz-0003f1-KA; Thu, 02 Mar 2023 03:25:43 -0500 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 1pXeFu-0003N4-0A for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:38 -0500 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 1pXeFs-0002Lq-99 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:37 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-127-J7_pdfHKNGKR2aBYAyqL1A-1; Thu, 02 Mar 2023 03:25:34 -0500 Received: by mail-wm1-f71.google.com with SMTP id k20-20020a05600c1c9400b003e2249bd2b4so5462174wms.5 for ; Thu, 02 Mar 2023 00:25:33 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id v12-20020adfedcc000000b002c5a1bd527dsm14591039wro.96.2023.03.02.00.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745535; 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; bh=+ZksbsNOv/+hJ85tBQeNhtUAxT46QdRsXOaorVG1pUQ=; b=eZ2z68yGZyXlZ4W9yD1Aymzi8KxoHh51EmDS5Xppn+FD0Gm9FQPEwzaf50x9fJr4FMKYJT 97FH5Ygzefp0lGP6dY0MICTnwBQfMKcoR5nVVkTCDPSKkdviBS8C0uXEvnv5+6jqwL9tnf p9snyofCNV9Y0NqPkvBR+rArf6oG4uo= X-MC-Unique: J7_pdfHKNGKR2aBYAyqL1A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745532; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+ZksbsNOv/+hJ85tBQeNhtUAxT46QdRsXOaorVG1pUQ=; b=BtaJ5ejL48knYs1SQKm/VClTlSexsaMcIS94MzpZd4M58diDpF7Lcl8yfhPUGcZRlM IRDvFdlXo4jq1Z1Qf4lOxC37BeLrMV3FZIFMYtOdATS6PxqG/eEE4y5Y+Yldi7LU2GFk Q9+KwUMbQwYQA+pUDtMErUwQcztwDfsFliVEfNpzu2by//9FM1qYAWDJ99QXl1JRkDB7 quQEhYvTYzMtw9DEerUnEvaPUMR3jk9lLNUw9RmCKJNdy1KYmE5TqFjOa/ncMZKmbrnW S64WURpYqYR4sTCcXlfGPAstT5MyZ32QPOQGngs3eYo8vyY+J5pWmlSdz0VVjlRgnnVI 911g== X-Gm-Message-State: AO0yUKXXWPbSccYz7Pc5WG49KyQDbigL65sYfgdKiEfVkvJktLv9XElX WgCXqQAaRkQHzMmQm8uRg7UmTWyqr/mfOFnzVx4Z3uxml91ZQ/nCUG2TIoph+STWaWKIjr/p6Wj qBVKqqdeD7P9Jyk5o+L3zb4khUEwdLbGdsI4bHq5oUQa9rw1fgA0jufm64wnbe9mfxA== X-Received: by 2002:a5d:4c52:0:b0:2cd:ceab:df1a with SMTP id n18-20020a5d4c52000000b002cdceabdf1amr741354wrt.32.1677745532556; Thu, 02 Mar 2023 00:25:32 -0800 (PST) X-Google-Smtp-Source: AK7set/8sWmKM91fW7eHIJ8zgIwRWLfFpxOqViq93z85SqdIms9DvJ1cQuPRdX5od14row1ktorSKw== X-Received: by 2002:a5d:4c52:0:b0:2cd:ceab:df1a with SMTP id n18-20020a5d4c52000000b002cdceabdf1amr741338wrt.32.1677745532292; Thu, 02 Mar 2023 00:25:32 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:29 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Eugenio =?utf-8?B?UMOpcmV6?= , Lei Yang , Laurent Vivier , Jason Wang Subject: [PULL 19/53] vdpa: stop all svq on device deletion Message-ID: <20230302082343.560446-20-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745566827100001 From: Eugenio P=C3=A9rez Not stopping them leave the device in a bad state when virtio-net fronted device is unplugged with device_del monitor command. This is not triggable in regular poweroff or qemu forces shutdown because cleanup is called right after vhost_vdpa_dev_start(false). But devices hot unplug does not call vdpa device cleanups. This lead to all the vhost_vdpa devices without stop the SVQ but the last. Fix it and clean the code, making it symmetric with vhost_vdpa_svqs_start. Fixes: dff4426fa656 ("vhost: Add Shadow VirtQueue kick forwarding capabilit= ies") Reported-by: Lei Yang Signed-off-by: Eugenio P=C3=A9rez Message-Id: <20230209170004.899472-1-eperezma@redhat.com> Tested-by: Laurent Vivier Acked-by: Jason Wang --- hw/virtio/vhost-vdpa.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 542e003101..df3a1e92ac 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -689,26 +689,11 @@ static int vhost_vdpa_get_device_id(struct vhost_dev = *dev, return ret; } =20 -static void vhost_vdpa_reset_svq(struct vhost_vdpa *v) -{ - if (!v->shadow_vqs_enabled) { - return; - } - - for (unsigned i =3D 0; i < v->shadow_vqs->len; ++i) { - VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, i); - vhost_svq_stop(svq); - } -} - static int vhost_vdpa_reset_device(struct vhost_dev *dev) { - struct vhost_vdpa *v =3D dev->opaque; int ret; uint8_t status =3D 0; =20 - vhost_vdpa_reset_svq(v); - ret =3D vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status); trace_vhost_vdpa_reset_device(dev, status); return ret; @@ -1100,6 +1085,8 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *de= v) =20 for (unsigned i =3D 0; i < v->shadow_vqs->len; ++i) { VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, i); + + vhost_svq_stop(svq); vhost_vdpa_svq_unmap_rings(dev, svq); =20 event_notifier_cleanup(&svq->hdev_kick); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745728; cv=none; d=zohomail.com; s=zohoarc; b=ZiDL1H1uz/kTlpaxgXr88nEpaTxoChU/3UMAuT0iWTte2ppNJtQ4PQelHGWvG6MVJ/IvLkvu0Ugd2++gFWAkR4anpoRDQaz2zANsYHuLLQbnUhL+5bhSIzkwKEEuV0bk04qLNRKc7+a78TI2HiypUvBzMwuKW2dAjrDeMgWT7G4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745728; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hCkjYV3Gpv1lSpJ9Xhk2qDaDQoVELHpoQmx9VQwG720=; b=IGqy8hPQwfIVUlJiLN8dn0rtRP4zpvHgwtMFUq3saPP0ykDdWJUbZtBRAuQfWbDtWGIKwNlaA1de8IR1Qy7eqCDHfcRn5O3Ye4SxJK/X7N2LylIkunOGbcOvzT9oWAJMIWjweP983jUhY0nlbBcKXFeUfG2RVxtk6uoL6OhbwkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745728975837.784701519381; Thu, 2 Mar 2023 00:28:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeG1-0003gE-0V; Thu, 02 Mar 2023 03:25:45 -0500 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 1pXeFw-0003V9-GY for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFv-0002MG-4G for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:40 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-500-PzJ5ZvQkPCWMbDvmc0sN3g-1; Thu, 02 Mar 2023 03:25:37 -0500 Received: by mail-wr1-f70.google.com with SMTP id d14-20020adfa34e000000b002bfc062eaa8so3053800wrb.20 for ; Thu, 02 Mar 2023 00:25:37 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id u12-20020a05600c00cc00b003e1202744f2sm2041336wmm.31.2023.03.02.00.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745538; 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: in-reply-to:in-reply-to:references:references; bh=hCkjYV3Gpv1lSpJ9Xhk2qDaDQoVELHpoQmx9VQwG720=; b=hFCxrnGS7zY8K/DstzrkMUGvWaztyIyKrooyrUw7Agiji6KPfekP7jtzkbpUH0y+iodlKc hJ7Xz6EzYtCMNC1z11mAdctNfv02ooN1rcgid6VD1Dy1elCLNnv63i+RrpabvW1Hhk6yIX 1+eOfVoQbE1GErEaXyc/q0SvFMy4BPc= X-MC-Unique: PzJ5ZvQkPCWMbDvmc0sN3g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745535; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hCkjYV3Gpv1lSpJ9Xhk2qDaDQoVELHpoQmx9VQwG720=; b=u0xr0/hv5KLrgUnvddDxNObo3twDWAjc/1T01Cw1T4dIOBnmXOK3WWSM/Y1E1mMujs CM4L0kqHJAHqpoEbwMP2UoriH5mHyiCvIhaX7Oh3fY9TwJ2+J9j7hDLAF33qZTrK/62+ ZMSdsRzGYv5/MR9Jv92xy50Opv/nXNEsXh2zZh92uFOyX9G31LxY0UlVXC5k1aokKyBa TyK61WmSmoudK/R/GpKFiWyh+OvDgiByj1o87aqMKLJ0qO5kodsxhf/5AVxSFkM3azXO zpI4TaefSYdFFdhRQm7pXyTpW+siJRhr/3gTl4hXBJyRHFVVWVpe5QKWsDD4hnEsprsH k+zQ== X-Gm-Message-State: AO0yUKVVKwkWWZaL8W+aGQwA1QVqOOokVBndW188l8z/+rX2I97WIZ/q 1WPhoGwjdRe28Yu+wE3fw0jjoMEcKX8EPj4gVGCwtRfdjGhtAW4qU0On0wdS59kBPHlhX3++U0x GARHY2TB38j9w5GvO/liFTm3vLiyq7rkAe6Uwm89ZCMcfbTihP1BLlAX0MS9hS+Y4yQ== X-Received: by 2002:a5d:6084:0:b0:2ca:e856:5a4 with SMTP id w4-20020a5d6084000000b002cae85605a4mr813636wrt.26.1677745535640; Thu, 02 Mar 2023 00:25:35 -0800 (PST) X-Google-Smtp-Source: AK7set/8TPU9PdUUVbOkP+KDSIVYyNLvIbWX2z4p3Ev9c7jB6VxF8Wi8rrcKhv/mnbuOTFbKhvfz4g== X-Received: by 2002:a5d:6084:0:b0:2ca:e856:5a4 with SMTP id w4-20020a5d6084000000b002cae85605a4mr813623wrt.26.1677745535395; Thu, 02 Mar 2023 00:25:35 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:32 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 20/53] pci/shpc: set attention led to OFF on reset Message-ID: <20230302082343.560446-21-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745729962100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy 0 is not a valid state for the led. Let's start with OFF. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-2-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index fca7f6691a..1b3f619dc9 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -223,6 +223,7 @@ void shpc_reset(PCIDevice *d) SHPC_SLOT_STATUS_PRSNT_MASK); shpc_set_status(shpc, i, SHPC_LED_OFF, SHPC_SLOT_PWR_LED_MASK); } + shpc_set_status(shpc, i, SHPC_LED_OFF, SHPC_SLOT_ATTN_LED_MASK); shpc_set_status(shpc, i, 0, SHPC_SLOT_STATUS_66); } shpc_set_sec_bus_speed(shpc, SHPC_SEC_BUS_33); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745641; cv=none; d=zohomail.com; s=zohoarc; b=HkMi8egiFCzOS57R7qhZ1E6TwcYBgSYYF4/ss5nOyyPxz48uoyPNvgKZi8jbRBwuzlss34R07Dc61w4bryd0jCX7tRzKWwdaIMZ+k8ICG3x3fKDPKI4sb+b81BZx8Zr7LEaiZu6zrzlbpM98DBsuMCF7hQnPf327ConbLI2o9cI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745641; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HFLZ/xNMkI2p47i7B4IDIpHTYBBjdkW8CGI5BT/BqdM=; b=Er9dF4523lrHncIW0JFe4jdQVSvC3W2luMWsVHEfPDKkK1c+Qwy8Pf4hQxy/DcNns0n6dJA3BzHahkuAa+5F81lC5kr0APEN8hvy1RPVkFndtdOMfpWTrx7KSHNcmiIMPAW+wJ0l7Q+f5dp+2SaW3FOdaE6IQD5b5ZGJgijc6J8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745641279502.33506976678905; Thu, 2 Mar 2023 00:27:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeG3-0003jx-0C; Thu, 02 Mar 2023 03:25:47 -0500 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 1pXeFz-0003er-CM for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeFx-0002MY-Tp for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:43 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-578-GVdm4VrpMo2l4pJyFmGvJQ-1; Thu, 02 Mar 2023 03:25:40 -0500 Received: by mail-wm1-f70.google.com with SMTP id n15-20020a05600c500f00b003dd07ce79c8so749552wmr.1 for ; Thu, 02 Mar 2023 00:25:39 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id p21-20020a05600c359500b003e0238d9101sm2207506wmq.31.2023.03.02.00.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745541; 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: in-reply-to:in-reply-to:references:references; bh=HFLZ/xNMkI2p47i7B4IDIpHTYBBjdkW8CGI5BT/BqdM=; b=ahOo7sbcrfHLAd6kwY8mmIrpPWUmPmY6+A/v+z0e5Sqrf328A+rZQ/pjOYtwe030RpwWH7 26jBF3LE9eOsp7At5e8RtR9qMaAVvBQSrK40DGEKe8Vzc+BnxomqDYjZEgpCLsfaWenyRX kv52rf7A1NfOvSd1YjnAImXrHmZkGW0= X-MC-Unique: GVdm4VrpMo2l4pJyFmGvJQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745538; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=HFLZ/xNMkI2p47i7B4IDIpHTYBBjdkW8CGI5BT/BqdM=; b=D1PNhzgqeipvaUyUEj3yLpeYSoTFrxpcaSS236M6wbfMr2/FTvYYzZ71t3P7lRIv3/ ndijDeOJIEFIJukj8D+U/ORdyQmXwGHcUT93nUAyQZDFWGWu39J591bisvAbYgsRD3Z9 dlS/G0MU7DrNfZ4uHTYS8S/ZUx9S7pz//fTK77fNVpFIOAe/p9EUA70/GA0Rw0Upf5UQ cbpLRJS7XLrmzm6ufPS5Rv8P5GIGdMehBqGSyKT1GvcbeMk9f8UuMu9LuiGy5zCQDlS2 0FOs1f8yypAb9jCoDXijKdE3Texc6WDSfPeSEJ1cL66KFPy5UmJ5ZPucRh6x47j2DYiI gTXQ== X-Gm-Message-State: AO0yUKWwTa1mQDBkxaIXh2J7ji4hoeahEVbDwPUItX6aAnwYMZJntApG wMTRKao3sqKYrUlThK74UVlqzBm2/l4U4/9WpyhBpDPT3JTiftHNzHSRPsnZsg5poxvPYY/i7OS mgMga0LsGB521iJZZAP3MhC2jMTHo6neXbxZQm/gJ6Jzhkksj35mQMG1Hkt//3QV0Hw== X-Received: by 2002:a05:600c:181c:b0:3eb:2e1e:beae with SMTP id n28-20020a05600c181c00b003eb2e1ebeaemr6781366wmp.25.1677745538479; Thu, 02 Mar 2023 00:25:38 -0800 (PST) X-Google-Smtp-Source: AK7set8uhy+giFetzVuDJ/QZa9zc+VasV+58H+1EoNO3sqOJ0YHVI3fVKYygC3lMQvSBBI/zKvxXWw== X-Received: by 2002:a05:600c:181c:b0:3eb:2e1e:beae with SMTP id n28-20020a05600c181c00b003eb2e1ebeaemr6781351wmp.25.1677745538132; Thu, 02 Mar 2023 00:25:38 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:35 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 21/53] pci/shpc: change shpc_get_status() return type to uint8_t Message-ID: <20230302082343.560446-22-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745643107100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy The result of the function is always one byte. The result is always assigned to uint8_t variable. Also, shpc_get_status() should be symmetric to shpc_set_status() which has uint8_t value argument. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-3-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 1b3f619dc9..5d71569b13 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -123,10 +123,13 @@ #define SHPC_PCI_TO_IDX(pci_slot) ((pci_slot) - 1) #define SHPC_IDX_TO_PHYSICAL(slot) ((slot) + 1) =20 -static uint16_t shpc_get_status(SHPCDevice *shpc, int slot, uint16_t msk) +static uint8_t shpc_get_status(SHPCDevice *shpc, int slot, uint16_t msk) { uint8_t *status =3D shpc->config + SHPC_SLOT_STATUS(slot); - return (pci_get_word(status) & msk) >> ctz32(msk); + uint16_t result =3D (pci_get_word(status) & msk) >> ctz32(msk); + + assert(result <=3D UINT8_MAX); + return result; } =20 static void shpc_set_status(SHPCDevice *shpc, --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745744; cv=none; d=zohomail.com; s=zohoarc; b=eCZcHzQ4EQKu6RaHo9hRKRPXbCMqfKoQ3FrBSy0klFBLrcMiRTBg6uWfZ6u6e5B1xi1rIS7XZrdRFg1DsJOQ4hlKBuo/2A4ko+bQ8cPxCBSgIj+CMK9aGAdtG5VUxJn0oQjGZh++jEznUPQhYSUYYTJubESnAd74jpHI6guVHMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745744; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DDvNE5AAxqmSM2z9TpCyi27x5+BVphcIk/6uvEz55eQ=; b=d0gu6haJKzRZM9HMkxDuXmwDewyYaRwBvXnRfAlLXCT+PtT9niOrXIq2lM5S0w8+s5vzte9ndfrd2q/q4Lb1MFZBOq7bh76f4bnygh/86m9dsZL3L8bEIq2aFmfNs24aIKQWdIDJ+Ak+7ESaQOau6fqTmEbDtFw+dQRZxKSPwLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745744210681.1044419150408; Thu, 2 Mar 2023 00:29:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGK-0004Jp-LT; Thu, 02 Mar 2023 03:26:04 -0500 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 1pXeG2-0003jR-O0 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeG0-0002Mt-SB for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:46 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-222-wrrw5VEqMbuSWu0tt8j_YA-1; Thu, 02 Mar 2023 03:25:43 -0500 Received: by mail-wm1-f70.google.com with SMTP id e17-20020a05600c219100b003e21fa60ec1so748001wme.2 for ; Thu, 02 Mar 2023 00:25:43 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id hg13-20020a05600c538d00b003d9aa76dc6asm2142379wmb.0.2023.03.02.00.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745544; 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: in-reply-to:in-reply-to:references:references; bh=DDvNE5AAxqmSM2z9TpCyi27x5+BVphcIk/6uvEz55eQ=; b=hTwVMXVhUVRldltjcPm6wRFNBQLUVvRs38fAnDP2AFzS19UkAZn+FWPVfAfgK5ZBS7mqZm TL9BXzkJZ0S69RdDflS3WdluPb2Jy3gywlrKAo3tW6iLneGz4EqDd4gzu3vGVefFo/thAN VllEDbAWUO+yo6vyrDUo7zULQ2PMhOA= X-MC-Unique: wrrw5VEqMbuSWu0tt8j_YA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745541; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DDvNE5AAxqmSM2z9TpCyi27x5+BVphcIk/6uvEz55eQ=; b=E2/ukMOKG3E3Bu1qXyRjZKLuvM1C58htB+fDp79bSapupcx11OJnSz5VkjW3jqX2Qf shX+pexvt/i1O5AJtBiPhVcuHXZLFzsuMWj8MIWfcJOU8AAPIVr4nEoyp9NAkclx7j+i bJLpq9wxTx/8iIMMRfRwLclojhXGecp7AJm5O3ppYNweVybvbXNEKpFXQNl8YmuvdaBD KvmGolanXUkxFFhx0+Bk4Phhc++OP8MFj/t2KAIpCEG2byEFs0/7mbDhrsHgTAk7TfW2 CJ7quKQRjH6lbZxU1N8rd3f6M09fo7ugExkFRTDWDs1BA5kmOuy9dDsfzvyKmjie/ov3 NbXQ== X-Gm-Message-State: AO0yUKWfPWFH62qrLtJM2LLAgTKXemlzvljW69Q1RTCUKcLKh+835an0 acgQ1tyr5DT8wxCbVnpG83lCsiih12Yg8HueMaaALcI0n1H0wu8HezXrxLJvxJ3gpaeveXmrCKh iZhaYr+FZOn6nT5pF/cd5Cg6xSWKCl3PV035/Rg80Ya+WrnGuXK0iQsEltdHgoQLjZg== X-Received: by 2002:a05:600c:310e:b0:3eb:3148:a1b7 with SMTP id g14-20020a05600c310e00b003eb3148a1b7mr7193730wmo.12.1677745541727; Thu, 02 Mar 2023 00:25:41 -0800 (PST) X-Google-Smtp-Source: AK7set+bGy+bLMmO9bkMtGsRQ0UTOGtUvH7jwUmxQ84ZMl6J75XUrAN15gOCquMB4FSFbg98oH9YXQ== X-Received: by 2002:a05:600c:310e:b0:3eb:3148:a1b7 with SMTP id g14-20020a05600c310e00b003eb3148a1b7mr7193705wmo.12.1677745541331; Thu, 02 Mar 2023 00:25:41 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:38 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 22/53] pci/shpc: shpc_slot_command(): handle PWRONLY -> ENABLED transition Message-ID: <20230302082343.560446-23-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745745855100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy ENABLED -> PWRONLY transition is not allowed and we handle it by shpc_invalid_command(). But PWRONLY -> ENABLED transition is silently ignored, which seems wrong. Let's handle it as correct. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-4-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 5d71569b13..25e4172382 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -273,28 +273,22 @@ static void shpc_slot_command(SHPCDevice *shpc, uint8= _t target, return; } =20 - switch (power) { - case SHPC_LED_NO: - break; - default: + if (power !=3D SHPC_LED_NO) { /* TODO: send event to monitor */ shpc_set_status(shpc, slot, power, SHPC_SLOT_PWR_LED_MASK); } - switch (attn) { - case SHPC_LED_NO: - break; - default: + if (attn !=3D SHPC_LED_NO) { /* TODO: send event to monitor */ shpc_set_status(shpc, slot, attn, SHPC_SLOT_ATTN_LED_MASK); } + if (state !=3D SHPC_STATE_NO) { + shpc_set_status(shpc, slot, state, SHPC_SLOT_STATE_MASK); + } =20 - if ((current_state =3D=3D SHPC_STATE_DISABLED && state =3D=3D SHPC_STA= TE_PWRONLY) || - (current_state =3D=3D SHPC_STATE_DISABLED && state =3D=3D SHPC_STA= TE_ENABLED)) { - shpc_set_status(shpc, slot, state, SHPC_SLOT_STATE_MASK); - } else if ((current_state =3D=3D SHPC_STATE_ENABLED || - current_state =3D=3D SHPC_STATE_PWRONLY) && - state =3D=3D SHPC_STATE_DISABLED) { - shpc_set_status(shpc, slot, state, SHPC_SLOT_STATE_MASK); + if ((current_state =3D=3D SHPC_STATE_ENABLED || + current_state =3D=3D SHPC_STATE_PWRONLY) && + state =3D=3D SHPC_STATE_DISABLED) + { power =3D shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MASK); /* TODO: track what monitor requested. */ /* Look at LED to figure out whether it's ok to remove the device.= */ --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746208; cv=none; d=zohomail.com; s=zohoarc; b=H9lgt/17wbExk4Fxf0iDwmtUJ30leoHLaoMuDKL4ANFlgWWWRdMVLcZFvEjqVZMlDvsb/jXSWOUwO3SJyjmUosAInSr2/NJjycHUqwZZcwnth4YCfyZklfs350RAtNwUTlVhp0osv5j1Qry1/6qLOt/ecnJAktYBw6N5g0r2dk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746208; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3HTn60RevXrUpLigk2n8Ix04V50sdVc3BBXErCPYges=; b=hFOPEJk4ofUl011B8+++z7PcnBLJONs4fNC5BB7kIPSSF+6mKNJ+uhu5NlgSdh+HjuWNCA5F4ii6uK2KWyGtWf8+HxVBd1eLNFARPiQU+Lx1uzZi7M052ACOFKSsUrXeWd6aopIy9pkw+jPYmwI4kja0Zxswx5O2ZkjwYHiam/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746208150482.5871948453405; Thu, 2 Mar 2023 00:36:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGM-0004VX-At; Thu, 02 Mar 2023 03:26:06 -0500 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 1pXeG5-0003ss-E7 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeG3-0002Ne-Pj for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:49 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-oGsfxN0-Mcqt6fJ3YUKMuw-1; Thu, 02 Mar 2023 03:25:45 -0500 Received: by mail-wm1-f71.google.com with SMTP id e17-20020a05600c219100b003e21fa60ec1so748056wme.2 for ; Thu, 02 Mar 2023 00:25:45 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id z7-20020a05600c0a0700b003dc434b39c7sm6666233wmp.0.2023.03.02.00.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745547; 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: in-reply-to:in-reply-to:references:references; bh=3HTn60RevXrUpLigk2n8Ix04V50sdVc3BBXErCPYges=; b=KGK2qi1SHn/E60ysNC+HP5YQJ+cJZrYSZiQninoXCN3aRRBh8g/iWz7O1adtxo+eA2rmTy rqQVaRf9sdnZCP6WyvgoOw6z4iG+XUnkannpXKuMyV2RFCoFMDTq5lV+KLOO3OvJZzV9cj z6p+lIWQyGAbRHvF48H8vb3x8SXFSPo= X-MC-Unique: oGsfxN0-Mcqt6fJ3YUKMuw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745544; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3HTn60RevXrUpLigk2n8Ix04V50sdVc3BBXErCPYges=; b=oS555Ja8Pn1sAQ425ra18+vPAkpy/9ijkNazjuJAEff3D0cnnqLNDMFFz3+YwDxCoa 2iO4Lb6cPmOp9d2ZKUazQ3Y/bneNUbXsoKxHutB/zb5Ilmsw9uRh9wqlwgD7bJFJ57eQ yiAEeE9vDQc46MH0SxrfPspRmPOSzFH37xB3EsuqCkd7QfBi1MW7e1FZk2MiaAgntQxj 76RkwmJgRWZhSh9ZFai3Rv1YPv0viyydMSMkOVsWbGoN2JLHoqPyz5jC/O2SJsfLu11H WcZnrV1HuO9G+BtZJ4YgqypdPVGpgwGLcYE0zHT7npnXCiBndaA58kFzlzpxx88vA36S ORKw== X-Gm-Message-State: AO0yUKVgKckQ7Kfn1PzMApTFqd5NJJGwcd8fKXpWcpZxrk3Ac8Jd0/SJ 0ogHFgVLf0CRQVpESfeqy+QQPWt3iS0Mkxvp6qGbLgQWRYrF/c6ifQmINoF/lRpyZDyZdfOCRJf 70BcvsAW4vgnj3zr6W8VjiYlaEmS24uzc0/Od41TudiquTjUu2RkyLWujnvnw33Ov7A== X-Received: by 2002:a05:600c:81b:b0:3e2:6ec:61ea with SMTP id k27-20020a05600c081b00b003e206ec61eamr7239190wmp.28.1677745544498; Thu, 02 Mar 2023 00:25:44 -0800 (PST) X-Google-Smtp-Source: AK7set8mR2ee+fO50Muxq9m420yOP1NC7Tv6E+sWrJyY1/U4JrW95O0FwkE79gv0kfljT21rIy94Sg== X-Received: by 2002:a05:600c:81b:b0:3e2:6ec:61ea with SMTP id k27-20020a05600c081b00b003e206ec61eamr7239173wmp.28.1677745544193; Thu, 02 Mar 2023 00:25:44 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:41 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 23/53] pci/shpc: more generic handle hot-unplug in shpc_slot_command() Message-ID: <20230302082343.560446-24-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746208572100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Free slot if both conditions (power-led =3D OFF and state =3D DISABLED) becomes true regardless of the sequence. It is similar to how PCIe hotplug works. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-5-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 52 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 25e4172382..959dc470f3 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -258,49 +258,59 @@ static void shpc_free_devices_in_slot(SHPCDevice *shp= c, int slot) } } =20 +static bool shpc_slot_is_off(uint8_t state, uint8_t power, uint8_t attn) +{ + return state =3D=3D SHPC_STATE_DISABLED && power =3D=3D SHPC_LED_OFF; +} + static void shpc_slot_command(SHPCDevice *shpc, uint8_t target, uint8_t state, uint8_t power, uint8_t attn) { - uint8_t current_state; int slot =3D SHPC_LOGICAL_TO_IDX(target); + uint8_t old_state =3D shpc_get_status(shpc, slot, SHPC_SLOT_STATE_MASK= ); + uint8_t old_power =3D shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MA= SK); + uint8_t old_attn =3D shpc_get_status(shpc, slot, SHPC_SLOT_ATTN_LED_MA= SK); + if (target < SHPC_CMD_TRGT_MIN || slot >=3D shpc->nslots) { shpc_invalid_command(shpc); return; } - current_state =3D shpc_get_status(shpc, slot, SHPC_SLOT_STATE_MASK); - if (current_state =3D=3D SHPC_STATE_ENABLED && state =3D=3D SHPC_STATE= _PWRONLY) { + + if (old_state =3D=3D SHPC_STATE_ENABLED && state =3D=3D SHPC_STATE_PWR= ONLY) { shpc_invalid_command(shpc); return; } =20 - if (power !=3D SHPC_LED_NO) { + if (power =3D=3D SHPC_LED_NO) { + power =3D old_power; + } else { /* TODO: send event to monitor */ shpc_set_status(shpc, slot, power, SHPC_SLOT_PWR_LED_MASK); } - if (attn !=3D SHPC_LED_NO) { + + if (attn =3D=3D SHPC_LED_NO) { + attn =3D old_attn; + } else { /* TODO: send event to monitor */ shpc_set_status(shpc, slot, attn, SHPC_SLOT_ATTN_LED_MASK); } - if (state !=3D SHPC_STATE_NO) { + + if (state =3D=3D SHPC_STATE_NO) { + state =3D old_state; + } else { shpc_set_status(shpc, slot, state, SHPC_SLOT_STATE_MASK); } =20 - if ((current_state =3D=3D SHPC_STATE_ENABLED || - current_state =3D=3D SHPC_STATE_PWRONLY) && - state =3D=3D SHPC_STATE_DISABLED) + if (!shpc_slot_is_off(old_state, old_power, old_attn) && + shpc_slot_is_off(state, power, attn)) { - power =3D shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MASK); - /* TODO: track what monitor requested. */ - /* Look at LED to figure out whether it's ok to remove the device.= */ - if (power =3D=3D SHPC_LED_OFF) { - shpc_free_devices_in_slot(shpc, slot); - shpc_set_status(shpc, slot, 1, SHPC_SLOT_STATUS_MRL_OPEN); - shpc_set_status(shpc, slot, SHPC_SLOT_STATUS_PRSNT_EMPTY, - SHPC_SLOT_STATUS_PRSNT_MASK); - shpc->config[SHPC_SLOT_EVENT_LATCH(slot)] |=3D - SHPC_SLOT_EVENT_MRL | - SHPC_SLOT_EVENT_PRESENCE; - } + shpc_free_devices_in_slot(shpc, slot); + shpc_set_status(shpc, slot, 1, SHPC_SLOT_STATUS_MRL_OPEN); + shpc_set_status(shpc, slot, SHPC_SLOT_STATUS_PRSNT_EMPTY, + SHPC_SLOT_STATUS_PRSNT_MASK); + shpc->config[SHPC_SLOT_EVENT_LATCH(slot)] |=3D + SHPC_SLOT_EVENT_MRL | + SHPC_SLOT_EVENT_PRESENCE; } } =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746155; cv=none; d=zohomail.com; s=zohoarc; b=dHeNU/OcY41OVGOHBkrCF7lZ8sKqFbcuMwiCAFGgVDkfwc9qxpY+aqnhybN6NG/FHGTXNY86sXQgry40xy93nt4wF/TmwNzU0dkxn3dQrO7f4TjM1xtt755WDE/vo9lB3VWfGg9esEAvzFO6zKL0dRnmcA2IvILbh7nCSAyMn60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746155; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EFVCuIJNs11CoeniZAfk9rLQ2ZLV3j08SI6kdll+0Mw=; b=An/50H7qkMXXEcmbrrn6Gn3Km9kgOA5NSgy774J47xSaJqW/Iic38TK7CIzJ/Y6EbQ4t9X6+qvHc3WvcVa1YclFuI5cFLHMVstvpbf24mkvfFjcQrH+1Hh/dyY2wN5QVpIRIJ2WNwXZkF0X+rz87MP7/8XD5gIT5Qd0XO0uYl5M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746155965366.6058811619773; Thu, 2 Mar 2023 00:35:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGL-0004Mv-3i; Thu, 02 Mar 2023 03:26:05 -0500 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 1pXeG8-000409-BH for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeG6-0002O7-NU for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:52 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-646-lzQk05_KNsyeNjebHgC-nw-1; Thu, 02 Mar 2023 03:25:49 -0500 Received: by mail-wm1-f70.google.com with SMTP id e17-20020a05600c219100b003e21fa60ec1so748117wme.2 for ; Thu, 02 Mar 2023 00:25:48 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id l35-20020a05600c1d2300b003e6dcd562a6sm2298358wms.28.2023.03.02.00.25.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745550; 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: in-reply-to:in-reply-to:references:references; bh=EFVCuIJNs11CoeniZAfk9rLQ2ZLV3j08SI6kdll+0Mw=; b=L8uXAPDeclh4C3+5PhTowAAZPbLstoxTFA8sGy/m8cNBhSs+HaFxbKstOdFifTFvX4G7aX cisMnwdjB1GsEZVi0CejbsLzRbXVMpSI1yMs7X1Z0M2RByBZenuhBF/j25S5WnXkQbOxvj A9r7VIh/FO0+p5X1r6IznsD0LUkiyw8= X-MC-Unique: lzQk05_KNsyeNjebHgC-nw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745547; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EFVCuIJNs11CoeniZAfk9rLQ2ZLV3j08SI6kdll+0Mw=; b=wJVOClCBjLepdNR+9N0d1qK9s2pl6OJwK644KbwJbgmAyKyeUZ3nTD1PMzWs4R6zdS 788M83jT0tB5MaxK4j3Kkk7leSYM8Dav5qZJfDV+RLrT7YRz7GOKS58L/JkM9I/ATIkj GTyF/hoNvVQmP22Uw2teHPK/H39pl2/76AH6NmHY/lFqsdyt/nQrr591kK8kt+ZwXU+l H24jAsn8rPGJk+XQf2pHypsVGG+HChzYwfLd0wbtfZEypVF+0Tf/cPSlF017m5p4zqSF Lut0cfTzx4EQXIvTEZVSKcvzPo49bIgFuYE20GJEqTdAToXlkiF1rRIH2GngUM52+irM d9yA== X-Gm-Message-State: AO0yUKWyKy/jE9A1ySCWrNCw86jPkQKLw8eNP3VxDeOfLbIARUs4cC06 zKzCKshU78fw88UW1olcrBmYGUP28DUhTvs/o4CfH7WVKg47874Ts6PS+aoAV4Ub+kHKKVnnt5G P8HAHmlHqczkfcHmYVsZ1sP5lsUy1I1+fq4IyVlTmUCvcx5uW/IJ/QAtGnVqTt8Jw3Q== X-Received: by 2002:a5d:5143:0:b0:2c7:103f:7122 with SMTP id u3-20020a5d5143000000b002c7103f7122mr6219178wrt.28.1677745547384; Thu, 02 Mar 2023 00:25:47 -0800 (PST) X-Google-Smtp-Source: AK7set8W06s187MkDVOuEw0eR2cT9nWt7iOmtxyxFjNYEcOZE7QACpPFbfvNRWqP80Qs0n/snfrxxA== X-Received: by 2002:a5d:5143:0:b0:2c7:103f:7122 with SMTP id u3-20020a5d5143000000b002c7103f7122mr6219163wrt.28.1677745547052; Thu, 02 Mar 2023 00:25:47 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:44 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 24/53] pci/shpc: pass PCIDevice pointer to shpc_slot_command() Message-ID: <20230302082343.560446-25-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746156313100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy We'll need it in further patch to report bridge in QAPI event. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-6-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 959dc470f3..9f964b1d70 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -263,9 +263,10 @@ static bool shpc_slot_is_off(uint8_t state, uint8_t po= wer, uint8_t attn) return state =3D=3D SHPC_STATE_DISABLED && power =3D=3D SHPC_LED_OFF; } =20 -static void shpc_slot_command(SHPCDevice *shpc, uint8_t target, +static void shpc_slot_command(PCIDevice *d, uint8_t target, uint8_t state, uint8_t power, uint8_t attn) { + SHPCDevice *shpc =3D d->shpc; int slot =3D SHPC_LOGICAL_TO_IDX(target); uint8_t old_state =3D shpc_get_status(shpc, slot, SHPC_SLOT_STATE_MASK= ); uint8_t old_power =3D shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MA= SK); @@ -314,8 +315,9 @@ static void shpc_slot_command(SHPCDevice *shpc, uint8_t= target, } } =20 -static void shpc_command(SHPCDevice *shpc) +static void shpc_command(PCIDevice *d) { + SHPCDevice *shpc =3D d->shpc; uint8_t code =3D pci_get_byte(shpc->config + SHPC_CMD_CODE); uint8_t speed; uint8_t target; @@ -336,7 +338,7 @@ static void shpc_command(SHPCDevice *shpc) state =3D (code & SHPC_SLOT_STATE_MASK) >> SHPC_SLOT_STATE_SHIFT; power =3D (code & SHPC_SLOT_PWR_LED_MASK) >> SHPC_SLOT_PWR_LED_SHI= FT; attn =3D (code & SHPC_SLOT_ATTN_LED_MASK) >> SHPC_SLOT_ATTN_LED_SH= IFT; - shpc_slot_command(shpc, target, state, power, attn); + shpc_slot_command(d, target, state, power, attn); break; case 0x40 ... 0x47: speed =3D code & SHPC_SEC_BUS_MASK; @@ -354,10 +356,10 @@ static void shpc_command(SHPCDevice *shpc) } for (i =3D 0; i < shpc->nslots; ++i) { if (!(shpc_get_status(shpc, i, SHPC_SLOT_STATUS_MRL_OPEN))) { - shpc_slot_command(shpc, i + SHPC_CMD_TRGT_MIN, + shpc_slot_command(d, i + SHPC_CMD_TRGT_MIN, SHPC_STATE_PWRONLY, SHPC_LED_ON, SHPC_LE= D_NO); } else { - shpc_slot_command(shpc, i + SHPC_CMD_TRGT_MIN, + shpc_slot_command(d, i + SHPC_CMD_TRGT_MIN, SHPC_STATE_NO, SHPC_LED_OFF, SHPC_LED_NO= ); } } @@ -375,10 +377,10 @@ static void shpc_command(SHPCDevice *shpc) } for (i =3D 0; i < shpc->nslots; ++i) { if (!(shpc_get_status(shpc, i, SHPC_SLOT_STATUS_MRL_OPEN))) { - shpc_slot_command(shpc, i + SHPC_CMD_TRGT_MIN, + shpc_slot_command(d, i + SHPC_CMD_TRGT_MIN, SHPC_STATE_ENABLED, SHPC_LED_ON, SHPC_LE= D_NO); } else { - shpc_slot_command(shpc, i + SHPC_CMD_TRGT_MIN, + shpc_slot_command(d, i + SHPC_CMD_TRGT_MIN, SHPC_STATE_NO, SHPC_LED_OFF, SHPC_LED_NO= ); } } @@ -410,7 +412,7 @@ static void shpc_write(PCIDevice *d, unsigned addr, uin= t64_t val, int l) shpc->config[a] &=3D ~(val & w1cmask); /* W1C: Write 1 to Clear */ } if (ranges_overlap(addr, l, SHPC_CMD_CODE, 2)) { - shpc_command(shpc); + shpc_command(d); } shpc_interrupt_update(d); } --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746028; cv=none; d=zohomail.com; s=zohoarc; b=ne5jJYsE55Sj0Q6LzXBMJRZ4j5LnqVybB/itaOWLMlNF+78Yin6rji7u/kUT7Ty8yeQEvyUtyugQ1AmMK/HC49AitDVeAKQFJCg/ayxtZCGtavXCp6aWgrPaK7UUH0zxdW0hugCSu0cmys/dOuKOaJvMVCYSKnhvMrrzpQqlQqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746028; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v+fAaTMzaHbQ6OGyBux6MoCGU/rvRP9Pac7qwzuX0Kw=; b=lWY08iXYl9T5AIFLWiphMPrmLjauckCaSbvw0Z/WerqMSY4EhzfKH2z63EfoldlZjXYJMpIG778q3csXF1piebq9Wtwgk9q6ypgO0ZJigYX/Y3CBji08O45WtP3XhA0wKghDJ1tIoogARq2MpW6evhL1YkeoSqUfGUA9wD351GI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746028906622.4149451763059; Thu, 2 Mar 2023 00:33:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGO-0004eS-3a; Thu, 02 Mar 2023 03:26:08 -0500 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 1pXeGB-00046Y-56 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeG9-0002Oa-IC for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:54 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-342-mySM7merO2qtsbh4pIbazw-1; Thu, 02 Mar 2023 03:25:51 -0500 Received: by mail-wm1-f71.google.com with SMTP id k36-20020a05600c1ca400b003eac86e4387so916712wms.8 for ; Thu, 02 Mar 2023 00:25:51 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id iz12-20020a05600c554c00b003e1f2e43a1csm2109878wmb.48.2023.03.02.00.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745553; 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: in-reply-to:in-reply-to:references:references; bh=v+fAaTMzaHbQ6OGyBux6MoCGU/rvRP9Pac7qwzuX0Kw=; b=YsNpN0TLxOR8+MWDbXMfzXBI1O1IG5l489/ifnkpDM16LhECw2icMpvEF2gV0ndepdJshj lgeplHH+voSasg4wyZptUsRogbwnXhSLmDpWLnovFpmfXwwE6RqGDrMCQsZnFl+4NkWlct 86iNgx84zCVHdcIy4v/JWws0YDLtl9I= X-MC-Unique: mySM7merO2qtsbh4pIbazw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745550; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=v+fAaTMzaHbQ6OGyBux6MoCGU/rvRP9Pac7qwzuX0Kw=; b=zE8hXyr+CR73dY42S5VeeVWHln8kz42j8q9ubCkzglj3DxAh71afsWtUV6SObXARyH t7pw/r0BPcZs57h3s3gcSJygJVEtRcYlqZSyrEYEG6hHr0fXr2E9/1qP4LHmp0UNWrNS Lf0u2IjbPbYsGoai076ILndZ6BpL2M1i3FHblZwWow62UxN/BIPBZ2/yGTiOjsnS1kOb pOtyGMYB0MdHuSUd4xlVDGSKJDaaEEWjPK6QbcaeZX7UmJFW9ZEMbAY7OyE+uKMzGHMI qXFWVl3e9d504sHQR1evgu9q2qn8nYB7Lh/c8PfEBK052JLQqpgRSzHcAimSrDxiWuEi Uvmg== X-Gm-Message-State: AO0yUKXkLa9RkbtGqBzKCVeTbx/KgsDY10rwaE+9xT/sXME9kUCgJ5+R iTdEiAHHHJ4j2pfdy1jlZDt7Q7fTuQ7BrmPNCO2bn+BMVMqzaxXobDt1nBlzQ13S/lwfc2LqmuL tDqGWGzAEENC9zO3w+AnIWuenz8yd0RrbZOX1mfYCDk2mR/zRuoRzjTiyM7yjjCbkFQ== X-Received: by 2002:a5d:4ed2:0:b0:2c7:f56:285b with SMTP id s18-20020a5d4ed2000000b002c70f56285bmr7656935wrv.63.1677745550182; Thu, 02 Mar 2023 00:25:50 -0800 (PST) X-Google-Smtp-Source: AK7set8GyNYM+E6tNg8LkJ9An+cQfBKa6oiDPDq8DJUvHw7Pk+rnyd173vFsLj6+hYjovJbg9HorSg== X-Received: by 2002:a5d:4ed2:0:b0:2c7:f56:285b with SMTP id s18-20020a5d4ed2000000b002c70f56285bmr7656922wrv.63.1677745549927; Thu, 02 Mar 2023 00:25:49 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:47 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 25/53] pci/shpc: refactor shpc_device_plug_common() Message-ID: <20230302082343.560446-26-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746029688100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Rename it to shpc_device_get_slot(), to mention what it does rather than how it is used. It also helps to reuse it in further commit. Also, add a return value and get rid of local_err. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-7-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 9f964b1d70..e7bc7192f1 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -496,8 +496,9 @@ static const MemoryRegionOps shpc_mmio_ops =3D { .max_access_size =3D 4, }, }; -static void shpc_device_plug_common(PCIDevice *affected_dev, int *slot, - SHPCDevice *shpc, Error **errp) + +static bool shpc_device_get_slot(PCIDevice *affected_dev, int *slot, + SHPCDevice *shpc, Error **errp) { int pci_slot =3D PCI_SLOT(affected_dev->devfn); *slot =3D SHPC_PCI_TO_IDX(pci_slot); @@ -507,21 +508,20 @@ static void shpc_device_plug_common(PCIDevice *affect= ed_dev, int *slot, "controller. Valid slots are between %d and %d.", pci_slot, SHPC_IDX_TO_PCI(0), SHPC_IDX_TO_PCI(shpc->nslots) - 1); - return; + return false; } + + return true; } =20 void shpc_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - Error *local_err =3D NULL; PCIDevice *pci_hotplug_dev =3D PCI_DEVICE(hotplug_dev); SHPCDevice *shpc =3D pci_hotplug_dev->shpc; int slot; =20 - shpc_device_plug_common(PCI_DEVICE(dev), &slot, shpc, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (!shpc_device_get_slot(PCI_DEVICE(dev), &slot, shpc, errp)) { return; } =20 @@ -563,16 +563,13 @@ void shpc_device_unplug_cb(HotplugHandler *hotplug_de= v, DeviceState *dev, void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - Error *local_err =3D NULL; PCIDevice *pci_hotplug_dev =3D PCI_DEVICE(hotplug_dev); SHPCDevice *shpc =3D pci_hotplug_dev->shpc; uint8_t state; uint8_t led; int slot; =20 - shpc_device_plug_common(PCI_DEVICE(dev), &slot, shpc, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (!shpc_device_get_slot(PCI_DEVICE(dev), &slot, shpc, errp)) { return; } =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745768; cv=none; d=zohomail.com; s=zohoarc; b=CCxOk4/N6f5/l1qYvfP2bVbehSYJNcM85OBTMaDkXM/lzmoRB+XCa+olPDeFm6ehYZRrt1Y+3IoHRVeeYJYyCQrdw+YnVbuh/65sCd2QOMcqamhLT0ZyXII/TGTmOflW811qEfy6Uccb3fsWX9gpMXqHlMQ54DBkcIGJbD9P390= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745768; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O/JYwSKf5nVRGaZw7BDSvU/17EvsC7CjAFuUr02BOcA=; b=GUBT1mydhPAOL30GBHzNy7WgJlmOI3T41KTMcvE9J4BW252vdw6XvWs11eykDZtcuYx2T0kYPQbc7Vrveor/DvcoxNqBd/+pYLMBMp3EXl7eBoFKfzVS0bHFt+EMF3s9kVCkwrFrYkrBOEB3X6jumVkbwGrYQInhFvixn+ZPJ8c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745768939275.6519792894686; Thu, 2 Mar 2023 00:29:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGQ-0004pT-01; Thu, 02 Mar 2023 03:26:10 -0500 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 1pXeGE-00049o-9n for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeGC-0002Op-Hn for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:25:57 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-444-jKjJ9BiNPvy_lWVIGweMjw-1; Thu, 02 Mar 2023 03:25:54 -0500 Received: by mail-wm1-f72.google.com with SMTP id az39-20020a05600c602700b003e97eb80524so926405wmb.4 for ; Thu, 02 Mar 2023 00:25:54 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id l8-20020a05600c4f0800b003b47b80cec3sm2446250wmq.42.2023.03.02.00.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745556; 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; bh=O/JYwSKf5nVRGaZw7BDSvU/17EvsC7CjAFuUr02BOcA=; b=ME6u3Bc/TA+uWHN54wDWVbiXecjI6ZQDmnYqsXM15vI5YQbgC+Xp2F3BAjNPD7IIgiypQg 8qolpZy4ytvwFh0TdMZ4Byy/sDZ+NENVkHU7XOcLmfPQ+JTeN5TQxxAzGG7Bx3aTh/tdTq 8pM7GABZnERjdL91EgBdOAErKYR8mn8= X-MC-Unique: jKjJ9BiNPvy_lWVIGweMjw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745553; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O/JYwSKf5nVRGaZw7BDSvU/17EvsC7CjAFuUr02BOcA=; b=ONfcXJii4I+1SSLOYCdSTkhfM0w7QBLbHnnAzXtW3h0KjqFe0HYSD9QKoqgXg0QxDH +Rp346knGi6YgTpXoQIV+KodV5F/GHv/7v4ogQFnXYXCSQE6XrTnEinUM7SGFkX/S+Cx mnzT5UQlx8NCLwVar0NI/HGPv7/YEC/gNJqmEP6Rj0Kw3VKHpy7LHgYv1aqWatqpP6IX rZc/WgyuuDOVF+8oaZgL2e1fLhc3tqFheg9cAHvbtfaB8jQisCa9vWtOO+FWvlnAy/G+ FQGIYnN5xT1v414JbQiZGgYrkTNFD6YjJS+d+eHb5nGXpNSXTATyg2s35mAR1EK4fEqM NB+g== X-Gm-Message-State: AO0yUKVIrEn48sIMnAfXAN6TQ6BqwNGfEFWbxQ/MEW7pXgZ6h+/+UBaM jaO5cEu3uBVFcxH+ptLmpymzKdqLK/TVKSue1rrH1RX9Jk7yDv0BXv521++q3U5hyG2WaLcQNJv ylLon0r3FYeV9qQ8TPwpjJ/nHXmRYFGf3ZYrUifyAgRyP0VqVgv7VhexGN7u7UxUHXw== X-Received: by 2002:a5d:5189:0:b0:2c3:be89:7c2b with SMTP id k9-20020a5d5189000000b002c3be897c2bmr844436wrv.14.1677745553164; Thu, 02 Mar 2023 00:25:53 -0800 (PST) X-Google-Smtp-Source: AK7set/Szraoep2QlLcCqbPf5nqM1CWTwlbDQXYE8QrVACaeFK4kJXWDZZTi1iePHYEoGAypmyCkDw== X-Received: by 2002:a5d:5189:0:b0:2c3:be89:7c2b with SMTP id k9-20020a5d5189000000b002c3be897c2bmr844420wrv.14.1677745552901; Thu, 02 Mar 2023 00:25:52 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:50 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 26/53] pcie: pcie_cap_slot_write_config(): use correct macro Message-ID: <20230302082343.560446-27-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745769969100003 From: Vladimir Sementsov-Ogievskiy PCI_EXP_SLTCTL_PIC_OFF is a value, and PCI_EXP_SLTCTL_PIC is a mask. Happily PCI_EXP_SLTCTL_PIC_OFF is a maximum value for this mask and is equal to the mask itself. Still the code looks like a bug. Let's make it more reader-friendly. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-8-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 924fdabd15..82ef723983 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -770,9 +770,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev, * control of powered off slots before powering them on. */ if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && - (val & PCI_EXP_SLTCTL_PIC_OFF) =3D=3D PCI_EXP_SLTCTL_PIC_OFF && + (val & PCI_EXP_SLTCTL_PIC) =3D=3D PCI_EXP_SLTCTL_PIC_OFF && (!(old_slt_ctl & PCI_EXP_SLTCTL_PCC) || - (old_slt_ctl & PCI_EXP_SLTCTL_PIC_OFF) !=3D PCI_EXP_SLTCTL_PIC_OFF= )) { + (old_slt_ctl & PCI_EXP_SLTCTL_PIC) !=3D PCI_EXP_SLTCTL_PIC_OFF)) { pcie_cap_slot_do_unplug(dev); } pcie_cap_update_power(dev); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745926; cv=none; d=zohomail.com; s=zohoarc; b=X52RnPl0bVBEYhhHBUWCQ6E1XjhqE5uRc4ZzuFytcW9pHR0ScoW7mrtr2F7NtyFADPOkTRyiwzLUrZ3CHEni6CdF+J0dANvbGAtw1OOrPNPczlVX11RXei8rSDlV1sFWpx89ssDOKynBMCZxKj3VRndKwKUmRCqiR66lK9SLBIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745926; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fpUPnDDHsSgm3zfqQTTpFqcSqwirzmtC8kRA6gtYoj8=; b=LXbNP8Ee1hi75xlJ1vz3mz12s/vmFPxK5L70UIPgmW7iIpz3ZQTvhSEy3v2EOSGNub4lMLqN1M7m/LVCE5wk2Ksu1vN/KdLTIollsDzHSy2Quz2jmgc03KuPLAvWL9aYz+UPJhBboNmKnYaHOectHpGUaonutiCubWfoxLxrZ2s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745926066955.106395946607; Thu, 2 Mar 2023 00:32:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGR-0004yD-W4; Thu, 02 Mar 2023 03:26:12 -0500 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 1pXeGH-0004Am-BA for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeGF-0002P6-Pn for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:01 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-148-NUvgoNOpPvmf-ewx_DHs1A-1; Thu, 02 Mar 2023 03:25:57 -0500 Received: by mail-wr1-f69.google.com with SMTP id i18-20020a05600011d200b002c94d861113so2982683wrx.16 for ; Thu, 02 Mar 2023 00:25:57 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id y1-20020adfdf01000000b002c6d0462163sm14714838wrl.100.2023.03.02.00.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745559; 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; bh=fpUPnDDHsSgm3zfqQTTpFqcSqwirzmtC8kRA6gtYoj8=; b=NDjaHxODxxZasSJwdXGKOJ4vHBx02a/aYu7sbcZm0Dk0Cn2zMLfxZmxHdQjX3AaH5ATGk5 jzfE0ETcFrVVeWI9dstFmcKpZ+/d8ps7i0hp5HfjUTwBC6QRZzA30RUoaQdaiw6LINj8VQ Z/nyjtdd/vzh/+WMAj7zy+4Y0nuoEeA= X-MC-Unique: NUvgoNOpPvmf-ewx_DHs1A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745556; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fpUPnDDHsSgm3zfqQTTpFqcSqwirzmtC8kRA6gtYoj8=; b=LybUelkhfJwu7MFC/tXZm6El2UWAmjxE3600pfXW0ZWIIrQknLLs+n2GafrFzypRwi JYWzOpN5KEpHoWC37yfq9nDsHSWssu/Oa8im7Oq2rsLYE+sYXCKvkN0qll1DnHAGQm5y 6dHpa9UgF09QUrKF0ZUc4bM2N1ag5K8m5nnRbpIkP0hcmDnSl74ItV52YIdJaIi/yJxD kMbUFAU1pJbRz3jISr3nAfCrcPAi25x2rEjB/kRkKVGiro3lfGrsCL+XbAKPv+KrITL1 /jcXcbhF6oeZZCRXdORk6cnHqMILKJ355Ou9qywt/ov0qjzmS+o/NkJvRfd+UyZNn59l 37gQ== X-Gm-Message-State: AO0yUKV6TSzmMMINNW7htBIcgNl0VtVp1vHKsoDS6OHBR5aMfG+HNQrV jt3892XjRsvOEzzIqrwxy461Jz+jTHWItGv9slR5RJwZXuvXaJekq79oQEU7l1xSmcr8gENvURK serjX+pIFnV9oJ0hUYPgWto4YvAZc0hT+K5GRg9cnMSTUgZHjFJ9mLIx/CFrC/0t9hg== X-Received: by 2002:a05:6000:1b8f:b0:2cb:72c2:3d12 with SMTP id r15-20020a0560001b8f00b002cb72c23d12mr6843458wru.68.1677745556199; Thu, 02 Mar 2023 00:25:56 -0800 (PST) X-Google-Smtp-Source: AK7set89j5MiQXLK1hV9ICRLkAzw80LO6HVY9IpfOvRRdDV/96a2p33N7JneFIHg/TGCTn3AEQ1KIQ== X-Received: by 2002:a05:6000:1b8f:b0:2cb:72c2:3d12 with SMTP id r15-20020a0560001b8f00b002cb72c23d12mr6843435wru.68.1677745555762; Thu, 02 Mar 2023 00:25:55 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:53 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 27/53] pcie_regs: drop duplicated indicator value macros Message-ID: <20230302082343.560446-28-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745927197100001 From: Vladimir Sementsov-Ogievskiy We already have indicator values in include/standard-headers/linux/pci_regs.h , no reason to reinvent them in include/hw/pci/pcie_regs.h. (and we already have usage of PCI_EXP_SLTCTL_PWR_IND_BLINK and PCI_EXP_SLTCTL_PWR_IND_OFF in hw/pci/pcie.c, so let's be consistent) Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-9-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/pci/pcie_regs.h | 9 --------- hw/pci/pcie.c | 13 +++++++------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h index 963dc2e170..00b595a82e 100644 --- a/include/hw/pci/pcie_regs.h +++ b/include/hw/pci/pcie_regs.h @@ -70,15 +70,6 @@ typedef enum PCIExpLinkWidth { #define PCI_EXP_SLTCTL_IND_ON 0x1 #define PCI_EXP_SLTCTL_IND_BLINK 0x2 #define PCI_EXP_SLTCTL_IND_OFF 0x3 -#define PCI_EXP_SLTCTL_AIC_SHIFT ctz32(PCI_EXP_SLTCTL_AIC) -#define PCI_EXP_SLTCTL_AIC_OFF \ - (PCI_EXP_SLTCTL_IND_OFF << PCI_EXP_SLTCTL_AIC_SHIFT) - -#define PCI_EXP_SLTCTL_PIC_SHIFT ctz32(PCI_EXP_SLTCTL_PIC) -#define PCI_EXP_SLTCTL_PIC_OFF \ - (PCI_EXP_SLTCTL_IND_OFF << PCI_EXP_SLTCTL_PIC_SHIFT) -#define PCI_EXP_SLTCTL_PIC_ON \ - (PCI_EXP_SLTCTL_IND_ON << PCI_EXP_SLTCTL_PIC_SHIFT) =20 #define PCI_EXP_SLTCTL_SUPPORTED \ (PCI_EXP_SLTCTL_ABPE | \ diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 82ef723983..ccdb2377e1 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -634,8 +634,8 @@ void pcie_cap_slot_init(PCIDevice *dev, PCIESlot *s) PCI_EXP_SLTCTL_PIC | PCI_EXP_SLTCTL_AIC); pci_word_test_and_set_mask(dev->config + pos + PCI_EXP_SLTCTL, - PCI_EXP_SLTCTL_PIC_OFF | - PCI_EXP_SLTCTL_AIC_OFF); + PCI_EXP_SLTCTL_PWR_IND_OFF | + PCI_EXP_SLTCTL_ATTN_IND_OFF); pci_word_test_and_set_mask(dev->wmask + pos + PCI_EXP_SLTCTL, PCI_EXP_SLTCTL_PIC | PCI_EXP_SLTCTL_AIC | @@ -679,7 +679,7 @@ void pcie_cap_slot_reset(PCIDevice *dev) PCI_EXP_SLTCTL_PDCE | PCI_EXP_SLTCTL_ABPE); pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTCTL, - PCI_EXP_SLTCTL_AIC_OFF); + PCI_EXP_SLTCTL_ATTN_IND_OFF); =20 if (dev->cap_present & QEMU_PCIE_SLTCAP_PCP) { /* Downstream ports enforce device number 0. */ @@ -694,7 +694,8 @@ void pcie_cap_slot_reset(PCIDevice *dev) PCI_EXP_SLTCTL_PCC); } =20 - pic =3D populated ? PCI_EXP_SLTCTL_PIC_ON : PCI_EXP_SLTCTL_PIC_OFF; + pic =3D populated ? + PCI_EXP_SLTCTL_PWR_IND_ON : PCI_EXP_SLTCTL_PWR_IND_OFF; pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTCTL, pic); } =20 @@ -770,9 +771,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev, * control of powered off slots before powering them on. */ if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && - (val & PCI_EXP_SLTCTL_PIC) =3D=3D PCI_EXP_SLTCTL_PIC_OFF && + (val & PCI_EXP_SLTCTL_PIC) =3D=3D PCI_EXP_SLTCTL_PWR_IND_OFF && (!(old_slt_ctl & PCI_EXP_SLTCTL_PCC) || - (old_slt_ctl & PCI_EXP_SLTCTL_PIC) !=3D PCI_EXP_SLTCTL_PIC_OFF)) { + (old_slt_ctl & PCI_EXP_SLTCTL_PIC) !=3D PCI_EXP_SLTCTL_PWR_IND_OFF= )) { pcie_cap_slot_do_unplug(dev); } pcie_cap_update_power(dev); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745783; cv=none; d=zohomail.com; s=zohoarc; b=Vr42Jvo/exRU80+Z1jJkAtb+Fd+NmOrxKhMmXLy+LSf+reaShMIFvZ5hHUkD0cX6aC71XuKo+Mf3R9TlOGz66GNa6aBsHtRABpzE9+MvyED3I2nrMQZzeG5EOjEjDRefiMA5ZHKUtP0PhfzwXD76nlJHz5obn5biP8WdKpAltU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745783; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x5lWbatbxSdF0Y0jI5eIVBSt28ruPy3dHHozV6cb81s=; b=nPHdoA+mNnzb83bM2jX6yK88ruZFX+EFz74aHItIEgrJWG1N0qgyhilQic1vBzXTw4gvWfoO6KNBUNqA4vptbOOzW2JryNSZSbRhN3yQum/CHHdnNr8fExAWifbDfAz1cdljxc2QQjEYfBnaooHGfiTc5Ojct8n5LRD5KTlo26k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745783053844.0528387602324; Thu, 2 Mar 2023 00:29:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGV-0005CK-Kl; Thu, 02 Mar 2023 03:26:15 -0500 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 1pXeGR-0004yx-Qw for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeGQ-0002Qj-1e for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:11 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-584-V4_4p-hMOtyYmr-_xXydng-1; Thu, 02 Mar 2023 03:26:00 -0500 Received: by mail-wr1-f69.google.com with SMTP id u5-20020a5d6da5000000b002cd82373455so1919139wrs.9 for ; Thu, 02 Mar 2023 00:26:00 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id c18-20020adfed92000000b002c54c9bd71fsm14967284wro.93.2023.03.02.00.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745569; 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; bh=x5lWbatbxSdF0Y0jI5eIVBSt28ruPy3dHHozV6cb81s=; b=Tq8V5H9nxF9pJYp1d0sSpPp+44aqsheKTeWTEqmVM4TC/+SNbq30OstL5NPk1PziT3vidS za37uKO3EJ9QvCJ78LNGZSvMMo2UsMV2rl4mlcJHkunVLa9R0/S71N17q0aF/J7/Sv5X0w 0CSSdAC4ZLzPMeWIn8TTMGTL7pz5njg= X-MC-Unique: V4_4p-hMOtyYmr-_xXydng-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745559; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=x5lWbatbxSdF0Y0jI5eIVBSt28ruPy3dHHozV6cb81s=; b=IRTnygUMwIA7Vn6LTNgovDM+xwqg6ChKqMOmWhUk5JQa+58xdw5CeEX7Y8+krlk2rW ohZE07X98ccuiFp+C9HB3q8y0XQIgelrEyrpNJkiyjA/msSz6RIKPiUzjOtVyoyWHL7k aar2r7u4B9z3YuPs2IHKggcJlElaTYylzi6SOUgjF9lPJSRdqLgKQKdAQPqf4iq3/N+0 EUcetXCmi9AaTI6UV4upYoyJIGjeCgwa8yB4zOp+AjBteN8TTfl/2NhArPVPLlQR4e4r gRbkAzSXZ3PtxFlshGCN+EW7Py9jWCH6i44c8JMbzlQY1Jqk5PBT1oQyYpkcjwO2HEBW 308A== X-Gm-Message-State: AO0yUKXIwL40rVFjo+XTkmZpH6LBeS+CSmqbuEW09N2EsWgk83GDjJqS JLTdBjslX3Jnp0bUD9Uo1fQVSn1xbHSy62fkHyaoOX69A19N1TPJs3prAvIJ7eVEs5GbT/WRd3r kKCVz0nzG7DmyLDl+9RHYXS9UgV67CXpW8wCnlS/gninZVFcK5YzsWVMofIaLWMwJqQ== X-Received: by 2002:a5d:4752:0:b0:2c9:d91b:a6ff with SMTP id o18-20020a5d4752000000b002c9d91ba6ffmr7676937wrs.21.1677745559211; Thu, 02 Mar 2023 00:25:59 -0800 (PST) X-Google-Smtp-Source: AK7set/LhCtEoJhugSrj+Yu3O5mLd6F27j/ZD4fAJSaNTyXQPb6SUeI0SQm++vg9VsZLsl7kQAgndQ== X-Received: by 2002:a5d:4752:0:b0:2c9:d91b:a6ff with SMTP id o18-20020a5d4752000000b002c9d91ba6ffmr7676917wrs.21.1677745558944; Thu, 02 Mar 2023 00:25:58 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:56 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 28/53] pcie: drop unused PCIExpressIndicator Message-ID: <20230302082343.560446-29-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745784136100003 From: Vladimir Sementsov-Ogievskiy The structure type is unused. Also, it's the only user of corresponding macros, so drop them too. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-10-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/pci/pcie.h | 8 -------- include/hw/pci/pcie_regs.h | 5 ----- 2 files changed, 13 deletions(-) diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index 798a262a0a..3cc2b15957 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -27,14 +27,6 @@ #include "hw/pci/pcie_sriov.h" #include "hw/hotplug.h" =20 -typedef enum { - /* for attention and power indicator */ - PCI_EXP_HP_IND_RESERVED =3D PCI_EXP_SLTCTL_IND_RESERVED, - PCI_EXP_HP_IND_ON =3D PCI_EXP_SLTCTL_IND_ON, - PCI_EXP_HP_IND_BLINK =3D PCI_EXP_SLTCTL_IND_BLINK, - PCI_EXP_HP_IND_OFF =3D PCI_EXP_SLTCTL_IND_OFF, -} PCIExpressIndicator; - typedef enum { /* these bits must match the bits in Slot Control/Status registers. * PCI_EXP_HP_EV_xxx =3D PCI_EXP_SLTCTL_xxxE =3D PCI_EXP_SLTSTA_xxx diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h index 00b595a82e..1fe0bdd25b 100644 --- a/include/hw/pci/pcie_regs.h +++ b/include/hw/pci/pcie_regs.h @@ -66,11 +66,6 @@ typedef enum PCIExpLinkWidth { =20 #define PCI_EXP_SLTCAP_PSN_SHIFT ctz32(PCI_EXP_SLTCAP_PSN) =20 -#define PCI_EXP_SLTCTL_IND_RESERVED 0x0 -#define PCI_EXP_SLTCTL_IND_ON 0x1 -#define PCI_EXP_SLTCTL_IND_BLINK 0x2 -#define PCI_EXP_SLTCTL_IND_OFF 0x3 - #define PCI_EXP_SLTCTL_SUPPORTED \ (PCI_EXP_SLTCTL_ABPE | \ PCI_EXP_SLTCTL_PDCE | \ --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745729; cv=none; d=zohomail.com; s=zohoarc; b=UZ353MXdrNPdbtifMEvXw+2LoVZ2RLFN1Pwo70COGLyxG8PDx2bGPgBWcuV3/jVKgs5NTE99A6p26x4FDidZsrq2xodFaT7LVioJHEGWX6UChy2zeqogYlMeMuoawPmXYMiNNWpnudlt+fXQH+/VFu/oAi+QMf+M/lawW0rU1lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745729; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h2bR1E9x5nXhHVI2VgaSSLZQ00ud7nc8Dt6XI/qDYmY=; b=EMSAmppCfKseiNbyl05ioEsmrBg0XTXZCNYfKAf8HwfjzoGheQKFstAGK9EPPTe3cxwCAKlb0qDemcWoic0wAt881rbuYroC97NAtHY+xymYcP9o4oDjFL1WnkV7avwbWbFoUEow1RQVxRFXe/unuaCZnrXPE3sy73cMVEGNpac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745729802160.3172467812924; Thu, 2 Mar 2023 00:28:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGS-0004yg-2A; Thu, 02 Mar 2023 03:26:12 -0500 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 1pXeGN-0004bK-4j for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:07 -0500 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 1pXeGL-0002Px-H7 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:06 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-HJ-w1EcXNJaTZoSEoBUqsw-1; Thu, 02 Mar 2023 03:26:03 -0500 Received: by mail-wm1-f71.google.com with SMTP id j32-20020a05600c1c2000b003e9bdf02c9fso920834wms.6 for ; Thu, 02 Mar 2023 00:26:03 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id hn6-20020a05600ca38600b003e22508a343sm2120388wmb.12.2023.03.02.00.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745564; 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: in-reply-to:in-reply-to:references:references; bh=h2bR1E9x5nXhHVI2VgaSSLZQ00ud7nc8Dt6XI/qDYmY=; b=CYd9wBAVDBoQJAFsvaLXV5ss3iuRhJAK34e5tANcKl06/lQadsceUdxEHGTJKnqocHPbJb 3CLU5IYqxtLsaHjSE72YwngHaD9Irvq3CD/PSNkhyiTU+a74ZYRcDEN2XQYNCkD2W8dPO6 etwm4/owcr6VK9ADd1hBZxbv+CXO1IQ= X-MC-Unique: HJ-w1EcXNJaTZoSEoBUqsw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745562; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=h2bR1E9x5nXhHVI2VgaSSLZQ00ud7nc8Dt6XI/qDYmY=; b=HhdMEB/iJWeSZlKDfyQm8lssayhO1i0n/jmqBjAbyC+kB49NrcbnLwBg9XUox8EGtA xYMhS49y2wBXNkiY4DtCQbfzTalaDUssEkrNA03Mjf8TGVfMsk0RoHabSVkXafqNi08m t+hr0Fr9iPxz+T6nznvmPBQhBWmDTT/+Oi8qEUBRqJxeUedBLawarfDQbhjNZ7NM9by9 xE56HR3v5rZwjJh1y+RrLArC9v229u0EBf+5jB2QqAbQz6qgxH0W2RBcVfG1IUKKGPdk kiSk7UG5njJ/ptK4PQFZlmyzuBd++SlfJlNlVG4Lnravvl7qCnKLad5ZbpDpSn6AHSzL d+jA== X-Gm-Message-State: AO0yUKUhgw7ZQf52aiSs4ObVwHi2tJKFDcz2lQ9gYypfjofIX+xdm5IR uX9It8esPKJaxO6qCc/325TckqQcQZhPKdj3S9NBqvaPGgVUSAVDpfkOcrLmWCdIEPqa4E1144l uxh3iYYYdUHD/+QbXIxECR2j6DsRWRQMI8vgKdPbZhaq3s4eRxfkU6cKp8g6ASNAhrw== X-Received: by 2002:a05:600c:4450:b0:3dc:16d2:ae5e with SMTP id v16-20020a05600c445000b003dc16d2ae5emr7194868wmn.32.1677745562022; Thu, 02 Mar 2023 00:26:02 -0800 (PST) X-Google-Smtp-Source: AK7set867L6gQV+lq+ECJNvoGTId2PsKcLD2opiwPutaGqJdHDOEOV5BV1V8ILTkglpj29xQLLMt+A== X-Received: by 2002:a05:600c:4450:b0:3dc:16d2:ae5e with SMTP id v16-20020a05600c445000b003dc16d2ae5emr7194848wmn.32.1677745561696; Thu, 02 Mar 2023 00:26:01 -0800 (PST) Date: Thu, 2 Mar 2023 03:25:59 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 29/53] pcie: pcie_cap_slot_enable_power() use correct helper Message-ID: <20230302082343.560446-30-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745731718100016 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy *_by_mask() helpers shouldn't be used here (and that's the only one). *_by_mask() helpers do shift their value argument, but in pcie.c code we use values that are already shifted appropriately. Happily, PCI_EXP_SLTCTL_PWR_ON is zero, so shift doesn't matter. But if we apply same helper for PCI_EXP_SLTCTL_PWR_OFF constant it will do wrong thing. So, let's use instead pci_word_test_and_clear_mask() which is already used in the file to clear PCI_EXP_SLTCTL_PWR_OFF bit in pcie_cap_slot_init() and pcie_cap_slot_reset(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-11-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index ccdb2377e1..db8360226f 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -373,8 +373,8 @@ void pcie_cap_slot_enable_power(PCIDevice *dev) uint32_t sltcap =3D pci_get_long(exp_cap + PCI_EXP_SLTCAP); =20 if (sltcap & PCI_EXP_SLTCAP_PCP) { - pci_set_word_by_mask(exp_cap + PCI_EXP_SLTCTL, - PCI_EXP_SLTCTL_PCC, PCI_EXP_SLTCTL_PWR_ON); + pci_word_test_and_clear_mask(exp_cap + PCI_EXP_SLTCTL, + PCI_EXP_SLTCTL_PCC); } } =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745655; cv=none; d=zohomail.com; s=zohoarc; b=AZ+n8Rvb/iCK676eTWmQN/nTK2GGSAgDz/qJG9JKjLSpySrdlaFgSh1Y8vD7NdABkx85hPCkJXGr5AZr/MX9KchKZwxuYLM3Z6h23S6SQxT0BQZ+r640ZWQvNY6Ar7R3f1KHzP78ytDhS1UXZkQpkivxs8GsUzD7LITie0ViYBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745655; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qs6Vjv5hksL8MXbWeOMHLJtgCWHyzUlQf+mQ8Y+akP4=; b=dIuzp9Y0o78xaFYUcbm853PkIg6YLGZrIY52R/6xYJvBxWEhKiwZbX3NctfODXaKBJDGe/KhwVFc6ZC+Zeh/TOweHvOiDgGqmJChqHfZKUyo9z7YLmuFXB289Ine8qwn+FaqrQXXFfHhIgp0arQR3t6ObGm7yFj+d/+yEfTkWz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167774565543618.715356195145887; Thu, 2 Mar 2023 00:27:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGd-0005RY-Dx; Thu, 02 Mar 2023 03:26:23 -0500 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 1pXeGY-0005IX-P5 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeGX-0002Re-32 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:18 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-488-NoI7n72zMSGSh7Ptp4RV1A-1; Thu, 02 Mar 2023 03:26:06 -0500 Received: by mail-wm1-f72.google.com with SMTP id k36-20020a05600c1ca400b003eac86e4387so916953wms.8 for ; Thu, 02 Mar 2023 00:26:06 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id y14-20020adff14e000000b002c59f18674asm14134101wro.22.2023.03.02.00.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745576; 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; bh=Qs6Vjv5hksL8MXbWeOMHLJtgCWHyzUlQf+mQ8Y+akP4=; b=H8KytBOg0MEUkcWHFuHaOIMVpEIXrsRqaqdEY6dNBlDXkf8BuZ3ciFfKs4+2Y491/BgaYB LG4Te1hoG2gI/c+CeAsAVf0Fes9E9Sl/j85Yok1DgMMEU2bA80aPaAgMPpBeFH6BrLbPk9 X17BAd0PNZIkVhvL+rWMfE22Bp11kPQ= X-MC-Unique: NoI7n72zMSGSh7Ptp4RV1A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745564; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Qs6Vjv5hksL8MXbWeOMHLJtgCWHyzUlQf+mQ8Y+akP4=; b=mO7bEt9nKC+/+k5FBp9IbLbxRejsoO2TOM1j6TBjFMY5weXh/VFNZ/QjWtlWNFQN8q Bmk460aGyfWbG4dYDQY9qxNzkbwHKlMRgOeLTr15VsFzjgNNhOOanISoKP5qA5JKm6Ja fNc//BPFrGjY0isuf7vs18QFILvl5vhMqZ7bDI91/rm6TpZG3y12vktgCTgMSvXZZbq9 RcBbD72TKexIWoddA+trv8b1NWixBL0wRvN0YRv0zdoHDyhMac9lZraKl0yjVF8kEkJJ YTeXBAXIVG8TvMocBE/edcewM/GFDvUGj+MDzXEqnp0l1Nw8XwBPdBcJl4BcQtrTx2Zm HOaA== X-Gm-Message-State: AO0yUKVUZWzg4V5EioI3FJTpVHQOTdtvG8b53UAcqBfaTsbJ5p5QNd55 N3RTQcwFEvPfXYVPzJFjg5LbCP54+hl9mk76l1ush4w3opDCSGg2tOWVKh8mX68qX00T7GRf2Da /vF+XxT+IgA+D12MT4xZm7ZUDffi0pjVFIwHRCd+jB7EYigvIUQeIsmdCtEEPo++qKw== X-Received: by 2002:adf:f611:0:b0:2cc:498d:b902 with SMTP id t17-20020adff611000000b002cc498db902mr6463512wrp.59.1677745564706; Thu, 02 Mar 2023 00:26:04 -0800 (PST) X-Google-Smtp-Source: AK7set+jCYLw0YPlJWZVLCsKLke1h0Gz917veZia4dWSqYNUquHflZ0JUqeYIWVUVAOPqydM2YolMA== X-Received: by 2002:adf:f611:0:b0:2cc:498d:b902 with SMTP id t17-20020adff611000000b002cc498db902mr6463495wrp.59.1677745564401; Thu, 02 Mar 2023 00:26:04 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:01 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 30/53] pcie: introduce pcie_sltctl_powered_off() helper Message-ID: <20230302082343.560446-31-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745657236100007 From: Vladimir Sementsov-Ogievskiy In pcie_cap_slot_write_config() we check for PCI_EXP_SLTCTL_PWR_OFF in a bad form. We should distinguish PCI_EXP_SLTCTL_PWR which is a "mask" and PCI_EXP_SLTCTL_PWR_OFF which is value for that mask. Better code is in pcie_cap_slot_unplug_request_cb() and in pcie_cap_update_power(). Let's use same pattern everywhere. To simplify things add also a helper. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-12-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pcie.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index db8360226f..90faf0710a 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -39,6 +39,11 @@ #define PCIE_DEV_PRINTF(dev, fmt, ...) \ PCIE_DPRINTF("%s:%x "fmt, (dev)->name, (dev)->devfn, ## __VA_ARGS__) =20 +static bool pcie_sltctl_powered_off(uint16_t sltctl) +{ + return (sltctl & PCI_EXP_SLTCTL_PCC) =3D=3D PCI_EXP_SLTCTL_PWR_OFF + && (sltctl & PCI_EXP_SLTCTL_PIC) =3D=3D PCI_EXP_SLTCTL_PWR_IND_OFF; +} =20 /*************************************************************************= ** * pci express capability helper functions @@ -395,6 +400,7 @@ static void pcie_cap_update_power(PCIDevice *hotplug_de= v) =20 if (sltcap & PCI_EXP_SLTCAP_PCP) { power =3D (sltctl & PCI_EXP_SLTCTL_PCC) =3D=3D PCI_EXP_SLTCTL_PWR_= ON; + /* Don't we need to check also (sltctl & PCI_EXP_SLTCTL_PIC) ? */ } =20 pci_for_each_device(sec_bus, pci_bus_num(sec_bus), @@ -579,8 +585,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *ho= tplug_dev, return; } =20 - if (((sltctl & PCI_EXP_SLTCTL_PIC) =3D=3D PCI_EXP_SLTCTL_PWR_IND_OFF) = && - ((sltctl & PCI_EXP_SLTCTL_PCC) =3D=3D PCI_EXP_SLTCTL_PWR_OFF)) { + if (pcie_sltctl_powered_off(sltctl)) { /* slot is powered off -> unplug without round-trip to the guest */ pcie_cap_slot_do_unplug(hotplug_pdev); hotplug_event_notify(hotplug_pdev); @@ -770,10 +775,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev, * this is a work around for guests that overwrite * control of powered off slots before powering them on. */ - if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && - (val & PCI_EXP_SLTCTL_PIC) =3D=3D PCI_EXP_SLTCTL_PWR_IND_OFF && - (!(old_slt_ctl & PCI_EXP_SLTCTL_PCC) || - (old_slt_ctl & PCI_EXP_SLTCTL_PIC) !=3D PCI_EXP_SLTCTL_PWR_IND_OFF= )) { + if ((sltsta & PCI_EXP_SLTSTA_PDS) && pcie_sltctl_powered_off(val) && + !pcie_sltctl_powered_off(old_slt_ctl)) + { pcie_cap_slot_do_unplug(dev); } pcie_cap_update_power(dev); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745631; cv=none; d=zohomail.com; s=zohoarc; b=IFgh7c8CmD9NtH5O6fzVmXJOIWNla4GzTio791q6OfRGuZIRfqQoOl1m/8UtH6LfHVSwCQtz6H95NTFBv0ZOAng3pVFy/g76IrJkbIXaJKkkC7NDbK4mhXWxXLaxWGhQY5Lt7NTzZAKiVKNOaCl/pA9L1hz4P74CoMsr1XWPR+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745631; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BZdFF76ZcDhntkg5fV7Et8wjmIeg/gJw+wUQyOqPpkg=; b=ZWvodAjmXtOtuZcKbPEEvloThS9DBy7eNzdIoKjscjSB/K2D8HzASYw8UePZmLujkGPI9HVs1A/g6ubkETU2L1A+54KRmER1iH+h0UmPMm/KNo9RCNGTmgu3MLyB0fcyzG9YoOIIekzgj3vjefr7eY/DN20MGXYyopOPGT8Lrz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745631492703.5123534400276; Thu, 2 Mar 2023 00:27:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGZ-0005JT-G2; Thu, 02 Mar 2023 03:26:19 -0500 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 1pXeGT-00054n-IQ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:14 -0500 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 1pXeGQ-0002Qn-Uh for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:12 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-283-B4sr-IbgOz2q006tF0UQ4w-1; Thu, 02 Mar 2023 03:26:09 -0500 Received: by mail-wm1-f71.google.com with SMTP id t1-20020a7bc3c1000000b003dfe223de49so923811wmj.5 for ; Thu, 02 Mar 2023 00:26:08 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id l4-20020a5d4804000000b002c59c6abc10sm14447805wrq.115.2023.03.02.00.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745570; 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: in-reply-to:in-reply-to:references:references; bh=BZdFF76ZcDhntkg5fV7Et8wjmIeg/gJw+wUQyOqPpkg=; b=A1L9bTKHve7JHkq+/NHK3JHmvW4mWonvD0VyPjoDyCBp7lWGuhcZ2jo4qr/fjAzh5qFJM7 jjlECK5m3/sz4cFtOFJjImoo5AFWa1IspXOntHiaboztNVPoFs2DcHtap74JWXHzWYm22u 3ZCPC/ZKsvgZ3sYPmFnkdWkPeQY4BPI= X-MC-Unique: B4sr-IbgOz2q006tF0UQ4w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745567; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BZdFF76ZcDhntkg5fV7Et8wjmIeg/gJw+wUQyOqPpkg=; b=Ji88waOA6R+T81XzKtc8/V5womeOpZ2Tiz834OU/lDolFpn9QS4yWBPcMZZJCIVo0T K7KRsy/cxjxpYh7L/pCaAr3Z8fASTD1H9k4Hw7Qy7wKw0YRNG5l1G5u7glhwJ4mnjifs 1vaN7a0MnvDoxRORd7i5AIixNCblx6aQsveYzgHdopl+7vr7Qs4+P9oKIPWYS76dvDXq H9+okz7rTN5aX22T17FzXX4wPAKQxSgFUOQMP5b1P9E7uzk3Gl2Gd3j5R5dLmSgIFFOR +E+B/hYrZ/ehc/mCgGHo4CT+5YMQbQnxZ7FO3Q6l5bPoCE7K1A5RqD5rt1GxvZq66+9u Ny0g== X-Gm-Message-State: AO0yUKXFXrhI0qibh8VPn13oT9ZUqBovekuM3ZHTLj6Gb1BnNK/lKixd TR+aerbQ6OExjY5t9GfyKURL23n9mAqHDVLtSlKHKfprERYDlUOX4XwFOs0diveUsEaGQVPtzon 5yaR1e0Sfu2nlrhSdh4vf8rnl2lnSDql5fXvWKFQ1u/Ex1EX+PHezH1lExg+05afGMg== X-Received: by 2002:a05:600c:4450:b0:3eb:3c76:c23c with SMTP id v16-20020a05600c445000b003eb3c76c23cmr6824604wmn.3.1677745567563; Thu, 02 Mar 2023 00:26:07 -0800 (PST) X-Google-Smtp-Source: AK7set+FgHtEbsjXN5dnLTYmIdY2IJfj0C42Rmvygx/oom9GJG/OoAI1bgh8wsJNzwwGIGRSkg2GYQ== X-Received: by 2002:a05:600c:4450:b0:3eb:3c76:c23c with SMTP id v16-20020a05600c445000b003eb3c76c23cmr6824580wmn.3.1677745567176; Thu, 02 Mar 2023 00:26:07 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:04 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , Anton Kuchin , Marcel Apfelbaum Subject: [PULL 31/53] pcie: set power indicator to off on reset by default Message-ID: <20230302082343.560446-32-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745633296100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy It should be zero, the only valid values are ON, OFF and BLINK. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Anton Kuchin Message-Id: <20230216180356.156832-13-vsementsov@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pcie.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 90faf0710a..b8c24cf45f 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -684,6 +684,7 @@ void pcie_cap_slot_reset(PCIDevice *dev) PCI_EXP_SLTCTL_PDCE | PCI_EXP_SLTCTL_ABPE); pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTCTL, + PCI_EXP_SLTCTL_PWR_IND_OFF | PCI_EXP_SLTCTL_ATTN_IND_OFF); =20 if (dev->cap_present & QEMU_PCIE_SLTCAP_PCP) { --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746210; cv=none; d=zohomail.com; s=zohoarc; b=RZcDBNQhICxfavSZksu/LPpKqGvjUsa1W1oQFM4PJQb3x6MYMIvm/4CjdUhOhZgmPJ1ybT1jLTWRY41xEmoNSJ+QhGKnj4h230e9RcmbdHWb3LPCpA/G13ARSi2pplWP5Bn6ikuOfzKaIAzzru7lC4muSeSNGDTpydTmOyoviDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wjucy0cfusU4XwAvaR67yzsR5ckrokMlyHf5HfD6GQY=; b=SCHV0+RBU2Hczs2iohBNx9P/dLmdP3yfE5IPdaW69P8slrNtHQoYiH1W9jR9i78ekPPFUBsyoUmAbTmAs+nAfTm8TZoslabA+1S3xvEDzgTSnjkmChiFAQQMVg7Q6c5AYToEYtUp4kx1Mj2jR7S2yqzCLV1e1uci2gHp5Cf6R7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746210053584.0924656094128; Thu, 2 Mar 2023 00:36:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGb-0005Nr-PH; Thu, 02 Mar 2023 03:26:21 -0500 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 1pXeGW-0005Fm-Ty for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:16 -0500 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 1pXeGV-0002RF-0t for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:16 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-627-N9Pju26GNxK8M8DnM0K8Kg-1; Thu, 02 Mar 2023 03:26:12 -0500 Received: by mail-wm1-f72.google.com with SMTP id z6-20020a05600c220600b003e222c9c5f4so5460823wml.4 for ; Thu, 02 Mar 2023 00:26:11 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id a4-20020a5d5704000000b002c559843748sm14742920wrv.10.2023.03.02.00.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745574; 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; bh=wjucy0cfusU4XwAvaR67yzsR5ckrokMlyHf5HfD6GQY=; b=Y8xc5a56gcgh/EsbbF5+ZAn6LovlAWYDxQnVPqIDws0ESEXZYnPG2SqnCCTzQL01qQzltw yOf77VL+dJTDLRqhLaTk7PsHgfRuWeOAz84YozvjYTPWc9/3+fZn+SVGkYQGaUghPjItpA VHVekxh2Ipd8sf3y7wU1jRlhvlDN1IE= X-MC-Unique: N9Pju26GNxK8M8DnM0K8Kg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745570; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wjucy0cfusU4XwAvaR67yzsR5ckrokMlyHf5HfD6GQY=; b=5pS/KkciLQeYzrnQ7CEOcQjBHj0hq9PPbC8cGYjs5Rc6p1MqZYOWIuK1MS+jhXEvOB /3YKDP+D85e5FC72hlHZA8YQ2bVCPcZc5Z3zIjqItsMyAHSp0i084QC5Sdm0aqyu5cvz TaAFErVeFmea9THF9WdnzBKgtCCl7H2lwKuoj0j4WYDebbFs8EYVODowwmZPwUDS5Fje mR/BacvCdEMShrrM0vvyhyWowf2o49MfjahY2fYLzhvrKro4bLJg4ELyBaJPn5uHbKBJ faIABGu2AVpT6ME+cE8WbDTQAQC/6REPlrNcNgyLc1w/RvvhZpn/qwLbRX96EHlGkD+V xFLw== X-Gm-Message-State: AO0yUKVaHlavNS3pPsa8/lSXHkxlh3FrZEK46fmUc4M2A0XuUdVJX+0z ZkEAHhSfrq59wNakLzXqK1nJC76L+PFOEvl85lbaUHjjzSU5XOWuvKtmPsN0ALfl1u/bSFVLYzB nUpP0Vonnh9yuL2LzxSORSP4weGOFmiYFuMCZ/KOeJa8dOpJBdsZtTOVnA9MOzJbmlg== X-Received: by 2002:a5d:4586:0:b0:2c7:1d71:e672 with SMTP id p6-20020a5d4586000000b002c71d71e672mr6599776wrq.7.1677745570287; Thu, 02 Mar 2023 00:26:10 -0800 (PST) X-Google-Smtp-Source: AK7set/GhEUguNKXV1QJMrhPFPQ/WSDcVVbMnNujEuBk/wK5wxjV2l2O1zOABxdFa+dN1eTyRkhvSQ== X-Received: by 2002:a5d:4586:0:b0:2c7:1d71:e672 with SMTP id p6-20020a5d4586000000b002c71d71e672mr6599766wrq.7.1677745569967; Thu, 02 Mar 2023 00:26:09 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:07 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Carlos =?utf-8?B?TMOzcGV6?= Subject: [PULL 32/53] vhost: avoid a potential use of an uninitialized variable in vhost_svq_poll() Message-ID: <20230302082343.560446-33-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746210501100013 From: Carlos L=C3=B3pez In vhost_svq_poll(), if vhost_svq_get_buf() fails due to a device providing invalid descriptors, len is left uninitialized and returned to the caller, potentally leaking stack data or causing undefined behavior. Fix this by initializing len to 0. Found with GCC 13 and -fanalyzer (abridged): ../hw/virtio/vhost-shadow-virtqueue.c: In function =E2=80=98vhost_svq_poll= =E2=80=99: ../hw/virtio/vhost-shadow-virtqueue.c:538:12: warning: use of uninitialized= value =E2=80=98len=E2=80=99 [CWE-457] [-Wanalyzer-use-of-uninitialized-val= ue] 538 | return len; | ^~~ =E2=80=98vhost_svq_poll=E2=80=99: events 1-4 | | 522 | size_t vhost_svq_poll(VhostShadowVirtqueue *svq) | | ^~~~~~~~~~~~~~ | | | | | (1) entry to =E2=80=98vhost_svq_poll=E2=80=99 |...... | 525 | uint32_t len; | | ~~~ | | | | | (2) region created on stack here | | (3) capacity: 4 bytes |...... | 528 | if (vhost_svq_more_used(svq)) { | | ~ | | | | | (4) inlined call to =E2=80=98vhost_svq_more_used= =E2=80=99 from =E2=80=98vhost_svq_poll=E2=80=99 (...) | 528 | if (vhost_svq_more_used(svq)) { | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | | || | | |(8) ...to here | | (7) following =E2=80=98true=E2=80=99 branch... |...... | 537 | vhost_svq_get_buf(svq, &len); | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | | | (9) calling =E2=80=98vhost_svq_get_buf=E2=80=99 from =E2= =80=98vhost_svq_poll=E2=80=99 | +--> =E2=80=98vhost_svq_get_buf=E2=80=99: events 10-11 | | 416 | static VirtQueueElement *vhost_svq_get_buf(VhostShadowV= irtqueue *svq, | | ^~~~~~~~~~~~~~~~~ | | | | | (10) entry to =E2=80=98vhost_s= vq_get_buf=E2=80=99 |...... | 423 | if (!vhost_svq_more_used(svq)) { | | ~ | | | | | (11) inlined call to =E2=80=98vhost_svq_more_u= sed=E2=80=99 from =E2=80=98vhost_svq_get_buf=E2=80=99 | (...) | =E2=80=98vhost_svq_get_buf=E2=80=99: event 14 | | 423 | if (!vhost_svq_more_used(svq)) { | | ^ | | | | | (14) following =E2=80=98false=E2=80=99 branch... | =E2=80=98vhost_svq_get_buf=E2=80=99: event 15 | |cc1: | (15): ...to here | <------+ | =E2=80=98vhost_svq_poll=E2=80=99: events 16-17 | | 537 | vhost_svq_get_buf(svq, &len); | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | | | (16) returning to =E2=80=98vhost_svq_poll=E2=80=99 from = =E2=80=98vhost_svq_get_buf=E2=80=99 | 538 | return len; | | ~~~ | | | | | (17) use of uninitialized value =E2=80=98len=E2=80= =99 here Note by Laurent Vivier : The return value is only used to detect an error: vhost_svq_poll vhost_vdpa_net_cvq_add vhost_vdpa_net_load_cmd vhost_vdpa_net_load_mac -> a negative return is only used to detect error vhost_vdpa_net_load_mq -> a negative return is only used to detect error vhost_vdpa_net_handle_ctrl_avail -> a negative return is only used to detect error Fixes: d368c0b052ad ("vhost: Do not depend on !NULL VirtQueueElement on vho= st_svq_flush") Signed-off-by: Carlos L=C3=B3pez Message-Id: <20230213085747.19956-1-clopez@suse.de> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-shadow-virtqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index 4307296358..515ccf870d 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -522,7 +522,7 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq, size_t vhost_svq_poll(VhostShadowVirtqueue *svq) { int64_t start_us =3D g_get_monotonic_time(); - uint32_t len; + uint32_t len =3D 0; =20 do { if (vhost_svq_more_used(svq)) { --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746207; cv=none; d=zohomail.com; s=zohoarc; b=aBn6+OObjE23uHiE/+Xth4QqKQN/bcBTsAD2KF5bzWLJeYX+Fr0KOh8asG43HfCD4lhg/iKCGyAnIx6v0ri0CGBpVCquKyGw0WRhr5Lce+m3XqXv0mfRATNFCsDyaA6SOmiLX2ffKGYnVsIJXRQ8zQ8mEJ6EsFzLDedpquO/95k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746207; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HzM2wIWwmRCmPsQ/RXdn+I3G0TDRllMNBrCQK4/Zu3g=; b=NGcWUrnJE7Eh8R1ldujiTlLcu6ZtsGwOyuI74+fD6/r1/ecR5A86CM9v3N+CdSJjAba+ZQECYXJJj9CSucnhyxu7s0UXyDwJjtm4PPzVi+rEsnqNJ3/3nAnZplm8cu0iO5vdtF6hQh+K6bUo+N0l/++kEnZSG0WcasWHTxowh40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746207727344.2350180465046; Thu, 2 Mar 2023 00:36:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGa-0005M2-R3; Thu, 02 Mar 2023 03:26:20 -0500 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 1pXeGY-0005HL-5b for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:18 -0500 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 1pXeGW-0002RL-3q for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:17 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-671-Y-kfZAx8P0uxREkqnvaxGg-1; Thu, 02 Mar 2023 03:26:14 -0500 Received: by mail-wm1-f72.google.com with SMTP id az39-20020a05600c602700b003e97eb80524so926728wmb.4 for ; Thu, 02 Mar 2023 00:26:14 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id iz2-20020a05600c554200b003e11ad0750csm2088753wmb.47.2023.03.02.00.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745575; 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; bh=HzM2wIWwmRCmPsQ/RXdn+I3G0TDRllMNBrCQK4/Zu3g=; b=ATRjRu2LNipv4yl7yeEnzQf1nsJ6j5G68K8bsA7i6fXP61FsXiHmTd37riLAm3AVyabwGC 3rVFBn6dZHrAiCkfi8ROx0Tm0M/fWcqlxSK/385cqoMwGKPIP+KDt8sD5I7mj/EFUNw11K xUznfzwGHqjfRGMawM5o8JG6sTsr+/Q= X-MC-Unique: Y-kfZAx8P0uxREkqnvaxGg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745573; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HzM2wIWwmRCmPsQ/RXdn+I3G0TDRllMNBrCQK4/Zu3g=; b=qW7TTkYBjPhH93+ohEC5glvReKcIEofzOWHcuLL3fUkoaPMM8a7ljAnJR1whC1Owlf MaarOrOeoly4VTGZxqsr4xdqytAWgxFLaSTWMrha2UJqAUAKov4dS5T1RoKGXFI9UCpW 78i5ga6Cm8sEWjn2MbAgRMKNwQUuTKq53qo1IyWubIA6SaJa4ZRnfkIvBMqBwv7YCn4j YYc+ycisqit7OzOv2aEBjZNhlWadBDWH5MPmzJpSKWP6Ep5BUmYefXZNd/5sRMfqWdNn mF+B8OS590SFirdqDK48cB1ApcaA6uzSnFpd1jjyHBWfB6SUtfGTbnNMTmdi1ZMF/0Ho WDGQ== X-Gm-Message-State: AO0yUKXmKNCzKr87R0/6QYKEM7/RsMtMMo/xfQmt8VH12M/2YQ9eh/Do eHkb46rnc7RgplldVS5m4/EbA7DZ4rf0ioPcvYctaSDbooFXfP3LVLqGk2jVmLfI3q9T4Ayz8yq 6kS3mjC0mizDwxTaYBxOqVUmNp6gdYTsdXhJppflrMyOTCE1ZxUibKmdtEC6v/dI3Iw== X-Received: by 2002:a05:600c:1898:b0:3eb:2de8:b732 with SMTP id x24-20020a05600c189800b003eb2de8b732mr6861821wmp.0.1677745572985; Thu, 02 Mar 2023 00:26:12 -0800 (PST) X-Google-Smtp-Source: AK7set/ENeI2+Blsy5XbEQJb8xTOJCdOAGYod/9lMd074LbPB6a9ySE6REiB+NbSvHvDYRQpQLgSDA== X-Received: by 2002:a05:600c:1898:b0:3eb:2de8:b732 with SMTP id x24-20020a05600c189800b003eb2de8b732mr6861807wmp.0.1677745572748; Thu, 02 Mar 2023 00:26:12 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:10 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Carlos =?utf-8?B?TMOzcGV6?= Subject: [PULL 33/53] libvhost-user: check for NULL when allocating a virtqueue element Message-ID: <20230302082343.560446-34-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746208567100001 From: Carlos L=C3=B3pez Check the return value for malloc(), avoiding a NULL pointer dereference, and propagate error in function callers. Found with GCC 13 and -fanalyzer: ../subprojects/libvhost-user/libvhost-user.c: In function =E2=80=98virtqueu= e_alloc_element=E2=80=99: ../subprojects/libvhost-user/libvhost-user.c:2556:19: error: dereference of= possibly-NULL =E2=80=98elem=E2=80=99 [CWE-690] [-Werror=3Danalyzer-possibl= e-null-dereference] 2556 | elem->out_num =3D out_num; | ~~~~~~~~~~~~~~^~~~~~~~~ =E2=80=98virtqueue_alloc_element=E2=80=99: event 1 | | 2554 | assert(sz >=3D sizeof(VuVirtqElement)); | | ^~~~~~ | | | | | (1) following =E2=80=98true=E2=80=99 branch (when =E2=80= =98sz > 31=E2=80=99)... | =E2=80=98virtqueue_alloc_element=E2=80=99: events 2-4 | | 2555 | elem =3D malloc(out_sg_end); | | ^~~~ ~~~~~~~~~~~~~~~~~~ | | | | | | | (3) this call could return NULL | | (2) ...to here | 2556 | elem->out_num =3D out_num; | | ~~~~~~~~~~~~~~~~~~~~~~~ | | | | | (4) =E2=80=98elem=E2=80=99 could be NULL: un= checked value from (3) | Signed-off-by: Carlos L=C3=B3pez Message-Id: <20230210112514.16858-1-clopez@suse.de> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- subprojects/libvhost-user/libvhost-user.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvho= st-user/libvhost-user.c index f661af7c85..0200b78e8e 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -2553,6 +2553,10 @@ virtqueue_alloc_element(size_t sz, =20 assert(sz >=3D sizeof(VuVirtqElement)); elem =3D malloc(out_sg_end); + if (!elem) { + DPRINT("%s: failed to malloc virtqueue element\n", __func__); + return NULL; + } elem->out_num =3D out_num; elem->in_num =3D in_num; elem->in_sg =3D (void *)elem + in_sg_ofs; @@ -2639,6 +2643,9 @@ vu_queue_map_desc(VuDev *dev, VuVirtq *vq, unsigned i= nt idx, size_t sz) =20 /* Now copy what we have collected and mapped */ elem =3D virtqueue_alloc_element(sz, out_num, in_num); + if (!elem) { + return NULL; + } elem->index =3D idx; for (i =3D 0; i < out_num; i++) { elem->out_sg[i] =3D iov[i]; --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745635; cv=none; d=zohomail.com; s=zohoarc; b=X3V7znVdUjB7k91G1u7WfgxaWmiwmrc1jg5CBfyNsNd6eNEVND369gHjyxnYhfl2YFDxti27u63do9mAghHTmB9yr2I81BYpu4WzoY4RkM+SPMTMXJ5W0+8Ix5TyGoQqxxn8HO6owONfss8tWLY8zP71+mQftXIJjVI+tyx0jEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w0RNEULKHXUI4bnIXmBTi+duJG2GyoHPzvmFBse0xtU=; b=PtIMwK1jcUzXv+v8tdCpUIxrX80Q/R3SBjfjOCW/JdopI/aI0Db0gj3NGWi70c9IgBkqSAPniB4G2SMhtHWpKsuRXOL7kLwmNMfriHUEak9/pb9cT0P5BTwffFnA+fnChel5JSGIsaHQKu3AdefU3url2ZGaBGmDiRXHCrkzMrQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745635889378.57681620926473; Thu, 2 Mar 2023 00:27:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeGd-0005SX-Ry; Thu, 02 Mar 2023 03:26:23 -0500 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 1pXeGb-0005Ns-Je for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:21 -0500 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 1pXeGZ-0002SA-8f for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:21 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-247-lhycS5JxNMKPt4tZ_TJolQ-1; Thu, 02 Mar 2023 03:26:17 -0500 Received: by mail-wr1-f72.google.com with SMTP id m10-20020adfe94a000000b002cdc5eac0d0so888534wrn.2 for ; Thu, 02 Mar 2023 00:26:17 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id m18-20020a05600c3b1200b003db0ad636d1sm2282185wms.28.2023.03.02.00.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745578; 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; bh=w0RNEULKHXUI4bnIXmBTi+duJG2GyoHPzvmFBse0xtU=; b=HYUyJfDWHgRcHI2aBb1Fb2x+DiJor5oQavG2PnAhB/qoFjWhRFZNNIMufjMrbKRIxwxpAA 7VKVBSDt9ZhMZODP4CTgs9ylIy2S5iz6Zn3lo3Pgu15O6/MFbztGssHkQCEJZ3MjMWZ7ZM 5CF1ClGE+72gt+m+dZZvE6TB53qF0Uw= X-MC-Unique: lhycS5JxNMKPt4tZ_TJolQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745576; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=w0RNEULKHXUI4bnIXmBTi+duJG2GyoHPzvmFBse0xtU=; b=RycXKkPOUR20b9Mko+6zjlqyn/Yj/R6OqPefG+/a4Kxi8mZ3gdPwcl0SctchaaYndk 2fpgVGplsZndkZVMlIn/Ij9ev7JT24ToIV4m0YCcjyzqk7x6xx1A8XvjPpq7dthK1xnz DUQrEe4y59MDwcxXz4xgaAXZ/NxaES2v2EeLhthjnPR2okaFvKKO4utv6/8YUX1Gpj2s XpB9tOub/87daKLtUEr1+xekpbmQlWA7epNRyICptlD+CmcE1ytaRPLSS5nv0tQ1UQfs YuMUMyRtuezFQX+cv4Oxb9is+60fo24COxGRNhvggVQdvcI+GQ30iUoknrtwTEavfjYL HLtg== X-Gm-Message-State: AO0yUKUsgERnmZGc6JhFqmUorCCztOVg+/HuPoOVTwr8PXLfndj6LnsK RKNVCeuLNZZ5YSHxQxn12y/goYGd+4JyQ/CVAzelga/QdpxQLKGZW7K8qLVaTOYU4YHQ+1wGryt Qtz0bm6Jc662Xo9qGqhwcnV2+iaK1GWyP+RcGhzw2FTtGys5CRbz7kk3vk9AbgkFXdg== X-Received: by 2002:a05:600c:2e95:b0:3dc:4313:fd1e with SMTP id p21-20020a05600c2e9500b003dc4313fd1emr7056046wmn.34.1677745576030; Thu, 02 Mar 2023 00:26:16 -0800 (PST) X-Google-Smtp-Source: AK7set87QNAou5XaRu5HFmxdrnvf+jVQDXggD7yHK+b6eV8y+EY2YwpPaozM2FomMYMI4dNL6YvAkQ== X-Received: by 2002:a05:600c:2e95:b0:3dc:4313:fd1e with SMTP id p21-20020a05600c2e9500b003dc4313fd1emr7056032wmn.34.1677745575799; Thu, 02 Mar 2023 00:26:15 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:12 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Marcel Apfelbaum Subject: [PULL 34/53] hw/pci: Trace IRQ routing on PCI topology Message-ID: <20230302082343.560446-35-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745637116100001 From: Philippe Mathieu-Daud=C3=A9 Trace how IRQ are rooted from EP to RC. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230211152239.88106-3-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pci.c | 8 ++++++++ hw/pci/trace-events | 1 + 2 files changed, 9 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index bad8e63db3..08060b3e88 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -279,9 +279,13 @@ static void pci_change_irq_level(PCIDevice *pci_dev, i= nt irq_num, int change) { PCIBus *bus; for (;;) { + int dev_irq =3D irq_num; bus =3D pci_get_bus(pci_dev); assert(bus->map_irq); irq_num =3D bus->map_irq(pci_dev, irq_num); + trace_pci_route_irq(dev_irq, DEVICE(pci_dev)->canonical_path, irq_= num, + pci_bus_is_root(bus) ? "root-complex" + : DEVICE(bus->parent_dev)->canonical_p= ath); if (bus->set_irq) break; pci_dev =3D bus->parent_dev; @@ -1600,8 +1604,12 @@ PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice = *dev, int pin) PCIBus *bus; =20 do { + int dev_irq =3D pin; bus =3D pci_get_bus(dev); pin =3D bus->map_irq(dev, pin); + trace_pci_route_irq(dev_irq, DEVICE(dev)->canonical_path, pin, + pci_bus_is_root(bus) ? "root-complex" + : DEVICE(bus->parent_dev)->canonical_p= ath); dev =3D bus->parent_dev; } while (dev); =20 diff --git a/hw/pci/trace-events b/hw/pci/trace-events index aaf46bc92d..42430869ce 100644 --- a/hw/pci/trace-events +++ b/hw/pci/trace-events @@ -3,6 +3,7 @@ # pci.c pci_update_mappings_del(const char *dev, uint32_t bus, uint32_t slot, uint= 32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"P= RIx64"+0x%"PRIx64 pci_update_mappings_add(const char *dev, uint32_t bus, uint32_t slot, uint= 32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"P= RIx64"+0x%"PRIx64 +pci_route_irq(int dev_irq, const char *dev_path, int parent_irq, const cha= r *parent_path) "IRQ %d @%s -> IRQ %d @%s" =20 # pci_host.c pci_cfg_read(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, = unsigned offs, unsigned val) "%s %02x:%02x.%x @0x%x -> 0x%x" --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745654; cv=none; d=zohomail.com; s=zohoarc; b=Z8zeHxnOnMHT+coj3xBhE4xEDH+41isSWMJDqLQLJciVZ2acGeqDBtEkrz08Nh+PnDgTY5sD2QufzLCB1u5vdKNPy18PQeEk7NapCmLgpU0Vy+k26cbDc9gqQih1tVi3F/2mA142rSjxW88ktWKmMKIkqPKuiQFGXIhqX6yL4/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745654; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BR6VzSroAnj+YfgqBaTcp9B8XN+Lg1AvIIAhtX3hqJc=; b=jl/tNMfDK25etfAGSoPMZbs6RnuBPami//1GSzt9wLc9TpspM5HfM83SttOHpxF8a8FbZNTK3RsoDUzDzUu9epE6CSXk8iibPgWlPdd+muzAJFYIkHfUIZJulVdG/oVrcC4MtyA23xTmI7xpTjwyxMkZdnYA2StPLyABuW7SHUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16777456547898.085495622486974; Thu, 2 Mar 2023 00:27:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeH9-0005fx-GH; Thu, 02 Mar 2023 03:26:55 -0500 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 1pXeGf-0005Vk-0A for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:26 -0500 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 1pXeGd-0002Sb-01 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:24 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-515-vSf_IAvyN6KqmN1HCu_eTw-1; Thu, 02 Mar 2023 03:26:21 -0500 Received: by mail-wm1-f70.google.com with SMTP id z6-20020a05600c220600b003e222c9c5f4so5461009wml.4 for ; Thu, 02 Mar 2023 00:26:21 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c444700b003eb0d6f48f3sm2251753wmn.27.2023.03.02.00.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745582; 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; bh=BR6VzSroAnj+YfgqBaTcp9B8XN+Lg1AvIIAhtX3hqJc=; b=CUbpBTGMAZGxngFiaP3KCUu3OuACkY7wzAELsvxVzSqcO9XwvwvdYGUprzzTDYWQ1Ht5eo IqhLC6+x16TeOoWYFOzoYWn280qQ8FiD0Mb4WjZ7ecpgUqQ0nARFHJNWyBzW7HBXNO6QUt WhtHfawqUZAsT/vCrGKBY9ouNOoPLLQ= X-MC-Unique: vSf_IAvyN6KqmN1HCu_eTw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745579; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BR6VzSroAnj+YfgqBaTcp9B8XN+Lg1AvIIAhtX3hqJc=; b=3pE9ldg0g88nJNB9TBUZnnwGWU2oVVPcLb8EX6RSnNMAO3c/4z+XN4ky7YjEU0aiHm aaCxcU/zyRy7lA95wGhPoKr4NwBOA6U0r2Kq2vbCUpfbzXJhuyc6kI+cphVVDMRirSxT 0k/4QxGfUyliI/rspXEdK0pdML3vRb4A94sxQz4CtmjqyiwK4U/i2kVBvTMZ3dX0WoQw 0lxl4mi5zGvQ22PacduLmcd/qMTsXAZDn1Hv5BanURrlYzFJCZx7I4625wSGbqcK9Vdv 2XcicXk3CZ3WRIO0evn58kt5jNCWW+TB1r4yMYZziIYjmmX5PKRuttHxwFapH3R4BaEy t0yA== X-Gm-Message-State: AO0yUKWDjaTlbFeXj2U03UpdlJUTE/KXavw+HyH7nM615NFFZ0F5EV29 T8uyIqUo6NJAJ+l16iJ56+n4+VfU6hec4zGe+2gW5syP1VDC5t9YHSe2oZBCCswXGi15zmIUV46 s1mKjeb12VP/6aTw/AG5LsAJsQBcZzdde79PyJUgskVcij6LZgpmkCTccWp+6IlAYwg== X-Received: by 2002:a5d:5689:0:b0:2cd:de25:1c76 with SMTP id f9-20020a5d5689000000b002cdde251c76mr823928wrv.17.1677745579724; Thu, 02 Mar 2023 00:26:19 -0800 (PST) X-Google-Smtp-Source: AK7set/sQbyO2Y87yBZsG5PkwUlkgwiYvR2jmWdc9be9hNnGA7gZ03Z7ra8QZ7rNlvHFoIKTuI8C0Q== X-Received: by 2002:a5d:5689:0:b0:2cd:de25:1c76 with SMTP id f9-20020a5d5689000000b002cdde251c76mr823908wrv.17.1677745579446; Thu, 02 Mar 2023 00:26:19 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:16 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Yajun Wu , Jiri Pirko , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Yajun@redhat.com, Wu@redhat.com, <@redhat.com, Jiri@redhat.com, Pirko@redhat.com, Paolo Bonzini Subject: [PULL 35/53] chardev/char-socket: set s->listener = NULL in char_socket_finalize Message-ID: <20230302082343.560446-36-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745655283100001 From: Yajun Wu After live migration with virtio block device, qemu crash at: #0 0x000055914f46f795 in object_dynamic_cast_assert (obj=3D0x559151b7b090= , typename=3D0x55914f80fbc4 "qio-channel", file=3D0x55914f80fb90 "/images/t= estvfe/sw/qemu.gerrit/include/io/channel.h", line=3D30, func=3D0x55914f80fc= b8 <__func__.17257> "QIO_CHANNEL") at ../qom/object.c:872 #1 0x000055914f480d68 in QIO_CHANNEL (obj=3D0x559151b7b090) at /images/te= stvfe/sw/qemu.gerrit/include/io/channel.h:29 #2 0x000055914f4812f8 in qio_net_listener_set_client_func_full (listener= =3D0x559151b7a720, func=3D0x55914f580b97 , data=3D0x5591519= f4ea0, notify=3D0x0, context=3D0x0) at ../io/net-listener.c:166 #3 0x000055914f580059 in tcp_chr_update_read_handler (chr=3D0x5591519f4ea= 0) at ../chardev/char-socket.c:637 #4 0x000055914f583dca in qemu_chr_be_update_read_handlers (s=3D0x5591519f= 4ea0, context=3D0x0) at ../chardev/char.c:226 #5 0x000055914f57b7c9 in qemu_chr_fe_set_handlers_full (b=3D0x559152bf23a= 0, fd_can_read=3D0x0, fd_read=3D0x0, fd_event=3D0x0, be_change=3D0x0, opaqu= e=3D0x0, context=3D0x0, set_open=3Dfalse, sync_state=3Dtrue) at ../chardev/= char-fe.c:279 #6 0x000055914f57b86d in qemu_chr_fe_set_handlers (b=3D0x559152bf23a0, fd= _can_read=3D0x0, fd_read=3D0x0, fd_event=3D0x0, be_change=3D0x0, opaque=3D0= x0, context=3D0x0, set_open=3Dfalse) at ../chardev/char-fe.c:304 #7 0x000055914f378caf in vhost_user_async_close (d=3D0x559152bf21a0, char= dev=3D0x559152bf23a0, vhost=3D0x559152bf2420, cb=3D0x55914f2fb8c1 ) at ../hw/virtio/vhost-user.c:2725 #8 0x000055914f2fba40 in vhost_user_blk_event (opaque=3D0x559152bf21a0, e= vent=3DCHR_EVENT_CLOSED) at ../hw/block/vhost-user-blk.c:395 #9 0x000055914f58388c in chr_be_event (s=3D0x5591519f4ea0, event=3DCHR_EV= ENT_CLOSED) at ../chardev/char.c:61 #10 0x000055914f583905 in qemu_chr_be_event (s=3D0x5591519f4ea0, event=3DC= HR_EVENT_CLOSED) at ../chardev/char.c:81 #11 0x000055914f581275 in char_socket_finalize (obj=3D0x5591519f4ea0) at .= ./chardev/char-socket.c:1083 #12 0x000055914f46f073 in object_deinit (obj=3D0x5591519f4ea0, type=3D0x55= 91519055c0) at ../qom/object.c:680 #13 0x000055914f46f0e5 in object_finalize (data=3D0x5591519f4ea0) at ../qo= m/object.c:694 #14 0x000055914f46ff06 in object_unref (objptr=3D0x5591519f4ea0) at ../qom= /object.c:1202 #15 0x000055914f4715a4 in object_finalize_child_property (obj=3D0x559151b7= 6c50, name=3D0x559151b7b250 "char3", opaque=3D0x5591519f4ea0) at ../qom/obj= ect.c:1747 #16 0x000055914f46ee86 in object_property_del_all (obj=3D0x559151b76c50) a= t ../qom/object.c:632 #17 0x000055914f46f0d2 in object_finalize (data=3D0x559151b76c50) at ../qo= m/object.c:693 #18 0x000055914f46ff06 in object_unref (objptr=3D0x559151b76c50) at ../qom= /object.c:1202 #19 0x000055914f4715a4 in object_finalize_child_property (obj=3D0x559151b6= b560, name=3D0x559151b76630 "chardevs", opaque=3D0x559151b76c50) at ../qom/= object.c:1747 #20 0x000055914f46ef67 in object_property_del_child (obj=3D0x559151b6b560,= child=3D0x559151b76c50) at ../qom/object.c:654 #21 0x000055914f46f042 in object_unparent (obj=3D0x559151b76c50) at ../qom= /object.c:673 #22 0x000055914f58632a in qemu_chr_cleanup () at ../chardev/char.c:1189 #23 0x000055914f16c66c in qemu_cleanup () at ../softmmu/runstate.c:830 #24 0x000055914eee7b9e in qemu_default_main () at ../softmmu/main.c:38 #25 0x000055914eee7bcc in main (argc=3D86, argv=3D0x7ffc97cb8d88) at ../so= ftmmu/main.c:48 In char_socket_finalize after s->listener freed, event callback function vhost_user_blk_event will be called to handle CHR_EVENT_CLOSED. vhost_user_blk_event is calling qio_net_listener_set_client_func_full which is still using s->listener. Setting s->listener =3D NULL after object_unref(OBJECT(s->listener)) can solve this issue. Signed-off-by: Yajun Wu Acked-by: Jiri Pirko Message-Id: <20230214021430.3638579-1-yajunw@nvidia.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Yajun Wu <yajunw@nvidia.com>
Acked-by: Jiri Pirko <jiri@nvidia.com>

Reviewed-by:= Marc-Andr=C3=A9 Lureau <= marcandre.lureau@redhat.com>

=C2=A0
Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- chardev/char-socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index c2265436ac..8c58532171 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1065,6 +1065,7 @@ static void char_socket_finalize(Object *obj) qio_net_listener_set_client_func_full(s->listener, NULL, NULL, NULL, chr->gcontext); object_unref(OBJECT(s->listener)); + s->listener =3D NULL; } if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745790; cv=none; d=zohomail.com; s=zohoarc; b=Y3s3qQDrHL630sLmoHAcOC81KzbNSAb7zVDgaCiJNn6TdaIOTqubOgSHzSldLVc0/8ftQX4vdZuOdjIZNgdg8RyLWYGuFPSkhQTZsEXIuzfW2qJRL2B4kkA7jQ8Kf/ifr8L+ADDX/Ls87rv2SU7XjXWgyzXZLlYdkmksKTcRUdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745790; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ezeTgkQPCK21u2w9yCROfexIuLJe7uFJDNbBydlsbB4=; b=I+EUspSWzuRZsQuLfQyvPOzcvDQpZ/Xm7du4jAd/cx+azQ4nWhstZC6kZYL11eX1KSJvZNyuaZHUUJEwbyqA92cXEcq71v0zAVH6OTf6+YI73imsteNYuRT8S54DBpiesCXpZ0H9J3f+Z0APNR9tx+h9gs5RdMSLKOey8WANwls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745790974716.7170523042089; Thu, 2 Mar 2023 00:29:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHY-000651-Bj; Thu, 02 Mar 2023 03:27:20 -0500 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 1pXeGi-0005ac-HS for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:32 -0500 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 1pXeGh-0002TP-08 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:28 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-391-m5kY3xWcOee_pNmS3tMoqw-1; Thu, 02 Mar 2023 03:26:24 -0500 Received: by mail-wm1-f69.google.com with SMTP id s18-20020a7bc392000000b003deaf780ab6so746461wmj.4 for ; Thu, 02 Mar 2023 00:26:24 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id n11-20020a05600c3b8b00b003e203681b26sm2291018wms.29.2023.03.02.00.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745586; 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: in-reply-to:in-reply-to:references:references; bh=ezeTgkQPCK21u2w9yCROfexIuLJe7uFJDNbBydlsbB4=; b=ilWwiFJawt5xG/8da6vlqiT5QGRpCfAbXqLb3hMzDzV809E23NhSoVobPAQjhfpHvqn1lv 65ce9vZQB/4aO0NS3YgssXS4WIfkoukl/Xln8KA88nq/8xql+7I9msuwZAmOgHl0pboAmi 5fZ4gqyHgqlPFatWYfSVlpuTcXxLfFM= X-MC-Unique: m5kY3xWcOee_pNmS3tMoqw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745583; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ezeTgkQPCK21u2w9yCROfexIuLJe7uFJDNbBydlsbB4=; b=wzWpZO6BjA3wSk/Kb38eXycSOJfqZcO/Q1oAB3DLpBBhdCJOxQ5L9tyD2AW9i1CAio nFtOW9tx2ucbI0AxhICQw9JGUqXE6oF9Y76GMxvYHYgcEQqUB/ntKNxSYDy2iiIhqxcH /Jdz24UYwPuP2AnEr5JQ1r0ifrfTaYrVJrszEmY4KXCqjVugbfp2mww+q886MlZK88jh YNWvK1EF3ts+hKOc4BQCloULtH1ZYbSFZfQ/d5qTKoRn9sTUK/W1/QL/b/e0/eBrDpr5 3VS0uSPGkn6HpQqmSmcyNGm9W7SalcgkmO2jvQhcbXrwFBsazkgruZLn5X9ysRdITUMW Y2Rw== X-Gm-Message-State: AO0yUKU3D2aOzycnyoLdHHsNkIusXlZZdD/YzmW0xiKAXMMLecq9MDCc xiSWwAJJMvQFoJcWpOIWeAxMqzjR9HY8odj+FIbBlPgi5LpeT88o9nzjydUxt27aRHX+OWQGeA0 6CFYGg361dQZdusntJTSFtTTf0pKAblfpaG5L7VZVxaFF5fYJ6ybUKcAnMHqsnlFgaw== X-Received: by 2002:a05:600c:458a:b0:3eb:37ce:4c38 with SMTP id r10-20020a05600c458a00b003eb37ce4c38mr7473692wmo.3.1677745583171; Thu, 02 Mar 2023 00:26:23 -0800 (PST) X-Google-Smtp-Source: AK7set/EgUNbybxOP2PDi34fb6LPHydbxhlpRv+9poYUrGfFkimM2enogC14W8d77D8Kgz3IZNrlRg== X-Received: by 2002:a05:600c:458a:b0:3eb:37ce:4c38 with SMTP id r10-20020a05600c458a00b003eb37ce4c38mr7473675wmo.3.1677745582935; Thu, 02 Mar 2023 00:26:22 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:19 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Zhenzhong Duan , Peter Xu , Jason Wang , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , David Hildenbrand , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: [PULL 36/53] memory: Optimize replay of guest mapping Message-ID: <20230302082343.560446-37-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745792160100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zhenzhong Duan On x86, there are two notifiers registered due to vtd-ir memory region splitting the whole address space. During replay of the address space for each notifier, the whole address space is scanned which is unnecessory. We only need to scan the space belong to notifier montiored space. Assert when notifier is used to monitor beyond iommu memory region's address space. Signed-off-by: Zhenzhong Duan Message-Id: <20230215065238.713041-1-zhenzhong.duan@intel.com> Acked-by: Peter Xu Acked-by: Jason Wang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 2 +- softmmu/memory.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 98a5c304a7..6b1de80e85 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3831,7 +3831,7 @@ static void vtd_iommu_replay(IOMMUMemoryRegion *iommu= _mr, IOMMUNotifier *n) .domain_id =3D vtd_get_domain_id(s, &ce, vtd_as->pasid), }; =20 - vtd_page_walk(s, &ce, 0, ~0ULL, &info, vtd_as->pasid); + vtd_page_walk(s, &ce, n->start, n->end, &info, vtd_as->pasid); } } else { trace_vtd_replay_ce_invalid(bus_n, PCI_SLOT(vtd_as->devfn), diff --git a/softmmu/memory.c b/softmmu/memory.c index 9d64efca26..da7d846619 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1900,6 +1900,7 @@ int memory_region_register_iommu_notifier(MemoryRegio= n *mr, iommu_mr =3D IOMMU_MEMORY_REGION(mr); assert(n->notifier_flags !=3D IOMMU_NOTIFIER_NONE); assert(n->start <=3D n->end); + assert(n->end <=3D memory_region_size(mr)); assert(n->iommu_idx >=3D 0 && n->iommu_idx < memory_region_iommu_num_indexes(iommu_mr)); =20 @@ -1923,7 +1924,6 @@ uint64_t memory_region_iommu_get_min_page_size(IOMMUM= emoryRegion *iommu_mr) =20 void memory_region_iommu_replay(IOMMUMemoryRegion *iommu_mr, IOMMUNotifier= *n) { - MemoryRegion *mr =3D MEMORY_REGION(iommu_mr); IOMMUMemoryRegionClass *imrc =3D IOMMU_MEMORY_REGION_GET_CLASS(iommu_m= r); hwaddr addr, granularity; IOMMUTLBEntry iotlb; @@ -1936,7 +1936,7 @@ void memory_region_iommu_replay(IOMMUMemoryRegion *io= mmu_mr, IOMMUNotifier *n) =20 granularity =3D memory_region_iommu_get_min_page_size(iommu_mr); =20 - for (addr =3D 0; addr < memory_region_size(mr); addr +=3D granularity)= { + for (addr =3D n->start; addr < n->end; addr +=3D granularity) { iotlb =3D imrc->translate(iommu_mr, addr, IOMMU_NONE, n->iommu_idx= ); if (iotlb.perm !=3D IOMMU_NONE) { n->notify(n, &iotlb); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746011; cv=none; d=zohomail.com; s=zohoarc; b=SshEmHIYkvYyf0wuD5GKY/NLj3lwctryM81E8vDMw5NZxbWlt3MyboLr24auY9mt2P9fo/uktvvhLs10gMqvPrSqaWN8XQYA+x3SuvJC5h5XekPTTpgtX3cQNKT7VULiB4W5klsclh/Lcd21iJaihBvtVJGGQdqBaQdLzLotS64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746011; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=t6c10ACzCOZas8J7pxjW6LzY+glwxzDOaL5XtXdfnh8=; b=jo5eXQi0qIiD1Yw6LIcVS9FTqrkZtMTRAthaAU1hXgflg1b3O6MTY6W/5+kCUG2uVCDLxUiXuf9Pzk2/lB/lrtvYO4eY8evBwqfqjG0pR3feFrtakuV7UKaaSjmHvxpHRq3pWQ8FKQ8XHAXygfXBhYXLZYTMnNXZPGwhLjPOA3A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746011618383.600386834265; Thu, 2 Mar 2023 00:33:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHU-0005sm-Hs; Thu, 02 Mar 2023 03:27:16 -0500 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 1pXeHA-0005gD-HJ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:56 -0500 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 1pXeGu-0002aX-CI for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:42 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-iJbyPlRENbCGu5uToN6EBw-1; Thu, 02 Mar 2023 03:26:27 -0500 Received: by mail-wm1-f71.google.com with SMTP id k26-20020a05600c0b5a00b003dfe4bae099so764686wmr.0 for ; Thu, 02 Mar 2023 00:26:27 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id j14-20020a5d464e000000b002c558869934sm14759686wrs.81.2023.03.02.00.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745598; 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: in-reply-to:in-reply-to:references:references; bh=t6c10ACzCOZas8J7pxjW6LzY+glwxzDOaL5XtXdfnh8=; b=PcrTtEBYrbN6FrMcAtCxH3cTR3CTdjBVV1MvtMXdfghu3pbGXIpNgCYrg3UsNYlDPHgEU+ BV0iw34JB99Ii5BgEDAYL5SgUl4ZLGIyXp8d2DNUevR3JzeUlHDJ4rsMMeYIS4JKFWLHkv lSROFx0m7lKlmS1nZsjo8XYRfE0480I= X-MC-Unique: iJbyPlRENbCGu5uToN6EBw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745586; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=t6c10ACzCOZas8J7pxjW6LzY+glwxzDOaL5XtXdfnh8=; b=UtPj2jokDHKjC0Euknr+swb9PpMDL4PToWH5p2tRoRKKcSbn2EF98n/kBXpcq15+SN sdgeHHoPiwbGNMJJiVFlwDEronO8N3l2cKCvT+dTPJWxpAMOrRUfgHe+wV3aFF8O9T8H AxYoYz+XkFFXtlq5fVyTlHQiKqUBIJel7cVYJQkvdvz2Dpzr1K3DeSRw9+0N19ZefjV6 N09yPhX3sOqfFirxQ1w5UcivS8CKWZXO93Fg43mgha/PMcGImnpDH2mFJ/bcFTzaR018 xpEGX/Uc9PlYmXq1dUCtsIKv+4Vi21kOMbAT17SjN8gzwkZhFjGEkLM6lTvlBV5TUOSz cKIg== X-Gm-Message-State: AO0yUKWalkeFzmgtGSjOnfM7QIH7NHgsxG3Uch0Xk82jomrBlAOGd5jc Qv3jtFCu1in3bkpHi+PxZ0oGo5ymroSoVpguJSqJjFbseFvqMEljLLQNpNULgujO/aPa51JiWks J2TpgsOfndLMPxmAF6eKxlTrvlhEa8SgMINb1ELXWp3G4iGt0nZGB/uxFOrHiM9zm0w== X-Received: by 2002:a05:6000:110f:b0:2c7:d75:373a with SMTP id z15-20020a056000110f00b002c70d75373amr6695240wrw.1.1677745586524; Thu, 02 Mar 2023 00:26:26 -0800 (PST) X-Google-Smtp-Source: AK7set+/WTnByFy9CB08VApz6vCmNBpNWvwj0Pov3wkw/8kcyZ6gKfXnE3pw+3qClQF8Ut+u5z42kA== X-Received: by 2002:a05:6000:110f:b0:2c7:d75:373a with SMTP id z15-20020a056000110f00b002c70d75373amr6695223wrw.1.1677745586304; Thu, 02 Mar 2023 00:26:26 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:23 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , Eric Auger , Viktor Prutyanov , Peter Xu , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 37/53] intel-iommu: fail MAP notifier without caching mode Message-ID: <20230302082343.560446-38-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746013594100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jason Wang Without caching mode, MAP notifier won't work correctly since guest won't send IOTLB update event when it establishes new mappings in the I/O page tables. Let's fail the IOMMU notifiers early instead of misbehaving silently. Reviewed-by: Eric Auger Tested-by: Viktor Prutyanov Signed-off-by: Jason Wang Message-Id: <20230223065924.42503-2-jasowang@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 6b1de80e85..b520542c47 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3186,6 +3186,13 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemory= Region *iommu, "Snoop Control with vhost or VFIO is not supporte= d"); return -ENOTSUP; } + if (!s->caching_mode && (new & IOMMU_NOTIFIER_MAP)) { + error_setg_errno(errp, ENOTSUP, + "device %02x.%02x.%x requires caching mode", + pci_bus_num(vtd_as->bus), PCI_SLOT(vtd_as->devfn), + PCI_FUNC(vtd_as->devfn)); + return -ENOTSUP; + } =20 /* Update per-address-space notifier flags */ vtd_as->notifier_flags =3D new; --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746236; cv=none; d=zohomail.com; s=zohoarc; b=IleIaR8BGP8n8ayEyfMC64S6+O+gLwLmxLPnw++9n70qd34Bge/6IX/B2SfjvkPGT6mw5htrEVHK77R158tBimTgyXa9Nhp5vY9FRuQ4MUTvohU8f0Rit6VEWfhQs9aQE5PoML640K56cscDAl+GxFpfQ6Wgl3bueLDzGhyIezE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746236; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8a+rP6o0RdY4iJOHPH7os1V5R8oHg454SVeKQqR7OvE=; b=DPPzvGB/vu9XNlwZPBQ4RxrmSm2giEVKhugdDmz2Oy0IFYHaJFZ+HIICr3jVyUd4gfQIkEO9shcX5vrl1vT5ojeN97pr8rfLbZLyS6JpajYEnje+CMOcFnqeI3iytsq88Etv74Ken38M7jsYK0wLaOg8jA1R9LBQk578V4P3ogM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746236109441.9966188680629; Thu, 2 Mar 2023 00:37:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHL-0005kE-86; Thu, 02 Mar 2023 03:27:07 -0500 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 1pXeH9-0005fz-P5 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:55 -0500 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 1pXeGo-0002Ye-8P for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:35 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-635-G0577PPbOK2TxBL9oHVIjA-1; Thu, 02 Mar 2023 03:26:32 -0500 Received: by mail-wm1-f70.google.com with SMTP id n15-20020a05600c500f00b003dd07ce79c8so750440wmr.1 for ; Thu, 02 Mar 2023 00:26:31 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id a5-20020a5d4565000000b002c3f81c51b6sm14344430wrc.90.2023.03.02.00.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745593; 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: in-reply-to:in-reply-to:references:references; bh=8a+rP6o0RdY4iJOHPH7os1V5R8oHg454SVeKQqR7OvE=; b=CHJXkeRnSrPZh1Qzgb59skJRYmqIRB13F7AYcvNooYJxt6S8amZAPYHeyPxCVfKff8jQXd Gp4Lb7d6YBwxonaI1nm2inQT0SVxEJ9EFt2BqVcN7ib2Px2iHdR6IMW3hkez/UoLMzeURe 4X2XZXYKQBJhHykTGxnFbH6ztyXrvx8= X-MC-Unique: G0577PPbOK2TxBL9oHVIjA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745590; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8a+rP6o0RdY4iJOHPH7os1V5R8oHg454SVeKQqR7OvE=; b=s0iXpN4CBTT8rxRQYaZXZl61K7PwVRPgk7Og6Iy1UxA+Wv+n8Nd+5rl+w7T75NmEAe 1cekEiJWawBcRfzjEpb++rV1sz6p+80MrDLeAU8mbW1hngBDWHdTBepYdcq6lAHv+wyu 48yuq0E90ZG7Ae+wezb70X8ISeDj1jdp9Ib8mdR7mD4dWvs51J6AASjxtbHvCRP0IKux qR62bPYgVF0lEy3VClgLNfqg77bIoWTqP9vfl1vGJHiykpTH4ffNkFzCwVYDH/XTQ/gw GudvXhq8gcqJT87nVZWWFM/QvHzMyAGjkxMBOHKQykKYgUZMvIpGeM8ZvHoukgEUbMSY zARQ== X-Gm-Message-State: AO0yUKVB92INMvfyfIZU/257ppP0t4HgHtYwwuZjS7kOYlInOkiR8Suk 25xzbF5ktDv5BFlBsQfpke2C1doA/0R162yl+01d+SN2UNKeJOU6ahdIN5ETkr6g/r8DCGo3lu/ 4LoE/FEg2TCyfJZmeqFkfweqxThpFODf7Xx447kfQd+wwgUnvm/1r9XffkPrFtpTBmQ== X-Received: by 2002:adf:dc50:0:b0:2c5:8c04:efbf with SMTP id m16-20020adfdc50000000b002c58c04efbfmr6953666wrj.13.1677745590334; Thu, 02 Mar 2023 00:26:30 -0800 (PST) X-Google-Smtp-Source: AK7set/Bu3WyPD8pBXiRZOHZJd8z6WczAJvd+o8PN+ICev8A08ETgL91zAH7cKzWrukJ9alEpWdAUA== X-Received: by 2002:adf:dc50:0:b0:2c5:8c04:efbf with SMTP id m16-20020adfdc50000000b002c58c04efbfmr6953647wrj.13.1677745590111; Thu, 02 Mar 2023 00:26:30 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:26 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , Laurent Vivier , Viktor Prutyanov , Peter Xu , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PULL 38/53] intel-iommu: fail DEVIOTLB_UNMAP without dt mode Message-ID: <20230302082343.560446-39-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746236757100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jason Wang Without dt mode, device IOTLB notifier won't work since guest won't send device IOTLB invalidation descriptor in this case. Let's fail early instead of misbehaving silently. Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Tested-by: Viktor Prutyanov Buglink: https://bugzilla.redhat.com/2156876 Signed-off-by: Jason Wang Message-Id: <20230223065924.42503-3-jasowang@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index b520542c47..a6b35b07d2 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3179,6 +3179,7 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryR= egion *iommu, { VTDAddressSpace *vtd_as =3D container_of(iommu, VTDAddressSpace, iommu= ); IntelIOMMUState *s =3D vtd_as->iommu_state; + X86IOMMUState *x86_iommu =3D X86_IOMMU_DEVICE(s); =20 /* TODO: add support for VFIO and vhost users */ if (s->snoop_control) { @@ -3193,6 +3194,13 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemory= Region *iommu, PCI_FUNC(vtd_as->devfn)); return -ENOTSUP; } + if (!x86_iommu->dt_supported && (new & IOMMU_NOTIFIER_DEVIOTLB_UNMAP))= { + error_setg_errno(errp, ENOTSUP, + "device %02x.%02x.%x requires device IOTLB mode", + pci_bus_num(vtd_as->bus), PCI_SLOT(vtd_as->devfn), + PCI_FUNC(vtd_as->devfn)); + return -ENOTSUP; + } =20 /* Update per-address-space notifier flags */ vtd_as->notifier_flags =3D new; --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746178; cv=none; d=zohomail.com; s=zohoarc; b=UVmeKG7BF/dfvj0TraFdhIhGk3UpN1tWUYWj6aa7RPV+7ILeeD7gW+zA1i0aVgslvA2g4/6czeU33ImGyI2Uyl/1XKJeI7ODoQCnXyOsk/t+/8E/mn3NI9nyjbOOkYd9rwU6d6XSZLpfHxodJcTktaFiN0RXxAUzRPecCAwuug4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746178; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LzDUIaTuNEevHNuAn+p1xusIpzBBwqLlx1bsRJPHkfQ=; b=c4BVPgeSUgo9woFY8RjGI/VZHWPfYvGzigaPYEp/uHbkVrQxRbVqEC+tBDR3sTveP3OAANu9h9CpYWcyAr0bvsPOMtOH0NmrRrbJWQ7ofdo/FS72UBLFatVQDE16ETyqjZ2K/URV1N4MMOUA6ZbSgl0iVM1AfEwqEUT323YdMXw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746178158826.5424631342056; Thu, 2 Mar 2023 00:36:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHL-0005k4-A2; Thu, 02 Mar 2023 03:27:07 -0500 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 1pXeH9-0005g2-Ou for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:55 -0500 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 1pXeGr-0002aG-0H for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:38 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-607-n_OWyf5xNMiw5Z1G94iufQ-1; Thu, 02 Mar 2023 03:26:35 -0500 Received: by mail-wr1-f71.google.com with SMTP id g6-20020adfa486000000b002c55ef1ec94so2990333wrb.0 for ; Thu, 02 Mar 2023 00:26:34 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id hn30-20020a05600ca39e00b003e21f01c426sm2124351wmb.9.2023.03.02.00.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745596; 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: in-reply-to:in-reply-to:references:references; bh=LzDUIaTuNEevHNuAn+p1xusIpzBBwqLlx1bsRJPHkfQ=; b=gi3yebCUS8UMAJndrK1QY6pUxYLzq27q4k8Ct4W6QQce34QMpqOrirXpf0g9YRA0kvV2/y L+/9m/aTjdrh+wCE+pSLoLGs9Drk/uw1XuVcOLbLi+/0U8/kPrSj0NwjUJH8CH4kSOHNkX eZ3Gup7ZZtTP+4oJc9M/WdxWcH2KO8Y= X-MC-Unique: n_OWyf5xNMiw5Z1G94iufQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745593; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LzDUIaTuNEevHNuAn+p1xusIpzBBwqLlx1bsRJPHkfQ=; b=q6ELmqlzIWlnnnmNHmnZebtmTTjqBuXWvhyzYqyVxuNwYYLInI+ATZ5YXEJhn45caP TQVdjBWfjViWCoN4XHNJBjx78urm+0Ndv/XPj2uP0Xp14LfIyiD9FFRpsKCIaXccij98 i2EUBt3Q/nq1vqrIANOWC2TR6PORMaLy9n2uLsobFliHuflBV/2xXyPyciZLQHfMkGRO ZP2baTmI5LeE8lasdnXkr2U3HWuY1EhRiLDFkDaENLlhbEI2desVOdlxW2QjrmoahIsF hZ4s3+zqgQSWxPAxEsmDbLLgZc7A726YDwJoXpgr/0oBiDaodr24R0ce0n4Ey74R6cH1 F58g== X-Gm-Message-State: AO0yUKVyXgcWL7Exa8s6DVJhhSSBZ5C1I5an8xx6HQxWeV0JCPZukjSL pq1S9tz70J91fXOfrE8+QqmFZ4FxMYNrp9Zsc7M2fQ1t02cBjaG4EIYUFkMUY6E+8aBNWW550rF 796yN1HiqxyP2ZitebmJyYN/VGGeKM+IWfrwCnARxlpQSV3zIXdTGvH5F2OeMAkYMfA== X-Received: by 2002:a05:600c:3c81:b0:3df:fcbd:3159 with SMTP id bg1-20020a05600c3c8100b003dffcbd3159mr816530wmb.3.1677745593538; Thu, 02 Mar 2023 00:26:33 -0800 (PST) X-Google-Smtp-Source: AK7set8Z2QWGjPu0PX+qOTVsmQgyxRnrHjBCzUvbAETBgq6f1laiG8bVBLHq0mkpjbLESj8Woik0/A== X-Received: by 2002:a05:600c:3c81:b0:3df:fcbd:3159 with SMTP id bg1-20020a05600c3c8100b003dffcbd3159mr816515wmb.3.1677745593288; Thu, 02 Mar 2023 00:26:33 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:30 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , Peter Xu , Paolo Bonzini , David Hildenbrand , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: [PULL 39/53] memory: introduce memory_region_unmap_iommu_notifier_range() Message-ID: <20230302082343.560446-40-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746180352100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jason Wang This patch introduces a new helper to unmap the range of a specific IOMMU notifier. Signed-off-by: Jason Wang Message-Id: <20230223065924.42503-4-jasowang@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/exec/memory.h | 10 ++++++++++ softmmu/memory.c | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 2e602a2fad..6fa0b071f0 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1731,6 +1731,16 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *i= ommu_mr, void memory_region_notify_iommu_one(IOMMUNotifier *notifier, IOMMUTLBEvent *event); =20 +/** + * memory_region_unmap_iommu_notifier_range: notify a unmap for an IOMMU + * translation that covers the + * range of a notifier + * + * @notifier: the notifier to be notified + */ +void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *n); + + /** * memory_region_register_iommu_notifier: register a notifier for changes = to * IOMMU translation entries. diff --git a/softmmu/memory.c b/softmmu/memory.c index da7d846619..4699ba55ec 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1996,6 +1996,19 @@ void memory_region_notify_iommu_one(IOMMUNotifier *n= otifier, } } =20 +void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *n) +{ + IOMMUTLBEvent event; + + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.target_as =3D &address_space_memory; + event.entry.iova =3D n->start; + event.entry.perm =3D IOMMU_NONE; + event.entry.addr_mask =3D n->end - n->start; + + memory_region_notify_iommu_one(n, &event); +} + void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, int iommu_idx, IOMMUTLBEvent event) --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746150; cv=none; d=zohomail.com; s=zohoarc; b=awLNjELm1fHlj+MBz5YRTShkbKoP+QQ+31U8eYsq+pa/Ou7UFWhWKnG81OBbln9ZQz42aBGYuODX5y2D9Tb2WJzVZIHQ5BARgYsBTwTxGxOLJ/ECrWtVLk7ypdIXdlfOwUP22k4rAAU7ONi+YZ4q9P/st3lcllBgjN62sJxc/EU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746150; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mK9tqXrZVANih9PF7PI/TwHTz75DueFW9hq/Lbg2GQE=; b=gNaJ5IZb49GPtgKUN8p4ktUTSDVZkmFB5QE8kk0+/yiz1wJ+sfGczmsze1mzOCBeNnh08IS/sSsoP9GQg5ua7fqL1z5xQ7NYG58VItx5Q21rMoU60qLwK2bu7MSAX7otdEaMhzRW6KLtB9WxB5cTyebY7EOrYEbQxyYRLTEMz0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746150565392.52985185683224; Thu, 2 Mar 2023 00:35:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHb-0006RO-Mg; Thu, 02 Mar 2023 03:27:23 -0500 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 1pXeHB-0005gI-5L for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:57 -0500 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 1pXeGu-0002ac-CP for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:42 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-249-S3TabqArMNe8TkJmt05DzQ-1; Thu, 02 Mar 2023 03:26:38 -0500 Received: by mail-wm1-f71.google.com with SMTP id l23-20020a7bc457000000b003e206cbce8dso5463061wmi.7 for ; Thu, 02 Mar 2023 00:26:37 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id r15-20020a05600c2f0f00b003eae73f0fc1sm2157736wmn.18.2023.03.02.00.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745599; 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: in-reply-to:in-reply-to:references:references; bh=mK9tqXrZVANih9PF7PI/TwHTz75DueFW9hq/Lbg2GQE=; b=gtuA2hlqQ9ntTe/W8dS+4yg+yUnDE927woLquQzERv9b0i3KySbuL7hi//ClJuIew4Oz1C JebRZKf+2ZjO3tzYW+VDHQMquj4nOqJWRYbY4Mp9cpyQEoNqNGTshPnNQmzqQQWTPH1Bxi FSJbNw2MqJ9sNHRPopKS/oAogU2fxzE= X-MC-Unique: S3TabqArMNe8TkJmt05DzQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745596; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mK9tqXrZVANih9PF7PI/TwHTz75DueFW9hq/Lbg2GQE=; b=Y+SezVq/+l1+IyDx23YF7PSv65Snys3HZTwQhDrKV/NcaS3mDgqGbI21H0VkMBd5AR 5W68lGFozuj+c5DPm7ul81r7ROPSCupuOS94DXveNs8zNypCeBJD8w9iQwXzIvT3iJkf q/0tyUKPkQBxkwgP9pVX1spuspa0Yzbx5qBM94PTDIPTORYubSum0Q9vvyGFm4N9dHen sl51i0VhH5zpmHVf3uEZPh3ljNujDeyJ8i+okQeIcnf3JS2vQwXM1BJ97IZuybzkpJ/x BDQ59k4kVBkH5mkDYIunJfPrtPz/k+E+qJwvwMtxQiD6qY16e9Jg96UZJivvjI38gDSE qpXw== X-Gm-Message-State: AO0yUKWwiUcBEn9lA77Y2FFNusKen4dJx0l1pFaOS4cUFSX9WvuhjqtQ y/KIzHOVgzBe5ZdvuXHWk5l6pWcWyRsTTT+SCeGzJgmPd+bXn5ZzFOrKWRo60PYStxhiHjbl9bD e4N5jvIXH6w14iT9v4c4ttL/gijof7ijQOnTxao1+TKp1mZ8mc3bTt/WFTs8p+I50OQ== X-Received: by 2002:a05:6000:88:b0:2c7:6a6c:c72a with SMTP id m8-20020a056000008800b002c76a6cc72amr6324009wrx.48.1677745596474; Thu, 02 Mar 2023 00:26:36 -0800 (PST) X-Google-Smtp-Source: AK7set+8FPsC/pNLqD46HoPf4jhkeTGQITbrehqYZFaHz6vtjjxtHEW1Czsqh8HP970Y2Sd38/efgQ== X-Received: by 2002:a05:6000:88:b0:2c7:6a6c:c72a with SMTP id m8-20020a056000008800b002c76a6cc72amr6323995wrx.48.1677745596224; Thu, 02 Mar 2023 00:26:36 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:33 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , Peter Xu , Eric Auger , qemu-arm@nongnu.org Subject: [PULL 40/53] smmu: switch to use memory_region_unmap_iommu_notifier_range() Message-ID: <20230302082343.560446-41-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_H2=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746152321100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jason Wang Signed-off-by: Jason Wang Message-Id: <20230223065924.42503-5-jasowang@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/arm/smmu-common.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 0a5a60ca1e..e7f1c1f219 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -467,20 +467,6 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_= t sid) return NULL; } =20 -/* Unmap the whole notifier's range */ -static void smmu_unmap_notifier_range(IOMMUNotifier *n) -{ - IOMMUTLBEvent event; - - event.type =3D IOMMU_NOTIFIER_UNMAP; - event.entry.target_as =3D &address_space_memory; - event.entry.iova =3D n->start; - event.entry.perm =3D IOMMU_NONE; - event.entry.addr_mask =3D n->end - n->start; - - memory_region_notify_iommu_one(n, &event); -} - /* Unmap all notifiers attached to @mr */ static void smmu_inv_notifiers_mr(IOMMUMemoryRegion *mr) { @@ -488,7 +474,7 @@ static void smmu_inv_notifiers_mr(IOMMUMemoryRegion *mr) =20 trace_smmu_inv_notifiers_mr(mr->parent_obj.name); IOMMU_NOTIFIER_FOREACH(n, mr) { - smmu_unmap_notifier_range(n); + memory_region_unmap_iommu_notifier_range(n); } } =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746093; cv=none; d=zohomail.com; s=zohoarc; b=bRe256PNK3+YPwvDb6qlh0UT5KBqeF3ZNPDW5TsEz3jwnUi+AOYuZXPwccs3lszpyZQ0q6SODVTYYOwq0gptiaGiHd0/HGzycV1UmShSqnGRRpRVapfP/Nd8K7lRUB1A7kZcmGNvCfefffM99LTG0YqNJxvaQduGqA/FKFC2E44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746093; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wXVLWL/BesuAOOm6vpOl2pfhgEhXIwPZXi20f0iQFYo=; b=ZS3qolYk7uUTO4tDOkYqYLsqU6pnhJNPL63haslwdVwpgbBFfrb74+0Hd9XgLV21mfUHkmpTtgaASnWvug+FPpzM7t0K7xwSQE2Fxfs/hT2O/gv9nKWX60u1kDc6G3pvKgscmiDZPkVKZeTBYtJmQBZ/hLKAxwHBBd8AEwUrC1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16777460928481014.2045408535791; Thu, 2 Mar 2023 00:34:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHb-0006T9-Q0; Thu, 02 Mar 2023 03:27:23 -0500 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 1pXeHC-0005gW-RM for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:58 -0500 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 1pXeGx-0002b6-En for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:44 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-401-8m4FxOs5OAmRKIbQZxplEw-1; Thu, 02 Mar 2023 03:26:41 -0500 Received: by mail-wm1-f69.google.com with SMTP id m28-20020a05600c3b1c00b003e7d4662b83so950742wms.0 for ; Thu, 02 Mar 2023 00:26:41 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id q6-20020a1ce906000000b003e0015c8618sm2112909wmc.6.2023.03.02.00.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745602; 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: in-reply-to:in-reply-to:references:references; bh=wXVLWL/BesuAOOm6vpOl2pfhgEhXIwPZXi20f0iQFYo=; b=Ew8ryN5NC4HeruOzW7VSTf/PMg760FoTdI1uq4U/p4wDYS16WqDec9OUD2N94ffK9MeAjC 3yysympD39MVYNSI2M/L80N73RXGUfEUsMSV452IjE3eYuSst+9gpOREwXAbfg85HiDVc9 IM6axZWvVd/xf9NYjvoQRB8WoZBL43c= X-MC-Unique: 8m4FxOs5OAmRKIbQZxplEw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745600; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wXVLWL/BesuAOOm6vpOl2pfhgEhXIwPZXi20f0iQFYo=; b=lTxcRHjHmKJDXgamBSO8xBajuuDEPrynqN6UETtk9/wBdbzbOWdt/XsWZ55XiXfYDO rJIhwiYzd/ewkczj/aqsd0dIxYLtBH/qIViuoUKETweA8inSOXDsbL5XmmkStuEGvNCB hoDwd17/Vq2ONsjSrFUbApMJocv0MWN0sDBxMPXiLWQdCxZijFVqduA+Hu7kpY+TiXH9 a8F8xVK4TJV0Z3JCo+Ctj7Dr6lnpZ1cnd14qhRH3d68olQBrhRWh/NWTOt/LSjIivIP3 v3dNkg2gqqrN345tRxUKdoP1bh3Cn3NjdFsLnACmyzhSFLXz3R7TQPCOJLW7ISXrR0Dl KZag== X-Gm-Message-State: AO0yUKXl3mnTBiQaohtxKIOEk/sBp7W/Fezr0aKYSIuC0DMid6COv03x qCAJQi/TRSC78S13RGPElyapeiQhl/uaE6yV5Ft5jT/SLEXjFlXa+nqaohttP22ZOI8g6B6torm 9U4gcT/Dfa2q+DtJ49EFrbcomWoGncqSJdhJ/jllgOy42/1/j5Hbq9EWVUwb1na34PA== X-Received: by 2002:a5d:6805:0:b0:2c8:42b5:8025 with SMTP id w5-20020a5d6805000000b002c842b58025mr7760476wru.47.1677745599985; Thu, 02 Mar 2023 00:26:39 -0800 (PST) X-Google-Smtp-Source: AK7set90GREJXlJhKKuj/HJeAFX/2M0aKO9VxIzkVIEb9j53QKW66V46tXPq1Qnpx5rxNJ5zV6jBNw== X-Received: by 2002:a5d:6805:0:b0:2c8:42b5:8025 with SMTP id w5-20020a5d6805000000b002c842b58025mr7760459wru.47.1677745599624; Thu, 02 Mar 2023 00:26:39 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:36 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Xu , Jason Wang , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 41/53] intel-iommu: send UNMAP notifications for domain or global inv desc Message-ID: <20230302082343.560446-42-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746093952100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Peter Xu We don't send UNMAP notification upon domain or global invalidation which will lead the notifier can't work correctly. One example is to use vhost remote IOTLB without enabling device IOTLB. Fixing this by sending UNMAP notification. Signed-off-by: Peter Xu Signed-off-by: Jason Wang Message-Id: <20230223065924.42503-6-jasowang@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index a6b35b07d2..faade7def8 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1530,13 +1530,17 @@ static int vtd_sync_shadow_page_table_range(VTDAddr= essSpace *vtd_as, return vtd_page_walk(s, ce, addr, addr + size, &info, vtd_as->pasid); } =20 -static int vtd_sync_shadow_page_table(VTDAddressSpace *vtd_as) +static int vtd_address_space_sync(VTDAddressSpace *vtd_as) { int ret; VTDContextEntry ce; IOMMUNotifier *n; =20 - if (!(vtd_as->iommu.iommu_notify_flags & IOMMU_NOTIFIER_IOTLB_EVENTS))= { + /* If no MAP notifier registered, we simply invalidate all the cache */ + if (!vtd_as_has_map_notifier(vtd_as)) { + IOMMU_NOTIFIER_FOREACH(n, &vtd_as->iommu) { + memory_region_unmap_iommu_notifier_range(n); + } return 0; } =20 @@ -2000,7 +2004,7 @@ static void vtd_iommu_replay_all(IntelIOMMUState *s) VTDAddressSpace *vtd_as; =20 QLIST_FOREACH(vtd_as, &s->vtd_as_with_notifiers, next) { - vtd_sync_shadow_page_table(vtd_as); + vtd_address_space_sync(vtd_as); } } =20 @@ -2082,7 +2086,7 @@ static void vtd_context_device_invalidate(IntelIOMMUS= tate *s, * framework will skip MAP notifications if that * happened. */ - vtd_sync_shadow_page_table(vtd_as); + vtd_address_space_sync(vtd_as); } } } @@ -2140,7 +2144,7 @@ static void vtd_iotlb_domain_invalidate(IntelIOMMUSta= te *s, uint16_t domain_id) if (!vtd_dev_to_context_entry(s, pci_bus_num(vtd_as->bus), vtd_as->devfn, &ce) && domain_id =3D=3D vtd_get_domain_id(s, &ce, vtd_as->pasid)) { - vtd_sync_shadow_page_table(vtd_as); + vtd_address_space_sync(vtd_as); } } } --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746026; cv=none; d=zohomail.com; s=zohoarc; b=IVQ14AZDi5ezJNjFv6qjIVb7Q6gmV/KYuIk5qXa6C/ofQk4yTI+4Bso5An44U0v+lpJ9dqd4Vf1JUeUOIMMA1fUd8M39rlhy4kFinOXLCUel5qy71w3MjmmKEDagsYMSO83F/REw2gwqNYT9EpS3TgRfB4+IgDP2jBrN0GFPNmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746026; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nnTR3xgEleaKgQugx6zt8EnPv3TKHsZvrDjaL0Vvsrk=; b=OsM8JNPlP/pqNft5+qP1P/3zhhgrQAh3AE5gPsnZ8AfEnV+J7MzFV9t8KqwnAUGzmbAg/gwJA8b/EqXu7AexYMWL4G8oh0d8QzQhMRG5r8rsrgdxZ9vpNoTV1nMCwoWmxYsLlFmo+9n9ar7KZCV6C7mZ3s4mSNqCiG+d92yOdZI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746026316865.5770452514288; Thu, 2 Mar 2023 00:33:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHU-0005sI-3O; Thu, 02 Mar 2023 03:27:16 -0500 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 1pXeHE-0005gq-1v for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:00 -0500 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 1pXeH3-0002bb-2t for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:50 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-329-0yjyyI8cNsGgVopSMVL41w-1; Thu, 02 Mar 2023 03:26:45 -0500 Received: by mail-wm1-f69.google.com with SMTP id l16-20020a05600c1d1000b003e77552705cso743030wms.7 for ; Thu, 02 Mar 2023 00:26:44 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id e16-20020a7bc2f0000000b003eb5a531232sm2147188wmk.38.2023.03.02.00.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745608; 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; bh=nnTR3xgEleaKgQugx6zt8EnPv3TKHsZvrDjaL0Vvsrk=; b=VAQYK/tjEI+7PCu5oW6xkrR65GAcfLAZRlB8NgofbldjCumDExgo6zkEo465UhaCziGGHd QCgOIXu8NVEUxlwfvgq028oQSgq3dnx1H22z81F8AQ8rFFNhfIChewJP0+er1f4yx68Sq8 CYNiYw0iErmVlC8U/yJGKIZrULWQ6PE= X-MC-Unique: 0yjyyI8cNsGgVopSMVL41w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745603; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nnTR3xgEleaKgQugx6zt8EnPv3TKHsZvrDjaL0Vvsrk=; b=gZJ07YhpjAcPeV6M7DuYp3fqUUAqVvcS/aYW3eU46HsUCKeGnAGzK6b0wyg7FFCqiZ GPB+zFK2dOFvsR8ZAAF8xUZPp/5gAy7xkE/Ihc4nN3X/w3p7RN7qxLJaTVNzebl/dwOa SGJ7m0Y3XSbnSg9AbDKApB35+sH0NioIH13CG4vEz0JcwklyJqgC6t1ScsqJt77Aq1dj oWvE0+UY2A6KepcLpl9UQGlSv4QEjJixyotyrHNQozUNbDr9AIcGhJ6MQ/F5NgdXIny/ hWSGgHrlPqhbQYGb/WQTRPKyhkRoR8D9gmCJPQZCqHOL5pDVZCdGZ44ye2cQNC+jUQzy AP0g== X-Gm-Message-State: AO0yUKVUSkfWCQghAfjjUmtyI1cBDnRrlbBhluzRhy+3u1k9DDC3K6H5 Rs7wtwzC5VoI12Lqv/C/IwmncmsQXlypsP7W9mtj2rdiWbO4jNC/RAVJvKUUFnyA7vg8uiGDn4N t5ypHZdd5Qf2ia91rCyQWKeQp3uAk8sFMrmLKZjpdA6ydUTXxX83vy+N94UGneLYVOg== X-Received: by 2002:a05:600c:8518:b0:3eb:3cc9:9f85 with SMTP id gw24-20020a05600c851800b003eb3cc99f85mr8021200wmb.26.1677745603509; Thu, 02 Mar 2023 00:26:43 -0800 (PST) X-Google-Smtp-Source: AK7set/2pyEy5IouLjMztmLJAPfYvTgGV3rQf/FDDjjqlh6nWgdSrl2ynnKOF829DNCU1xrcPpU9iw== X-Received: by 2002:a05:600c:8518:b0:3eb:3cc9:9f85 with SMTP id gw24-20020a05600c851800b003eb3cc99f85mr8021180wmb.26.1677745603255; Thu, 02 Mar 2023 00:26:43 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:40 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jonathan Cameron , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Markus Armbruster , Fan Ni , Richard Henderson , Thomas Huth , Stefan Hajnoczi Subject: [PULL 42/53] MAINTAINERS: Add Fan Ni as Compute eXpress Link QEMU reviewer Message-ID: <20230302082343.560446-43-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746027649100001 From: Jonathan Cameron Fan Ni has offered to help out with QEMU CXL emulation reviewing. Add him as a designated reviewer. Thanks to Fan for stepping up after I requested help following Ben stepping down as co-maintainer. Fan base been active in testing and review recently so great to have Fan on board. Based on patch [PATCH] MAINTAINERS: Remove CXL maintainer Ben Widawsky Message-id: <20230220212437.1462314-1-armbru@redhat.com> Message-Id: <20230228113926.11485-1-Jonathan.Cameron@huawei.com> Signed-off-by: Jonathan Cameron Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Markus Armbruster Acked-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e96e9dbfe6..a4647dd1c4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2637,6 +2637,7 @@ T: git https://gitlab.com/vsementsov/qemu.git block Compute Express Link M: Ben Widawsky M: Jonathan Cameron +R: Fan Ni S: Supported F: hw/cxl/ F: hw/mem/cxl_type3.c --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745844; cv=none; d=zohomail.com; s=zohoarc; b=AZfP0SQP3iUhSiNAKT6a3grL6VJN7Do+RmYhBtfDAodzXXUsUUlN+uzfYvKUYMo2pwEZfxIo2nEAHzG4VrI3HASMIM5Qz5vO1zlOVoInXmc3+PTJGmFIiF4sBhXZEg46iV4gTF0axX8XB1JSP/QrnSk/DAKBKDdBkOmDFXinGZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745844; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KXKJYPHxmk6txH9lWOLxXYxCMI6HULeDlaEu87sqk8Y=; b=XZd1xkeA4sSIiYz4IBJR3BNy8JQ+Q6QjvfYczg5iIkVSQWiS4/w9AjftyPrhUKdCXrjtIMQZdZEvERauqVF3G7Q0okvf9BoM4+zgYtz57SNen7fx9m1e4WY+yO2woLphLUgBkJVE60A2kLyrPaauzzING2iVeLABIYUuuueufBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745844779918.981749890052; Thu, 2 Mar 2023 00:30:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHZ-0006EZ-QI; Thu, 02 Mar 2023 03:27:21 -0500 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 1pXeHE-0005gz-VI for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:00 -0500 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 1pXeH4-0002bg-46 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:51 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-433-FpC0A7OVPf6fOLa2fX2ZLQ-1; Thu, 02 Mar 2023 03:26:48 -0500 Received: by mail-wm1-f69.google.com with SMTP id t1-20020a7bc3c1000000b003dfe223de49so924514wmj.5 for ; Thu, 02 Mar 2023 00:26:47 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id i15-20020adffdcf000000b002c58ca558b6sm14710566wrs.88.2023.03.02.00.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745609; 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: in-reply-to:in-reply-to:references:references; bh=KXKJYPHxmk6txH9lWOLxXYxCMI6HULeDlaEu87sqk8Y=; b=EB9HmQF4GIEUmAx/jITwRRF0ygs+x+e/YGS2rfUNkidZ9LvZRRYVfU9wyLN/Z+Tg/mPV3T j92mvpPQ+gv4QRIn+1upkBktVOxgFxhTNRXYM96GnlmZVfBjwx8FoKjAsxI3keQVoayToh D2gEBTuChlYgiAynpbrvrNB3Vi5aMCY= X-MC-Unique: FpC0A7OVPf6fOLa2fX2ZLQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745606; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KXKJYPHxmk6txH9lWOLxXYxCMI6HULeDlaEu87sqk8Y=; b=Yc7HWq0KMUk1pHdEowRWm5Isy3VBdWAW7eol7mXOxeLhsORrK5B7Y+nAGN9Ta9P1WZ 6pbDNu76zDe8TfF6c1uXq5V2ekm3OPnjkrPSaUtP5Fscg7whYHSdZqMI9PPRVnkdsDnz Borrj6nI0efxR/1b6KJIIlmVhBUR/+NoBUhX0DjHoOX35QiFXyM+HZO9EhNT9igbUiTk VwZjlqEeK6jXhCkY4gCt2SW7iNXblHDY0vKgI4pJDnzlXVB2ftW9ch5PzKA/D4RQXJSD lVyJVUIGiqqSEkjIikfUQ25vSnLGoGMzRTrGZpcPZBad9q53RbLrKyqWRHW4Y48WEV/N Mlig== X-Gm-Message-State: AO0yUKVQL9zaB8MXBCEb8Yvk0nxl7jLdqTygVyjCsBRhdxsluHIfxEws JfHBZM3oPj8QrH+njs625UwG3Vmo3blXW/jQptjBhkHqqbhbhfqWx8qKiE3aiOyfPzPOClZKxeq ljv0epCW2Rp1EpwNuQVufLwWzgI4S4godH2KU6IpBsGL+NOT4E7A3xEABdgbgVioPqw== X-Received: by 2002:a05:600c:3542:b0:3eb:2b88:5af2 with SMTP id i2-20020a05600c354200b003eb2b885af2mr7494470wmq.20.1677745606508; Thu, 02 Mar 2023 00:26:46 -0800 (PST) X-Google-Smtp-Source: AK7set/e6e3+0kjIHFhg0ff0K8memG7EK/ajFzZdMMBYU/qCuXCNWCgjpDD8U8r1+OjHmJpgas8lJg== X-Received: by 2002:a05:600c:3542:b0:3eb:2b88:5af2 with SMTP id i2-20020a05600c354200b003eb2b885af2mr7494456wmq.20.1677745606257; Thu, 02 Mar 2023 00:26:46 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:43 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jonathan Cameron , Ira Weiny , Gregory Price , Fan Ni , Ben Widawsky Subject: [PULL 43/53] hw/mem/cxl_type3: Improve error handling in realize() Message-ID: <20230302082343.560446-44-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745847097100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jonathan Cameron msix_init_exclusive_bar() can fail, so if it does cleanup the address space. Reviewed-by: Ira Weiny Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-2-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/mem/cxl_type3.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index dae4fd89ca..252822bd82 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -401,7 +401,7 @@ static void ct3_realize(PCIDevice *pci_dev, Error **err= p) MemoryRegion *mr =3D ®s->component_registers; uint8_t *pci_conf =3D pci_dev->config; unsigned short msix_num =3D 1; - int i; + int i, rc; =20 if (!cxl_setup_memory(ct3d, errp)) { return; @@ -438,7 +438,10 @@ static void ct3_realize(PCIDevice *pci_dev, Error **er= rp) &ct3d->cxl_dstate.device_registers); =20 /* MSI(-X) Initailization */ - msix_init_exclusive_bar(pci_dev, msix_num, 4, NULL); + rc =3D msix_init_exclusive_bar(pci_dev, msix_num, 4, NULL); + if (rc) { + goto err_address_space_free; + } for (i =3D 0; i < msix_num; i++) { msix_vector_use(pci_dev, i); } @@ -450,6 +453,11 @@ static void ct3_realize(PCIDevice *pci_dev, Error **er= rp) cxl_cstate->cdat.free_cdat_table =3D ct3_free_cdat_table; cxl_cstate->cdat.private =3D ct3d; cxl_doe_cdat_init(cxl_cstate, errp); + return; + +err_address_space_free: + address_space_destroy(&ct3d->hostmem_as); + return; } =20 static void ct3_exit(PCIDevice *pci_dev) --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745899; cv=none; d=zohomail.com; s=zohoarc; b=BcwSWlylfUlr9+rPtn5ODuSmHn/kW+6YsOJYPUu4CpedYqE1BjWl5imV68lwSSjLaXDuKL2HsRXD9tYdC82Pw7iI36n+KWrKhCpqf7OaTzRBB0XgHlFP7OqcvMQN7MZQRXjhxnm0UfZkDqIq2BapLIEnM6XEdte1j8/Fg+Ztbcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745899; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W05d36iyqgPX5XxXyCwMaq0MQ8DCCuia50mu0w9ZGq8=; b=GPeQLw3+J9q94a45GNh1/AGTYmtFKjW1jWiM4m3ZRVCt+EX+vkjm9v2Qt6t3hOifbCeLqSnBVOlOMDCPNg8SJ+dBIpIw37M1UXnEl+exYrNEuvt5XiSvj20uZAKFNr+An+KqvHsO539li1G7/76IGlSP/yzwe5ARit20O3rAHP4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745899211487.6700020893343; Thu, 2 Mar 2023 00:31:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHd-0006tB-N1; Thu, 02 Mar 2023 03:27:25 -0500 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 1pXeHF-0005h9-Lm for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:01 -0500 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 1pXeH7-0002bz-9C for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:54 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-589-u0YNPpVMMZ6O10788MXRww-1; Thu, 02 Mar 2023 03:26:51 -0500 Received: by mail-wm1-f72.google.com with SMTP id m28-20020a05600c3b1c00b003e7d4662b83so950935wms.0 for ; Thu, 02 Mar 2023 00:26:51 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id l8-20020adff488000000b002c557f82e27sm14712293wro.99.2023.03.02.00.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745612; 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; bh=W05d36iyqgPX5XxXyCwMaq0MQ8DCCuia50mu0w9ZGq8=; b=f96dXtNpdv9ySMPYFJU89nSY9XRcXjr0nAiNLv0nB8/cfV0sD7npXTsgIv/EmI5/LqK2EM RwYIBkhNHqp5M4nB5tZWRZSJIMFjBpQanQ3MF6Rlnc5f8emtyqW0U4upiSByIVAcml5eqd gMLRmqQcnOHY3LoW0XkLgZ1mq3pfue4= X-MC-Unique: u0YNPpVMMZ6O10788MXRww-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745610; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W05d36iyqgPX5XxXyCwMaq0MQ8DCCuia50mu0w9ZGq8=; b=nvy3ViyIaElAZF4y1bzquctT91/Zr3+Ja+Rs3TYbfNPVPn1BFzwhSaBevUSWYcCg0/ TZBNCpspCeREZRXhpvL650AXznCpTJmvzN1FG9QoAVTI/BbyUza9OxtW1PiWhpwNBnfz OPLtsAZtSCt+wtMdnOqQ+QbUFYSKPY9DSg/lOQlOn4I6spDUOmFyEoRXORytmNz9B3lI svdDgHgsfwuI1TuKbwU8fktitR5WesvG10SX4EZ6DGshtAa+AT78detrLqjLi085HqlV +HZy96pFHaxm6IKDM3lp4I+6IBdaU0tHh96W0pX/HTcBAcxu9SPg7fXM+yuzStwXkpzp mpPw== X-Gm-Message-State: AO0yUKX+JplmiF4FMNxOCpls2YaxAjkxjsYPKK8CT0HH9rSPX+Vf9kBC aZmiofSb+gGgWaxmrmLOBhccA9YJkxRmIZzprQ6Go8RtnMXY1RDvtdzf3QG16jB2SbIJLGwyjoP CAuArLGXtFn7qLs79/79prxFLgzMEe7s5mMzJ66wS2b3GYJI6+Q7PWBmXt5voSoKtbw== X-Received: by 2002:adf:f847:0:b0:2c6:e7f6:49af with SMTP id d7-20020adff847000000b002c6e7f649afmr6508301wrq.27.1677745610040; Thu, 02 Mar 2023 00:26:50 -0800 (PST) X-Google-Smtp-Source: AK7set/QFJorrIWEopzDdS2L2WIXDcUwWJ2tAuco/rEd1u7beq8jTElK5HEh7116i5/iTIge8zHglA== X-Received: by 2002:adf:f847:0:b0:2c6:e7f6:49af with SMTP id d7-20020adff847000000b002c6e7f649afmr6508286wrq.27.1677745609853; Thu, 02 Mar 2023 00:26:49 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:46 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jonathan Cameron , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Ira Weiny , Gregory Price , Fan Ni , Marcel Apfelbaum Subject: [PULL 44/53] hw/pci-bridge/cxl_downstream: Fix type naming mismatch Message-ID: <20230302082343.560446-45-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745901054100003 From: Jonathan Cameron Fix capitalization difference between struct name and typedef. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ira Weiny Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-3-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci-bridge/cxl_downstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c index 3d4e6b59cd..54f507318f 100644 --- a/hw/pci-bridge/cxl_downstream.c +++ b/hw/pci-bridge/cxl_downstream.c @@ -15,7 +15,7 @@ #include "hw/pci/pcie_port.h" #include "qapi/error.h" =20 -typedef struct CXLDownStreamPort { +typedef struct CXLDownstreamPort { /*< private >*/ PCIESlot parent_obj; =20 --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746129; cv=none; d=zohomail.com; s=zohoarc; b=Wqy52JNBtsTI8JtPIAsQUoOfmDZ45NqMNp1UNoHfZbfUsxOG+e5TLb76A81uqFVkNyeAwBFnMlneRdAZfgx83TL11L358tK/j3s4j1AX0k7kdpbWMqqtRI4yDQNJ+2iTI0w3sIDmWgblvhjiF2TT0D1ueLSgk+DFMu0tc0+uaBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746129; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9Oa6YLBxIoDgfjENvfUetPLFDxTwoQRGLPSXdNky5K8=; b=BnAbz1EtevmrwJmGWTlhBltiv9DIElyOhYIKvZJy2a76GC913AT5lxlA1FanAQKio/E1524WR1NEJD+QTKX92/8dJj0QvVZiGe2P/D2R64MhiDo0tctLUGeIyxA5yn6B26hYNE2lPgGyJPbngXz5IgKPnOPyWcUTx1IcYkCCt6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746129008365.7947844130739; Thu, 2 Mar 2023 00:35:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHh-0007LY-LB; Thu, 02 Mar 2023 03:27:29 -0500 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 1pXeHF-0005hM-S1 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeHB-0002cl-KC for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:26:58 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-314-gYrAdg0lOXSNwEyz7jSvDA-1; Thu, 02 Mar 2023 03:26:55 -0500 Received: by mail-wm1-f71.google.com with SMTP id p22-20020a7bcc96000000b003e2036a1516so920879wma.7 for ; Thu, 02 Mar 2023 00:26:55 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id f20-20020a7bc8d4000000b003db03725e86sm2082330wml.8.2023.03.02.00.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745617; 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: in-reply-to:in-reply-to:references:references; bh=9Oa6YLBxIoDgfjENvfUetPLFDxTwoQRGLPSXdNky5K8=; b=NcDIs0qvjxuYRf52o56w9hGTVgNQbokhgb9qfimwI9G920G2ANMdznXpRE7Tm5j2lSutBx uK0Kp71ubOG6M4lxec9kEBlf1MSYg0avM3V7ZAyzsQ2IAVIWQD6FL6BgsBXoxBHOd/wU+h 43FEmsUYI2sPBkHdK6MedEv5N735nVc= X-MC-Unique: gYrAdg0lOXSNwEyz7jSvDA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745614; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9Oa6YLBxIoDgfjENvfUetPLFDxTwoQRGLPSXdNky5K8=; b=ebd4kCJ1zq81EGhs8mEkQ6fy7XVSAb6JGSDi0mj3OwvHIK43kpo1Wg1eTB409/W/Y1 +d3gUmIvH8frjtA5yoCmSBTIPg+LlHiEuy31QWrBTh+Bml9Rj2zG9MR5EbxLii2b4Tm7 WSoYQd1CPs0T44jsIdW19Z8JhXXfM3YwPhFLanCxcFrED/KU8VwVPDsZrYwY93r9muv+ wmZz9VP6uVHA4N/YfK3+D1SNWJvU/TK5Pmnolebt18XeLlqnqLOQjZDGmaxSsY1kzmOt sejHfMO2pNfHi0CIxeLbRHdHbNU5Y2pHGRoUiA/ju2gL0xFQKji3ddbcQr6To2opSGtx rDyA== X-Gm-Message-State: AO0yUKVztAr7Jmhmgm4uIFZ7U5Wu2rDoEPVnCCi7flh3ewS8mnTHFim3 Wx2JU165GpPqcGIE53MhA/TABLQSYS6uFtMDWhgwpu15psPDQ0QA6qrnMmx45LX5rLelAI/GlnH QLXCqlnRi9VSqEnGU6qRV4dgDk6ieZ8lm8MZ8SviMI3Ac1B/YgRuBgZ8DZBG/I943Cg== X-Received: by 2002:a05:600c:45d3:b0:3ea:f883:5ac with SMTP id s19-20020a05600c45d300b003eaf88305acmr6889191wmo.5.1677745614175; Thu, 02 Mar 2023 00:26:54 -0800 (PST) X-Google-Smtp-Source: AK7set8TXpwQkoQrmiuWHa+5xCUJ2f3q7lFN2DlYCU8Z93Omodb4E3iDozBY14FqHM214+7ny+qQYw== X-Received: by 2002:a05:600c:45d3:b0:3ea:f883:5ac with SMTP id s19-20020a05600c45d300b003eaf88305acmr6889169wmo.5.1677745613830; Thu, 02 Mar 2023 00:26:53 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:50 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Gregory Price , Davidlohr Bueso , Ira Weiny , Gregory Price , Jonathan Cameron , Fan Ni , Ben Widawsky Subject: [PULL 45/53] hw/cxl: set cxl-type3 device type to PCI_CLASS_MEMORY_CXL Message-ID: <20230302082343.560446-46-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746130102100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gregory Price Current code sets to STORAGE_EXPRESS and then overrides it. Reviewed-by: Davidlohr Bueso Reviewed-by: Ira Weiny Signed-off-by: Gregory Price Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-4-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/mem/cxl_type3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 252822bd82..217a5e639b 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -408,7 +408,6 @@ static void ct3_realize(PCIDevice *pci_dev, Error **err= p) } =20 pci_config_set_prog_interface(pci_conf, 0x10); - pci_config_set_class(pci_conf, PCI_CLASS_MEMORY_CXL); =20 pcie_endpoint_cap_init(pci_dev, 0x80); if (ct3d->sn !=3D UI64_NULL) { @@ -627,7 +626,7 @@ static void ct3_class_init(ObjectClass *oc, void *data) =20 pc->realize =3D ct3_realize; pc->exit =3D ct3_exit; - pc->class_id =3D PCI_CLASS_STORAGE_EXPRESS; + pc->class_id =3D PCI_CLASS_MEMORY_CXL; pc->vendor_id =3D PCI_VENDOR_ID_INTEL; pc->device_id =3D 0xd93; /* LVF for now */ pc->revision =3D 1; --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746208; cv=none; d=zohomail.com; s=zohoarc; b=SzeufyLJ/Lw2Hyh9zfSGuEdgQW72p3QUlXPtCRO/1OFgErYCacjbQd5U/z+fpwCx8xzlgbLFa+1Er3MPUF/VI4NDPueqMtADspT3Jq/CVcWVoEFt9qa9YgBScq6d9e6KEuNU3dcwRl1KQLbwnMRm9MxnYtJI51rV9EgXyU2Xw6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746208; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7sh8dSfop4p9UJ3T0MvZ2cmCfp1xzBPVgRTzyaj5hc4=; b=Fs2/W5HUrR2YzfaDH9XCBhWpNxvS/lz4vJEzX94yEFcI2jBYF7tkphg4mJ+IwQIGLhvBvp0zEkpA0QkqbIys5NsH5vl/FvrgH3j1hWFdwsq1xIjnvg0AGK7UKvKnvQTF6sLR9y0ruDbKdg1cvO4gLewApEVyoVpBGSSA8hQhHiA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167774620818713.203701693823518; Thu, 2 Mar 2023 00:36:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHf-00076Z-C8; Thu, 02 Mar 2023 03:27:27 -0500 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 1pXeHH-0005hb-0F for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeHE-0002cw-Hj for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:01 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-70-TY3Z7dYiMm6AaWErYNf2qA-1; Thu, 02 Mar 2023 03:26:58 -0500 Received: by mail-wm1-f71.google.com with SMTP id t1-20020a7bc3c1000000b003dfe223de49so924753wmj.5 for ; Thu, 02 Mar 2023 00:26:58 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id u8-20020a05600c440800b003eb3933ef10sm2073958wmn.46.2023.03.02.00.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745620; 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: in-reply-to:in-reply-to:references:references; bh=7sh8dSfop4p9UJ3T0MvZ2cmCfp1xzBPVgRTzyaj5hc4=; b=cfAYkMAdgPDfp2GBapxtPWQVA6nBAlHaSKC3OzV9dv/wafdRA5mYlDlsP5E+zyuIVnGdh8 Gi/Su+xk2Jv0SU1pGIbsSyx/iWvkn5dbbWM2n+YrKqGvaWk0SkTPaE3TEEtCtPsA0CUOBr 7KLx+QYLwyXqdD1UkK0DMC5xoHCSFvw= X-MC-Unique: TY3Z7dYiMm6AaWErYNf2qA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745617; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7sh8dSfop4p9UJ3T0MvZ2cmCfp1xzBPVgRTzyaj5hc4=; b=zK3ebiudUGBJ92SPJex9BkGWauK+pHSn7hNaJp4tDUt22H424s69zd8r+HiAKYH8if W6AgyCVKN7pLKwz0bxfki4geVcFTzHt0IUBDlffDBZdraFsEDS6w1cmoiWlHl09nSRAu 2C836ukjXti7k0haXW1R2EAw5eqou8hdc39rk8dZVqnFJjbxHfSoJXtD21lpM47JdxFY zC/fb3jK602JTSUc1FNeFrfa73GKY6vsrWsIdyN26iwkXyxjKGnbsuhbRHI1k0dZiYBA 8YLcLbQItJ3xZqib3FQJd7Y6DozwNCQDLrp5KZNyQYS7nqbX0ZI00KXeIKpQ+y52yU0l qLgg== X-Gm-Message-State: AO0yUKWozctvgKmYptGJof5w75yY9INwE7u4GTh4vw8s8/n7jnhTWzrU +HbxX2KvTdpYAotWukoQkV/9E4ngubuQtsuV3TwTUj0buzMz5VTwLSBrAqozg0gUy/V7+5fFvRz s9WgaM6x16KUUYwyz6Boe8AvEKrO16BtishjxtZS91mm9bVEuk2gWli56zUTRJAfqpw== X-Received: by 2002:a05:600c:4a9f:b0:3eb:3908:8541 with SMTP id b31-20020a05600c4a9f00b003eb39088541mr6588281wmp.2.1677745617139; Thu, 02 Mar 2023 00:26:57 -0800 (PST) X-Google-Smtp-Source: AK7set80Ovf/bCv5bvVqVYbewAS/emBOgZ1D3xldmH6cE5Nl4BcD8Z1i7NmXxt/fKLvWtFQDmMwazw== X-Received: by 2002:a05:600c:4a9f:b0:3eb:3908:8541 with SMTP id b31-20020a05600c4a9f00b003eb39088541mr6588260wmp.2.1677745616805; Thu, 02 Mar 2023 00:26:56 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:54 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Gregory Price , Gregory Price , Davidlohr Bueso , Jonathan Cameron , Fan Ni , Ben Widawsky Subject: [PULL 46/53] hw/cxl: Add CXL_CAPACITY_MULTIPLIER definition Message-ID: <20230302082343.560446-47-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746208570100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gregory Price Remove usage of magic numbers when accessing capacity fields and replace with CXL_CAPACITY_MULTIPLIER, matching the kernel definition. Signed-off-by: Gregory Price Reviewed-by: Davidlohr Bueso Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-5-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/cxl/cxl-mailbox-utils.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index bc1bb18844..3f67b665f5 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -12,8 +12,11 @@ #include "hw/pci/pci.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "qemu/units.h" #include "qemu/uuid.h" =20 +#define CXL_CAPACITY_MULTIPLIER (256 * MiB) + /* * How to add a new command, example. The command set FOO, with cmd BAR. * 1. Add the command set and cmd to the enum. @@ -138,7 +141,7 @@ static ret_code cmd_firmware_update_get_info(struct cxl= _cmd *cmd, } QEMU_PACKED *fw_info; QEMU_BUILD_BUG_ON(sizeof(*fw_info) !=3D 0x50); =20 - if (cxl_dstate->pmem_size < (256 << 20)) { + if (cxl_dstate->pmem_size < CXL_CAPACITY_MULTIPLIER) { return CXL_MBOX_INTERNAL_ERROR; } =20 @@ -283,7 +286,7 @@ static ret_code cmd_identify_memory_device(struct cxl_c= md *cmd, CXLType3Class *cvc =3D CXL_TYPE3_GET_CLASS(ct3d); uint64_t size =3D cxl_dstate->pmem_size; =20 - if (!QEMU_IS_ALIGNED(size, 256 << 20)) { + if (!QEMU_IS_ALIGNED(size, CXL_CAPACITY_MULTIPLIER)) { return CXL_MBOX_INTERNAL_ERROR; } =20 @@ -293,8 +296,8 @@ static ret_code cmd_identify_memory_device(struct cxl_c= md *cmd, /* PMEM only */ snprintf(id->fw_revision, 0x10, "BWFW VERSION %02d", 0); =20 - id->total_capacity =3D size / (256 << 20); - id->persistent_capacity =3D size / (256 << 20); + id->total_capacity =3D size / CXL_CAPACITY_MULTIPLIER; + id->persistent_capacity =3D size / CXL_CAPACITY_MULTIPLIER; id->lsa_size =3D cvc->get_lsa_size(ct3d); =20 *len =3D sizeof(*id); @@ -314,14 +317,14 @@ static ret_code cmd_ccls_get_partition_info(struct cx= l_cmd *cmd, QEMU_BUILD_BUG_ON(sizeof(*part_info) !=3D 0x20); uint64_t size =3D cxl_dstate->pmem_size; =20 - if (!QEMU_IS_ALIGNED(size, 256 << 20)) { + if (!QEMU_IS_ALIGNED(size, CXL_CAPACITY_MULTIPLIER)) { return CXL_MBOX_INTERNAL_ERROR; } =20 /* PMEM only */ part_info->active_vmem =3D 0; part_info->next_vmem =3D 0; - part_info->active_pmem =3D size / (256 << 20); + part_info->active_pmem =3D size / CXL_CAPACITY_MULTIPLIER; part_info->next_pmem =3D 0; =20 *len =3D sizeof(*part_info); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745759; cv=none; d=zohomail.com; s=zohoarc; b=hkgewkNpLa0eEIZtO3phRaqHbVtVtk1CAqzra12ySkWTgsK/UWeoCYZKK3Be8zv2ewO+jhF909gYiipLu/4a6GRGKz3YLnZw5oVVh+Rwm4pxN6dNk2Zs3R0ZL7RJIJj1ftPIYtMAc9nz1prpgB5ZFs7dxz70So7z+v1zwn737kI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745759; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wh1Er9v7J0W+GmPxUecMe89Y+EM6DaUlXYuRCYSIj6U=; b=SHe+aARyLcEpyATaULME8BzbUhT0o5qQMFl3J329eh/hNakoCOeHNVn4fuF2598FurbXd/jaMWndULVNZ2uhzmNlTCBgL+ik0Kh72CsxPwecApr2kODRp4ZoRHg6uM7UbRdgji9UetW3Bw/G19/Wg3Cbxh7oYtzjyhhdUr0f/bo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745759591712.152659384886; Thu, 2 Mar 2023 00:29:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHj-0007e8-FP; Thu, 02 Mar 2023 03:27:31 -0500 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 1pXeHJ-0005j3-7n for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:05 -0500 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 1pXeHH-0002dF-MD for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:04 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17--KoAYL5fP6itaBuxQbVvvg-1; Thu, 02 Mar 2023 03:27:01 -0500 Received: by mail-wm1-f69.google.com with SMTP id k20-20020a05600c1c9400b003e2249bd2b4so5463639wms.5 for ; Thu, 02 Mar 2023 00:27:01 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id a2-20020adfdd02000000b002c3f03d8851sm14859699wrm.16.2023.03.02.00.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745623; 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: in-reply-to:in-reply-to:references:references; bh=wh1Er9v7J0W+GmPxUecMe89Y+EM6DaUlXYuRCYSIj6U=; b=jWrhdNhg96GS4NBKOvqtyWkxlsIKqdVkQpJMIE7AiGlqN6pMnXmu/yofKtGoVeHwrqncBI D574R0SO4iIZlRDlZW/ibHNPC0wczxFQcA6U7gKNKtNKGJCU0zfEEaLNu6OK+aEWxg57zv 0mWLTvw1vIKVRkDVac3VU0IqO1NBfZ4= X-MC-Unique: -KoAYL5fP6itaBuxQbVvvg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745620; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wh1Er9v7J0W+GmPxUecMe89Y+EM6DaUlXYuRCYSIj6U=; b=qS6fnxXjfDIXWWWWfSUr+RmUpNIR/PpBCPBTYLAhHn0tcLq70FaABevKyN8eHhwblw VsrxHhgno5itNGfXL+FtQuE44RBZpQNgX3wdHq8EmllX47rVGVyq4GMdwwzIjzHB3vU2 eoQdhsSsO/M/gmxk04bvAPh7i3kaqhrl5aSaXtoAO+MtH8M+g+bgJPvDp2Hcm85KhRz7 MShYApvT8p4gVzuhps5Z6PitxqiQoRHipylDkhWLInnhNw1kCYHjv/blbGXO7VR+XXju FOw4TAuRd1x8qH/mvVTG5rN8uJt8DJY6HqJVNgxQHwPfq+ETOQi8l3WOhTXZVuNBxbnI WVaQ== X-Gm-Message-State: AO0yUKVeKaexF8Ocuti/TQ49+xVxe/4YbdN6luXVvV0vcOgqxJVhEutO Zmes2rw4lCucjEcQjrcWJcMvlsVI9fF6dc4VVe2T52951jRyInE2qImJMIaFDaqYLonljgiIEJo Yn/h8QpUSETJfIPOmgOmdzqgAi3GNgJ7cyyrNHCju159rd6is/pj84OBBbdosVXgjxA== X-Received: by 2002:a5d:6604:0:b0:2c7:fc61:12d4 with SMTP id n4-20020a5d6604000000b002c7fc6112d4mr6635218wru.47.1677745620235; Thu, 02 Mar 2023 00:27:00 -0800 (PST) X-Google-Smtp-Source: AK7set/wJ9mjgFwAezzU/5g43yUhL0sdFUc+kMGPLL++Iv1xfFbn27lpMSaRgKJ1+zJxWnQEM0ufmg== X-Received: by 2002:a5d:6604:0:b0:2c7:fc61:12d4 with SMTP id n4-20020a5d6604000000b002c7fc6112d4mr6635199wru.47.1677745619900; Thu, 02 Mar 2023 00:26:59 -0800 (PST) Date: Thu, 2 Mar 2023 03:26:57 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jonathan Cameron , Gregory Price , Fan Ni , Igor Mammedov , Ani Sinha Subject: [PULL 47/53] tests/acpi: Allow update of q35/DSDT.cxl Message-ID: <20230302082343.560446-48-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745759909100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jonathan Cameron Next patch will drop duplicate _UID entry so allow update. Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-6-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..9ce0f596cc 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/DSDT.cxl", --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746250; cv=none; d=zohomail.com; s=zohoarc; b=Yfodlj4qs24VJy5386FNf9EqyqpqQrZ6qSiku0GeZzymJndpTMgMZ8dAD0OQ067cHXVJLbyXK5hBYL5L1ZlkTGCScM6B7IGEhYjguPMC9U3zIeuqTJTKIw6X6oKEnX5NQ0L60UoJXwheraXYEorhWk+8FpDxQiqIATYVoANS8Ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746250; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9IIGp7zrkNhTcOV4Tj+3SpaPucnF4OxZRR6wI/GqvX4=; b=GjEtxBH67rtXVKkpHpOyrTzEZxd9LLaKg5Jf76aYlXkELnnlzOCJlIth6AAuLlhHIqPxg389+73yzUTMUzleSsd16OrE7c40sj/apIRsenUF8prqwThio1L65bPIlZ9ypJ4Z/sObNp+lWdTJR8XfEt9jy/hgfre829e1xuF3+G0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746250456999.1222878297642; Thu, 2 Mar 2023 00:37:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHa-0006Fn-1R; Thu, 02 Mar 2023 03:27:22 -0500 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 1pXeHM-0005l3-UZ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeHL-0002dV-1f for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:08 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-370-1oaxTR1lO3KnNIUFJcISsw-1; Thu, 02 Mar 2023 03:27:05 -0500 Received: by mail-wm1-f72.google.com with SMTP id f14-20020a7bcc0e000000b003dd41ad974bso748846wmh.3 for ; Thu, 02 Mar 2023 00:27:05 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id u9-20020a5d5149000000b002c54c92e125sm14719027wrt.46.2023.03.02.00.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:27:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745626; 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: in-reply-to:in-reply-to:references:references; bh=9IIGp7zrkNhTcOV4Tj+3SpaPucnF4OxZRR6wI/GqvX4=; b=YYnnGaXb/NmUC24SQHQO2hf9kf27eJGh+gFDXZGG8euZ39Nx3OzO0kDqUZITCtD2wMSdUD IjbGaw2BdXyjuTkFGd6Ax5LgvSSD1ecU9bSSxFDBOheBxhC6yvDfhPG5+gE4LE/uof8UrE cLvGtfW9yIeqOpzFn/60BcGBvmXvo3E= X-MC-Unique: 1oaxTR1lO3KnNIUFJcISsw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745623; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9IIGp7zrkNhTcOV4Tj+3SpaPucnF4OxZRR6wI/GqvX4=; b=J3y7Ij9BdTiUemUeQVs7+hJQrLh9p+tZUAR1Fx/2S7rZtVLe+/LJlkXWd7mrg3b/3h 2mlYCSVDR4d12WCl2sBIXAmk8GZm7dD0Q8o35OQ3KPESOzd/Y5beSJ9FzqoE8IF09T5G p25UueGL3SF0UUGXWuYffLnYMflVzx6EfOEEKdYAFOrBRGEA81ldbVLn857ogk+6piua h72VoGB9G7590HaBeZIiVAGizkdUKefG9AjLhzDAup1Oj+Zc8ysyPyK1HHIqcHGCxfJr tVtnO48YYxZHGsKMehMuRxx0G+XiAU/EEUgv5fVkYFPNiIVTbHd8ORf6NBOVOqpk4SW0 vpyw== X-Gm-Message-State: AO0yUKWAilQw9yTvxBeR5z/8L/J9huJl48QCqPU4ZzG970f9iXXfWJBC d3gnoC4e0H6nVLVKLCPtqxpB+2Y1CGUJGLNRSfpuOFad5S4NxQLufhZ7UGpUvpRj2ka2v6Aqpo2 ELtDJ5qCVoJrJ6GL1tBpVeDTY3Y6I08GiSKQYcnNsY+n3CDWvz4sFOOV6K3D4kS7MkA== X-Received: by 2002:a5d:658f:0:b0:2c5:5391:8ab1 with SMTP id q15-20020a5d658f000000b002c553918ab1mr6495093wru.53.1677745623757; Thu, 02 Mar 2023 00:27:03 -0800 (PST) X-Google-Smtp-Source: AK7set8SInoFK67Z1s1Je6GnR/djCKhpTYqZmCEq2sVABANECYrzMnVLqZFZpY8mNGHnWwJkbEi4MA== X-Received: by 2002:a5d:658f:0:b0:2c5:5391:8ab1 with SMTP id q15-20020a5d658f000000b002c553918ab1mr6495073wru.53.1677745623496; Thu, 02 Mar 2023 00:27:03 -0800 (PST) Date: Thu, 2 Mar 2023 03:27:00 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jonathan Cameron , Ira Weiny , Gregory Price , Fan Ni , Igor Mammedov , Ani Sinha , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 48/53] hw/i386/acpi: Drop duplicate _UID entry for CXL root bridge Message-ID: <20230302082343.560446-49-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746250817100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jonathan Cameron Noticed as this prevents iASL disasembling the DSDT table. Reviewed-by: Ira Weiny Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-7-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d27921fd8f..b19fb4259e 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1514,7 +1514,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(pkg, aml_eisaid("PNP0A03")); aml_append(dev, aml_name_decl("_CID", pkg)); aml_append(dev, aml_name_decl("_ADR", aml_int(0))); - aml_append(dev, aml_name_decl("_UID", aml_int(bus_num))); build_cxl_osc_method(dev); } else if (pci_bus_is_express(bus)) { aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08"= ))); --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746014; cv=none; d=zohomail.com; s=zohoarc; b=W0oMI/d1rz5qDBZVuhP2/jBY6PArIvcQgccT1d/91OTEnUyIaewvWA3ewI8397/0BFaTt5n4Vvr+wqmf6P5CntKY4IwUYfeM8CaCCabVbpMzdkMCHj0mr5fUNNcxdyiG848qlPvlGMfpiUsmgvhOLLbsPvzgJL7dsmato3MKG4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746014; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0gLD0kkpEIGnbkKgLONjSzYFdAd36ytp0U57Bu2N4uo=; b=gZ20FIdx+O1TW+9jmMoORnrE8m4zk0m2VC31pbG2mDbRVTxD55cFDYuUfot9OQeT7RE7EzNV7AArBnC4cWEQ7MqD4E0TdlbIyPb/s+k3H5kSP5NWpOF6JyKLVe+Z/fw+eGk9/9tWMATkv7G75pOX0+7eZoRu2EF4800GcNDZSR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746014874196.31361257447543; Thu, 2 Mar 2023 00:33:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHe-0006yi-5x; Thu, 02 Mar 2023 03:27:26 -0500 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 1pXeHQ-0005o4-Bz for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:12 -0500 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 1pXeHO-0002di-8k for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:11 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-407-a46Ra1lnMoqnHGrSXPXq8w-1; Thu, 02 Mar 2023 03:27:08 -0500 Received: by mail-wm1-f71.google.com with SMTP id n27-20020a05600c3b9b00b003e9ca0f4677so740651wms.8 for ; Thu, 02 Mar 2023 00:27:08 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id p14-20020a05600c468e00b003eb369abd92sm2442806wmo.2.2023.03.02.00.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745629; 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: in-reply-to:in-reply-to:references:references; bh=0gLD0kkpEIGnbkKgLONjSzYFdAd36ytp0U57Bu2N4uo=; b=eUqlQj0QDMi8kdOEjYe5y8OFQZeTEm5ZFaPBnOgEwOBlDPVI0NpTMr0x9QiWFVM8uPlvzn JwXpjF986nTvwCppH5by8pGt9EjU5wvQf0ukcJuL/qcAZutvmVAifWWNYKWWogIrkH9MGC lMyq7ayx880AM5W1r7Blhs/C7tafwF8= X-MC-Unique: a46Ra1lnMoqnHGrSXPXq8w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745627; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0gLD0kkpEIGnbkKgLONjSzYFdAd36ytp0U57Bu2N4uo=; b=jhsdH9wMdHf1JRtKRxBpwl82Dj061kRw7TusJ3KFdwTIKhB4/ZZkwHYjvXHrV2FY7f 2nVYsjI29CgjVNTDdgp+iF2h72/0VtNlI5t1uHpBdkfMZo2oJdzJItlfbaUy4R/IvHHJ RpjtxXDQJwSPg1icX0RA+V0g70x2Ij0eUHy0PNzCwaSyZCK/BQ4JMID9YWtAFzNsA+qU Lj5jssq4DnhY+6tm8tU6OZrYK/IV1TmeTjlEKeNnP77ZIQdEKiAgZNFrFp80qKuzwRLj qLI66sRLhMghMHK0oALsQLe54qZJDaTCJT91byf6bid9OX3F9YuB3+l+2ESJSTxsudpM xIjA== X-Gm-Message-State: AO0yUKUl3AqCZfp2G5ZeipxMXNfc1nXlcmRru6oaZ3kTCaNl5EnLaBQ3 JiMuSTg/o4CE0MQbej9gigUP7dKjZh8M3dReLqhmn/pXJgutX4i/Ehrty0moJlIevxowgtz2Y0B ddM1oB5w9MTboKgZcO2yCTAQ/u1NV6UgGZdOTBECqsHOYjS4B4LkfPk24OSjYqgXZhw== X-Received: by 2002:a05:600c:1c0a:b0:3eb:2e32:72c3 with SMTP id j10-20020a05600c1c0a00b003eb2e3272c3mr7353224wms.22.1677745627014; Thu, 02 Mar 2023 00:27:07 -0800 (PST) X-Google-Smtp-Source: AK7set84s/IwTBlVBHssnX7+RonFWlEMlkPvhJ2Q5xCzGYMDScIgDcBFlVXw6SxBh1wKQLfIG4pp5g== X-Received: by 2002:a05:600c:1c0a:b0:3eb:2e32:72c3 with SMTP id j10-20020a05600c1c0a00b003eb2e3272c3mr7353206wms.22.1677745626767; Thu, 02 Mar 2023 00:27:06 -0800 (PST) Date: Thu, 2 Mar 2023 03:27:03 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jonathan Cameron , Gregory Price , Fan Ni , Igor Mammedov , Ani Sinha Subject: [PULL 49/53] tests: acpi: Update q35/DSDT.cxl for removed duplicate UID Message-ID: <20230302082343.560446-50-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746015639100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jonathan Cameron Dropping the ID effects this table in trivial fashion. Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-8-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/q35/DSDT.cxl | Bin 9578 -> 9564 bytes 2 files changed, 1 deletion(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 9ce0f596cc..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/DSDT.cxl", diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl index 3d18b9672d124a0cf11a79e92c396a1b883d0589..4586b9a18b24acd946cd32c7e3e= 3a70891a246d2 100644 GIT binary patch delta 65 zcmaFmb;pa#CDSUKwt0m6-Tor}*e5CzZ*UWUScYLp@!%?rjc`U&A (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746137034401.555226574226; Thu, 2 Mar 2023 00:35:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHX-00062T-U9; Thu, 02 Mar 2023 03:27:19 -0500 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 1pXeHU-0005sZ-7Y for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeHS-0002eF-8u for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:15 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-528-YoJve-9JOIeXgpryXXO2bA-1; Thu, 02 Mar 2023 03:27:12 -0500 Received: by mail-wr1-f72.google.com with SMTP id l14-20020a5d526e000000b002cd851d79b2so1840283wrc.5 for ; Thu, 02 Mar 2023 00:27:12 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id h22-20020a05600c351600b003daf6e3bc2fsm5259385wmq.1.2023.03.02.00.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745633; 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; bh=06NSXo2usdhJ/Sn5OakCV2a8qNU3uktnLwbikqyYFjw=; b=hronxsSbIKNraGWhqIdoGbOQM3MDATsSWcfUt1rY6MTWM9WKlqPGgWXG79zD6inmSkqO5G Q5eU4enDtnuCBkpUVpUcP/EjU2q329z5eGkFNQ3UuT+u2exbxQTldSOqMzO2GwzC+HqcxY hIhEjlQAe4LOzWfwWx/xtGDqAGLGJiQ= X-MC-Unique: YoJve-9JOIeXgpryXXO2bA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745631; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=06NSXo2usdhJ/Sn5OakCV2a8qNU3uktnLwbikqyYFjw=; b=0YpUzytSiqQ8Hh31Z0+IDGRyYHvnR5gGcrVY4pWcUsuSJ6PJlhl6O303IW3kvTN4/b Gtms/agBDcsVXnKidkNCiEqXhB/QcOIeVaWFRyRaoSF1TekWIkyRQ8kc3U7sCQ/h3r9C +B5NdCgZBl8ON5FtJJoHmnwXvrq6gOOKiyrReX1PWqdyteN0OeZAfri2H+AfPIRoaC6W faTGtBLyVbgfx+xLZd4gzhYvXBgFFzDGJUgoN0xmCMlCs3NEHpf9yZs7IElRQWeQLdfy y8aOVwBOOn+dH/fi3si4cJWvg/XqBWxO2/Fx6ryEZmbx49lpOmQ7FlkOjuKy+mK/jzm6 fujQ== X-Gm-Message-State: AO0yUKWdlSYYltXOAy3CQWtBZ48d8CoJs0YRiJaRV28SFyMhDFdmjW9G yVfz6MQg+KTznoifLDA+f5nWHmjehN1P0CK2KuNW9DAbA0gd5AThvTb/lYV8v+fciHw3g9s2a0N /q2XqTvCG0qR+8dcHpdqNJqadbYSpjw0qTtIqp2jRAKy5EDVwCl6QTf1Vd1coTjVF+Q== X-Received: by 2002:a7b:c84a:0:b0:3df:eda1:439c with SMTP id c10-20020a7bc84a000000b003dfeda1439cmr790424wml.11.1677745631030; Thu, 02 Mar 2023 00:27:11 -0800 (PST) X-Google-Smtp-Source: AK7set8/ZUKX+l9j37aSLkPk7tpOqejREZxm3wpcYqkbYLsVwfB3ZjW4L12iAjG/sscRwV36fMDhJw== X-Received: by 2002:a7b:c84a:0:b0:3df:eda1:439c with SMTP id c10-20020a7bc84a000000b003dfeda1439cmr790400wml.11.1677745630635; Thu, 02 Mar 2023 00:27:10 -0800 (PST) Date: Thu, 2 Mar 2023 03:27:07 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Ira Weiny , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Gregory Price , Jonathan Cameron , Fan Ni , Richard Henderson , Thomas Huth , Paolo Bonzini Subject: [PULL 50/53] qemu/bswap: Add const_le64() Message-ID: <20230302082343.560446-51-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746138307100001 From: Ira Weiny Gcc requires constant versions of cpu_to_le* calls. Add a 64 bit version. Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Ira Weiny Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-9-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/qemu/bswap.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index b1650daedf..15a78c0db5 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -125,11 +125,20 @@ CPU_CONVERT(le, 32, uint32_t) CPU_CONVERT(le, 64, uint64_t) =20 /* - * Same as cpu_to_le{16,32}, except that gcc will figure the result is + * Same as cpu_to_le{16,32,64}, except that gcc will figure the result is * a compile-time constant if you pass in a constant. So this can be * used to initialize static variables. */ #if HOST_BIG_ENDIAN +# define const_le64(_x) \ + ((((_x) & 0x00000000000000ffU) << 56) | \ + (((_x) & 0x000000000000ff00U) << 40) | \ + (((_x) & 0x0000000000ff0000U) << 24) | \ + (((_x) & 0x00000000ff000000U) << 8) | \ + (((_x) & 0x000000ff00000000U) >> 8) | \ + (((_x) & 0x0000ff0000000000U) >> 24) | \ + (((_x) & 0x00ff000000000000U) >> 40) | \ + (((_x) & 0xff00000000000000U) >> 56)) # define const_le32(_x) \ ((((_x) & 0x000000ffU) << 24) | \ (((_x) & 0x0000ff00U) << 8) | \ @@ -139,6 +148,7 @@ CPU_CONVERT(le, 64, uint64_t) ((((_x) & 0x00ff) << 8) | \ (((_x) & 0xff00) >> 8)) #else +# define const_le64(_x) (_x) # define const_le32(_x) (_x) # define const_le16(_x) (_x) #endif --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745866; cv=none; d=zohomail.com; s=zohoarc; b=UzQ3j/g8MVCA27dS8wwE2oOFTBwdyw6z5pQif7+238EHWadkjbZdf5ooNLTWR7Ey79ei3OfCW3qOEY+1voL0ugF89oWlnrke0l0/pbVcXC9THuVWogutkr1Fm9R31E5LE9E0O1ocULUvIEkCDbBp+MGy6NU2m2/+bLXBDbP8aso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745866; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W6p53gX22LqpjFJNMKhB6/zMnZpapMbepMWoGiYnIz8=; b=kb6PEYoQoQ8UcvN0N3AwGgArAUtdksQuGNSclEJYfNWfzTwTUEXayBzFgOreUXSuWEgllHhXTzZtt6d3groqpoBZDbTbePMCIIo5j2h1o3KVtVVmQztX02ynqN5PFgV44gCgLqS8Fwov9pbnvxOzKuwzGuyXjbhYujKPVG6AEJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745866384180.98469859838292; Thu, 2 Mar 2023 00:31:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHd-0006xD-UJ; Thu, 02 Mar 2023 03:27:25 -0500 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 1pXeHX-00060K-9t for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:19 -0500 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 1pXeHV-0002eg-Kd for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:18 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-19RIydLQOf-oxA6G1ZDWRg-1; Thu, 02 Mar 2023 03:27:15 -0500 Received: by mail-wm1-f72.google.com with SMTP id r7-20020a05600c35c700b003eb3f2c4fb4so744238wmq.6 for ; Thu, 02 Mar 2023 00:27:15 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id j40-20020a05600c1c2800b003dd1bd0b915sm2331487wms.22.2023.03.02.00.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:27:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745637; 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: in-reply-to:in-reply-to:references:references; bh=W6p53gX22LqpjFJNMKhB6/zMnZpapMbepMWoGiYnIz8=; b=f0jlZb2DbqWfUK52deVI1/zrsJnjGbChFwU4Nv4XbQVMDKsKGOG/gJt/YGwWwTCYfXjfiB 7N7cHYSulCZFCA/ojaN3RmZ+GP9xlOam8BL00ml4msyYIC45/2M9AhU/0ZABq1UrQ4AhNW 7Ow2UB+yyWyzV1T0xTWB1hdFlXcLg34= X-MC-Unique: 19RIydLQOf-oxA6G1ZDWRg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745634; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=W6p53gX22LqpjFJNMKhB6/zMnZpapMbepMWoGiYnIz8=; b=yi0JJLfkq8Svk/LckaL3kQjbxOEiEzT4KPWfHAIXaV5WPHmIMqNypPV7X9iE15s+NH jycbdjAReAbAX6i3eRo+Awy/8ESjUMa5vNSPsSm/vxdEnHeQ7eRb37BqHeN33+zBWmMd ikwAHoVYYfj/Z3SWmwMytLS5QwDOyXz+2NQOMn3AzfK5XchohtQ/o9RDUy06lw3/WwWy i2/teKAJVAsgC271NGekUWR4gi5CGwCQGfDFuk1+SEkpq8lOgIypxNkchZ33Dk0YrMgY ZPm+oSp5Jn9Bzoy+XOoUw4iwmnfY0wTJN7095EZaayst11/nAQUw1ZPH2u5obiQ9Qtpf TiXw== X-Gm-Message-State: AO0yUKVtNvpxqaKOgvLGbDOGK2WgzygN87yBbrAE6Az51ZGSXf8EgGrt 3RPrpq3ZBsKkG3BN3VdcdeFD7E09WDC5Iu451eaXZkaEzX3TAvROxK9g5axfrHj2cMCHzZBJQP3 XLU8HtjSC9F1cc5zq1xbd0xHD7iei6oAlbMm/kLYzm83LO61DY0i/D8lcPDJm+WGvow== X-Received: by 2002:a05:600c:1609:b0:3dc:555c:dd30 with SMTP id m9-20020a05600c160900b003dc555cdd30mr6853955wmn.27.1677745634114; Thu, 02 Mar 2023 00:27:14 -0800 (PST) X-Google-Smtp-Source: AK7set8zyDGXZ0yO/q9cNYFn6T9v7CdWE5SK3HoQpUTOcWbSWf+rzFA+bagTk1XDd+e7gj6i+EKOXg== X-Received: by 2002:a05:600c:1609:b0:3dc:555c:dd30 with SMTP id m9-20020a05600c160900b003dc555cdd30mr6853937wmn.27.1677745633847; Thu, 02 Mar 2023 00:27:13 -0800 (PST) Date: Thu, 2 Mar 2023 03:27:10 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Ira Weiny , Gregory Price , Jonathan Cameron , Fan Ni , Fam Zheng Subject: [PULL 51/53] qemu/uuid: Add UUID static initializer Message-ID: <20230302082343.560446-52-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745866994100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ira Weiny UUID's are defined as network byte order fields. No static initializer was available for UUID's in their standard big endian format. Define a big endian initializer for UUIDs. Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Ira Weiny Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-10-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/qemu/uuid.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h index 9925febfa5..dc40ee1fc9 100644 --- a/include/qemu/uuid.h +++ b/include/qemu/uuid.h @@ -61,6 +61,18 @@ typedef struct { (clock_seq_hi_and_reserved), (clock_seq_low), (node0), (node1), (node2= ),\ (node3), (node4), (node5) } =20 +/* Normal (network byte order) UUID */ +#define UUID(time_low, time_mid, time_hi_and_version, \ + clock_seq_hi_and_reserved, clock_seq_low, node0, node1, node2, \ + node3, node4, node5) \ + { ((time_low) >> 24) & 0xff, ((time_low) >> 16) & 0xff, \ + ((time_low) >> 8) & 0xff, (time_low) & 0xff, \ + ((time_mid) >> 8) & 0xff, (time_mid) & 0xff, \ + ((time_hi_and_version) >> 8) & 0xff, (time_hi_and_version) & 0xff, \ + (clock_seq_hi_and_reserved), (clock_seq_low), \ + (node0), (node1), (node2), (node3), (node4), (node5) \ + } + #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-" \ "%02hhx%02hhx-%02hhx%02hhx-" \ "%02hhx%02hhx-" \ --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677746211; cv=none; d=zohomail.com; s=zohoarc; b=awwk5NC2G/+HMseIhTD/4We0M+S+PO8Azn+CHZkSfb/wB8azzTimyAcoJuEINIR1ziulrz2pwcCUWmW0e6MXHTnvrpERZQ30Acc058yOcVsJxS+9iMzFXfY0gPcon+avHvXnX1g1wAAG4qI1T9nbJLWbFBY+TGSNb7uwl1cwnIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677746211; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3t5jQqODDajtK+7mIy/cbeToTBQURm+FACwk2b/4bzM=; b=OemLUWVibsHIX3w6306Atsci5e9eu8XcvSfgSJ8GB5QPrvxxR+C57fPeB3Hx0LvMBnZ71nHzyrwffD3K9/LQmcXSVb3NconMOmZM2IHU3qQ33VbOh2hfn+nRWXsp406ouoGwiSOQSY6KJagTJb13renQc11wCrTrsc3ae7+tC9Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677746211916238.75364041520277; Thu, 2 Mar 2023 00:36:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHf-0007Ak-NU; Thu, 02 Mar 2023 03:27:27 -0500 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 1pXeHb-0006QB-8a for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:23 -0500 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 1pXeHZ-0002fA-1W for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:22 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-635-lxxLT5waOwWVxZ7g1xPN8w-1; Thu, 02 Mar 2023 03:27:19 -0500 Received: by mail-wm1-f69.google.com with SMTP id bi27-20020a05600c3d9b00b003e9d0925341so5459969wmb.8 for ; Thu, 02 Mar 2023 00:27:19 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id s4-20020a5d6a84000000b002c551f7d452sm14893007wru.98.2023.03.02.00.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:27:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745640; 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; bh=3t5jQqODDajtK+7mIy/cbeToTBQURm+FACwk2b/4bzM=; b=ZrW+yNAKG3VTRO8P3GPBmmhNG9lPkopAuFy4kGXLZhKJBijlAAQbH10fjckjZ2YwmFK+/r YdK5Lf93ndpvWciMJNz/IvOKqR5L3WiWhuLsxfW6RurfvNjkjvON0PQbmWmRnwUwoo5ffE iYxHc5Hxs/l2iWTdSDHS900jSXTxc2c= X-MC-Unique: lxxLT5waOwWVxZ7g1xPN8w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745637; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3t5jQqODDajtK+7mIy/cbeToTBQURm+FACwk2b/4bzM=; b=2S6maHJnhdwNDB4qVdiIoZDTU0iqsDXA4uNBHmst6q6r82CB56y2tOrQfn0CPE2ETB Ijs7Or5FM81EMgiVIstok2dUOG0F4OZjlXhCNMEtMHphVRnvQkNOpeX5k4EFqYuEfVWr 1w4yNU99TO+kKmUZ4Jw3fcYXCPEdW33exRYqXr5N/SjHjtB3v28VRoUzUHm+G8Ui4CiY vam7ojp4eISlL2c4IH/o2+D56S/8huXAukfWvHiNJa2c3zgZgk9zCYUvCBMPsv45CiHV d8SA8qfdKqPX7lhKFL/KTw7prsfgw13imJX0hkfO5orArKcvBqCHwvcoUOviUfTn0MaP 3Rng== X-Gm-Message-State: AO0yUKV2eDhdEgmdc09M0FL6R9pUG6vebgdgEeJeP118bszSrvLm7uKo qxtvqccky6K0ayMXf6EYpVRG2LJkJ2AeFcP5+gQ/f6RokWyRGyjb+f1xAlUjFOeR37ZvZ3v6Hfv CuujpqOo3aN1bsdp0G4r+bDWr0hxML03ai5T3MMZlFEGmf9mCKH1KfPEhoDK3kvPHCg== X-Received: by 2002:a05:600c:3088:b0:3ea:f75d:4626 with SMTP id g8-20020a05600c308800b003eaf75d4626mr6752476wmn.38.1677745637710; Thu, 02 Mar 2023 00:27:17 -0800 (PST) X-Google-Smtp-Source: AK7set9Oz2OCJLdVrBpoK2OmajwJP13VZd/8UwVi/lLuJ9HSw16sz7xS2OudM/XCpFff2F2cEL+mmQ== X-Received: by 2002:a05:600c:3088:b0:3ea:f75d:4626 with SMTP id g8-20020a05600c308800b003eaf75d4626mr6752456wmn.38.1677745637349; Thu, 02 Mar 2023 00:27:17 -0800 (PST) Date: Thu, 2 Mar 2023 03:27:14 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Ira Weiny , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Gregory Price , Jonathan Cameron , Fan Ni , Ben Widawsky Subject: [PULL 52/53] hw/cxl/mailbox: Use new UUID network order define for cel_uuid Message-ID: <20230302082343.560446-53-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677746212529100017 From: Ira Weiny The cel_uuid was programatically generated previously because there was no static initializer for network order UUIDs. Use the new network order initializer for cel_uuid. Adjust cxl_initialize_mailbox() because it can't fail now. Update specification reference. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Gregory Price Tested-by: Gregory Price Signed-off-by: Ira Weiny Signed-off-by: Jonathan Cameron Message-Id: <20230206172816.8201-11-Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/cxl/cxl_device.h | 2 +- hw/cxl/cxl-device-utils.c | 2 +- hw/cxl/cxl-mailbox-utils.c | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 250adf18b2..7e5ad65c1d 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -170,7 +170,7 @@ CXL_DEVICE_CAPABILITY_HEADER_REGISTER(MEMORY_DEVICE, CXL_DEVICE_CAP_HDR1_OFFSET + CXL_DEVICE_CAP_REG_SIZE * 2) =20 -int cxl_initialize_mailbox(CXLDeviceState *cxl_dstate); +void cxl_initialize_mailbox(CXLDeviceState *cxl_dstate); void cxl_process_mailbox(CXLDeviceState *cxl_dstate); =20 #define cxl_device_cap_init(dstate, reg, cap_id) = \ diff --git a/hw/cxl/cxl-device-utils.c b/hw/cxl/cxl-device-utils.c index 83ce7a8270..4c5e88aaf5 100644 --- a/hw/cxl/cxl-device-utils.c +++ b/hw/cxl/cxl-device-utils.c @@ -267,5 +267,5 @@ void cxl_device_register_init_common(CXLDeviceState *cx= l_dstate) cxl_device_cap_init(cxl_dstate, MEMORY_DEVICE, 0x4000); memdev_reg_init_common(cxl_dstate); =20 - assert(cxl_initialize_mailbox(cxl_dstate) =3D=3D 0); + cxl_initialize_mailbox(cxl_dstate); } diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 3f67b665f5..206e04a4b8 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -193,7 +193,11 @@ static ret_code cmd_timestamp_set(struct cxl_cmd *cmd, return CXL_MBOX_SUCCESS; } =20 -static QemuUUID cel_uuid; +/* CXL 3.0 8.2.9.5.2.1 Command Effects Log (CEL) */ +static const QemuUUID cel_uuid =3D { + .data =3D UUID(0x0da9c0b5, 0xbf41, 0x4b78, 0x8f, 0x79, + 0x96, 0xb1, 0x62, 0x3b, 0x3f, 0x17) +}; =20 /* 8.2.9.4.1 */ static ret_code cmd_logs_get_supported(struct cxl_cmd *cmd, @@ -458,11 +462,8 @@ void cxl_process_mailbox(CXLDeviceState *cxl_dstate) DOORBELL, 0); } =20 -int cxl_initialize_mailbox(CXLDeviceState *cxl_dstate) +void cxl_initialize_mailbox(CXLDeviceState *cxl_dstate) { - /* CXL 2.0: Table 169 Get Supported Logs Log Entry */ - const char *cel_uuidstr =3D "0da9c0b5-bf41-4b78-8f79-96b1623b3f17"; - for (int set =3D 0; set < 256; set++) { for (int cmd =3D 0; cmd < 256; cmd++) { if (cxl_cmd_set[set][cmd].handler) { @@ -476,6 +477,4 @@ int cxl_initialize_mailbox(CXLDeviceState *cxl_dstate) } } } - - return qemu_uuid_parse(cel_uuidstr, &cel_uuid); } --=20 MST From nobody Mon May 6 11:49:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677745980; cv=none; d=zohomail.com; s=zohoarc; b=HARuOMwf2PDDGtv8XgU8NA1wDWY2bp966tBQLmjeMrGJ4evWVrsfHuBLItLV11AMvy6yu9b9KNcsNBy4HXLgMiJ67aYSl8hhACQ4qginj/FS5KW9llFSSjARXEGwOlwGE9XL0ms3B6kage2IxW3G5QS4kdIYk3lvs4a3rN5Plu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677745980; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w16c6O5L85j1u7aO8euRCxbVgQ1wD1YQJCSN4IXKOs8=; b=ldgdtSFbAMYirbxQuosNeNBCp7tvwphKSo0l2AtZtRTN0cgeZm1wkWwDLuOwBFHFgFpmlEPHHPN4cw0UO9J32C6gUGdvcAjkEiARUVkD7supgWU4MDwNH0piIixEAvuPl25khbalRk346Joy0P95iBxkMGOvJ02GDXiqX/9/igo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677745980593586.8340128681995; Thu, 2 Mar 2023 00:33:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXeHl-0007vZ-Au; Thu, 02 Mar 2023 03:27:33 -0500 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 1pXeHe-0006y5-7n for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXeHb-0002fJ-NX for qemu-devel@nongnu.org; Thu, 02 Mar 2023 03:27:25 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-664-r-Yag-MFMWKYU4gXf5W03A-1; Thu, 02 Mar 2023 03:27:22 -0500 Received: by mail-wm1-f70.google.com with SMTP id c7-20020a7bc847000000b003e00be23a70so936038wml.2 for ; Thu, 02 Mar 2023 00:27:21 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c198a00b003e11f280b8bsm2155292wmq.44.2023.03.02.00.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 00:27:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677745643; 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: in-reply-to:in-reply-to:references:references; bh=w16c6O5L85j1u7aO8euRCxbVgQ1wD1YQJCSN4IXKOs8=; b=CEIpTrE6L98rAIr1ZIvK+gGUmRYIUEZS+qta0dmvwGR6JTSdRFJfQ0UeJOs4J4HymHUE46 nhC+TMQexeBtj1At4TnCdvXAOmTGbnyRoE04xVPMZPgltYOgMLvqfTT0HtoSUPCAoMvJeE /x5BIsP3guUw0Z0fYLvV39ezCGkXe20= X-MC-Unique: r-Yag-MFMWKYU4gXf5W03A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677745640; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=w16c6O5L85j1u7aO8euRCxbVgQ1wD1YQJCSN4IXKOs8=; b=fQjH30sXne3TmPZEAhCKsrukKhKR8/1PYVokdvsXmDK+YmEajMgq6vu/y7o+9fcy0D QJBKxrsTHfdFc5MjzMXa62z9me7a5X01NszhIDx/CcWuq0WWHnyfFbYUt1huOrYVS9f+ cl+vgPZ6ivtnE9cz7bsnBDDbq0ReNoObGonLVEL8aKsmLxdmQ7sOuOBifOL3xm9NgYxx 6BfAx4C880BWAVKtRej07MGELHLLM+r0IwKLEnvb3A8XcBvt6sOxrFsdzRdAP9O9nG4X sTGNpIUfm5FlgLOCvUZxnnkCFup9WO9I3ylFFxHRpZxb+FCm5zOIciRFpE+IpfKhJD2c uLzA== X-Gm-Message-State: AO0yUKUhwB7nezorUA8+5hFe5NzW8/DhiYDodM75X6S51VwqO2NpDZoe gq3wgw6VVyH31P1xt5iRvysU34TwLh1rzXZpJT6opSvcdkBcCTaTbvM1KmgF6ItpoE9nd9w5Zpv gZFbpDW8GKFP7Zz91FgDXo9pfXDHSfxA2KVhq8D+0tlSgpJdj7bXxTM0K203GEsexxQ== X-Received: by 2002:a05:600c:2eca:b0:3dc:42d2:aee4 with SMTP id q10-20020a05600c2eca00b003dc42d2aee4mr6571435wmn.25.1677745640154; Thu, 02 Mar 2023 00:27:20 -0800 (PST) X-Google-Smtp-Source: AK7set+e1DUMQ4SGywscmbBk2FI8s1GcGwo2vyJZGrrTkMHRFgN+o6Wcrxi37JdRjlWO6yv5sVOCpA== X-Received: by 2002:a05:600c:2eca:b0:3dc:42d2:aee4 with SMTP id q10-20020a05600c2eca00b003dc42d2aee4mr6571419wmn.25.1677745639828; Thu, 02 Mar 2023 00:27:19 -0800 (PST) Date: Thu, 2 Mar 2023 03:27:17 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 53/53] tests/data/acpi/virt: drop (most) duplicate files. Message-ID: <20230302082343.560446-54-mst@redhat.com> References: <20230302082343.560446-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230302082343.560446-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677745981481100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When virt ACPI files were added, lots of duplicates were created because we forgot that there's a no-prefix fallback: e.g. if tests/data/acpi/virt/APIC.memhp is not there then test will use tests/data/acpi/virt/APIC. Drop these. These were found with $find tests/data/acpi/ -type f -exec sha256sum '{}' ';'|sort -d|uniq -w 64 = --all-repeated=3Dseparate (trick: -d does a dictionary sort so a no-suffix file ends up first). Note: there are still a bunch of issues with duplicates left even after thi= s. First pc and q35 are often identical. Second, sometimes files are identical but not identical to the default fallback, e.g. tests/data/acpi/pc/SLIT.cphp and tests/data/acpi/pc/SLIT.memhp or tests/data/acpi/q35/HMAT.acpihmat-noinitiator and tests/data/acpi/virt/HMAT= .acpihmatvirt Finding a way to deduplicate these is still a TODO item - softlinks maybe? We also need to make rebuild-expected-aml.sh smarter about not creating these duplicates in the 1st place. And maybe we should use softlinks instead of relying on a fallback to make it explicit what version does each test expect? Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/virt/APIC.memhp | Bin 172 -> 0 bytes tests/data/acpi/virt/APIC.numamem | Bin 172 -> 0 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 0 bytes tests/data/acpi/virt/FACP.memhp | Bin 276 -> 0 bytes tests/data/acpi/virt/FACP.numamem | Bin 276 -> 0 bytes tests/data/acpi/virt/GTDT.memhp | Bin 96 -> 0 bytes tests/data/acpi/virt/GTDT.numamem | Bin 96 -> 0 bytes tests/data/acpi/virt/IORT.memhp | Bin 128 -> 0 bytes tests/data/acpi/virt/IORT.numamem | Bin 128 -> 0 bytes tests/data/acpi/virt/IORT.pxb | Bin 128 -> 0 bytes tests/data/acpi/virt/MCFG.memhp | Bin 60 -> 0 bytes tests/data/acpi/virt/MCFG.numamem | Bin 60 -> 0 bytes tests/data/acpi/virt/SPCR.memhp | Bin 80 -> 0 bytes tests/data/acpi/virt/SPCR.numamem | Bin 80 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/data/acpi/virt/APIC.memhp delete mode 100644 tests/data/acpi/virt/APIC.numamem delete mode 100644 tests/data/acpi/virt/DSDT.numamem delete mode 100644 tests/data/acpi/virt/FACP.memhp delete mode 100644 tests/data/acpi/virt/FACP.numamem delete mode 100644 tests/data/acpi/virt/GTDT.memhp delete mode 100644 tests/data/acpi/virt/GTDT.numamem delete mode 100644 tests/data/acpi/virt/IORT.memhp delete mode 100644 tests/data/acpi/virt/IORT.numamem delete mode 100644 tests/data/acpi/virt/IORT.pxb delete mode 100644 tests/data/acpi/virt/MCFG.memhp delete mode 100644 tests/data/acpi/virt/MCFG.numamem delete mode 100644 tests/data/acpi/virt/SPCR.memhp delete mode 100644 tests/data/acpi/virt/SPCR.numamem diff --git a/tests/data/acpi/virt/APIC.memhp b/tests/data/acpi/virt/APIC.me= mhp deleted file mode 100644 index 179d274770a23209b949c90a929525e22368568b..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ<^@N{0oz`(%b?&R<65v<@85#X!<1dKp25F13p0FMNW#lQh$F##Fe0Wcl|15CX* gLI}uWgsNwO(#&xED9WH5UbsC>V09of9T)-_08#k}0RR91 diff --git a/tests/data/acpi/virt/APIC.numamem b/tests/data/acpi/virt/APIC.= numamem deleted file mode 100644 index 179d274770a23209b949c90a929525e22368568b..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ<^@N{0oz`(%b?&R<65v<@85#X!<1dKp25F13p0FMNW#lQh$F##Fe0Wcl|15CX* gLI}uWgsNwO(#&xED9WH5UbsC>V09of9T)-_08#k}0RR91 diff --git a/tests/data/acpi/virt/DSDT.numamem b/tests/data/acpi/virt/DSDT.= numamem deleted file mode 100644 index c47503990715d389914fdf9c8bccb510761741ac..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5196 zcmZvg%WoT16o>EFlh__VVmr>uc{qhq@vO#n^Jr;H?6H%$#EJ2w4N@w(5&}`OsYHcT zDx{D_3)#^~Yza~%{tYBn?AWnj&4zz~9p>D*Gs*8LXQYhh%-r+M{l>@f@oo97-K~;R zv7eed-lo6U{J7^W(q<{8^s#=3D;zie6$2Yz#~e^mBd*G&#KJFRTP>vbqtQOUvmPD||{ z-ST$2(Y1be({-!W@LF=3D<_5DKGnR<~@8kkafrM@3kmUV@qXOz3TzUQqQ?nmwJed5+A z*WYb8X-f7QmO&JpoI%7=3D(_v=3DAe$bDmw6)#eq12^|+n#4$+}u&I@a8Tes^;z-p>KN$ z5mOh4YKUm+S=3D1zi6O$M=3DFlxxCi;TF$7zIWh88<|REisb7xPgo%kuf4M9AGRVV_9U3 zN{kFJmXWa{G7=3DIa2aFYDtcr}J#K;3<6&W{0MoMB7fpHTU)$qf?OU!X3MhO_VkRg^S z|BytbJ_(HXks;S@3L$1@j z#8?Ez8ZzWMEl7;lfYCsPT&G2eaTOR%WXN?oE-|hF!vjW5uG5mlcoP^cWXN?oAu-+t zMjIJ&olZ)OcY(2v47pCHB*t}MY#>9f(`kv}0%H>ya-Ggdj2bXH$dK!_EHQ2X;~p~P zI-Qjm%fR>$8FHP@NsLusY#~Fg(|L(;3m9Es)a5!|kQldtv5gG5PAd}QE--dN#`Z5g zuM^Irx7~9a?kY7O9<@g%s_QPMy+QkCbNjq4@pt=3D$iZjgv z$fQtb(u{(;*gUuO`byZ9A%!=3Dl+t{nq10lb zCxz&lV4ex)nc$ujqGytMCYdL-WavpDdZw5swbSP51&<`fJt;&_hj}{8lUg|Rq!2yR z%rnhA)7+Cn^vp2N4D+Ox4?QVF&n)xIGS4jcq!2xG%rnP4sYOIj3ej_nd5$s9G44qr zdeYAsQ{zDu=3Db0z9l;}wzdKQ>xfq53VCxz%)WS&LlNi8UPQiz`8%yXQ1j&n~6(UX2C zf@g_&Qp<{-6r$$@^PFIw6Wo(R^qgd#lgyJ^T=3Db+6J*SxG6!Vq!2x4nddC?oaLSrqURj*oMWEUa-%1O=3DsC|k z=3Db7g`_oNU#7ntV)^Q0CXJt;)b3iGTm&kFaX(0J}2b!`1snxAj_OWAYR&%cO!v@DTx z(!o;1>%mt#eeYg6R~jAoecuXEVaLEwv`&Dis{+cLJ4fBqvkDtrhSKW=3D$a+IynRA>K zHoBZe>jucWCa}!8kX6bLyk33NbqkreL4fW1?NuRC^br->w z9}fT1Kg(zvUZ*QohI#MjIN$ezB-Ay^2Uc57ft+$_sgb>m6Pa#^|%@=3Dcw`t+!0-VY^R# zDZQh~lwBbPf<BbPf<!1Bl59VJZSCW(Gzk28RDY I01|@%0RBM>0RR91 diff --git a/tests/data/acpi/virt/SPCR.numamem b/tests/data/acpi/virt/SPCR.= numamem deleted file mode 100644 index 24e0a579e7d73f432a614380e29aa95113344186..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmWFza1IJ!U|?W6?d0$55v<@85#X!<1dKp25F11@12F>!1Bl59VJZSCW(Gzk28RDY I01|@%0RBM>0RR91 --=20 MST