From nobody Wed May 15 18:41:20 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=1682770615; cv=none; d=zohomail.com; s=zohoarc; b=ERWXTMV60277wiWd43QxJzNNu0ikNSgKZHaJXZkQ8nIhQiYTzLBgdweOGn9uzOX5oZr2PZ0p6Mk4cHwZLa1je2XneUdXlfP6WeSrOiGbn/5x/lQ0b1Gtd9OpHxbC3ejVPHgrbWIZUNg8qvxFk0Uwpcwp2KwcvCW4v9YXEZlzyTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770615; 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=rZjfT0cTItj0hs1HOL6CzpkHNiD5S5aMbOQBf2WtlOU=; b=LVJNzorWMlqRlr6j2rqZGy9Gn5MEJMnRlqr/SF7WrArwmMBYfLwTE+Cmm5+AAtdp3qwRBbTlIvUVw8Iy2gT8UGB2desbVvTWpb+GwYLcFwpl1kQHU2BkMvn3TDmoyImSQfOQ8qsTXRxgJ241Avw4cN3zVuGB83D0cNUAN5XhJcg= 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 1682770615350358.3214922651216; Sat, 29 Apr 2023 05:16:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVP-00067W-0f; Sat, 29 Apr 2023 08:16:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVO-00067A-1F for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:46 -0400 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 1psjVM-0004sU-Dv for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:45 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-8-O4uV6ym2MI6EakU6XRZIBw-1; Sat, 29 Apr 2023 08:16:42 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-94a35b0d4ceso80112966b.3 for ; Sat, 29 Apr 2023 05:16:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id qt2-20020a170906ece200b0094e1344ddfdsm12335263ejb.34.2023.04.29.05.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770603; 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=rZjfT0cTItj0hs1HOL6CzpkHNiD5S5aMbOQBf2WtlOU=; b=gQ/gl6Z2QWHkx2TESowyalhQKpPTDZ/bo6TXmuCYRPiU4F+CY8BQkQnNEt3jKY3/EzHVHG DEFlYoMaRQraPoyCJT6TOocGF+7EB5/fbxIcj5aC/tCnEa49r5ef1ILTtt4ze5+CA2v4A8 mGAuJFNsg4637HIni8nTbbmvRcOMxIw= X-MC-Unique: O4uV6ym2MI6EakU6XRZIBw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770600; x=1685362600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rZjfT0cTItj0hs1HOL6CzpkHNiD5S5aMbOQBf2WtlOU=; b=kaP6N0VB+zxSO/5ef1desxjtXs0Qm+fkuz2YMoUUcHpaXqucfVx5w19uFutK3t7l8z 0yxn40TFxxhA8YHyrn5CcfVIawWsGdfhgjK+JgcjY9vd0tW2PYoWkb8W/bkecNfgmV35 ehU1YKVwjEdXMudMkBcYkYASp9Bb/OwdbVcxv0DeCHSVDBpohUq8/Z0vK1kABt8QNP9A ku+wSlZRVQLr1HF1SUMP7DpkxUMKymduCreSJUr8iZ4p60+L9+Q+Ll3IEJZhmZ2e2h9w oWKABl7LiDS+JR1pBF5OoyWvO/060Nuzzj435KZ9ij3zv9NILrbTSfKeHEFRZLxN3D31 +CWw== X-Gm-Message-State: AC+VfDw3xzmn1z+cRt10dAgn44TgSXS5UkKwBmNUe1RPP3Jf0VLP8poS ru2R7HDecQTARYWoSe9UD9oUeCfhefa4bNzfFwr0jUZ47Kv/2cN3UUVW50kzwpW85nmYpBrKsHD ecH9S7pOPfp1JmDDKWa4XZuir97tnZQf2K1T/EPQl8I7o3eYGmgKgXdVy1rNylA1rHb2jrIb5rC w= X-Received: by 2002:a17:907:da4:b0:959:8cbe:63a5 with SMTP id go36-20020a1709070da400b009598cbe63a5mr8111224ejc.44.1682770600504; Sat, 29 Apr 2023 05:16:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zWSqwOGvKrLYiO+4SY+g5UBCEo6DSAZbXm3vMfBrEWxgpIPAU2t4o+JZ1H4zAf+SveBzr5g== X-Received: by 2002:a17:907:da4:b0:959:8cbe:63a5 with SMTP id go36-20020a1709070da400b009598cbe63a5mr8111200ejc.44.1682770600120; Sat, 29 Apr 2023 05:16:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tom Lendacky , "Dr . David Alan Gilbert" Subject: [PULL 01/17] qapi, i386/sev: Change the reduced-phys-bits value from 5 to 1 Date: Sat, 29 Apr 2023 14:16:20 +0200 Message-Id: <20230429121636.230934-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770615760100001 Content-Type: text/plain; charset="utf-8" From: Tom Lendacky A guest only ever experiences, at most, 1 bit of reduced physical addressing. Change the query-sev-capabilities json comment to use 1. Fixes: 31dd67f684 ("sev/i386: qmp: add query-sev-capabilities command") Signed-off-by: Tom Lendacky Reviewed-by: Dr. David Alan Gilbert Message-Id: Signed-off-by: Paolo Bonzini --- qapi/misc-target.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/misc-target.json b/qapi/misc-target.json index de9105452377..bf04042f45d9 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -172,7 +172,7 @@ # -> { "execute": "query-sev-capabilities" } # <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE", # "cpu0-id": "2lvmGwo+...61iEinw=3D=3D", -# "cbitpos": 47, "reduced-phys-bits": 5}} +# "cbitpos": 47, "reduced-phys-bits": 1}} # ## { 'command': 'query-sev-capabilities', 'returns': 'SevCapability', --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770653; cv=none; d=zohomail.com; s=zohoarc; b=Xw8njHiotFs0+r5PeC2aBUfMRe692iqqfsrhHLFb6vgR4bhxC67Ks+lL5T+0HxKAoQaI2DixJSqfPFprZk/uEUQXUAsX5gK2xGQ8FHpRg1QErBuuEyqw+9YFwLO8vMJUvLZiflsXTd+WsrhPqGYiY51JZfJy9XdZVhgBK8k0Spo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770653; 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=F20gxlV9n4yZCSeO59/h7L5GIiTcNexiSlZxndpWyR8=; b=SqSXVu0fXz3+YFtvz9uRSheaGfT1YdYPx3R0KpP3reUzeGZKves2DFYXzUHpFS18nJsmZ4mesD5zNocLjnN0GvFojTgEkPNKm9cppuoZohrubWZ7ALeayxQ4GzQHsYp9n7z7gEoUzC4n0irwCW8Q/mS0WSMdlTK63iL0pKqeyHc= 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 1682770653938945.5924680912728; Sat, 29 Apr 2023 05:17:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVS-00068n-8I; Sat, 29 Apr 2023 08:16:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVQ-000684-Q8 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVP-0004sm-7P for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:48 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-577-AvTMKYYQMU6t1W8vx_s7wg-1; Sat, 29 Apr 2023 08:16:44 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-95f6f291b9aso100082666b.3 for ; Sat, 29 Apr 2023 05:16:43 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id h6-20020aa7c606000000b005068ea7f54dsm10205239edq.96.2023.04.29.05.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770606; 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=F20gxlV9n4yZCSeO59/h7L5GIiTcNexiSlZxndpWyR8=; b=QADccZQPPiupUUDbK9zMQkqNtQlCzqvAECdcX49xw8Kchl5tKZ7qrs7B61Ut3HmkjiAkVw SAe/ze9KZMzSkDmQwrYY0F5+nd4STwc776csne04k089WlK1rJ+MhYxwQ1Zl7y+YPEhf3i XgNg6/TNUQ6r5KU6KSDrAYfyuWcCwaE= X-MC-Unique: AvTMKYYQMU6t1W8vx_s7wg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770602; x=1685362602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F20gxlV9n4yZCSeO59/h7L5GIiTcNexiSlZxndpWyR8=; b=ScjawUTQEOLnGsG8yw9/dJYaoghSNb9NsbNZGw3NVGoOQOr1g9X0wcml9M/4iZkjtr 6RJA9WkU8dfGbKL8vNa6M/d7LoTo/NQ91d2wj7x4N5YOUPz9KahJyXrHjVO1sv0C1tsv zYZwaz3vX/mNj4b8OTT7FPcxi8lKmiSJkXU6dabsdHAZq9m09c0AFvfgsgsNVYuTjT9O O9BDnLAswZjMbRWFqkGv5nnbchneaqvdGNhM7rnZiyhZx/akjqSMcLEJ5aIloCCS8Jof xwndzEOmyBvlTnQ//pdKEUGkIrJcrhUnYcBsIjgjCvUkrmw6tUg1wig5QML7MC17f48x 1RKw== X-Gm-Message-State: AC+VfDxppbkZCR9lAWio+Hn4v4RspD0DJn83aJxMQyfmr2FvRvBY7Ux+ 9XDVx4DL+23DKDfmQbqnUb+i9U2f0NgdyYCt1p1CYcSw/hkiar6zoRdR4TsrV+ZC0jEVWlC5/7S 9GgXdjSw773RQ4tXHgV1tAAELVYINFhsBT9saQMmYUlFe8mQTHXClheyDFXVnZ+PptzhmBipbUM U= X-Received: by 2002:a17:906:ef0d:b0:94e:bc04:c6f6 with SMTP id f13-20020a170906ef0d00b0094ebc04c6f6mr8653998ejs.9.1682770602542; Sat, 29 Apr 2023 05:16:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/f7boLVsnp6/WNktXUliYzHkxp124VwegmfTr0phXcQD6PV/2dWMUMZKBWhxFnYcTAwkJRw== X-Received: by 2002:a17:906:ef0d:b0:94e:bc04:c6f6 with SMTP id f13-20020a170906ef0d00b0094ebc04c6f6mr8653974ejs.9.1682770602181; Sat, 29 Apr 2023 05:16:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tom Lendacky , "Dr . David Alan Gilbert" Subject: [PULL 02/17] qemu-options.hx: Update the reduced-phys-bits documentation Date: Sat, 29 Apr 2023 14:16:21 +0200 Message-Id: <20230429121636.230934-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770654903100001 Content-Type: text/plain; charset="utf-8" From: Tom Lendacky A guest only ever experiences, at most, 1 bit of reduced physical addressing. Update the documentation to reflect this as well as change the example value on the reduced-phys-bits option. Fixes: a9b4942f48 ("target/i386: add Secure Encrypted Virtualization (SEV) = object") Signed-off-by: Tom Lendacky Reviewed-by: Dr. David Alan Gilbert Message-Id: <13a62ced1808546c1d398e2025cf85f4c94ae123.1664550870.git.thomas= .lendacky@amd.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index b5efa648bad1..42fc90aae473 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -5438,7 +5438,7 @@ SRST physical address space. The ``reduced-phys-bits`` is used to provide the number of bits we loose in physical address space. Similar to C-bit, the value is Host family dependent. On EPYC, - the value should be 5. + a guest will lose a maximum of 1 bit, so the value should be 1. =20 The ``sev-device`` provides the device file to use for communicating with the SEV firmware running inside AMD Secure @@ -5473,7 +5473,7 @@ SRST =20 # |qemu_system_x86| \\ ...... \\ - -object sev-guest,id=3Dsev0,cbitpos=3D47,reduced-phys-bit= s=3D5 \\ + -object sev-guest,id=3Dsev0,cbitpos=3D47,reduced-phys-bit= s=3D1 \\ -machine ...,memory-encryption=3Dsev0 \\ ..... =20 --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770705; cv=none; d=zohomail.com; s=zohoarc; b=b2f1oe7jcvrxOSbDd8tgGSTThyjeaXdzkharHD5aXWxaK0h29fefSu5Ndy82LsSQBmfIGTbwaStMtuHBGTj/J1fGvydsdYAE2wCIhh4BbGFfOJyHVg9O974p5B7S2FKKB4Ot79h69gHITquhzqR79qnIxI8AH0LzVoKFAmYibKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770705; 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=YeUC/1DjrJw6AqrdGMEqztcG44rXewMs3zOdih0CUzU=; b=FUTX9B98nYr8F14vD/PmwodHjGwVSz0gwxOaA+W8AOBtWV9MNpOnGV1+G/sz0FBZImD47ToswI6SCOaBtIfeDuyLENIZOmr3GvQ6QVFJqgbkok0MzOy2PWYF7gRBJL032xT0J3I4izYrbxYAFylu72AMphBrBfjkEF+cGGdb2KM= 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 1682770705117250.73074738230434; Sat, 29 Apr 2023 05:18:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVU-00069Y-FE; Sat, 29 Apr 2023 08:16:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVS-00068o-E0 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVQ-0004sw-Rp for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:50 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-533-b4HksLkmOieNegfFSpz7Nw-1; Sat, 29 Apr 2023 08:16:46 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-506a446b97bso864430a12.1 for ; Sat, 29 Apr 2023 05:16:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id b11-20020a056402138b00b004bd6e3ed196sm10018010edv.86.2023.04.29.05.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770608; 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=YeUC/1DjrJw6AqrdGMEqztcG44rXewMs3zOdih0CUzU=; b=IFacNYagof8qeHMdLO3Xz6FQItVg9zM5tu2VCvwdfytyUWuEBVB0MkJaphlCjPEQfQS8rW gtk5c2LZvPcO+cphsFmPclcI3lVvuJIWHZxALNo2oyfPErgPZNlCcos+0swOVQw1xJXOfi W0Tj2k6VsBIQANUfTnKh89RnC2i4teo= X-MC-Unique: b4HksLkmOieNegfFSpz7Nw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770604; x=1685362604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YeUC/1DjrJw6AqrdGMEqztcG44rXewMs3zOdih0CUzU=; b=PbIHx8Kyt2kQQgDKqKnuiUns+84VPos0g7JAOd6PoSB+xkErMvnRAkCRWP9hSNcKif PUuiSjdyyghVUuEaYhVVwdno+XLebDosQ9GtF4CTkkrNYk7ZQCIVrqMZj3h1MUbiN+7o TyeqhwjA9rC9Z5NcVnIDoc2USsJQLpV1fgZgeebyQ0+AblazqMZdEeUx+aqbYsMWzWlc xc4nLRe12zGANF/srBwE3ewKE72RB9f6bl7L2nFDT8wpJok3/rePBtg8lv0018lFemIB HP5nOL/ATAORNMpgYXXLMJdntsv7BhNxEjIhSoh4szAXZ/a7PV/Q9Vmjc1rmGs7xpdNf RITg== X-Gm-Message-State: AC+VfDyR7pNu2A5FLLiHL5VxembAoMg9wibfbOuhDFCVPQVoTorr13w8 6NVZ3Z7pKiBC8ftXkS+U/rlpqSvEZbn7Z8HMnL+1tf9naoqzI5tUQgLO+ixvNrdhq5X240IR8nm OnYcYvPSA3xJjQPF3bwLw1JCfkJgVbbBCeDqXZEuejUx1s6AMn4o5HmUFPHc1weC37RDVGMPaQs g= X-Received: by 2002:aa7:d9da:0:b0:50a:1d85:319e with SMTP id v26-20020aa7d9da000000b0050a1d85319emr1292043eds.27.1682770604417; Sat, 29 Apr 2023 05:16:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5qqm9mxpvYUbiBnvj+XxqNKMAMguvezwsxR3AuKvqpsV8VgGvyA60QKUeXnB/iNQ5szZ5riA== X-Received: by 2002:aa7:d9da:0:b0:50a:1d85:319e with SMTP id v26-20020aa7d9da000000b0050a1d85319emr1292026eds.27.1682770604074; Sat, 29 Apr 2023 05:16:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tom Lendacky , "Dr . David Alan Gilbert" Subject: [PULL 03/17] i386/sev: Update checks and information related to reduced-phys-bits Date: Sat, 29 Apr 2023 14:16:22 +0200 Message-Id: <20230429121636.230934-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770707241100005 Content-Type: text/plain; charset="utf-8" From: Tom Lendacky The value of the reduced-phys-bits parameter is propogated to the CPUID information exposed to the guest. Update the current validation check to account for the size of the CPUID field (6-bits), ensuring the value is in the range of 1 to 63. Maintain backward compatibility, to an extent, by allowing a value greater than 1 (so that the previously documented value of 5 still works), but not allowing anything over 63. Fixes: d8575c6c02 ("sev/i386: add command to initialize the memory encrypti= on context") Signed-off-by: Tom Lendacky Reviewed-by: Dr. David Alan Gilbert Message-Id: Signed-off-by: Paolo Bonzini --- target/i386/sev.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index 859e06f6ad77..fe2144c0388b 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -932,15 +932,26 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error= **errp) host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL); host_cbitpos =3D ebx & 0x3f; =20 + /* + * The cbitpos value will be placed in bit positions 5:0 of the EBX + * register of CPUID 0x8000001F. No need to verify the range as the + * comparison against the host value accomplishes that. + */ if (host_cbitpos !=3D sev->cbitpos) { error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%= d'", __func__, host_cbitpos, sev->cbitpos); goto err; } =20 - if (sev->reduced_phys_bits < 1) { - error_setg(errp, "%s: reduced_phys_bits check failed, it should be= >=3D1," - " requested '%d'", __func__, sev->reduced_phys_bits); + /* + * The reduced-phys-bits value will be placed in bit positions 11:6 of + * the EBX register of CPUID 0x8000001F, so verify the supplied value + * is in the range of 1 to 63. + */ + if (sev->reduced_phys_bits < 1 || sev->reduced_phys_bits > 63) { + error_setg(errp, "%s: reduced_phys_bits check failed," + " it should be in the range of 1 to 63, requested '%d'", + __func__, sev->reduced_phys_bits); goto err; } =20 --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770658; cv=none; d=zohomail.com; s=zohoarc; b=OoySXXyao+hbkuU+oQa9jALmJcbgIjdinPxqnkX/WSNLbHYK57xef6WbRUDkbZ/d21pLuy2rZHxVvp5+kF4TGdMoGDx2XOK2WNP9t0Mam672K27/Dbp8836GjOQqIPsHBUq3axvcAtkumjiSl56NNzwdIiR3N96gS8BM/xYF6G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770658; 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=Y6n25tAvKjm/CgHaYE2Nh9DWMy5VIM9DHEAD/A734ys=; b=Iwe0EzD6Sg+Q/3/S4PTg28I+A1zZQBiEko7iAUwOpoQFHaz9PrpaMamLqbi90GkfH6L8h8mYqarL8Mu2EzcJdudiuyQzoeUfXUDYfPfSHiLZ+sL7F14507opiLcpEyHjBbCPY+X8T9kNxAFSHovl3GVk/sJSOLQdaIpfQsW77qQ= 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 1682770658278246.65408018810683; Sat, 29 Apr 2023 05:17:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVV-0006A6-AG; Sat, 29 Apr 2023 08:16:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVT-00069C-ON for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVS-0004tD-9D for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:51 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-W3_Xpf0vM8uZBjDZeIGDtw-1; Sat, 29 Apr 2023 08:16:48 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5067ce9bf7bso840316a12.2 for ; Sat, 29 Apr 2023 05:16:47 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id i21-20020a05640200d500b00501d73cfc86sm10483196edu.9.2023.04.29.05.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770609; 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=Y6n25tAvKjm/CgHaYE2Nh9DWMy5VIM9DHEAD/A734ys=; b=gvfQFNM9BlxoH1+G/3+WIdLUAdy4xoxgaHvELIYoScpQTvKiewkyFHzjgNN4v7ZfeLPRiZ vCwLa1nasoqRPSK+c2v8v1vptPlpiaFHxu7Qqb9mI/D+cAoxLMEa6eK4qa/x/BAxppdCCY suZAUmxTD6nl2izKcOBQMzr68DC3Dzc= X-MC-Unique: W3_Xpf0vM8uZBjDZeIGDtw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770606; x=1685362606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y6n25tAvKjm/CgHaYE2Nh9DWMy5VIM9DHEAD/A734ys=; b=Et/HqHXpSbbr4bP6190JU/48pSj3AuKXmLQZ3V4H8AF7fzYfXwbf6ansjIfo3Pi+OF 5bGvubbgGDJPIXHLVOPPQEYobEP615cEvHpYkb0wrkVrvDjsI73QSj/Pwlpj5Jw0GfsD ZWV/nGDF/dnBFThSYVrKdBp2R0wrLA5yinsDP6YpBPiVRd6ccgXmhx+EVAAeZqfizvBY fpWTam8AnR6JDVMVSJUtWAQU+KSWtPjxZT2tUaBrRKP+B9HC1OFKBubqVmP3IR3gf4i8 N730i1BpffnKz90DWuPIHMy42d3WZv9K/wjWw1nMGMhXLsJq2iWHsyS8/ASociipqvZV W7Gg== X-Gm-Message-State: AC+VfDx84ebs2HR3QuwGBiod02uk/IehunUatd223TVR/iW3JWStshno i/zVEocVcDXJndOb+A2Fstz2uJ2TgS78Wm3KRL9XHDPv549qcBpkMiJYDCp5OolBOl7wJwhi6sT iCsk+6oanjIsJ0JqQpDFfFHD86Dvw2PXJ0tB9KywOGVskFzAo/Z/6bljzMA+4FkdrmHAuxyRAEt w= X-Received: by 2002:aa7:c2ca:0:b0:506:a48e:6af1 with SMTP id m10-20020aa7c2ca000000b00506a48e6af1mr1232521edp.38.1682770606208; Sat, 29 Apr 2023 05:16:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6EpE84ck5Zrv6ZlludpThDEZ4dGbJIjOzuvMoMNAHnxlVXC9qthTquYhBvCQ3uQ7SmV/EWpA== X-Received: by 2002:aa7:c2ca:0:b0:506:a48e:6af1 with SMTP id m10-20020aa7c2ca000000b00506a48e6af1mr1232507edp.38.1682770605888; Sat, 29 Apr 2023 05:16:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tom Lendacky , "Dr . David Alan Gilbert" Subject: [PULL 04/17] i386/cpu: Update how the EBX register of CPUID 0x8000001F is set Date: Sat, 29 Apr 2023 14:16:23 +0200 Message-Id: <20230429121636.230934-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770658859100001 Content-Type: text/plain; charset="utf-8" From: Tom Lendacky Update the setting of CPUID 0x8000001F EBX to clearly document the ranges associated with fields being set. Fixes: 6cb8f2a663 ("cpu/i386: populate CPUID 0x8000_001F when SEV is active= ") Signed-off-by: Tom Lendacky Reviewed-by: Dr. David Alan Gilbert Message-Id: <5822fd7d02b575121380e1f493a8f6d9eba2b11a.1664550870.git.thomas= .lendacky@amd.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2e30e348a176..73dd99374abe 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6000,8 +6000,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, if (sev_enabled()) { *eax =3D 0x2; *eax |=3D sev_es_enabled() ? 0x8 : 0; - *ebx =3D sev_get_cbit_position(); - *ebx |=3D sev_get_reduced_phys_bits() << 6; + *ebx =3D sev_get_cbit_position() & 0x3f; /* EBX[5:0] */ + *ebx |=3D (sev_get_reduced_phys_bits() & 0x3f) << 6; /* EBX[11= :6] */ } break; default: --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770732; cv=none; d=zohomail.com; s=zohoarc; b=c8cwsRvKg/xhg0K8BGzI4RCZ745avzp5VxOgiyLVnvalbDER3mOKW0GIygLoSOe/cNqP6/nrRLXedI2Z/qyvT1++jvYLyBKD1fDsKIf78ty8hjy76Rh/1KXM+9LZS/CMZJ3RQflOvM1KQ+FKeZlbbjErUHx8gofVkzK/x/3fI+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770732; 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=CTpkXl8qcYf/BoKwv5k/ANj9FqbYr0F84l1GbrfcI+E=; b=XjBMYueK10hcZKm75lJfxkOEglLz+JuXvpK7zBj75xjZWju+uvfMKaoOuJZ4rCqIAZWiPXwXiswSczum059XDsNf05Uh5WMF7tPkYKdwxeWs2iDQ1HAbBsB5VwMXZgYedH+7bHO3djZ21CvU1H+Kyt7PfHGx5xjDKxDFbKcO6bs= 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 1682770732851842.5350813945362; Sat, 29 Apr 2023 05:18:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVY-0006Dd-0o; Sat, 29 Apr 2023 08:16:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVV-0006A8-NJ for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:53 -0400 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 1psjVT-0004tQ-U1 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:53 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-JOh0elglNda2XY8fUP_Wog-1; Sat, 29 Apr 2023 08:16:49 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a348facbbso102010866b.1 for ; Sat, 29 Apr 2023 05:16:49 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id sb10-20020a1709076d8a00b00958079b676asm9838993ejc.122.2023.04.29.05.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770611; 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=CTpkXl8qcYf/BoKwv5k/ANj9FqbYr0F84l1GbrfcI+E=; b=cgPwCkTGe/DFPd8Hy+2/xX8ytLSirMirVM/dZwIRYdnMWSXWKu2I+e+DdCKKKSP/pNs/oq pllxfYaD45eiOHwxEHE96gnAROYV19RXnb+entjPonjS1TI54IhVcnR6/PdvPgx6tuAjnO ep82j6ADIzfxbCiiElOgpK3Ru/nxQ20= X-MC-Unique: JOh0elglNda2XY8fUP_Wog-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770608; x=1685362608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CTpkXl8qcYf/BoKwv5k/ANj9FqbYr0F84l1GbrfcI+E=; b=h4x35x2py6gbeXW9nmhBky1zSNFrdXTdjPqke/h2pJ1zinu39B2+1kItgne235XcXK ljgL03Wc8DhAJeSYVaniDanhnq/Nj/RQm2qAbtae7SFNJU2dbEP+2JysmGmXAvHfrMaU HVeoZgv72JeGVDk7NqYI70XmAQwBtQJkhJ3LZ9iWFQc/k35nVU2YJUVW0P0FwrBrZ8p2 prhmO+ewUNuKTrdsQRArGrY4fxQdzdjxZVBMj9qAdns6AjTmIhcoX7IXVxY4EVIuZB/w G0wg/kg7twtciHhf2oIlL1q3t67d3iQRJI5VCrVfvgVqxm0UMVBj9pNRZDvzlDGUqg3H gR2A== X-Gm-Message-State: AC+VfDwE1QPjRYdJ/FPUeQfMxs/03RDAuCSIuB4RglUHFA20rzNzj9Vu /182Yl9pqAlYAyE0L+ZnrmF9UzhSI7pk6EoswrFfpQoXzaFrmnuT/fKZhga+7t22iLnbG9A3O0u rGm7ohx/xpxpk3n9OhVuTmCkZz+o1+yaDMp2jIQn8Tms/g4tieCsaaWaOLD2rM3C5kEeN8GmKRp M= X-Received: by 2002:a17:906:ee86:b0:957:12a6:ac9 with SMTP id wt6-20020a170906ee8600b0095712a60ac9mr8337467ejb.36.1682770608162; Sat, 29 Apr 2023 05:16:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5d6NM2NoMj5fVpNk57xLQR8Y8cIvOChVQ0BHEhIncP8wT5JLAfEduUy74m+7elKr+xw262ug== X-Received: by 2002:a17:906:ee86:b0:957:12a6:ac9 with SMTP id wt6-20020a170906ee8600b0095712a60ac9mr8337448ejb.36.1682770607849; Sat, 29 Apr 2023 05:16:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Jiaxi Chen , Tao Su , Xiaoyao Li Subject: [PULL 05/17] target/i386: Add support for CMPCCXADD in CPUID enumeration Date: Sat, 29 Apr 2023 14:16:24 +0200 Message-Id: <20230429121636.230934-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770733322100001 Content-Type: text/plain; charset="utf-8" From: Jiaxi Chen CMPccXADD is a new set of instructions in the latest Intel platform Sierra Forest. This new instruction set includes a semaphore operation that can compare and add the operands if condition is met, which can improve database performance. The bit definition: CPUID.(EAX=3D7,ECX=3D1):EAX[bit 7] Add CPUID definition for CMPCCXADD. Signed-off-by: Jiaxi Chen Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li Message-Id: <20230303065913.1246327-2-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 73dd99374abe..67210ffd79b9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -875,7 +875,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { .type =3D CPUID_FEATURE_WORD, .feat_names =3D { NULL, NULL, NULL, NULL, - "avx-vnni", "avx512-bf16", NULL, NULL, + "avx-vnni", "avx512-bf16", NULL, "cmpccxadd", NULL, NULL, "fzrm", "fsrs", "fsrc", NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d243e290d385..d5843c15558f 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -907,6 +907,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord= w, #define CPUID_7_1_EAX_AVX_VNNI (1U << 4) /* AVX512 BFloat16 Instruction */ #define CPUID_7_1_EAX_AVX512_BF16 (1U << 5) +/* CMPCCXADD Instructions */ +#define CPUID_7_1_EAX_CMPCCXADD (1U << 7) /* Fast Zero REP MOVS */ #define CPUID_7_1_EAX_FZRM (1U << 10) /* Fast Short REP STOS */ --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770721; cv=none; d=zohomail.com; s=zohoarc; b=kZdHSQPuGouRRGYyFiTUTSZIhxiWLwrSpbdBZJc5Bwiqw+VxIHP+6aRt5kifBMQK+xRKJpj33YCbpKNvFwhqlswrsdBIYP4EeGNASINyn39RXRX4vPFrO9S/eM+pZ+j4OZFXy9l7hSjzCtwvra0v5yDvfDf+YLSewlcY2HxHv3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770721; 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=wWEBPtqtcK7SRP2OJS9qr7tuHGua11ptsOCd1VxR/f4=; b=F+M9ILPDfWk7cme4W7Sy6zYgY2ovdmeSMGL589QAvh9z1o7plXJ+LyczWat2EH0IKAo50diqid2GHaWRcUjLwi4X6K8sEyCuGUjZHs9ry9CtrNp/YLYp61BRG+YJVQVfubgiDtohNGsGGUDiAPO0wBQrQbPdvU9kRJkgFlZPgsk= 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 168277072198029.16558604792681; Sat, 29 Apr 2023 05:18:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVY-0006Df-1o; Sat, 29 Apr 2023 08:16:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVX-0006Cg-9t for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:55 -0400 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 1psjVV-0004th-Pb for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:55 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-144-xlZYvx6jOpyWkN6wluOqsg-1; Sat, 29 Apr 2023 08:16:51 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5067ce9bf7bso840373a12.2 for ; Sat, 29 Apr 2023 05:16:51 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bc28-20020a056402205c00b00506c3c0d393sm10283619edb.78.2023.04.29.05.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770613; 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=wWEBPtqtcK7SRP2OJS9qr7tuHGua11ptsOCd1VxR/f4=; b=O0WnkoiN0cE+2CSsBrHGmNbX1RfbVwk2biuWZHgRLlKZoDQhZHGfDXlKG3pTPwSjDFL1mP ciCBl8dp2yOXpekKejE6maa/46TmJtsZyI28pD0B1BAZ0EEoGGF/sb0jRCumTT1YehP0GR aqvn3rOBtLhkifq4VUlbXv/p5GmIFYo= X-MC-Unique: xlZYvx6jOpyWkN6wluOqsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770610; x=1685362610; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wWEBPtqtcK7SRP2OJS9qr7tuHGua11ptsOCd1VxR/f4=; b=FyunZA8qanymRYbENV6DkN8vUsDISZ6d5oXY4z/0hzOxn2QDeMklwRtEVVZPD22j+P 98+3avHFx3ImaIsyef813rtr+Aj98bufYBTiNg0kDtOHVjVOn9YvkiYOwGy5gaUepoqV 3KYPnC+o5i6zoX8LykISuJJo868lepVI1IWkvz9AFaCno6bMdzxJNScOIUrNC8ItSJgE KlUJqGS09dJuNoDukbnpwM2fJy5g7stg2HCzWVsOFnMicl1/nhfdcWOL1hh+ZYqhlQT5 Ek8WVEX1wP+sTaRRAaeM4eSv/E78g5Dqt9QdlqQofSsv90ouC0fQiUYoR50HZv68FI2T AGHA== X-Gm-Message-State: AC+VfDzzgfhFwhVet3mR9CKjKNimOYfEcD/ZTKkYecUbgDtm0yY1npRp nXki33VZrNzL27lB2mR2Sw7IWCto2BsqVGbMt9hjZ0amuLByJVhIRgJ70qffTus/qWMk4atqRt9 3LuRP4HhTIlqgSJfoeEqtb+rKiUC2qFMXldU4jKiIy91QD/C9CXRtUeV39UmNhSrnWNo+IQC575 w= X-Received: by 2002:a05:6402:2029:b0:506:a7a4:88a9 with SMTP id ay9-20020a056402202900b00506a7a488a9mr1603861edb.4.1682770610114; Sat, 29 Apr 2023 05:16:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Ik6CI4Blhg0HRMSL11zSFkUtlsyiG9w7WURkra0EKAg0oeDHcUG5O7rJr4M1sE0+TybYtrQ== X-Received: by 2002:a05:6402:2029:b0:506:a7a4:88a9 with SMTP id ay9-20020a056402202900b00506a7a488a9mr1603844edb.4.1682770609865; Sat, 29 Apr 2023 05:16:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Jiaxi Chen , Tao Su , Xiaoyao Li Subject: [PULL 06/17] target/i386: Add support for AMX-FP16 in CPUID enumeration Date: Sat, 29 Apr 2023 14:16:25 +0200 Message-Id: <20230429121636.230934-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770723316100002 Content-Type: text/plain; charset="utf-8" From: Jiaxi Chen Latest Intel platform Granite Rapids has introduced a new instruction - AMX-FP16, which performs dot-products of two FP16 tiles and accumulates the results into a packed single precision tile. AMX-FP16 adds FP16 capability and allows a FP16 GPU trained model to run faster without loss of accuracy or added SW overhead. The bit definition: CPUID.(EAX=3D7,ECX=3D1):EAX[bit 21] Add CPUID definition for AMX-FP16. Signed-off-by: Jiaxi Chen Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li Message-Id: <20230303065913.1246327-3-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 67210ffd79b9..841c407d6d76 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -879,7 +879,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { NULL, NULL, "fzrm", "fsrs", "fsrc", NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + NULL, "amx-fp16", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d5843c15558f..7deb37eca5a8 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -915,6 +915,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord= w, #define CPUID_7_1_EAX_FSRS (1U << 11) /* Fast Short REP CMPS/SCAS */ #define CPUID_7_1_EAX_FSRC (1U << 12) +/* Support Tile Computational Operations on FP16 Numbers */ +#define CPUID_7_1_EAX_AMX_FP16 (1U << 21) =20 /* XFD Extend Feature Disabled */ #define CPUID_D_1_EAX_XFD (1U << 4) --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770634; cv=none; d=zohomail.com; s=zohoarc; b=Ug1yEpvOpFRYsNcJlrmZZQFrOwRORGDQ2pc61j8Kre6QiZ/w9iY6SxD8G858DHfOWn9e3H33tVXDLJgO7G5HxeBiUHt67dvr8+MzN4F/8P2zTpV4WDu2ubocVZU4C6fA0tMgQaguoKSc/EOi0cA2YXEFjY5fMHC7Bh5DyVkNLr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770634; 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=H1icCCj5SrF32zbacKrFKTJjuTNf5Lvd8BnQQFfyUhY=; b=lgR/ck447+gMSJRO6TtftQUvybtmhTkuvaDYmglUjhJTLRo+4FEAqrDfFCQWkfDvlkZ111iPR9D/jPfcI//OuOsGJLdDNLVbxr4RKHnJz8KHtLCgDYdXzAx2E5vaoBD4ar9Y4+KqNIHKGmThWCGFTihflfVv+zp92wDkquSTIrg= 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 168277063412494.67131146581676; Sat, 29 Apr 2023 05:17:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVa-0006Ex-M7; Sat, 29 Apr 2023 08:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVZ-0006EF-CU for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:57 -0400 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 1psjVX-0004uB-Qg for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:57 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-eQd0Jn68N9KziYY9R3cl8w-1; Sat, 29 Apr 2023 08:16:53 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-94ee1fc1233so81540066b.1 for ; Sat, 29 Apr 2023 05:16:53 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id sb21-20020a170906edd500b0094f4d2d81d9sm12439648ejb.94.2023.04.29.05.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770615; 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=H1icCCj5SrF32zbacKrFKTJjuTNf5Lvd8BnQQFfyUhY=; b=O8pg63YFBqDAa4YPGXUNTB3931xoIaf4yTD8R2ZShOr6NrmqVLowpT3dnjcAGrlGtrq3cB 9594z+ptGhxlw8OpvsqkfZiZyCnYXiLKMANETTu1NZM5r3I4/8NPGvFBKA+xOOpaTv/vLn Ou197nEJ87aW9m5JxzWBrWHAnj8eFGs= X-MC-Unique: eQd0Jn68N9KziYY9R3cl8w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770612; x=1685362612; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H1icCCj5SrF32zbacKrFKTJjuTNf5Lvd8BnQQFfyUhY=; b=LmvNB2EnRUK9ueZEgoVFPPiaI42HC3oV1b4uju9uRsZm1lQDn4DV5pY73TEYw5daBw Pb78GtzyldN+x6ppJoz2oFAqX4XWJOq0oiCGHvsY+HdlddJQEPMrKOKS+AJRYyqQs5bB OGtGcyOg8D/2JqCmhn3Nl21wP4WLcxXCke0fEB0ksv8Gwnc7qXff3ZSVdYey+k8JsaRL 337JaxYXhlihyPfClYfPhOfPo9/6j833Y1PKf2TWZE5YnrUempSsOBuLbMWlOcbcWUXT Nbu6Tf/b2mx4EZGtQ8Yjmr92LOZK3OcX4yjuY710278f6sbLHU4VYneEC2bVUnjgKfp1 fSbQ== X-Gm-Message-State: AC+VfDwBixTtpgLefzmr6IBtPX0orXaU5oRy+Oc8Rfct7aJnLGTBFzDk Jd3KFDvKTAOrny+M/FOzwoGmPKPfHetDrTHznTwf1xaWjbuTiGWyl+y1foaSmdELLNvt8ZJOx0e clB4h/Oy9k6KOBfxkOpb7fARxsUmAQX6Ptf+P/7MULVUH2yxwMSnRIcH3iZvwVZlboYIdOpCzA8 c= X-Received: by 2002:a17:906:6a28:b0:947:5acb:920c with SMTP id qw40-20020a1709066a2800b009475acb920cmr7837281ejc.34.1682770611901; Sat, 29 Apr 2023 05:16:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Gjf1viUV7vxAcRRNmpn4wh1xGIOXvwkI2nJMYqMEhjhk99HMsTjGRjzSPgqkmtpHxV253mA== X-Received: by 2002:a17:906:6a28:b0:947:5acb:920c with SMTP id qw40-20020a1709066a2800b009475acb920cmr7837267ejc.34.1682770611598; Sat, 29 Apr 2023 05:16:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Jiaxi Chen , Tao Su , Xiaoyao Li Subject: [PULL 07/17] target/i386: Add support for AVX-IFMA in CPUID enumeration Date: Sat, 29 Apr 2023 14:16:26 +0200 Message-Id: <20230429121636.230934-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770635896100003 Content-Type: text/plain; charset="utf-8" From: Jiaxi Chen AVX-IFMA is a new instruction in the latest Intel platform Sierra Forest. This instruction packed multiplies unsigned 52-bit integers and adds the low/high 52-bit products to Qword Accumulators. The bit definition: CPUID.(EAX=3D7,ECX=3D1):EAX[bit 23] Add CPUID definition for AVX-IFMA. Signed-off-by: Jiaxi Chen Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li Message-Id: <20230303065913.1246327-4-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 841c407d6d76..8eb2ee5045d7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -879,7 +879,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { NULL, NULL, "fzrm", "fsrs", "fsrc", NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, "amx-fp16", NULL, NULL, + NULL, "amx-fp16", NULL, "avx-ifma", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 7deb37eca5a8..1f72d11e0ccc 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -917,6 +917,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord= w, #define CPUID_7_1_EAX_FSRC (1U << 12) /* Support Tile Computational Operations on FP16 Numbers */ #define CPUID_7_1_EAX_AMX_FP16 (1U << 21) +/* Support for VPMADD52[H,L]UQ */ +#define CPUID_7_1_EAX_AVX_IFMA (1U << 23) =20 /* XFD Extend Feature Disabled */ #define CPUID_D_1_EAX_XFD (1U << 4) --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770719; cv=none; d=zohomail.com; s=zohoarc; b=oET8XAGLaEqmbP525VLYJhXGeM2ZeAP6K8CGr6uV6btzeiOrH28fCuxaRwJCfOb7XuXki067h5C5lTYHnD7w2O5XA1dG+zEPLd308JdkSWuHTymNFv7qJrjl1NsfBjHtyohUWFOyaX5FVF7+tQCZYfon98oPDIG9U+ZNUFqjWLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770719; 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=g5jCDgOpo4kOJBA8VgoEFYVbYBz41TlczOJAa/4zYuU=; b=nxlPPGRJPMlGguqJMK0YVs/repmab8c5+SlFOiBwNZhBIMVrtvsyZUSnNPCkRQe1fLpjYR37yScvQPDyGhh1i249xOtBn8Xb7V+Um4mOqFBTCWqceOqiYM8/dwkCKkdz6TalWlO4I2bTbk/Qh6b4tk4yLrYrcpDlGfyYHwZC6kY= 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 1682770719867447.3968835573297; Sat, 29 Apr 2023 05:18:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVe-0006Gj-Sv; Sat, 29 Apr 2023 08:17:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVc-0006GN-74 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVa-0004uY-Bq for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:16:59 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-591-_nelRE9vM96qy6yvCUt-uA-1; Sat, 29 Apr 2023 08:16:55 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-509e422cfb3so840719a12.3 for ; Sat, 29 Apr 2023 05:16:55 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id qw16-20020a1709066a1000b00959b3c30f2csm7783764ejc.222.2023.04.29.05.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770617; 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=g5jCDgOpo4kOJBA8VgoEFYVbYBz41TlczOJAa/4zYuU=; b=cL0xcohUUINCoSbqAUZ8+UvbQKCXeJ5BRyXCVtujPuuE75jrIvBJ66MXi6qy+5pDqNI8rR xNNFa8ObrPTgMAwrG9W5vSsQfvBzhw7spxCzHI0EH6mVjlCHI8yD+tdMyx4FryzieEYNHZ b8iZlOWVVSDkc94gDHXzVr69Be/5sdQ= X-MC-Unique: _nelRE9vM96qy6yvCUt-uA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770614; x=1685362614; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g5jCDgOpo4kOJBA8VgoEFYVbYBz41TlczOJAa/4zYuU=; b=VTggE+raU3AvbfHuaHGc9H6y8xc5Zt7aNxPb1DXktip/okNAqFQ1tFUp+jRKqxlJjI 7rnaB1tSncIvGxBfPPXyUZlhv865BN0/ROZdpiALM+6+567uZn/HfAMzhhmJkwWtdkBl SKycp3ksk0PddS8vZ0EOVhYe+84scfbUE2oeqiFNSydoUJVuS2PT9kJiBSjOEBQOIPOX ZU1/cY1CthYyIKm+ofw1NAQirwCms2B/pVdyK1VjBfDF1OJRKybNvF7woVYQESD5sfUq MD7SMqTBgEiI7NI+wPR2W+FGLPCGeM/MWBw9lht0XratmEiz+9BG8OF3z9RMbkREr52t LEUw== X-Gm-Message-State: AC+VfDzriPPFsklgYKooOOwN/n5Up2XMF6k9+P5pIhKloImsFr00m72p T4g/WlhZ8fkKDaFyDZvE4j7AQZdmz/oBUcS2BYiivE/RZLSIsF16l7rmoS8VyXdMST4qLLYlc3Z YZIvXHZ5BQA/3RXNBJ8rD5ZSmNkeuuuNlXOs181yVrllcyst1E40u6yBuga4kSkUkUSjtTqrgAz 8= X-Received: by 2002:a17:906:58ca:b0:94e:ff23:992a with SMTP id e10-20020a17090658ca00b0094eff23992amr7997565ejs.59.1682770613929; Sat, 29 Apr 2023 05:16:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7R+sUe8VizOUa8+uZEDbAF37X80kEgfc0ZtP5q34eIBVhQ64JauV01p0BSXkvxNDxvqFYwaQ== X-Received: by 2002:a17:906:58ca:b0:94e:ff23:992a with SMTP id e10-20020a17090658ca00b0094eff23992amr7997544ejs.59.1682770613499; Sat, 29 Apr 2023 05:16:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Jiaxi Chen , Tao Su , Xiaoyao Li Subject: [PULL 08/17] target/i386: Add support for AVX-VNNI-INT8 in CPUID enumeration Date: Sat, 29 Apr 2023 14:16:27 +0200 Message-Id: <20230429121636.230934-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770720188100001 Content-Type: text/plain; charset="utf-8" From: Jiaxi Chen AVX-VNNI-INT8 is a new set of instructions in the latest Intel platform Sierra Forest, aims for the platform to have superior AI capabilities. This instruction multiplies the individual bytes of two unsigned or unsigned source operands, then adds and accumulates the results into the destination dword element size operand. The bit definition: CPUID.(EAX=3D7,ECX=3D1):EDX[bit 4] AVX-VNNI-INT8 is on a new feature bits leaf. Add a CPUID feature word FEAT_7_1_EDX for this leaf. Add CPUID definition for AVX-VNNI-INT8. Signed-off-by: Jiaxi Chen Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li Message-Id: <20230303065913.1246327-5-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 22 +++++++++++++++++++++- target/i386/cpu.h | 4 ++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 8eb2ee5045d7..abceab2b6992 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -667,6 +667,7 @@ void x86_cpu_vendor_words2str(char *dst, uint32_t vendo= r1, #define TCG_7_0_EDX_FEATURES CPUID_7_0_EDX_FSRM #define TCG_7_1_EAX_FEATURES (CPUID_7_1_EAX_FZRM | CPUID_7_1_EAX_FSRS | \ CPUID_7_1_EAX_FSRC) +#define TCG_7_1_EDX_FEATURES 0 #define TCG_APM_FEATURES 0 #define TCG_6_EAX_FEATURES CPUID_6_EAX_ARAT #define TCG_XSAVE_FEATURES (CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XGETBV1) @@ -890,6 +891,25 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { }, .tcg_features =3D TCG_7_1_EAX_FEATURES, }, + [FEAT_7_1_EDX] =3D { + .type =3D CPUID_FEATURE_WORD, + .feat_names =3D { + NULL, NULL, NULL, NULL, + "avx-vnni-int8", NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + }, + .cpuid =3D { + .eax =3D 7, + .needs_ecx =3D true, .ecx =3D 1, + .reg =3D R_EDX, + }, + .tcg_features =3D TCG_7_1_EDX_FEATURES, + }, [FEAT_8000_0007_EDX] =3D { .type =3D CPUID_FEATURE_WORD, .feat_names =3D { @@ -5534,9 +5554,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, } } else if (count =3D=3D 1) { *eax =3D env->features[FEAT_7_1_EAX]; + *edx =3D env->features[FEAT_7_1_EDX]; *ebx =3D 0; *ecx =3D 0; - *edx =3D 0; } else { *eax =3D 0; *ebx =3D 0; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 1f72d11e0ccc..0b25d180753b 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -626,6 +626,7 @@ typedef enum FeatureWord { FEAT_SGX_12_1_EAX, /* CPUID[EAX=3D0x12,ECX=3D1].EAX (SGX ATTRIBUTES[3= 1:0]) */ FEAT_XSAVE_XSS_LO, /* CPUID[EAX=3D0xd,ECX=3D1].ECX */ FEAT_XSAVE_XSS_HI, /* CPUID[EAX=3D0xd,ECX=3D1].EDX */ + FEAT_7_1_EDX, /* CPUID[EAX=3D7,ECX=3D1].EDX */ FEATURE_WORDS, } FeatureWord; =20 @@ -920,6 +921,9 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord= w, /* Support for VPMADD52[H,L]UQ */ #define CPUID_7_1_EAX_AVX_IFMA (1U << 23) =20 +/* Support for VPDPB[SU,UU,SS]D[,S] */ +#define CPUID_7_1_EDX_AVX_VNNI_INT8 (1U << 4) + /* XFD Extend Feature Disabled */ #define CPUID_D_1_EAX_XFD (1U << 4) =20 --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770671; cv=none; d=zohomail.com; s=zohoarc; b=Oju36nnkdvxe4jWMCbRWN3ucwftt4wUuV2qi4sk56mBguU/bihZGoo2A/A1hzS6Lzte5j6SVqchqKoJ4ggI73hWn0FaR2HCeeIFhvv87PRln3xD4bSk/5PlGV4R1v5nvYNfIKjAqsjmfItFEzhoYyG8pkzbc3sfamp0743iEzCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770671; 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=qJ2LfEsLk4GkG6XIynmM/r0tYdCk8YN8LvnxMKnc3OI=; b=Kuzo2FzBq9sVwjW8MW8gveyA1xT72BMUntD5y6gmTT+Tdo8V3MawltvZtjZipX4+eqtH9zUcIGTpe3FrZSWWOrFW4N+r85Ro3QQ6n//VDTXlgzu3RSXqpG5DSiBxK+Q5uplXTStJMnwRcEVbwCmS7XvGRuoZNDdYXRDfvLS4clQ= 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 1682770671409793.9398096423309; Sat, 29 Apr 2023 05:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVw-0006lQ-MB; Sat, 29 Apr 2023 08:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVg-0006Hv-Fa for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:06 -0400 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 1psjVb-0004w0-U8 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:04 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-y211b61gPeyFIPXeX5Q8RQ-1; Sat, 29 Apr 2023 08:16:57 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-50692ecb286so653268a12.0 for ; Sat, 29 Apr 2023 05:16:57 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id q3-20020a056402032300b004af6c5f1805sm10088677edw.52.2023.04.29.05.16.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770619; 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=qJ2LfEsLk4GkG6XIynmM/r0tYdCk8YN8LvnxMKnc3OI=; b=Jp6HA+BzJ+WHfQM07G+b+OR80ydLgoXMgLG37FB/YUrZ2tPMr1MlsdT3n+ovST/0PL/grE xc5JDOUY8Bbbx7RFeKnupFRGOblMAJsH+5QqrV6hJMF8YpYkAUwhVm29JvIRBoy2OLSNzb lKjtdjLxKOfbF+MPRkkBqLSF3WuQumM= X-MC-Unique: y211b61gPeyFIPXeX5Q8RQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770615; x=1685362615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qJ2LfEsLk4GkG6XIynmM/r0tYdCk8YN8LvnxMKnc3OI=; b=RepmpfbdZfaALi6ro3O18HSyyyBhO5duzs0Gc27v55QELUu9EdFkNg+nEQYiFuHycn vSGuLBqVIzNGM/7iJOjxT7YHqnKIQ0pMWS/OKLRQRGCfbFSLlhHfIzEIG9qZH9FOCgsf tP83ama+9go0+EnR6NgbueqMaGeu8SM7ga03JNYGPkJq3Gpk4VLI8Kp9FUaVQLCBLzR7 u74YjJyegARpHgVrpxbSq06TRX9gWnfx2pkFYScOVbCgOX6gkrxV8t6NdOn5PzJuT5cn gATTKjb8lyzEpaOID+UPBCUVrVXuoV0wVnxmOQF8Kwv5H6mRvC0615M69K1BRYJ48OaD 2G1Q== X-Gm-Message-State: AC+VfDzH6rIG9gk+Xj+QfzfbTPgP4mwfuOfT/NdhSDhL/aUEenPo3Z66 PKiXD/oRaaO1oqBXErFnQ5zqf56rDOGUeEW78iZmedZmG3dXkcX9/OVuqMHro+bHl88p6h3hgLF 3PVVBAsGZkPFTPDOnEqxABLr9ieHqbZKQcw2AvYQuZWCBBytWYsGmyo8zVKGcIbDDy7UTzxqeOY k= X-Received: by 2002:a05:6402:1143:b0:50b:5211:446f with SMTP id g3-20020a056402114300b0050b5211446fmr325408edw.6.1682770615456; Sat, 29 Apr 2023 05:16:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4aK1XsD7fpe+Ys8qfeDVa4RzfrmVnX2o27ilBXsAjdnihmO8yck8/XR5I5T0JCr9o8jm+MTg== X-Received: by 2002:a05:6402:1143:b0:50b:5211:446f with SMTP id g3-20020a056402114300b0050b5211446fmr325395edw.6.1682770615184; Sat, 29 Apr 2023 05:16:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Jiaxi Chen , Tao Su , Xiaoyao Li Subject: [PULL 09/17] target/i386: Add support for AVX-NE-CONVERT in CPUID enumeration Date: Sat, 29 Apr 2023 14:16:28 +0200 Message-Id: <20230429121636.230934-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770673010100001 Content-Type: text/plain; charset="utf-8" From: Jiaxi Chen AVX-NE-CONVERT is a new set of instructions which can convert low precision floating point like BF16/FP16 to high precision floating point FP32, as well as convert FP32 elements to BF16. This instruction allows the platform to have improved AI capabilities and better compatibility. The bit definition: CPUID.(EAX=3D7,ECX=3D1):EDX[bit 5] Add CPUID definition for AVX-NE-CONVERT. Signed-off-by: Jiaxi Chen Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li Message-Id: <20230303065913.1246327-6-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index abceab2b6992..0204a3ac801a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -895,7 +895,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { .type =3D CPUID_FEATURE_WORD, .feat_names =3D { NULL, NULL, NULL, NULL, - "avx-vnni-int8", NULL, NULL, NULL, + "avx-vnni-int8", "avx-ne-convert", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 0b25d180753b..b46d52f3fa44 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -923,6 +923,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord= w, =20 /* Support for VPDPB[SU,UU,SS]D[,S] */ #define CPUID_7_1_EDX_AVX_VNNI_INT8 (1U << 4) +/* AVX NE CONVERT Instructions */ +#define CPUID_7_1_EDX_AVX_NE_CONVERT (1U << 5) =20 /* XFD Extend Feature Disabled */ #define CPUID_D_1_EAX_XFD (1U << 4) --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770699; cv=none; d=zohomail.com; s=zohoarc; b=lldJQhf/vSU8wOdmi9wn8SNK8HgdAgLpmEUh2BDufaf+yFdN28J4uOJ4EghP6PACzExRs/PTnQW6q1FUea4cetC/sWWpY7XwxhjQW8J6kbSy7CTRCdfqMwTY7QMmbSmq8AutA/lSyh3p/XZalEpmgOBxAZszi6HjprQ1S8poH3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770699; 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=Tk04m5HgptbG8YCpVathlHNG/5l9vROJS4WjJ+ft1YY=; b=jAlg7pbX1MnmiC5yAjjXMPr9Bm5BMk4vUYPpkt1xIgmNL5gEGPK+Pq4Etm54cxrdd91phQVK+c9aAI9bphC1RwXDJBjhIniaFipYbkBS+5YVMOXeFBl0Uk1ew8R0+vbaLrm7SnGVZXDRpSNf73PnnOM0GU7ZtA9xe+LmrmdW3tM= 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 1682770699406762.4965804607782; Sat, 29 Apr 2023 05:18:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVq-0006Wv-Pq; Sat, 29 Apr 2023 08:17:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVf-0006HD-LD for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:04 -0400 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 1psjVe-0004wG-5T for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:03 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-118-0UlZ9bZzMLShCge4HxXwpQ-1; Sat, 29 Apr 2023 08:16:59 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-50a14564599so18566830a12.0 for ; Sat, 29 Apr 2023 05:16:59 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id d9-20020a17090694c900b0095354acf666sm12513076ejy.92.2023.04.29.05.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770621; 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=Tk04m5HgptbG8YCpVathlHNG/5l9vROJS4WjJ+ft1YY=; b=MJq1zpJk/s4hvXmR32Z9lXiKqOIXd6f3X1dUJ+NffPY2O2qkjXWYlhWjtDLE1onqmzKFxd rG0fxPTxiirJwtIXin3OAq4AACF5cT2yFgstg9jDlB9mdaUOcnhBiP84Luxn0J18TZDVC4 ateu3nmy1HGKcbnmUp9h+9z3Yh7j5Iw= X-MC-Unique: 0UlZ9bZzMLShCge4HxXwpQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770618; x=1685362618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tk04m5HgptbG8YCpVathlHNG/5l9vROJS4WjJ+ft1YY=; b=Yi2OU3/E/2J2zPhBf4XBerxg+W3etDFKF7Q+zr8MQsssFigVuGsxJoHJNuow++dxvS 4ZjWxnwHE/TToiFr1r7TX6khK+f5OU8vMqYkcCnF+/KOsXBZJDM+v1ciCWbRRr+CDBUL 2/OVkxEN5wg9DU3BoQ4ksQW+WlFtDlAyQBbUBQvhchjXmsdrfC/3pLew3hTCS85C+o3D axeyczLLgg8V4aNiCXQSCtrQ3u/vSZJMDeVzSQIVdtfzYRusDWzLd1FY4fcH30vc0/lB OnNfYkTc2BJ8MP31E65D76w3APf2mb0ayYJfr9k1DAKrLuKHXcGlj/C08MtQUpB4CTJU D9+g== X-Gm-Message-State: AC+VfDxc03HmTVqGmaF9XP0znNRKtIbiKO7LBHyIzozPfyn+WBSLOY9f 5U0jcgiIbpUhlT1h54Eoa4Cp198g73eV9XOLcBVVq1mA4ChnNWIb/OwkiievnLztDo8yC2HX+JZ Vh719rMr/8BsCDF6U4uYoN+mlbmtWbCc3/+ETpBrwlbiwMfCER66ay56hc9lq/50ebwGEkrhaJU U= X-Received: by 2002:a17:907:9807:b0:94a:653b:ba41 with SMTP id ji7-20020a170907980700b0094a653bba41mr7779332ejc.15.1682770617884; Sat, 29 Apr 2023 05:16:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ53grshhOBo6XUuN+vVQU03SPqil40VY9Z7miWwwtvOjsHL1EsaG84ScddjoV434oW01sHLtw== X-Received: by 2002:a17:907:9807:b0:94a:653b:ba41 with SMTP id ji7-20020a170907980700b0094a653bba41mr7779316ejc.15.1682770617660; Sat, 29 Apr 2023 05:16:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Jiaxi Chen , Tao Su , Xiaoyao Li Subject: [PULL 10/17] target/i386: Add support for PREFETCHIT0/1 in CPUID enumeration Date: Sat, 29 Apr 2023 14:16:29 +0200 Message-Id: <20230429121636.230934-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770700145100001 Content-Type: text/plain; charset="utf-8" From: Jiaxi Chen Latest Intel platform Granite Rapids has introduced a new instruction - PREFETCHIT0/1, which moves code to memory (cache) closer to the processor depending on specific hints. The bit definition: CPUID.(EAX=3D7,ECX=3D1):EDX[bit 14] Add CPUID definition for PREFETCHIT0/1. Signed-off-by: Jiaxi Chen Signed-off-by: Tao Su Reviewed-by: Xiaoyao Li Message-Id: <20230303065913.1246327-7-tao1.su@linux.intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0204a3ac801a..823320fe420c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -897,7 +897,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { NULL, NULL, NULL, NULL, "avx-vnni-int8", "avx-ne-convert", NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + NULL, NULL, "prefetchiti", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b46d52f3fa44..8504aaac6807 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -925,6 +925,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord= w, #define CPUID_7_1_EDX_AVX_VNNI_INT8 (1U << 4) /* AVX NE CONVERT Instructions */ #define CPUID_7_1_EDX_AVX_NE_CONVERT (1U << 5) +/* PREFETCHIT0/1 Instructions */ +#define CPUID_7_1_EDX_PREFETCHITI (1U << 14) =20 /* XFD Extend Feature Disabled */ #define CPUID_D_1_EAX_XFD (1U << 4) --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770694; cv=none; d=zohomail.com; s=zohoarc; b=ODM+t9+oGXlLwAcqdxlu6jqAPkKgMQ0BdP0yKqIuCst74n8paMSFT3x9qz9fUMwgXp8i7JBUrqymQlExEZSCR9GrAiRjKwQsPluyFPnunNd9Alw/S/yYgnZXPlplRQcdSf6uZUbWoam9zpBlx/KpE+A9R+IROSPwGo72Zn/zxP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770694; 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=1tVVKWLeIMR9DWlb5Rsf5pMPPF9IxoYoOF9wINtHKaI=; b=BEaWPXGHSS5/4RKcaggPlY6SKwmPwov5DhSkx+akW+iPNcjZ8+vSHjOkrCfN+bqYXIEOSSF75C4AeEVAeTsLLSho2XwyLYrL2pR1mAk1w7RxK/Uxi2UoVA2QhxFWUjkPBgDrmzkYelCF2gDaqF/zGott5/xpUkVh8/aBKdib5/A= 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 168277069473669.96459466869499; Sat, 29 Apr 2023 05:18:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVx-0006wE-Qg; Sat, 29 Apr 2023 08:17:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVh-0006JT-2y for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVf-0004wL-2e for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:04 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-XszKcEpVMNycFXj5_PB8xQ-1; Sat, 29 Apr 2023 08:17:01 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-94ee1fc1233so81547266b.1 for ; Sat, 29 Apr 2023 05:17:00 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id g13-20020a170906348d00b0095337c5da35sm12601514ejb.15.2023.04.29.05.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770622; 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=1tVVKWLeIMR9DWlb5Rsf5pMPPF9IxoYoOF9wINtHKaI=; b=IbOnbbjlrhhIFERfWCw1Ad+CVBEZqfjVPhbr2pBS6mBmKtgkFdf8SFTNYSPKO+XakRnrG4 wnmUKxJ+bYoN5xvHvPAXlnKJXiblzg+jeoycn1S5ytLVuxoBPdNswNyYICH7PlnjwssEfC VZnZzGEPYSDrPxxhJkir2U54je21dFA= X-MC-Unique: XszKcEpVMNycFXj5_PB8xQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770619; x=1685362619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1tVVKWLeIMR9DWlb5Rsf5pMPPF9IxoYoOF9wINtHKaI=; b=EKzikDPdpFMMwbOGaBsY5ouBTO2Dmz6HdymMfCM+JJZMEoE/RPDF53VgXvhwfwsYhc vL8pU6hYYq9EdWdl0bJWJUMXpWtBqJNLRPOv82c9iK1+0ungc4xs3j3+pVDOsiDiVTCj aEZQaiqhG97QlBVcINANb0EsJBMbOXwaLnGt31EuwC1RZTmM86FhMPKVT45wcKJfuFdx nFkzrwvn1/cOOWFR3YPFZaA79XmmmAClxDzm79Vu1v+pMQMg8Izihjuul7dxZbbwjxY4 Un4Znxypb4VJAddtJFLl+7z+Wog5TpysC3ZiDprhBOLE9u5HUNPJYxzxpPFn5JFSRo24 5k7Q== X-Gm-Message-State: AC+VfDy8VL5XjAK4diWw0or37h5Ff7q4GD46E/CrdqyTlXjefmtpZVv2 VRhSdO+NGCZY2fEuNn11NM4XzkzyyksppTsEW7U2I7PGzS7I1qxCCyvgRNcTzWeSl4NXZLHvjsD 3W8LkobCT0J1kVbN+3y7ko95KQIFYXHTLaT8xjXfRMYUAmTtP2hjcFIUg4pLR0SwPUtbrso7MBi I= X-Received: by 2002:a17:907:a4c:b0:95e:c549:9ace with SMTP id be12-20020a1709070a4c00b0095ec5499acemr7118534ejc.62.1682770619585; Sat, 29 Apr 2023 05:16:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Pwwgq267fx7sOqAlHVFA8kvERrqY2ZWRD2MMmOaMPC/7xlQWFE55MRq+6jXLw7JBrn+F3ug== X-Received: by 2002:a17:907:a4c:b0:95e:c549:9ace with SMTP id be12-20020a1709070a4c00b0095ec5499acemr7118521ejc.62.1682770619306; Sat, 29 Apr 2023 05:16:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: David 'Digit' Turner Subject: [PULL 11/17] Fix libvhost-user.c compilation. Date: Sat, 29 Apr 2023 14:16:30 +0200 Message-Id: <20230429121636.230934-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770696032100003 Content-Type: text/plain; charset="utf-8" From: David 'Digit' Turner The source file uses VIRTIO_F_VERSION_1 which is not defined by on Debian 10. The system-provided which does not include the macro definition is included through , so fix the issue by including the standard-headers version before that. Signed-off-by: David 'Digit' Turner Message-Id: <20230405125920.2951721-2-digit@google.com> Signed-off-by: Paolo Bonzini --- subprojects/libvhost-user/libvhost-user.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvho= st-user/libvhost-user.c index 0abd898a52c4..8fb61e2df2fe 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -32,6 +32,12 @@ #include #include =20 +/* Necessary to provide VIRTIO_F_VERSION_1 on system + * with older linux headers. Must appear before + * below. + */ +#include "standard-headers/linux/virtio_config.h" + #if defined(__linux__) #include #include --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770753; cv=none; d=zohomail.com; s=zohoarc; b=H9NMxf58GYkH4uOirOxLnko4LGBXMSXVx9FJBSHMxkYdIMzHKUOhG3hYiNYNfZJqNWG7X6cglowQsWnBNgXn/6yT2vX4UL1E1Um6vt98wTv9eGytdefwhIVF8B/FoifuWIpUPqpyWygmq8TgaDykur615bS/ALMbLyR089vV040= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770753; 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=b0PhNgVo26jX7IJWZqqtOArVqrOt3ATGkt8cuJoYovE=; b=RdZFwhswg4sLy9lVzC5O46rgx3N6nmYTnHHdSpl3GPDGAe60UZHf/CNz4/8xCR6m/jDi8hx5+YmoUoIQ9PusqC11ZIIZgCJr3R0YiKHoTh1YFzqJY0e+vkUDrhQkOOs3VOR2lMsETl6Y2Y3o09ErQT1ZDIaCxj0lVL5/P03gpYI= 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 1682770753273647.9230302564328; Sat, 29 Apr 2023 05:19:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVy-00073K-TO; Sat, 29 Apr 2023 08:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVi-0006JZ-TP for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:08 -0400 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 1psjVh-0004wn-Dn for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:06 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-288-hLTPKuS-NainoSmeCW-8XQ-1; Sat, 29 Apr 2023 08:17:02 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-50a14564599so18566948a12.0 for ; Sat, 29 Apr 2023 05:17:02 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id v10-20020a1709063bca00b0094ee3e4c934sm12499701ejf.221.2023.04.29.05.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770624; 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=b0PhNgVo26jX7IJWZqqtOArVqrOt3ATGkt8cuJoYovE=; b=Ae6DgxKgkke69b6sENYQqC2fKzvCTdWiVcqqEjO9MbRv24WlBjzUB6aayH+G8x1mHECdOx albqVeupmcRzb1qP2RxZVM3mZ8jTAj1t93upcyt/Af3uZ08WBKQ33IVlZ1hSICI24hhzOU eaIU3HPTcyI/rgSatXHnyLxT1WA/00g= X-MC-Unique: hLTPKuS-NainoSmeCW-8XQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770621; x=1685362621; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b0PhNgVo26jX7IJWZqqtOArVqrOt3ATGkt8cuJoYovE=; b=XgXvR5uCgOXYu4RbRvgOZggoG8p76ceoxKf1G+5sqOGGoVvtogvdwSnrnIRVXb035j qtuBO/C0p/M3lAp3oZpBmrmea1cWI6KEtsuxkhGjdoRhMav0pItDkYqTodE4woeLO6ux tGlSnDjAON1ubpCU6IIFRy5D56gtzEtgU/7Tfm51uYM6C+h1DeUCYvM0+h3WI89zGEsS yB+r+oUUGOH561lkdubOt1Mki8Bx1qALHiwPbCN4ivUdWwI1GYfGGXAG6n9Nr0PvtW/a TSx9VSh70zd5NqwTYke/hh6U99fb5e17yvYR7fT7Y3cBQN8IXCt24Ru0otkuQbovL44V Iy3A== X-Gm-Message-State: AC+VfDxqCCfn02DiWykzEmsFytBNs5OQ4rXXVBOIoDxRkq4bOJ4uhtn2 u/oT5tS3JWh6l5QWor3aOLDyqRGZsUWZFiHTJaKisCU5NPRfwNvRXExRMF+V/Y3QnYXlVYqaBg+ HRx/Q587KLED6XrUBZtGTU2FsiNMPe4fum3JPrDVoGzhzdYBKTE2rUFiOUCHBLCapHP0MjLk4iQ s= X-Received: by 2002:a17:907:1c24:b0:94a:8e19:6aba with SMTP id nc36-20020a1709071c2400b0094a8e196abamr7613528ejc.21.1682770621234; Sat, 29 Apr 2023 05:17:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4HE1+zpfCmYkOUHl1OpXDjC+ZE8mMZI5NRsvnLpAsJD5SGJK9sIuHLaBw2ljh5A1pu4vdSZQ== X-Received: by 2002:a17:907:1c24:b0:94a:8e19:6aba with SMTP id nc36-20020a1709071c2400b0094a8e196abamr7613514ejc.21.1682770620996; Sat, 29 Apr 2023 05:17:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: David 'Digit' Turner Subject: [PULL 12/17] update-linux-headers.sh: Add missing kernel headers. Date: Sat, 29 Apr 2023 14:16:31 +0200 Message-Id: <20230429121636.230934-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770753511100001 Content-Type: text/plain; charset="utf-8" From: David 'Digit' Turner Add , used by hw/display/virtio-gpu-udmabuf.c Add , used by qga/commands-posix.c Add used by kvm-all.c, which requires the _BITUL() macro definition to be available. Without these, QEMU will not compile on Debian 10 systems. Signed-off-by: David 'Digit' Turner Message-Id: <20230405172109.3081788-3-digit@google.com> [Add for __DECLARE_FLEX_ARRAY. - Paolo] Signed-off-by: Paolo Bonzini --- scripts/update-linux-headers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers= .sh index b1ad99cba824..35a64bb50193 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -160,8 +160,8 @@ done =20 rm -rf "$output/linux-headers/linux" mkdir -p "$output/linux-headers/linux" -for header in kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h \ - psci.h psp-sev.h userfaultfd.h mman.h vduse.h; do +for header in const.h stddef.h kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h= \ + psci.h psp-sev.h userfaultfd.h memfd.h mman.h nvme_ioctl.h v= duse.h; do cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" done =20 --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770736; cv=none; d=zohomail.com; s=zohoarc; b=VOrDIWmuMCbz7YyooSymz5NtuFwh5fj4t24PvELXpVdb827tMO2bCOcOOfQBOsFhv50hfb+Hn5Njh5nyrMJWOLlf9BA/WpinzdtJ2qMAWxxewDsAEAeLJjGaKSYKfqUNxsWfsDiynmwJWx4tOKmoSkkKbWM/YeOiamQWEL8dATo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770736; 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=AcwRYSJ5iPQTdvFBrPx6gkZt08sgyTSox/JO86+AovU=; b=a8mkID9yMl/3UDOuwcZlwdqFih9jRJpVRcP+QHoY3nF2jH6l2kOwX2dRGgis2em5zsGIoa77g64fXlHG9Hvnt0oVvLZv9YL4xP6LdiicNDXcAaEkCfInUPbJEM2zj+ChnCHNqYkZJRknesNzIIguMDMVL6nfnmokIVpe3kT8NI8= 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 1682770736145867.4468563311391; Sat, 29 Apr 2023 05:18:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVx-0006wA-QT; Sat, 29 Apr 2023 08:17:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVn-0006Li-33 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVj-0004x5-RV for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:10 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-55-BNvP1EDfPTGlJL0t8CsDWA-1; Sat, 29 Apr 2023 08:17:05 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-94f7a2b21fdso103750466b.2 for ; Sat, 29 Apr 2023 05:17:05 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id hf27-20020a1709072c5b00b0095fde299e83sm3825880ejc.214.2023.04.29.05.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770627; 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=AcwRYSJ5iPQTdvFBrPx6gkZt08sgyTSox/JO86+AovU=; b=I+cZ8S6yF2fSxDJtlX3Ho/n9yMVzaFqgriqz74LJRf4GEsmatbC3WV+w/HVctAH9C87650 kMCa0yRzrq87Z416NON1/lKn+JqqGqJ7L2kRsDNnMHnmrGeA9lfqiDxt0sJIVdMrqpoRL3 xIdyaFqWncSbD7CRD/ZOEUXrQDXm1cs= X-MC-Unique: BNvP1EDfPTGlJL0t8CsDWA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770623; x=1685362623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AcwRYSJ5iPQTdvFBrPx6gkZt08sgyTSox/JO86+AovU=; b=B7nScAncXJZ5NqVqpF89NYkhvlhlmRwiaSyCsXn7nSZ5vT+CbTn17eM5bPCwZtPNF9 LX1f/BNSL+yn2qUoomSwDf8qm5gCm3FPJVKiQSMcjd1ufmI7YKLSldOtWugvDgMN9dQd Ux5+7vGQhA53Bscue60sUG21T6oKWjoIo9zFT1bpJmw3fRyYalGlxYHEYR+eSbaJWfri uPknXv59bbYAqKfbKvAyQy/qLSY0lE+7IhOSukakQpr2qIf/d7/UHbgtPphU5sZb4Ue4 wEotZcSMEx1sj5pzrJ/hx2hZkdxNozGLotyEuOtaqNUhw0fPlAM9hHBsUHhW4TZh7vgk JFmw== X-Gm-Message-State: AC+VfDw/K+FfuecEO8OT9AnezLWuKXqqa6/Xj038fGgyfDHQZt2qNlOL sMbcsk03mG3vnDooVNQK2EJeeN1NZ9fL9SRDJ9y6fARxL92Ct1k1v5TiElAhiCohJ6MNM70uqgm Dii4W0JbgHN4sO4ejhIHUZi+cH44x25UNWd2MQV+Ms8r4TAnKNUPXW8HsQULZkrPkqOo2VCMT4X 4= X-Received: by 2002:a17:907:96a6:b0:94f:2c22:a7a2 with SMTP id hd38-20020a17090796a600b0094f2c22a7a2mr7744760ejc.68.1682770623151; Sat, 29 Apr 2023 05:17:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mkIvGjj08rZ3g8pjihPrwv4ESBXzs66DE6Pq4XvIqyf8S4zwtMwhodMHsfN6X9CMWjrwUgw== X-Received: by 2002:a17:907:96a6:b0:94f:2c22:a7a2 with SMTP id hd38-20020a17090796a600b0094f2c22a7a2mr7744730ejc.68.1682770622616; Sat, 29 Apr 2023 05:17:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: David 'Digit' Turner Subject: [PULL 13/17] Update linux headers to v6.3rc5 Date: Sat, 29 Apr 2023 14:16:32 +0200 Message-Id: <20230429121636.230934-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770737442100001 Content-Type: text/plain; charset="utf-8" From: David 'Digit' Turner commit 7e364e56293bb98cae1b55fd835f5991c4e96e7d Signed-off-by: David 'Digit' Turner Message-Id: <20230405172109.3081788-4-digit@google.com> Signed-off-by: Paolo Bonzini --- include/standard-headers/drm/drm_fourcc.h | 12 ++ include/standard-headers/linux/ethtool.h | 48 +++++++- include/standard-headers/linux/fuse.h | 45 +++++++- include/standard-headers/linux/pci_regs.h | 1 + include/standard-headers/linux/vhost_types.h | 2 + include/standard-headers/linux/virtio_blk.h | 105 +++++++++++++++++ linux-headers/asm-arm64/kvm.h | 1 + linux-headers/asm-x86/kvm.h | 34 +++++- linux-headers/linux/const.h | 36 ++++++ linux-headers/linux/kvm.h | 9 ++ linux-headers/linux/memfd.h | 39 +++++++ linux-headers/linux/nvme_ioctl.h | 114 +++++++++++++++++++ linux-headers/linux/stddef.h | 47 ++++++++ linux-headers/linux/vfio.h | 15 ++- linux-headers/linux/vhost.h | 8 ++ 15 files changed, 506 insertions(+), 10 deletions(-) create mode 100644 linux-headers/linux/const.h create mode 100644 linux-headers/linux/memfd.h create mode 100644 linux-headers/linux/nvme_ioctl.h create mode 100644 linux-headers/linux/stddef.h diff --git a/include/standard-headers/drm/drm_fourcc.h b/include/standard-h= eaders/drm/drm_fourcc.h index 69cab17b383f..dc3e6112c11c 100644 --- a/include/standard-headers/drm/drm_fourcc.h +++ b/include/standard-headers/drm/drm_fourcc.h @@ -87,6 +87,18 @@ extern "C" { * * The authoritative list of format modifier codes is found in * `include/uapi/drm/drm_fourcc.h` + * + * Open Source User Waiver + * ----------------------- + * + * Because this is the authoritative source for pixel formats and modifiers + * referenced by GL, Vulkan extensions and other standards and hence used = both + * by open source and closed source driver stacks, the usual requirement f= or an + * upstream in-kernel or open source userspace user does not apply. + * + * To ensure, as much as feasible, compatibility across stacks and avoid + * confusion with incompatible enumerations stakeholders for all relevant = driver + * stacks should approve additions. */ =20 #define fourcc_code(a, b, c, d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \ diff --git a/include/standard-headers/linux/ethtool.h b/include/standard-he= aders/linux/ethtool.h index 87176ab075d2..99fcddf04f88 100644 --- a/include/standard-headers/linux/ethtool.h +++ b/include/standard-headers/linux/ethtool.h @@ -711,6 +711,24 @@ enum ethtool_stringset { ETH_SS_COUNT }; =20 +/** + * enum ethtool_mac_stats_src - source of ethtool MAC statistics + * @ETHTOOL_MAC_STATS_SRC_AGGREGATE: + * if device supports a MAC merge layer, this retrieves the aggregate + * statistics of the eMAC and pMAC. Otherwise, it retrieves just the + * statistics of the single (express) MAC. + * @ETHTOOL_MAC_STATS_SRC_EMAC: + * if device supports a MM layer, this retrieves the eMAC statistics. + * Otherwise, it retrieves the statistics of the single (express) MAC. + * @ETHTOOL_MAC_STATS_SRC_PMAC: + * if device supports a MM layer, this retrieves the pMAC statistics. + */ +enum ethtool_mac_stats_src { + ETHTOOL_MAC_STATS_SRC_AGGREGATE, + ETHTOOL_MAC_STATS_SRC_EMAC, + ETHTOOL_MAC_STATS_SRC_PMAC, +}; + /** * enum ethtool_module_power_mode_policy - plug-in module power mode policy * @ETHTOOL_MODULE_POWER_MODE_POLICY_HIGH: Module is always in high power = mode. @@ -779,6 +797,31 @@ enum ethtool_podl_pse_pw_d_status { ETHTOOL_PODL_PSE_PW_D_STATUS_ERROR, }; =20 +/** + * enum ethtool_mm_verify_status - status of MAC Merge Verify function + * @ETHTOOL_MM_VERIFY_STATUS_UNKNOWN: + * verification status is unknown + * @ETHTOOL_MM_VERIFY_STATUS_INITIAL: + * the 802.3 Verify State diagram is in the state INIT_VERIFICATION + * @ETHTOOL_MM_VERIFY_STATUS_VERIFYING: + * the Verify State diagram is in the state VERIFICATION_IDLE, + * SEND_VERIFY or WAIT_FOR_RESPONSE + * @ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED: + * indicates that the Verify State diagram is in the state VERIFIED + * @ETHTOOL_MM_VERIFY_STATUS_FAILED: + * the Verify State diagram is in the state VERIFY_FAIL + * @ETHTOOL_MM_VERIFY_STATUS_DISABLED: + * verification of preemption operation is disabled + */ +enum ethtool_mm_verify_status { + ETHTOOL_MM_VERIFY_STATUS_UNKNOWN, + ETHTOOL_MM_VERIFY_STATUS_INITIAL, + ETHTOOL_MM_VERIFY_STATUS_VERIFYING, + ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED, + ETHTOOL_MM_VERIFY_STATUS_FAILED, + ETHTOOL_MM_VERIFY_STATUS_DISABLED, +}; + /** * struct ethtool_gstrings - string set for data tagging * @cmd: Command number =3D %ETHTOOL_GSTRINGS @@ -1183,7 +1226,7 @@ struct ethtool_rxnfc { uint32_t rule_cnt; uint32_t rss_context; }; - uint32_t rule_locs[0]; + uint32_t rule_locs[]; }; =20 =20 @@ -1741,6 +1784,9 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_800000baseDR8_2_Full_BIT =3D 96, ETHTOOL_LINK_MODE_800000baseSR8_Full_BIT =3D 97, ETHTOOL_LINK_MODE_800000baseVR8_Full_BIT =3D 98, + ETHTOOL_LINK_MODE_10baseT1S_Full_BIT =3D 99, + ETHTOOL_LINK_MODE_10baseT1S_Half_BIT =3D 100, + ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT =3D 101, =20 /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS diff --git a/include/standard-headers/linux/fuse.h b/include/standard-heade= rs/linux/fuse.h index a1af78d9894e..35c131a10736 100644 --- a/include/standard-headers/linux/fuse.h +++ b/include/standard-headers/linux/fuse.h @@ -201,6 +201,11 @@ * 7.38 * - add FUSE_EXPIRE_ONLY flag to fuse_notify_inval_entry * - add FOPEN_PARALLEL_DIRECT_WRITES + * - add total_extlen to fuse_in_header + * - add FUSE_MAX_NR_SECCTX + * - add extension header + * - add FUSE_EXT_GROUPS + * - add FUSE_CREATE_SUPP_GROUP */ =20 #ifndef _LINUX_FUSE_H @@ -358,6 +363,8 @@ struct fuse_file_lock { * FUSE_SECURITY_CTX: add security context to create, mkdir, symlink, and * mknod * FUSE_HAS_INODE_DAX: use per inode DAX + * FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir, + * symlink and mknod (single group that matches parent) */ #define FUSE_ASYNC_READ (1 << 0) #define FUSE_POSIX_LOCKS (1 << 1) @@ -394,6 +401,7 @@ struct fuse_file_lock { /* bits 32..63 get shifted down 32 bits into the flags2 field */ #define FUSE_SECURITY_CTX (1ULL << 32) #define FUSE_HAS_INODE_DAX (1ULL << 33) +#define FUSE_CREATE_SUPP_GROUP (1ULL << 34) =20 /** * CUSE INIT request/reply flags @@ -499,6 +507,17 @@ struct fuse_file_lock { */ #define FUSE_EXPIRE_ONLY (1 << 0) =20 +/** + * extension type + * FUSE_MAX_NR_SECCTX: maximum value of &fuse_secctx_header.nr_secctx + * FUSE_EXT_GROUPS: &fuse_supp_groups extension + */ +enum fuse_ext_type { + /* Types 0..31 are reserved for fuse_secctx_header */ + FUSE_MAX_NR_SECCTX =3D 31, + FUSE_EXT_GROUPS =3D 32, +}; + enum fuse_opcode { FUSE_LOOKUP =3D 1, FUSE_FORGET =3D 2, /* no reply */ @@ -882,7 +901,8 @@ struct fuse_in_header { uint32_t uid; uint32_t gid; uint32_t pid; - uint32_t padding; + uint16_t total_extlen; /* length of extensions in 8byte units */ + uint16_t padding; }; =20 struct fuse_out_header { @@ -1043,4 +1063,27 @@ struct fuse_secctx_header { uint32_t nr_secctx; }; =20 +/** + * struct fuse_ext_header - extension header + * @size: total size of this extension including this header + * @type: type of extension + * + * This is made compatible with fuse_secctx_header by using type values > + * FUSE_MAX_NR_SECCTX + */ +struct fuse_ext_header { + uint32_t size; + uint32_t type; +}; + +/** + * struct fuse_supp_groups - Supplementary group extension + * @nr_groups: number of supplementary groups + * @groups: flexible array of group IDs + */ +struct fuse_supp_groups { + uint32_t nr_groups; + uint32_t groups[]; +}; + #endif /* _LINUX_FUSE_H */ diff --git a/include/standard-headers/linux/pci_regs.h b/include/standard-h= eaders/linux/pci_regs.h index 85ab1278811e..dc2000e0fe3a 100644 --- a/include/standard-headers/linux/pci_regs.h +++ b/include/standard-headers/linux/pci_regs.h @@ -693,6 +693,7 @@ #define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380 /* Transmit Margin */ #define PCI_EXP_LNKCTL2_HASD 0x0020 /* HW Autonomous Speed Disable */ #define PCI_EXP_LNKSTA2 0x32 /* Link Status 2 */ +#define PCI_EXP_LNKSTA2_FLIT 0x0400 /* Flit Mode Status */ #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x32 /* end of v2 EPs w/ link */ #define PCI_EXP_SLTCAP2 0x34 /* Slot Capabilities 2 */ #define PCI_EXP_SLTCAP2_IBPD 0x00000001 /* In-band PD Disable Supported */ diff --git a/include/standard-headers/linux/vhost_types.h b/include/standar= d-headers/linux/vhost_types.h index c41a73fe36ec..88600e2d9f19 100644 --- a/include/standard-headers/linux/vhost_types.h +++ b/include/standard-headers/linux/vhost_types.h @@ -163,5 +163,7 @@ struct vhost_vdpa_iova_range { #define VHOST_BACKEND_F_IOTLB_ASID 0x3 /* Device can be suspended */ #define VHOST_BACKEND_F_SUSPEND 0x4 +/* Device can be resumed */ +#define VHOST_BACKEND_F_RESUME 0x5 =20 #endif diff --git a/include/standard-headers/linux/virtio_blk.h b/include/standard= -headers/linux/virtio_blk.h index e81715cd70c3..7155b1a4701b 100644 --- a/include/standard-headers/linux/virtio_blk.h +++ b/include/standard-headers/linux/virtio_blk.h @@ -41,6 +41,7 @@ #define VIRTIO_BLK_F_DISCARD 13 /* DISCARD is supported */ #define VIRTIO_BLK_F_WRITE_ZEROES 14 /* WRITE ZEROES is supported */ #define VIRTIO_BLK_F_SECURE_ERASE 16 /* Secure Erase is supported */ +#define VIRTIO_BLK_F_ZONED 17 /* Zoned block device */ =20 /* Legacy feature bits */ #ifndef VIRTIO_BLK_NO_LEGACY @@ -135,6 +136,16 @@ struct virtio_blk_config { /* Secure erase commands must be aligned to this number of sectors. */ __virtio32 secure_erase_sector_alignment; =20 + /* Zoned block device characteristics (if VIRTIO_BLK_F_ZONED) */ + struct virtio_blk_zoned_characteristics { + uint32_t zone_sectors; + uint32_t max_open_zones; + uint32_t max_active_zones; + uint32_t max_append_sectors; + uint32_t write_granularity; + uint8_t model; + uint8_t unused2[3]; + } zoned; } QEMU_PACKED; =20 /* @@ -172,6 +183,27 @@ struct virtio_blk_config { /* Secure erase command */ #define VIRTIO_BLK_T_SECURE_ERASE 14 =20 +/* Zone append command */ +#define VIRTIO_BLK_T_ZONE_APPEND 15 + +/* Report zones command */ +#define VIRTIO_BLK_T_ZONE_REPORT 16 + +/* Open zone command */ +#define VIRTIO_BLK_T_ZONE_OPEN 18 + +/* Close zone command */ +#define VIRTIO_BLK_T_ZONE_CLOSE 20 + +/* Finish zone command */ +#define VIRTIO_BLK_T_ZONE_FINISH 22 + +/* Reset zone command */ +#define VIRTIO_BLK_T_ZONE_RESET 24 + +/* Reset All zones command */ +#define VIRTIO_BLK_T_ZONE_RESET_ALL 26 + #ifndef VIRTIO_BLK_NO_LEGACY /* Barrier before this op. */ #define VIRTIO_BLK_T_BARRIER 0x80000000 @@ -191,6 +223,72 @@ struct virtio_blk_outhdr { __virtio64 sector; }; =20 +/* + * Supported zoned device models. + */ + +/* Regular block device */ +#define VIRTIO_BLK_Z_NONE 0 +/* Host-managed zoned device */ +#define VIRTIO_BLK_Z_HM 1 +/* Host-aware zoned device */ +#define VIRTIO_BLK_Z_HA 2 + +/* + * Zone descriptor. A part of VIRTIO_BLK_T_ZONE_REPORT command reply. + */ +struct virtio_blk_zone_descriptor { + /* Zone capacity */ + uint64_t z_cap; + /* The starting sector of the zone */ + uint64_t z_start; + /* Zone write pointer position in sectors */ + uint64_t z_wp; + /* Zone type */ + uint8_t z_type; + /* Zone state */ + uint8_t z_state; + uint8_t reserved[38]; +}; + +struct virtio_blk_zone_report { + uint64_t nr_zones; + uint8_t reserved[56]; + struct virtio_blk_zone_descriptor zones[]; +}; + +/* + * Supported zone types. + */ + +/* Conventional zone */ +#define VIRTIO_BLK_ZT_CONV 1 +/* Sequential Write Required zone */ +#define VIRTIO_BLK_ZT_SWR 2 +/* Sequential Write Preferred zone */ +#define VIRTIO_BLK_ZT_SWP 3 + +/* + * Zone states that are available for zones of all types. + */ + +/* Not a write pointer (conventional zones only) */ +#define VIRTIO_BLK_ZS_NOT_WP 0 +/* Empty */ +#define VIRTIO_BLK_ZS_EMPTY 1 +/* Implicitly Open */ +#define VIRTIO_BLK_ZS_IOPEN 2 +/* Explicitly Open */ +#define VIRTIO_BLK_ZS_EOPEN 3 +/* Closed */ +#define VIRTIO_BLK_ZS_CLOSED 4 +/* Read-Only */ +#define VIRTIO_BLK_ZS_RDONLY 13 +/* Full */ +#define VIRTIO_BLK_ZS_FULL 14 +/* Offline */ +#define VIRTIO_BLK_ZS_OFFLINE 15 + /* Unmap this range (only valid for write zeroes command) */ #define VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP 0x00000001 =20 @@ -217,4 +315,11 @@ struct virtio_scsi_inhdr { #define VIRTIO_BLK_S_OK 0 #define VIRTIO_BLK_S_IOERR 1 #define VIRTIO_BLK_S_UNSUPP 2 + +/* Error codes that are specific to zoned block devices */ +#define VIRTIO_BLK_S_ZONE_INVALID_CMD 3 +#define VIRTIO_BLK_S_ZONE_UNALIGNED_WP 4 +#define VIRTIO_BLK_S_ZONE_OPEN_RESOURCE 5 +#define VIRTIO_BLK_S_ZONE_ACTIVE_RESOURCE 6 + #endif /* _LINUX_VIRTIO_BLK_H */ diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h index a7cfefb3a809..d7e7bb885e20 100644 --- a/linux-headers/asm-arm64/kvm.h +++ b/linux-headers/asm-arm64/kvm.h @@ -109,6 +109,7 @@ struct kvm_regs { #define KVM_ARM_VCPU_SVE 4 /* enable SVE for this CPU */ #define KVM_ARM_VCPU_PTRAUTH_ADDRESS 5 /* VCPU uses address authentication= */ #define KVM_ARM_VCPU_PTRAUTH_GENERIC 6 /* VCPU uses generic authentication= */ +#define KVM_ARM_VCPU_HAS_EL2 7 /* Support nested virtualization */ =20 struct kvm_vcpu_init { __u32 target; diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h index 2747d2ce14fb..2937e7bf6982 100644 --- a/linux-headers/asm-x86/kvm.h +++ b/linux-headers/asm-x86/kvm.h @@ -9,6 +9,7 @@ =20 #include #include +#include =20 #define KVM_PIO_PAGE_OFFSET 1 #define KVM_COALESCED_MMIO_PAGE_OFFSET 2 @@ -505,8 +506,8 @@ struct kvm_nested_state { * KVM_{GET,PUT}_NESTED_STATE ioctl values. */ union { - struct kvm_vmx_nested_state_data vmx[0]; - struct kvm_svm_nested_state_data svm[0]; + __DECLARE_FLEX_ARRAY(struct kvm_vmx_nested_state_data, vmx); + __DECLARE_FLEX_ARRAY(struct kvm_svm_nested_state_data, svm); } data; }; =20 @@ -523,6 +524,35 @@ struct kvm_pmu_event_filter { #define KVM_PMU_EVENT_ALLOW 0 #define KVM_PMU_EVENT_DENY 1 =20 +#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS BIT(0) +#define KVM_PMU_EVENT_FLAGS_VALID_MASK (KVM_PMU_EVENT_FLAG_MASKED_EVENTS) + +/* + * Masked event layout. + * Bits Description + * ---- ----------- + * 7:0 event select (low bits) + * 15:8 umask match + * 31:16 unused + * 35:32 event select (high bits) + * 36:54 unused + * 55 exclude bit + * 63:56 umask mask + */ + +#define KVM_PMU_ENCODE_MASKED_ENTRY(event_select, mask, match, exclude) \ + (((event_select) & 0xFFULL) | (((event_select) & 0XF00ULL) << 24) | \ + (((mask) & 0xFFULL) << 56) | \ + (((match) & 0xFFULL) << 8) | \ + ((__u64)(!!(exclude)) << 55)) + +#define KVM_PMU_MASKED_ENTRY_EVENT_SELECT \ + (GENMASK_ULL(7, 0) | GENMASK_ULL(35, 32)) +#define KVM_PMU_MASKED_ENTRY_UMASK_MASK (GENMASK_ULL(63, 56)) +#define KVM_PMU_MASKED_ENTRY_UMASK_MATCH (GENMASK_ULL(15, 8)) +#define KVM_PMU_MASKED_ENTRY_EXCLUDE (BIT_ULL(55)) +#define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT (56) + /* for KVM_{GET,SET,HAS}_DEVICE_ATTR */ #define KVM_VCPU_TSC_CTRL 0 /* control group for the timestamp counter (TS= C) */ #define KVM_VCPU_TSC_OFFSET 0 /* attribute for the TSC offset */ diff --git a/linux-headers/linux/const.h b/linux-headers/linux/const.h new file mode 100644 index 000000000000..5e4898725168 --- /dev/null +++ b/linux-headers/linux/const.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* const.h: Macros for dealing with constants. */ + +#ifndef _LINUX_CONST_H +#define _LINUX_CONST_H + +/* Some constant macros are used in both assembler and + * C code. Therefore we cannot annotate them always with + * 'UL' and other type specifiers unilaterally. We + * use the following macros to deal with this. + * + * Similarly, _AT() will cast an expression with a type in C, but + * leave it unchanged in asm. + */ + +#ifdef __ASSEMBLY__ +#define _AC(X,Y) X +#define _AT(T,X) X +#else +#define __AC(X,Y) (X##Y) +#define _AC(X,Y) __AC(X,Y) +#define _AT(T,X) ((T)(X)) +#endif + +#define _UL(x) (_AC(x, UL)) +#define _ULL(x) (_AC(x, ULL)) + +#define _BITUL(x) (_UL(1) << (x)) +#define _BITULL(x) (_ULL(1) << (x)) + +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) + +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + +#endif /* _LINUX_CONST_H */ diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 1e2c16cfe303..599de3c6e3aa 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -581,6 +581,8 @@ struct kvm_s390_mem_op { struct { __u8 ar; /* the access register number */ __u8 key; /* access key, ignored if flag unset */ + __u8 pad1[6]; /* ignored */ + __u64 old_addr; /* ignored if cmpxchg flag unset */ }; __u32 sida_offset; /* offset into the sida */ __u8 reserved[32]; /* ignored */ @@ -593,11 +595,17 @@ struct kvm_s390_mem_op { #define KVM_S390_MEMOP_SIDA_WRITE 3 #define KVM_S390_MEMOP_ABSOLUTE_READ 4 #define KVM_S390_MEMOP_ABSOLUTE_WRITE 5 +#define KVM_S390_MEMOP_ABSOLUTE_CMPXCHG 6 + /* flags for kvm_s390_mem_op->flags */ #define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0) #define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1) #define KVM_S390_MEMOP_F_SKEY_PROTECTION (1ULL << 2) =20 +/* flags specifying extension support via KVM_CAP_S390_MEM_OP_EXTENSION */ +#define KVM_S390_MEMOP_EXTENSION_CAP_BASE (1 << 0) +#define KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG (1 << 1) + /* for KVM_INTERRUPT */ struct kvm_interrupt { /* in */ @@ -1173,6 +1181,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223 #define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224 #define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225 +#define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226 =20 #ifdef KVM_CAP_IRQ_ROUTING =20 diff --git a/linux-headers/linux/memfd.h b/linux-headers/linux/memfd.h new file mode 100644 index 000000000000..01c0324e7733 --- /dev/null +++ b/linux-headers/linux/memfd.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_MEMFD_H +#define _LINUX_MEMFD_H + +#include + +/* flags for memfd_create(2) (unsigned int) */ +#define MFD_CLOEXEC 0x0001U +#define MFD_ALLOW_SEALING 0x0002U +#define MFD_HUGETLB 0x0004U +/* not executable and sealed to prevent changing to executable. */ +#define MFD_NOEXEC_SEAL 0x0008U +/* executable */ +#define MFD_EXEC 0x0010U + +/* + * Huge page size encoding when MFD_HUGETLB is specified, and a huge page + * size other than the default is desired. See hugetlb_encode.h. + * All known huge page size encodings are provided here. It is the + * responsibility of the application to know which sizes are supported on + * the running system. See mmap(2) man page for details. + */ +#define MFD_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT +#define MFD_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK + +#define MFD_HUGE_64KB HUGETLB_FLAG_ENCODE_64KB +#define MFD_HUGE_512KB HUGETLB_FLAG_ENCODE_512KB +#define MFD_HUGE_1MB HUGETLB_FLAG_ENCODE_1MB +#define MFD_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB +#define MFD_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB +#define MFD_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB +#define MFD_HUGE_32MB HUGETLB_FLAG_ENCODE_32MB +#define MFD_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB +#define MFD_HUGE_512MB HUGETLB_FLAG_ENCODE_512MB +#define MFD_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB +#define MFD_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB +#define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB + +#endif /* _LINUX_MEMFD_H */ diff --git a/linux-headers/linux/nvme_ioctl.h b/linux-headers/linux/nvme_io= ctl.h new file mode 100644 index 000000000000..f8df31dbc49a --- /dev/null +++ b/linux-headers/linux/nvme_ioctl.h @@ -0,0 +1,114 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Definitions for the NVM Express ioctl interface + * Copyright (c) 2011-2014, Intel Corporation. + */ + +#ifndef _LINUX_NVME_IOCTL_H +#define _LINUX_NVME_IOCTL_H + +#include + +struct nvme_user_io { + __u8 opcode; + __u8 flags; + __u16 control; + __u16 nblocks; + __u16 rsvd; + __u64 metadata; + __u64 addr; + __u64 slba; + __u32 dsmgmt; + __u32 reftag; + __u16 apptag; + __u16 appmask; +}; + +struct nvme_passthru_cmd { + __u8 opcode; + __u8 flags; + __u16 rsvd1; + __u32 nsid; + __u32 cdw2; + __u32 cdw3; + __u64 metadata; + __u64 addr; + __u32 metadata_len; + __u32 data_len; + __u32 cdw10; + __u32 cdw11; + __u32 cdw12; + __u32 cdw13; + __u32 cdw14; + __u32 cdw15; + __u32 timeout_ms; + __u32 result; +}; + +struct nvme_passthru_cmd64 { + __u8 opcode; + __u8 flags; + __u16 rsvd1; + __u32 nsid; + __u32 cdw2; + __u32 cdw3; + __u64 metadata; + __u64 addr; + __u32 metadata_len; + union { + __u32 data_len; /* for non-vectored io */ + __u32 vec_cnt; /* for vectored io */ + }; + __u32 cdw10; + __u32 cdw11; + __u32 cdw12; + __u32 cdw13; + __u32 cdw14; + __u32 cdw15; + __u32 timeout_ms; + __u32 rsvd2; + __u64 result; +}; + +/* same as struct nvme_passthru_cmd64, minus the 8b result field */ +struct nvme_uring_cmd { + __u8 opcode; + __u8 flags; + __u16 rsvd1; + __u32 nsid; + __u32 cdw2; + __u32 cdw3; + __u64 metadata; + __u64 addr; + __u32 metadata_len; + __u32 data_len; + __u32 cdw10; + __u32 cdw11; + __u32 cdw12; + __u32 cdw13; + __u32 cdw14; + __u32 cdw15; + __u32 timeout_ms; + __u32 rsvd2; +}; + +#define nvme_admin_cmd nvme_passthru_cmd + +#define NVME_IOCTL_ID _IO('N', 0x40) +#define NVME_IOCTL_ADMIN_CMD _IOWR('N', 0x41, struct nvme_admin_cmd) +#define NVME_IOCTL_SUBMIT_IO _IOW('N', 0x42, struct nvme_user_io) +#define NVME_IOCTL_IO_CMD _IOWR('N', 0x43, struct nvme_passthru_cmd) +#define NVME_IOCTL_RESET _IO('N', 0x44) +#define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) +#define NVME_IOCTL_RESCAN _IO('N', 0x46) +#define NVME_IOCTL_ADMIN64_CMD _IOWR('N', 0x47, struct nvme_passthru_cmd64) +#define NVME_IOCTL_IO64_CMD _IOWR('N', 0x48, struct nvme_passthru_cmd64) +#define NVME_IOCTL_IO64_CMD_VEC _IOWR('N', 0x49, struct nvme_passthru_cmd6= 4) + +/* io_uring async commands: */ +#define NVME_URING_CMD_IO _IOWR('N', 0x80, struct nvme_uring_cmd) +#define NVME_URING_CMD_IO_VEC _IOWR('N', 0x81, struct nvme_uring_cmd) +#define NVME_URING_CMD_ADMIN _IOWR('N', 0x82, struct nvme_uring_cmd) +#define NVME_URING_CMD_ADMIN_VEC _IOWR('N', 0x83, struct nvme_uring_cmd) + +#endif /* _LINUX_NVME_IOCTL_H */ diff --git a/linux-headers/linux/stddef.h b/linux-headers/linux/stddef.h new file mode 100644 index 000000000000..bb6ea517efb5 --- /dev/null +++ b/linux-headers/linux/stddef.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_STDDEF_H +#define _LINUX_STDDEF_H + + + +#ifndef __always_inline +#define __always_inline __inline__ +#endif + +/** + * __struct_group() - Create a mirrored named and anonyomous struct + * + * @TAG: The tag name for the named sub-struct (usually empty) + * @NAME: The identifier name of the mirrored sub-struct + * @ATTRS: Any struct attributes (usually empty) + * @MEMBERS: The member declarations for the mirrored structs + * + * Used to create an anonymous union of two structs with identical layout + * and size: one anonymous and one named. The former's members can be used + * normally without sub-struct naming, and the latter can be used to + * reason about the start, end, and size of the group of struct members. + * The named struct can also be explicitly tagged for layer reuse, as well + * as both having struct attributes appended. + */ +#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ + union { \ + struct { MEMBERS } ATTRS; \ + struct TAG { MEMBERS } ATTRS NAME; \ + } + +/** + * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union + * + * @TYPE: The type of each flexible array element + * @NAME: The name of the flexible array member + * + * In order to have a flexible array member in a union or alone in a + * struct, it needs to be wrapped in an anonymous struct with at least 1 + * named member, but that member can be empty. + */ +#define __DECLARE_FLEX_ARRAY(TYPE, NAME) \ + struct { \ + struct { } __empty_ ## NAME; \ + TYPE NAME[]; \ + } +#endif diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index c59692ce0bce..4a534edbdcba 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -49,7 +49,11 @@ /* Supports VFIO_DMA_UNMAP_FLAG_ALL */ #define VFIO_UNMAP_ALL 9 =20 -/* Supports the vaddr flag for DMA map and unmap */ +/* + * Supports the vaddr flag for DMA map and unmap. Not supported for media= ted + * devices, so this capability is subject to change as groups are added or + * removed. + */ #define VFIO_UPDATE_VADDR 10 =20 /* @@ -1343,8 +1347,7 @@ struct vfio_iommu_type1_info_dma_avail { * Map process virtual addresses to IO virtual addresses using the * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required. * - * If flags & VFIO_DMA_MAP_FLAG_VADDR, update the base vaddr for iova, and - * unblock translation of host virtual addresses in the iova range. The v= addr + * If flags & VFIO_DMA_MAP_FLAG_VADDR, update the base vaddr for iova. The= vaddr * must have previously been invalidated with VFIO_DMA_UNMAP_FLAG_VADDR. = To * maintain memory consistency within the user application, the updated va= ddr * must address the same memory object as originally mapped. Failure to d= o so @@ -1395,9 +1398,9 @@ struct vfio_bitmap { * must be 0. This cannot be combined with the get-dirty-bitmap flag. * * If flags & VFIO_DMA_UNMAP_FLAG_VADDR, do not unmap, but invalidate host - * virtual addresses in the iova range. Tasks that attempt to translate an - * iova's vaddr will block. DMA to already-mapped pages continues. This - * cannot be combined with the get-dirty-bitmap flag. + * virtual addresses in the iova range. DMA to already-mapped pages conti= nues. + * Groups may not be added to the container while any addresses are invali= d. + * This cannot be combined with the get-dirty-bitmap flag. */ struct vfio_iommu_type1_dma_unmap { __u32 argsz; diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h index f9f115a7c75b..92e1b700b51c 100644 --- a/linux-headers/linux/vhost.h +++ b/linux-headers/linux/vhost.h @@ -180,4 +180,12 @@ */ #define VHOST_VDPA_SUSPEND _IO(VHOST_VIRTIO, 0x7D) =20 +/* Resume a device so it can resume processing virtqueue requests + * + * After the return of this ioctl the device will have restored all the + * necessary states and it is fully operational to continue processing the + * virtqueue descriptors. + */ +#define VHOST_VDPA_RESUME _IO(VHOST_VIRTIO, 0x7E) + #endif --=20 2.40.0 From nobody Wed May 15 18:41:20 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=1682770747; cv=none; d=zohomail.com; s=zohoarc; b=XKoqE54x2on2GrbJN3ynMYavmPn8F6rnsmWGVvNe13bhWELDhCeVxaKlV3J4OBnOUPNi5kOXsMy95W7piAO8cTWMRTfg6j+sBFgnoevDnYAaMHRtkJQiWMLAPLDxWcPMRrzLIZNCkMX4XDEUCC1iJbVPnyyMEBhvM/HnQzICQnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770747; h=Content-Type:Content-Transfer-Encoding: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=2i11gauYtKzpujwiNKXwlF+ueCGrE+rc0CkTsdy1xxk=; b=ZYz5PWKOFjxOUql0r0Gzcm02F0L0EjV95D9YvFgrDypU/cPXkT9OJGttyDmCBBrcUFTbsX4lRw8xTWvhvUfL4GEcu1THo8U6JX7FgDux3aJqadLm2exzcBCob6neLlVyM5+TD6+ijxx4f6cl30IG0pcsas+eLdQj5UecvCk4KCY= 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 168277074728575.70357520502023; Sat, 29 Apr 2023 05:19:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjW0-0007E2-BC; Sat, 29 Apr 2023 08:17:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVo-0006MY-4Y for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVl-0004xR-PB for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:11 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-73-zUqzw4K4OG69TxYBbU4G1A-1; Sat, 29 Apr 2023 08:17:05 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-50684e6414aso655419a12.1 for ; Sat, 29 Apr 2023 05:17:05 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id y10-20020aa7d50a000000b00506a5606343sm10095591edq.14.2023.04.29.05.17.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2i11gauYtKzpujwiNKXwlF+ueCGrE+rc0CkTsdy1xxk=; b=A9bS1zp5v+nLq51YMtRo10UpFKnIAlW7/19gKF6Nmg73vCTpgzYp5Jcc/XQR9KAfa9efYU 1o3W3b77boaaCpEh2vPqzsAxMxNTxvL8Q4E8i3DoKI8Rye9Ir1bULG45m1MMRDgWX+NIa8 Af0IQYJTxG20W19puGRwENn5c3HOT8Q= X-MC-Unique: zUqzw4K4OG69TxYBbU4G1A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770624; x=1685362624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2i11gauYtKzpujwiNKXwlF+ueCGrE+rc0CkTsdy1xxk=; b=hfdvbzzIfOycb0YaTf4+pqYFdjzML9mbNIZJDxuwGF4HHQV4hFYNLO/RhVLpdvpATs uvZJ6pZbkFy4a+HNZ6puHFK6slwLH2jqUkm7i/FujxhWvfp2mV8Q2DhEkz2cAgGhbaPK GpTsK0tL1S8+/wC4ruoPn75T4reH9gh743dWMD+LdGaCLKoN1iS/RmzGSY3XCoLabY6m zTVoFIJzDgZIkHwowjDSDZ+oY4489o9EJk0U+v6MJGnf0yfC5xg4NiwUe07EB9kKX0Qm fUdWC7LuwBTxH0OjGwph+Rr/YIzaEeNV5G/ZE2sP9eTEwbOFj5++7p1UHousmF4m0HWW Ce5g== X-Gm-Message-State: AC+VfDzFYX6G2/nIL4hLPKF4zC6AOC/eUqGyfLKM2QvuUVU6zdOB2qeY IUC5arX4s1VIVuz7ISgBEwmh4vy2zczLVkC09Rec2nR3qvjurhWZGUukcs2k9FWgqt5lnZyc8Zr PtF9m7A3K8eeYEM+iNn6D67pWtL/Ozc1nAIdFnri96JjtjYKPetKp4BxHWI43V8/bSwIgeDQOhV k= X-Received: by 2002:aa7:de09:0:b0:504:af14:132d with SMTP id h9-20020aa7de09000000b00504af14132dmr1193743edv.13.1682770624199; Sat, 29 Apr 2023 05:17:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6z/ABdVlDoK99N+60SkJnEMnQ5mKj9zp6yT7W6oS9XP7DzFoeFex4JkVT1XkUT4KiA9SDKFA== X-Received: by 2002:aa7:de09:0:b0:504:af14:132d with SMTP id h9-20020aa7de09000000b00504af14132dmr1193734edv.13.1682770623977; Sat, 29 Apr 2023 05:17:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/17] tests: vhost-user-test: release mutex on protocol violation Date: Sat, 29 Apr 2023 14:16:33 +0200 Message-Id: <20230429121636.230934-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770749447100003 Content-Type: text/plain; charset="utf-8" chr_read() is printing an error message and returning with s->data_mutex ta= ken. This can potentially cause a hang. Reported by Coverity. Signed-off-by: Paolo Bonzini --- tests/qtest/vhost-user-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index bf9f7c4248ca..e4f95b2858f0 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -351,7 +351,7 @@ static void chr_read(void *opaque, const uint8_t *buf, = int size) if (size !=3D msg.size) { qos_printf("%s: Wrong message size received %d !=3D %d\n", __func__, size, msg.size); - return; + goto out; } } =20 @@ -509,6 +509,7 @@ static void chr_read(void *opaque, const uint8_t *buf, = int size) break; } =20 +out: g_mutex_unlock(&s->data_mutex); } =20 --=20 2.40.0 From nobody Wed May 15 18:41:21 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=1682770705; cv=none; d=zohomail.com; s=zohoarc; b=S/ok7XUDKUiwNJ7m2JoJvCLaXyxmtx7w4k0G6K+Ar7/cYixPy9nmuHK9HCCcEENJu6r37qQSaymCMA4XdFpgQ5y9Njvb8azvX20/X7B7qs+aehEJVUo0IFpIQjivVF34IXAJYPJHKHmqvVk4NMQ/UF/tEHz1Au3lwsgSKvTTPaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770705; 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=PHhT/smfyWtvGZDS7UNOSFwqaBjI/hYBfmr5J0LGzIU=; b=V7unGXJCe4OZLFHnuwDFM/cvP+MYPxjFvCvz+yMIOPSXNrdKHkktZqiOqTFNF6rnKcZhLd7mPZCxBdqPFsgIiPo210xjs2f/uENYoHsVHzLISGmJZbOokoLMBDae4YcakbfL04SUn6fsuckjiKJQTMjzCZaT4T46Whc8/Cb3hww= 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 1682770705096453.090498775; Sat, 29 Apr 2023 05:18:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVy-00072t-TN; Sat, 29 Apr 2023 08:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVm-0006Lh-RR for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVl-0004xM-F1 for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:10 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-231-GXaMI7q_NQunFxPbf_SkNQ-1; Sat, 29 Apr 2023 08:17:07 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a341ee4fcso106851866b.0 for ; Sat, 29 Apr 2023 05:17:06 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id t25-20020a17090616d900b009534603453dsm12269893ejd.131.2023.04.29.05.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770628; 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=PHhT/smfyWtvGZDS7UNOSFwqaBjI/hYBfmr5J0LGzIU=; b=XCJO6kPWcCOudePVePA/HkD+pGy7hjp2Rxb5y4MWagPyhMgkikPYWfASzmjaV+ASywBuvs xxB1sGo+uxfTNnXcotrRa7N4ilfzbHHWnpgAxB2gtuNLxm6ECzNLfgmtSUKODCd+OmKlUG AJ6oXeVYEMUOQpgacJdufTQNmSHlv88= X-MC-Unique: GXaMI7q_NQunFxPbf_SkNQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770625; x=1685362625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PHhT/smfyWtvGZDS7UNOSFwqaBjI/hYBfmr5J0LGzIU=; b=VGBfEYEYFaJr5TWb3Ggdn/GPppu5ykqqAqqdoFX20zAmwF5vJ/AqzLk40mCpoLYRDP 6NLqUqIhsv+Q6/p4V0Xj2ADN5Tqz8RGm5QiJauvWRfPT1MhrxDS3O1MNGMLYQ+baXLDZ r3J6sKLmdj531sTrLY3QtjWbeun9ADOgmdozkw8PlVNJ7wjpFJT99DJA9xqTVa/YKU1m YWzofAa2B9A2TLTVeCVvEnOCSI+aMsiWq7EU8BEy2QkPJa60DOjqV9AqQMfsiV+7gA/O 6AGj0yZmKhkN1inXECwA+dpiSm23MhFDijLYMzMRcAE8/Zvambrjkulcc6qgCKg7T4t3 /ruA== X-Gm-Message-State: AC+VfDxm+ZyQ78TH0C2g7BsQzS9gQ4pgQZRluK1D9VGBZKCYF3dTuhNw zEikbCTAGt98zGnxuymgjophsr7KjdNxWngmrPyknFe/gVVP5GSFs/ojDnVyd61MbAWezgGVu9O yGVIyFxSaNGLn4y27dj1xHjTAruMVUdmO7mOW04a0OLSpNRZgm8NtUuHgIz1p1CLMm1OuWQeBPv I= X-Received: by 2002:a17:907:3e1a:b0:94f:19b5:bafd with SMTP id hp26-20020a1709073e1a00b0094f19b5bafdmr8980996ejc.42.1682770625630; Sat, 29 Apr 2023 05:17:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZKeO3hDrCuU7baQtKvFKGPRkulHqCP6bKJP6RJEztD7koh2aXxDCp7L6EMMIJNX43pprmhA== X-Received: by 2002:a17:907:3e1a:b0:94f:19b5:bafd with SMTP id hp26-20020a1709073e1a00b0094f19b5bafdmr8980980ejc.42.1682770625414; Sat, 29 Apr 2023 05:17:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Taylor Simpson Subject: [PULL 15/17] target/hexagon: fix = vs. == mishap Date: Sat, 29 Apr 2023 14:16:34 +0200 Message-Id: <20230429121636.230934-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770707228100003 Content-Type: text/plain; charset="utf-8" Coverity reports a parameter that is "set but never used". This is caused by an assignment operator being used instead of equality. Cc: Taylor Simpson Signed-off-by: Paolo Bonzini --- target/hexagon/idef-parser/parser-helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hexagon/idef-parser/parser-helpers.c b/target/hexagon/i= def-parser/parser-helpers.c index 86511efb62b9..0a01ec39b75e 100644 --- a/target/hexagon/idef-parser/parser-helpers.c +++ b/target/hexagon/idef-parser/parser-helpers.c @@ -1123,7 +1123,7 @@ HexValue gen_extend_op(Context *c, HexValue *value, HexSignedness signedness) { - unsigned bit_width =3D (dst_width =3D 64) ? 64 : 32; + unsigned bit_width =3D (dst_width =3D=3D 64) ? 64 : 32; HexValue value_m =3D *value; HexValue src_width_m =3D *src_width; =20 --=20 2.40.0 From nobody Wed May 15 18:41:21 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=1682770722; cv=none; d=zohomail.com; s=zohoarc; b=W2NZJ3VFyUCapgaT8/NH+hMz8HWclfb8uOLmPPleicACCRR5t3zKjUoxAt5lcoHut0X5vUDlGCdMERSquuq6yoMYDhVus7jCtQz922GEy7C9cnmiAvCh9rHimV+rmg0ps6YLbtzUz4E6KSqPEt3G6RVmJ9BRRdn6MpJSmLcjR2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770722; 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=t3JYSL71/jrUO57UK1NBG3ZDARVXsuJxlKqthvDRR88=; b=AHIV6ReRRPtrOiDDs7IInHN3WvZIajG+GyrmqJ/v0TVIeoO4uuCPIJ24vXcxpqTicoE6Cfv6qJL8LiV8rVSaOrrW7l5u+fnBg28cy7uhBxd0TcltwryPtpwSdVU3MX5Q7hWlQ0KPvspcB5gcGZRibqxx2hT9WnDbDxUh+FzDIUM= 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 168277072220219.44753724725183; Sat, 29 Apr 2023 05:18:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjW2-0007LU-56; Sat, 29 Apr 2023 08:17:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVq-0006W2-Je for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVn-0004xs-TP for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:13 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-571-8MjjKOgvPb22Ir1p0zDsTQ-1; Sat, 29 Apr 2023 08:17:09 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-505b696f254so641041a12.3 for ; Sat, 29 Apr 2023 05:17:09 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jt11-20020a170906ca0b00b00958434d4ecesm9914872ejb.13.2023.04.29.05.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770631; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t3JYSL71/jrUO57UK1NBG3ZDARVXsuJxlKqthvDRR88=; b=J0RGCz0i2964i1wPsCKyF05h7NGStTV7wpKQQ25KKztjNuC+53gNSh/y436kHHwirQey9t o/5Ca54wRi9jtLY8xfO37CRogBMGIcxXKlRjhLEGwcpSY3dQemH7f2nBfgVFWiDaMUoKtZ agluXxddvK57+kUiSJUoWc0VSvKXmBU= X-MC-Unique: 8MjjKOgvPb22Ir1p0zDsTQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770628; x=1685362628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t3JYSL71/jrUO57UK1NBG3ZDARVXsuJxlKqthvDRR88=; b=C/B46dEQrT4McSwgyvE0trgKhys1J4LVji6sADGnlEemFte+gI4ZkRkXgDDUo+OULW kzD7eGusnEPZABKisW6DFe0HdTUnp4Man52MXnNxVp5Z5OryilvAatEZiU8YXANcsZTU F/z4TuJIKGY02MuDx/bZ11BUFcS3/f6LJ1Nw+wS6e3u2tTBO+5M5x3oxLa4BYPuxMWx9 7gOXtRXac1V+qPs3PZmAALOp7fIhtMvtJi9r4JlfzQGaaw2ZwQsJB8al4rf758HBLl3N BwbKEb3PAu/LbNWJKscaSLEGxkqx+JNFVaMcMv9DVch8ZtEHP0bbj39QitLHgJ0Ec2Ui fBbw== X-Gm-Message-State: AC+VfDytTaRDoDns1QfwnB1gT/JPBwyuB206lsjzOxXEMYrW0vEPMcR2 ESli7Gyp0u7/KP/B+/QCY4qxXfo5xlf3kWx0k0FxZKZQO3xFtiAYVK5W+W2E69KVTFo2iOnW8dN 2DGo/Or+l3ABDPzR38yB0XEYPktBCnLKYXKQQRyOLcr7nElXBxToYlYG2g9x8PI0AbATM62x12I c= X-Received: by 2002:a17:906:7307:b0:958:489f:d050 with SMTP id di7-20020a170906730700b00958489fd050mr8126340ejc.43.1682770628042; Sat, 29 Apr 2023 05:17:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5yzEOI5ljzWYkfeJr/5QBSPYLZtp6AJk5qEH2cnLWnt/ng1RvcrIo5s+2pTZwpGPvFh5Q+Ow== X-Received: by 2002:a17:906:7307:b0:958:489f:d050 with SMTP id di7-20020a170906730700b00958489fd050mr8126315ejc.43.1682770627783; Sat, 29 Apr 2023 05:17:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 16/17] async: Suppress GCC13 false positive in aio_bh_poll() Date: Sat, 29 Apr 2023 14:16:35 +0200 Message-Id: <20230429121636.230934-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770723282100001 From: C=C3=A9dric Le Goater GCC13 reports an error : ../util/async.c: In function =E2=80=98aio_bh_poll=E2=80=99: include/qemu/queue.h:303:22: error: storing the address of local variable = =E2=80=98slice=E2=80=99 in =E2=80=98*ctx.bh_slice_list.sqh_last=E2=80=99 [-= Werror=3Ddangling-pointer=3D] 303 | (head)->sqh_last =3D &(elm)->field.sqe_next; = \ | ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~ ../util/async.c:169:5: note: in expansion of macro =E2=80=98QSIMPLEQ_INSERT= _TAIL=E2=80=99 169 | QSIMPLEQ_INSERT_TAIL(&ctx->bh_slice_list, &slice, next); | ^~~~~~~~~~~~~~~~~~~~ ../util/async.c:161:17: note: =E2=80=98slice=E2=80=99 declared here 161 | BHListSlice slice; | ^~~~~ ../util/async.c:161:17: note: =E2=80=98ctx=E2=80=99 declared here But the local variable 'slice' is removed from the global context list in following loop of the same routine. Add a pragma to silent GCC. Cc: Stefan Hajnoczi Cc: Paolo Bonzini Cc: Daniel P. Berrang=C3=A9 Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Tested-by: Daniel Henrique Barboza Message-Id: <20230420202939.1982044-1-clg@kaod.org> Signed-off-by: Paolo Bonzini --- util/async.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/util/async.c b/util/async.c index 21016a1ac7c1..856e1a8a337a 100644 --- a/util/async.c +++ b/util/async.c @@ -164,7 +164,21 @@ int aio_bh_poll(AioContext *ctx) =20 /* Synchronizes with QSLIST_INSERT_HEAD_ATOMIC in aio_bh_enqueue(). */ QSLIST_MOVE_ATOMIC(&slice.bh_list, &ctx->bh_list); + + /* + * GCC13 [-Werror=3Ddangling-pointer=3D] complains that the local vari= able + * 'slice' is being stored in the global 'ctx->bh_slice_list' but the + * list is emptied before this function returns. + */ +#if !defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" +#pragma GCC diagnostic ignored "-Wdangling-pointer=3D" +#endif QSIMPLEQ_INSERT_TAIL(&ctx->bh_slice_list, &slice, next); +#if !defined(__clang__) +#pragma GCC diagnostic pop +#endif =20 while ((s =3D QSIMPLEQ_FIRST(&ctx->bh_slice_list))) { QEMUBH *bh; --=20 2.40.0 From nobody Wed May 15 18:41:21 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=1682770684; cv=none; d=zohomail.com; s=zohoarc; b=bJVaSwP4AdbbZ1XTebD0bFcz/myWp6LawmO+z6qAEZYE1uKJxQESucLdiEeyJAmIqMmkGCWD5NB8JIvvAorkw42jMsL78thbx4qgZ+9RR3GrWicF6xcex7qtXk7vd/UcfWyjEhUg+77WmEzgptFUVZRAExUksqAZEMvwz2OuG8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682770684; h=Content-Type:Content-Transfer-Encoding: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=GEcIm3ncOAoTM5gXAT+mpmQYieCKspPnGHdQEd9rYu4=; b=nxIlipxRShDByloz+/phNDbsqUyTcKZAKX9anRYJTjGLslC467k2mtX8oRr3vLUbiurdwMBNHLL2wXGsktsDXXRg9MXOKoDKRk6OUXO3Y2GMajUQcNCijjOBkwbhrsA9wfFjGHIpCBsqEaB0M8o05Vn8xNPj/7XlMHcNNjLCMao= 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 1682770684125574.6050382888498; Sat, 29 Apr 2023 05:18:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psjVy-000737-UA; Sat, 29 Apr 2023 08:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVr-0006Y7-Lp for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psjVp-0004y8-5H for qemu-devel@nongnu.org; Sat, 29 Apr 2023 08:17:15 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-rgo2YUdEOSOO5CWLDjLRKQ-1; Sat, 29 Apr 2023 08:17:10 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-50b87b70324so445366a12.1 for ; Sat, 29 Apr 2023 05:17:10 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id l22-20020a170906795600b0094f25ae0821sm12343280ejo.31.2023.04.29.05.17.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 05:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682770632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GEcIm3ncOAoTM5gXAT+mpmQYieCKspPnGHdQEd9rYu4=; b=bGLa76nVr9CCPZUnagnM6guaPZvojsyuP9AblWDCWPbG31HoZPPdBuRmAWSS0g3rxcLw/H NIxLwvhPa0bEqu8whG5W6F396WkblZFl+8H8XAYpbSKylE4LRnOgJ87eHWau8RC3XeohG0 SSvEKWnen9ZIL8y6A1KeO8r580tWjkw= X-MC-Unique: rgo2YUdEOSOO5CWLDjLRKQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682770629; x=1685362629; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GEcIm3ncOAoTM5gXAT+mpmQYieCKspPnGHdQEd9rYu4=; b=Ce7a+tfzzsNY1f2HASelMmM9tN7Da/A2F2ZxKDtMcK5P1hI/zbFndeHlfU2oJZOZa4 ZmguoCiZamDoOf4a+2FqXNEFGNrQt3SUWg6h8E3RoNuDHE/xU4UT0scXBwjpmQGBL0nu rDrbTja9D2W5GQsdA7t6SaRobFTxBBZmzaN9SAu7gQE4MNBmizgYbiIFPXFjAdFj1FYA 8Ohgg4ahus/JSJlwtzH9tTH7i2F7/dgUW8S7GJdI0kgEeMfUqUA5PbAf1f2Vck5/qIN2 enQkX8SYMBPmhSyxz/HVQUGtOvrwoQyA6VWS4597uxh7JFUVr5M1UkEwmWn1vK/sYVj4 IJwg== X-Gm-Message-State: AC+VfDx12YOs7a4bFICWpcPzMKS9Rvr0rs5MZ5YXJgGZ9I0g3D7321mS 2F68iVuJKZhyQc9fVjcM2tKmq2+nS+SMLtCrgNodhueQi4EJnDgc/FB+s4vWdkfwgMKuJ0wGeEK Y1SqkhrDhiIs0D6vED8R8cTTGEirs7RWBdSNkgzX05e7xDybT/vNssBmAfPeMBDLcDrhgP/GPns w= X-Received: by 2002:a17:906:3a8f:b0:953:37d9:282f with SMTP id y15-20020a1709063a8f00b0095337d9282fmr9582129ejd.38.1682770629407; Sat, 29 Apr 2023 05:17:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7dZCdbj2/CUyOAnF1aCo5g7R0qxzOqg5E2KhVoZ5yy4+wF3l/m1Jh9ui9lSjoP1C+0UsUCMA== X-Received: by 2002:a17:906:3a8f:b0:953:37d9:282f with SMTP id y15-20020a1709063a8f00b0095337d9282fmr9582117ejd.38.1682770629189; Sat, 29 Apr 2023 05:17:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/17] cpus-common: stop using mb_set/mb_read Date: Sat, 29 Apr 2023 14:16:36 +0200 Message-Id: <20230429121636.230934-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com> References: <20230429121636.230934-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682770686007100001 Content-Type: text/plain; charset="utf-8" Use a store-release at the end of the work item, and a load-acquire when waiting for the item to be completed. This is the standard message passing pattern and is both enough and clearer than mb_read/mb_set. Signed-off-by: Paolo Bonzini --- cpus-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpus-common.c b/cpus-common.c index b0047e456f93..a53716deb437 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -157,7 +157,7 @@ void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func,= run_on_cpu_data data, wi.exclusive =3D false; =20 queue_work_on_cpu(cpu, &wi); - while (!qatomic_mb_read(&wi.done)) { + while (!qatomic_load_acquire(&wi.done)) { CPUState *self_cpu =3D current_cpu; =20 qemu_cond_wait(&qemu_work_cond, mutex); @@ -363,7 +363,7 @@ void process_queued_cpu_work(CPUState *cpu) if (wi->free) { g_free(wi); } else { - qatomic_mb_set(&wi->done, true); + qatomic_store_release(&wi->done, true); } } qemu_mutex_unlock(&cpu->work_mutex); --=20 2.40.0