From nobody Thu May 16 20:10:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1704898643; cv=none; d=zohomail.com; s=zohoarc; b=mHM85jDF7pfvzaA1louF7YmsPEKSZ1bybnhUbv+E3rYfQZX5cz3X5oC/b9jMPZU8w7xAHze4QBzAd9Cn0AVik23j2hemaQxkoW/uWnmCYOr9zZjO4JWHQr3FuKNCusuBhJHN6f37sLTkmDluoDYCXb9qht8H/LBtWmeZ0MRiw4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704898643; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C+Ns9F9oXu8JWmZgiuS6JpNqxTmui1PVJh0bmPBcMr0=; b=j8GFUaxAzu/BVk8u3qH2E+iKfuoTZcx1s1n3cM0Ju1uAHCD2xVTu9BEBZbKcPhbfUH+NwKm7IKooJwzVyKyvJ41wY1VZPlwJa3f4NbnB59G9zp/uHvwpQs6XJDxX2DNGDu4UsR9+QjrM+01YbFne7qNLSUri29+zPFhK4nZ5kLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1704898643695340.233555505896; Wed, 10 Jan 2024 06:57:23 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.665543.1035752 (Exim 4.92) (envelope-from ) id 1rNa11-0006cw-IE; Wed, 10 Jan 2024 14:57:11 +0000 Received: by outflank-mailman (output) from mailman id 665543.1035752; Wed, 10 Jan 2024 14:57:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa11-0006cp-Fh; Wed, 10 Jan 2024 14:57:11 +0000 Received: by outflank-mailman (input) for mailman id 665543; Wed, 10 Jan 2024 14:57:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa0z-0006ap-Ju for xen-devel@lists.xenproject.org; Wed, 10 Jan 2024 14:57:09 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8634b0bf-afc8-11ee-9b0f-b553b5be7939; Wed, 10 Jan 2024 15:57:07 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40e5a5b0fb5so1485455e9.3 for ; Wed, 10 Jan 2024 06:57:07 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id bg3-20020a05600c3c8300b0040d91fa270fsm2449640wmb.36.2024.01.10.06.57.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jan 2024 06:57:06 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8634b0bf-afc8-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1704898627; x=1705503427; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=C+Ns9F9oXu8JWmZgiuS6JpNqxTmui1PVJh0bmPBcMr0=; b=Mx6pf1HDgvmNX6mWNkvuFQ8aN7pqz73N+zVNPXhiNQTd/KTB6YWbJec8Ha1iqnPDy7 yKznLNnp16aqkQhRJ/uXF/8vYyhUV6znbPRRQhGlvIocHniveWpoWhnIi133FCGRxcSZ HhU8tAL9jDdiJtA5lRIl4lEamfTEK5PqNeI765EQ9ugPe6NrTGxuIBFjn219erH/ZghG NA/LyVWrxlF0lX2WsOmG26orEfAuPHGKz8AFQMDVVEmoUf3ew2bX5uM9fSk5jXGPxxL8 qffRWxdJPPPVz5v124TnjciWVEXWzcZrjlbhpHP2s9ICmuS1Ud9W7A2fUeJL/PvwtI1Z bcbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898627; x=1705503427; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=C+Ns9F9oXu8JWmZgiuS6JpNqxTmui1PVJh0bmPBcMr0=; b=SIcWCmHj6aIYLycF2YDIIdLlR0mq+5L2O6LQmWOItDSQsJCI5pPcFRxMv5bGbmsb+j 3oGLnCSHyKYP7WdgbGuZwR264GZ1/cWjS91iD8M8L7bAurtqUBHb8tU7dqonk5saQwDX qO5IGG0/MNpbnFGVp8s+EwQyIfh69Y8h5EwvZE5pBb/r00zG+xcrW1f0nLo2fZEJ+xxs V2s2eWktqWOvtW1kmMeLoX0z7ABC/H1H6H8ipMAuxTLFNzUzyNT8ZklBL6nejMh/UigY HdUy+/yasmk26OFPLH9ZJ70NuH19lF4QMl+woxVmYoQX6kcDh4YjjlW9VZEVqHbLogrh Fn8Q== X-Gm-Message-State: AOJu0YzjMOBpyfFc9aAR3vPd9eliaGujcA4jnUeb2f0l+58wPzVJUauP znpSTqxHeX13ooM003B7k3QrGvelp7SIAj4KMkyXQCXU/w== X-Google-Smtp-Source: AGHT+IGwd4dDRXqLVlNJ8Knn15D1lvRQSiFU6wgYFjBngTtUJpgQwL87pfUkRcwNA3YuHcuzxz2yZg== X-Received: by 2002:a05:600c:3791:b0:40e:4f24:64d6 with SMTP id o17-20020a05600c379100b0040e4f2464d6mr640947wmr.41.1704898627129; Wed, 10 Jan 2024 06:57:07 -0800 (PST) Message-ID: <88437dea-8448-4420-a608-957f3d861bba@suse.com> Date: Wed, 10 Jan 2024 15:57:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 1/5] x86/HVM: split restore state checking from state loading Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1704898644801100001 ..., at least as reasonably feasible without making a check hook mandatory (in particular strict vs relaxed/zero-extend length checking can't be done early this way). Note that only one of the two uses of "real" hvm_load() is accompanied with a "checking" one. The other directly consumes hvm_save() output, which ought to be well-formed. This means that while input data related checks don't need repeating in the "load" function when already done by the "check" one (albeit assertions to this effect may be desirable), domain state related checks (e.g. has_xyz(d)) will be required in both places. With the split arch_hvm_{check,load}(), also invoke the latter only after downing all the vCPU-s. Suggested-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- Do we really need all the copying involved in use of _hvm_read_entry() (backing hvm_load_entry()? Zero-extending loads are likely easier to handle that way, but for strict loads all we gain is a reduced risk of unaligned accesses (compared to simply pointing into h->data[]). --- v5: Add comment. Re-order vCPU-down vs arch_hvm_load(). v4: Fold hvm_check() into hvm_load(). v2: New. --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -379,8 +379,12 @@ long arch_do_domctl( if ( copy_from_guest(c.data, domctl->u.hvmcontext.buffer, c.size) = !=3D 0 ) goto sethvmcontext_out; =20 + ret =3D hvm_load(d, false, &c); + if ( ret ) + goto sethvmcontext_out; + domain_pause(d); - ret =3D hvm_load(d, &c); + ret =3D hvm_load(d, true, &c); domain_unpause(d); =20 sethvmcontext_out: --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5391,7 +5391,7 @@ int hvm_copy_context_and_params(struct d } =20 c.cur =3D 0; - rc =3D hvm_load(dst, &c); + rc =3D hvm_load(dst, true, &c); =20 out: vfree(c.data); --- a/xen/arch/x86/hvm/save.c +++ b/xen/arch/x86/hvm/save.c @@ -30,7 +30,8 @@ static void arch_hvm_save(struct domain d->arch.hvm.sync_tsc =3D rdtsc(); } =20 -static int arch_hvm_load(struct domain *d, const struct hvm_save_header *h= dr) +static int arch_hvm_check(const struct domain *d, + const struct hvm_save_header *hdr) { uint32_t eax, ebx, ecx, edx; =20 @@ -55,6 +56,11 @@ static int arch_hvm_load(struct domain * "(%#"PRIx32") and restored on another (%#"PRIx32").\n", d->domain_id, hdr->cpuid, eax); =20 + return 0; +} + +static void arch_hvm_load(struct domain *d, const struct hvm_save_header *= hdr) +{ /* Restore guest's preferred TSC frequency. */ if ( hdr->gtsc_khz ) d->arch.tsc_khz =3D hdr->gtsc_khz; @@ -66,13 +72,12 @@ static int arch_hvm_load(struct domain * =20 /* VGA state is not saved/restored, so we nobble the cache. */ d->arch.hvm.stdvga.cache =3D STDVGA_CACHE_DISABLED; - - return 0; } =20 /* List of handlers for various HVM save and restore types */ static struct { hvm_save_handler save; + hvm_check_handler check; hvm_load_handler load; const char *name; size_t size; @@ -88,6 +93,7 @@ void __init hvm_register_savevm(uint16_t { ASSERT(typecode <=3D HVM_SAVE_CODE_MAX); ASSERT(hvm_sr_handlers[typecode].save =3D=3D NULL); + ASSERT(hvm_sr_handlers[typecode].check =3D=3D NULL); ASSERT(hvm_sr_handlers[typecode].load =3D=3D NULL); hvm_sr_handlers[typecode].save =3D save_state; hvm_sr_handlers[typecode].load =3D load_state; @@ -275,12 +281,15 @@ int hvm_save(struct domain *d, hvm_domai return 0; } =20 -int hvm_load(struct domain *d, hvm_domain_context_t *h) +/* + * @real =3D false requests checking of the incoming state, while @real = =3D true + * requests actual loading, which will then assume that checking was alrea= dy + * done or is unnecessary. + */ +int hvm_load(struct domain *d, bool real, hvm_domain_context_t *h) { const struct hvm_save_header *hdr; struct hvm_save_descriptor *desc; - hvm_load_handler handler; - struct vcpu *v; int rc; =20 if ( d->is_dying ) @@ -291,50 +300,92 @@ int hvm_load(struct domain *d, hvm_domai if ( !hdr ) return -ENODATA; =20 - rc =3D arch_hvm_load(d, hdr); - if ( rc ) - return rc; + rc =3D arch_hvm_check(d, hdr); + if ( real ) + { + struct vcpu *v; + + ASSERT(!rc); =20 - /* Down all the vcpus: we only re-enable the ones that had state saved= . */ - for_each_vcpu(d, v) - if ( !test_and_set_bit(_VPF_down, &v->pause_flags) ) - vcpu_sleep_nosync(v); + /* + * Down all the vcpus: we only re-enable the ones that had state + * saved. + */ + for_each_vcpu(d, v) + if ( !test_and_set_bit(_VPF_down, &v->pause_flags) ) + vcpu_sleep_nosync(v); + + arch_hvm_load(d, hdr); + } + else if ( rc ) + return rc; =20 for ( ; ; ) { + const char *name; + hvm_load_handler load; + if ( h->size - h->cur < sizeof(struct hvm_save_descriptor) ) { /* Run out of data */ printk(XENLOG_G_ERR "HVM%d restore: save did not end with a null entry\n", d->domain_id); + ASSERT(!real); return -ENODATA; } =20 /* Read the typecode of the next entry and check for the end-mark= er */ desc =3D (struct hvm_save_descriptor *)(&h->data[h->cur]); - if ( desc->typecode =3D=3D 0 ) + if ( desc->typecode =3D=3D HVM_SAVE_CODE(END) ) + { + /* Reset cursor for hvm_load(, true, ). */ + if ( !real ) + h->cur =3D 0; return 0; + } =20 /* Find the handler for this entry */ - if ( (desc->typecode > HVM_SAVE_CODE_MAX) || - ((handler =3D hvm_sr_handlers[desc->typecode].load) =3D=3D NU= LL) ) + if ( desc->typecode >=3D ARRAY_SIZE(hvm_sr_handlers) || + !(name =3D hvm_sr_handlers[desc->typecode].name) || + !(load =3D hvm_sr_handlers[desc->typecode].load) ) { printk(XENLOG_G_ERR "HVM%d restore: unknown entry typecode %u\= n", d->domain_id, desc->typecode); + ASSERT(!real); return -EINVAL; } =20 - /* Load the entry */ - printk(XENLOG_G_INFO "HVM%d restore: %s %"PRIu16"\n", d->domain_id, - hvm_sr_handlers[desc->typecode].name, desc->instance); - rc =3D handler(d, h); + if ( real ) + { + /* Load the entry */ + printk(XENLOG_G_INFO "HVM restore %pd: %s %"PRIu16"\n", d, + name, desc->instance); + rc =3D load(d, h); + } + else + { + /* Check the entry. */ + hvm_check_handler check =3D hvm_sr_handlers[desc->typecode].ch= eck; + + if ( !check ) + { + if ( desc->length > h->size - h->cur - sizeof(*desc) ) + return -ENODATA; + h->cur +=3D sizeof(*desc) + desc->length; + rc =3D 0; + } + else + rc =3D check(d, h); + } + if ( rc ) { - printk(XENLOG_G_ERR "HVM%d restore: failed to load entry %u/%u= rc %d\n", - d->domain_id, desc->typecode, desc->instance, rc); + printk(XENLOG_G_ERR "HVM restore %pd: failed to %s %s:%u rc %d= \n", + d, real ? "load" : "check", name, desc->instance, rc); return rc; } + process_pending_softirqs(); } =20 --- a/xen/arch/x86/include/asm/hvm/save.h +++ b/xen/arch/x86/include/asm/hvm/save.h @@ -103,6 +103,8 @@ static inline unsigned int hvm_load_inst * restoring. Both return non-zero on error. */ typedef int (*hvm_save_handler) (struct vcpu *v, hvm_domain_context_t *h); +typedef int (*hvm_check_handler)(const struct domain *d, + hvm_domain_context_t *h); typedef int (*hvm_load_handler) (struct domain *d, hvm_domain_context_t *h); =20 @@ -140,6 +142,6 @@ size_t hvm_save_size(struct domain *d); int hvm_save(struct domain *d, hvm_domain_context_t *h); int hvm_save_one(struct domain *d, unsigned int typecode, unsigned int ins= tance, XEN_GUEST_HANDLE_64(uint8) handle, uint64_t *bufsz); -int hvm_load(struct domain *d, hvm_domain_context_t *h); +int hvm_load(struct domain *d, bool real, hvm_domain_context_t *h); =20 #endif /* __XEN_HVM_SAVE_H__ */ From nobody Thu May 16 20:10:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1704898671; cv=none; d=zohomail.com; s=zohoarc; b=m84P6c98lm1/XIqtV4KR/QBYTRk0PzD1aGwZvhJTwaCKFSg3N8YJ8O6wJP69c7oqDIWZQy5LcU0Hs5haTp5s+0F0kqgsDUqjSLn8lJ8Ts/C1hXzS7vBpeAZpWZO0GqMzOrT0lLm8M8PPUE81RA/PJ+EVxN1c7RnEQLxBPTpdsFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704898671; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3102lstaK73LzoqFwPAeE+Wj//RivVZPDGZVH12C8fY=; b=ktShleB/P7a3dBRtdx2vJeXrM9GCU7ssDhW2av39GQYld8SI+VmTafq37CLzb+pgnK1MvS4CGSS6ReSaoXlW7jabE2LJqqsi9PTptdYxDrk63u8S1W4bLwVoFfw/mhOjkLrPktNruuIdUuGyDXZnojca5txhGUd30fFNMH8X8XE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1704898671191219.30758570163414; Wed, 10 Jan 2024 06:57:51 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.665548.1035763 (Exim 4.92) (envelope-from ) id 1rNa1Q-0007FG-17; Wed, 10 Jan 2024 14:57:36 +0000 Received: by outflank-mailman (output) from mailman id 665548.1035763; Wed, 10 Jan 2024 14:57:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa1P-0007F9-UK; Wed, 10 Jan 2024 14:57:35 +0000 Received: by outflank-mailman (input) for mailman id 665548; Wed, 10 Jan 2024 14:57:35 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa1P-0006ap-63 for xen-devel@lists.xenproject.org; Wed, 10 Jan 2024 14:57:35 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 957a49f0-afc8-11ee-9b0f-b553b5be7939; Wed, 10 Jan 2024 15:57:33 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40e4d515cdeso23217555e9.1 for ; Wed, 10 Jan 2024 06:57:33 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id bg3-20020a05600c3c8300b0040d91fa270fsm2449640wmb.36.2024.01.10.06.57.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jan 2024 06:57:32 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 957a49f0-afc8-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1704898653; x=1705503453; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=3102lstaK73LzoqFwPAeE+Wj//RivVZPDGZVH12C8fY=; b=gm+rv0xfPgNhYF706WrdwHRVUqQeZf+eYgRaU9iuv6Z8Ig88WTXHnqnimEV8FRNe0S fFbC8bzxqO2y/rM8ZNLa2UVvaP0ZD1tvhEspPvw3WOY7HJpkV+IBkC1TMqaZCxv8aK2a W7yxpkO17pu+qCFbn3HwSQAGUiVEDqkyzuBBQaNBEFHJ1BCQcjxpjqIOWpUZnCUmxc4z KEYpIzhiK6Y2znP4mUbeEDiVLPUSA/Ybl7MN0OaS6+KTaINiveTDsW+3hHC5YE/+eUNC KyzGBp0BrliuhRkVWgNwvixnynh8FinWfnEjESH31RWssLySzRfk+j5E0vNI6XJoJ0XB /e1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898653; x=1705503453; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3102lstaK73LzoqFwPAeE+Wj//RivVZPDGZVH12C8fY=; b=VM/hlJzyGnvKJVfckr3GrYXoLPfDnqe3B4RBoPB2QFE9gpQP8e29EjtlOkj94OcvYw 5q6JKLlUBxQfIuQzrDSvK3pGyq0HEaL+aAXDMyp6WTrTWw+RFglnYKACudlz6GjWECyz cpweN1waXajlHMu0OtkO6JqUgG3WShkmwzZedc1agHyj8tgMOS4KWgtYgRr0vNwbwQ9H rt8YVhtjSxqvWiNYRy28uH4BSS/ODunU996QMi+X28vSwseAzilCht09OAHLvIIpEdGI V2+peLsbrZkGT4dRsmdJ4oAYkjh4mTIBpDJtdFi/7HYGFhkvCrD3rLoKSB6gR7+zsLMI sR+Q== X-Gm-Message-State: AOJu0YzvOfMYCYHVogcaHBAXd/XpHTiVXgwjQBsDrEZCPAyi8ONYq/+f HtSgI1GFoQZSAVZ3GsRhLkNzMcehWZoP+xbu0v61ZZ+ifg== X-Google-Smtp-Source: AGHT+IHDTaTydRkAfyTOn9O75WQzYwxcjetr6RQH5Ef5XnPum+MTJ3GqQR+w4sca2wiRH8biZ8e9Rg== X-Received: by 2002:a05:600c:4513:b0:40e:44c2:a3ed with SMTP id t19-20020a05600c451300b0040e44c2a3edmr603861wmo.61.1704898652774; Wed, 10 Jan 2024 06:57:32 -0800 (PST) Message-ID: Date: Wed, 10 Jan 2024 15:57:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 2/5] x86/HVM: adjust save/restore hook registration for optional check handler Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1704898672634100001 Content-Type: text/plain; charset="utf-8" Register NULL uniformly as a first step. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v2: New. --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -374,7 +374,7 @@ static int cf_check vmce_load_vcpu_ctxt( return err ?: vmce_restore_vcpu(v, &ctxt); } =20 -HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, +HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, NULL, vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); #endif =20 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -458,7 +458,7 @@ static int cf_check pit_load(struct doma return rc; } =20 -HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_load, 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, NULL, pit_load, 1, HVMSR_PER_DOM); #endif =20 /* The intercept action for PIT DM retval: 0--not handled; 1--handled. */ --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -692,7 +692,7 @@ static int cf_check hpet_load(struct dom return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, hpet_load, 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, NULL, hpet_load, 1, HVMSR_PER_D= OM); =20 static void hpet_set(HPETState *h) { --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -793,7 +793,7 @@ static int cf_check hvm_load_tsc_adjust( return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(TSC_ADJUST, hvm_save_tsc_adjust, +HVM_REGISTER_SAVE_RESTORE(TSC_ADJUST, hvm_save_tsc_adjust, NULL, hvm_load_tsc_adjust, 1, HVMSR_PER_VCPU); =20 static int cf_check hvm_save_cpu_ctxt(struct vcpu *v, hvm_domain_context_t= *h) @@ -1186,7 +1186,7 @@ static int cf_check hvm_load_cpu_ctxt(st return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, hvm_load_cpu_ctxt, 1, +HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt, NULL, hvm_load_cpu_ctxt,= 1, HVMSR_PER_VCPU); =20 #define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct hvm_hw_cpu_xsave, \ @@ -1535,6 +1535,7 @@ static int __init cf_check hvm_register_ hvm_register_savevm(CPU_XSAVE_CODE, "CPU_XSAVE", hvm_save_cpu_xsave_states, + NULL, hvm_load_cpu_xsave_states, HVM_CPU_XSAVE_SIZE(xfeature_mask) + sizeof(struct hvm_save_descriptor), @@ -1543,6 +1544,7 @@ static int __init cf_check hvm_register_ hvm_register_savevm(CPU_MSR_CODE, "CPU_MSR", hvm_save_cpu_msrs, + NULL, hvm_load_cpu_msrs, HVM_CPU_MSR_SIZE(ARRAY_SIZE(msrs_to_send)) + sizeof(struct hvm_save_descriptor), --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -784,9 +784,9 @@ static int cf_check irq_load_link(struct return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(PCI_IRQ, irq_save_pci, irq_load_pci, +HVM_REGISTER_SAVE_RESTORE(PCI_IRQ, irq_save_pci, NULL, irq_load_pci, 1, HVMSR_PER_DOM); -HVM_REGISTER_SAVE_RESTORE(ISA_IRQ, irq_save_isa, irq_load_isa, +HVM_REGISTER_SAVE_RESTORE(ISA_IRQ, irq_save_isa, NULL, irq_load_isa, 1, HVMSR_PER_DOM); -HVM_REGISTER_SAVE_RESTORE(PCI_LINK, irq_save_link, irq_load_link, +HVM_REGISTER_SAVE_RESTORE(PCI_LINK, irq_save_link, NULL, irq_load_link, 1, HVMSR_PER_DOM); --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -773,7 +773,7 @@ static int cf_check hvm_load_mtrr_msr(st return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, hvm_load_mtrr_msr, 1, +HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, NULL, hvm_load_mtrr_msr= , 1, HVMSR_PER_VCPU); =20 void memory_type_changed(struct domain *d) --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -300,7 +300,7 @@ static int cf_check acpi_load(struct dom return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(PMTIMER, acpi_save, acpi_load, +HVM_REGISTER_SAVE_RESTORE(PMTIMER, acpi_save, NULL, acpi_load, 1, HVMSR_PER_DOM); =20 int pmtimer_change_ioport(struct domain *d, uint64_t version) --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -797,7 +797,7 @@ static int cf_check rtc_load(struct doma return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(RTC, rtc_save, rtc_load, 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(RTC, rtc_save, NULL, rtc_load, 1, HVMSR_PER_DOM); =20 void rtc_reset(struct domain *d) { --- a/xen/arch/x86/hvm/save.c +++ b/xen/arch/x86/hvm/save.c @@ -88,6 +88,7 @@ static struct { void __init hvm_register_savevm(uint16_t typecode, const char *name, hvm_save_handler save_state, + hvm_check_handler check_state, hvm_load_handler load_state, size_t size, int kind) { @@ -96,6 +97,7 @@ void __init hvm_register_savevm(uint16_t ASSERT(hvm_sr_handlers[typecode].check =3D=3D NULL); ASSERT(hvm_sr_handlers[typecode].load =3D=3D NULL); hvm_sr_handlers[typecode].save =3D save_state; + hvm_sr_handlers[typecode].check =3D check_state; hvm_sr_handlers[typecode].load =3D load_state; hvm_sr_handlers[typecode].name =3D name; hvm_sr_handlers[typecode].size =3D size; --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -631,7 +631,8 @@ static int cf_check ioapic_load(struct d return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(IOAPIC, ioapic_save, ioapic_load, 1, HVMSR_PER_D= OM); +HVM_REGISTER_SAVE_RESTORE(IOAPIC, ioapic_save, NULL, ioapic_load, 1, + HVMSR_PER_DOM); =20 void vioapic_reset(struct domain *d) { --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -1145,7 +1145,7 @@ static int cf_check viridian_load_domain return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_DOMAIN, viridian_save_domain_ctxt, +HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_DOMAIN, viridian_save_domain_ctxt, NULL, viridian_load_domain_ctxt, 1, HVMSR_PER_DOM); =20 static int cf_check viridian_save_vcpu_ctxt( @@ -1188,7 +1188,7 @@ static int cf_check viridian_load_vcpu_c return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_VCPU, viridian_save_vcpu_ctxt, +HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_VCPU, viridian_save_vcpu_ctxt, NULL, viridian_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); =20 static int __init cf_check parse_viridian_version(const char *arg) --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1617,9 +1617,9 @@ static int cf_check lapic_load_regs(stru return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(LAPIC, lapic_save_hidden, +HVM_REGISTER_SAVE_RESTORE(LAPIC, lapic_save_hidden, NULL, lapic_load_hidden, 1, HVMSR_PER_VCPU); -HVM_REGISTER_SAVE_RESTORE(LAPIC_REGS, lapic_save_regs, +HVM_REGISTER_SAVE_RESTORE(LAPIC_REGS, lapic_save_regs, NULL, lapic_load_regs, 1, HVMSR_PER_VCPU); =20 int vlapic_init(struct vcpu *v) --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -449,7 +449,7 @@ static int cf_check vpic_load(struct dom return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(PIC, vpic_save, vpic_load, 2, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(PIC, vpic_save, NULL, vpic_load, 2, HVMSR_PER_DO= M); =20 void vpic_reset(struct domain *d) { --- a/xen/arch/x86/include/asm/hvm/save.h +++ b/xen/arch/x86/include/asm/hvm/save.h @@ -113,6 +113,7 @@ typedef int (*hvm_load_handler) (struct void hvm_register_savevm(uint16_t typecode, const char *name,=20 hvm_save_handler save_state, + hvm_check_handler check_state, hvm_load_handler load_state, size_t size, int kind); =20 @@ -122,12 +123,13 @@ void hvm_register_savevm(uint16_t typeco =20 /* Syntactic sugar around that function: specify the max number of * saves, and this calculates the size of buffer needed */ -#define HVM_REGISTER_SAVE_RESTORE(_x, _save, _load, _num, _k) \ +#define HVM_REGISTER_SAVE_RESTORE(_x, _save, check, _load, _num, _k) \ static int __init cf_check __hvm_register_##_x##_save_and_restore(void) \ { \ hvm_register_savevm(HVM_SAVE_CODE(_x), \ #_x, \ &_save, \ + check, \ &_load, \ (_num) * (HVM_SAVE_LENGTH(_x) \ + sizeof (struct hvm_save_descriptor)), \ From nobody Thu May 16 20:10:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1704898692; cv=none; d=zohomail.com; s=zohoarc; b=btiL1DWZrQ0rZcCWG8Xz8AOW/GnlVnKoyC+c3E3NUWldU/vraJcYhrgtfvp+TPAAzE51hjeSDXbv1zF5PI3x3oPJdUXD68WZulJ5ckmfZYutf1ierK3Jqq1UoXXYNx468gSZzdclnLQKEbnfS1qZBITUwpeWJRB55gB5Qkl1aVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704898692; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZlEogBHJ42bqKdVld3OnXFEdms3+g1R9Ku2xVNYGcew=; b=bdsFFJ8lQFZEbv3he064uLMOIVuwyIwIVuVBypu8+atgtwhRh6StnnTYvh//o/L20BW1c/WcOoxIvZoR192zoWnXFpovdaFC5JVAWz4+wc5LbYjArSBnt2oN9PlF/Jh9wrBcvg/i2+mi/nyGsDk+gY9IR6QPQXYmuyBx6qer4vo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1704898692528662.684097493323; Wed, 10 Jan 2024 06:58:12 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.665552.1035772 (Exim 4.92) (envelope-from ) id 1rNa1n-0007o2-7T; Wed, 10 Jan 2024 14:57:59 +0000 Received: by outflank-mailman (output) from mailman id 665552.1035772; Wed, 10 Jan 2024 14:57:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa1n-0007nt-4u; Wed, 10 Jan 2024 14:57:59 +0000 Received: by outflank-mailman (input) for mailman id 665552; Wed, 10 Jan 2024 14:57:58 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa1m-0006ap-0Q for xen-devel@lists.xenproject.org; Wed, 10 Jan 2024 14:57:58 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a2cb12c9-afc8-11ee-9b0f-b553b5be7939; Wed, 10 Jan 2024 15:57:55 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40e586a62f7so5691945e9.2 for ; Wed, 10 Jan 2024 06:57:55 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id bg3-20020a05600c3c8300b0040d91fa270fsm2449640wmb.36.2024.01.10.06.57.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jan 2024 06:57:55 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a2cb12c9-afc8-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1704898675; x=1705503475; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=ZlEogBHJ42bqKdVld3OnXFEdms3+g1R9Ku2xVNYGcew=; b=D0LbPuqJ/1GFV+QIohfs73Go3PkXyMZYCrU2EXxxKWVsn0hCXLydG7kNujrx6vMiVr GrjTu4hWoGM2an++4NtPbgezMEVdMZj7RWnjsrWkOKh9nBiCgbDSPxog6oLi54zIHmO/ O/cc5d8fNVuNDXtSvaE/SOkN7bFhREwYO6z5yUT1Wo4EULS2IkLcgjl+927LIb4ClIp2 sk7IxfyU7eAwFsO3GmtlvV8FSmASWWsIN2E0ZHHxwwYSTVtJbJdQxOR4SE/qJl6k+ZXC 6TiQiTNXNCwA4LHOupvQGD9cYetZ3fIPlpYqkFfKsgPc45T1TmnoT8CQ1m/Mlg1MtMV5 wbew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898675; x=1705503475; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZlEogBHJ42bqKdVld3OnXFEdms3+g1R9Ku2xVNYGcew=; b=Y/8EfFScNjIIw1zIFeVRL4Mvy8h51X8pRlbTWC5DtANVWDtegZEEUUDtWNK3Yyb4gt yTP0HyQjT7R+rJHKjgzhil/TeX1L54cnBoazWm0k8F6YOpyl8vMLUk6BRjFkyW+IcVO3 0NTH+HPa2uiFbHh8WXgN48rLno3TIJNRDyE+Vhnt3lWO86RkyG9wDpwXn47RAUssLBRD eL0VY2kQmtungFYSFhreW7gA6noWawrr2N4J+bGianB/RnkUersvH6KhlHHeX1fmKztV L8W1EZxQwo6777nNtXP7XE7DIqtXK1uS2d2ORPzRyKvc3a5mujEePE0YIUlCQeqZjCr1 l4Jg== X-Gm-Message-State: AOJu0YwjwLujeBly4MYW12gXKeG/dLczJKR+UZDwCM5PK8RvaCdaw/ur LLGVtunP988pqzbfPAziKJp6hksKvTtdlcb24AQuuu0skg== X-Google-Smtp-Source: AGHT+IGqPRZUmbbDhoja1xdxE5cCCS4uoRPFgeEHEe1bFfxyBlbTW98nxPYD55HNOyyiKPXWRX0y4A== X-Received: by 2002:a05:600c:1f88:b0:40e:3511:2c39 with SMTP id je8-20020a05600c1f8800b0040e35112c39mr672943wmb.172.1704898675203; Wed, 10 Jan 2024 06:57:55 -0800 (PST) Message-ID: <37993f0d-2f53-4889-9dcb-82c34da0dba7@suse.com> Date: Wed, 10 Jan 2024 15:57:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 3/5] x86/vPIT: check values loaded from state save record Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1704898694570100001 In particular pit_latch_status() and speaker_ioport_read() perform calculations which assume in-bounds values. Several of the state save record fields can hold wider ranges, though. Refuse to load values which cannot result from normal operation, except mode, the init state of which (see also below) cannot otherwise be reached. Note that ->gate should only be possible to be zero for channel 2; enforce that as well. Adjust pit_reset()'s writing of ->mode as well, to not unduly affect the value pit_latch_status() may calculate. The chosen mode of 7 is still one which cannot be established by writing the control word. Note that with or without this adjustment effectively all switch() statements using mode as the control expression aren't quite right when the PIT is still in that init state; there is an apparent assumption that before these can sensibly be invoked, the guest would init the PIT (i.e. in particular set the mode). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- For mode we could refuse to load values in the [0x08,0xfe] range; I'm not certain that's going to be overly helpful. For count I was considering to clip the saved value to 16 bits (i.e. to convert the internally used 0x10000 back to the architectural 0x0000), but pit_save() doesn't easily lend itself to such a "fixup". If desired perhaps better a separate change anyway. --- v3: Slightly adjust two comments. Re-base over rename in earlier patch. v2: Introduce separate checking function; switch to refusing to load bogus values. Re-base. --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -47,6 +47,7 @@ #define RW_STATE_MSB 2 #define RW_STATE_WORD0 3 #define RW_STATE_WORD1 4 +#define RW_STATE_NUM 5 =20 #define get_guest_time(v) \ (is_hvm_vcpu(v) ? hvm_get_guest_time(v) : (u64)get_s_time()) @@ -427,6 +428,47 @@ static int cf_check pit_save(struct vcpu return rc; } =20 +static int cf_check pit_check(const struct domain *d, hvm_domain_context_t= *h) +{ + const struct hvm_hw_pit *hw; + unsigned int i; + + if ( !has_vpit(d) ) + return -ENODEV; + + hw =3D hvm_get_entry(PIT, h); + if ( !hw ) + return -ENODATA; + + /* + * Check to-be-loaded values are within valid range, for them to repre= sent + * actually reachable state. Uses of some of the values elsewhere ass= ume + * this is the case. Note that the channels' mode fields aren't check= ed; + * Xen prior to 4.19 might save them as 0xff. + */ + if ( hw->speaker_data_on > 1 || hw->pad0 ) + return -EDOM; + + for ( i =3D 0; i < ARRAY_SIZE(hw->channels); ++i ) + { + const struct hvm_hw_pit_channel *ch =3D &hw->channels[i]; + + if ( ch->count > 0x10000 || + ch->count_latched >=3D RW_STATE_NUM || + ch->read_state >=3D RW_STATE_NUM || + ch->write_state >=3D RW_STATE_NUM || + ch->rw_mode > RW_STATE_WORD0 || + ch->gate > 1 || + ch->bcd > 1 ) + return -EDOM; + + if ( i !=3D 2 && !ch->gate ) + return -EINVAL; + } + + return 0; +} + static int cf_check pit_load(struct domain *d, hvm_domain_context_t *h) { PITState *pit =3D domain_vpit(d); @@ -443,6 +485,14 @@ static int cf_check pit_load(struct doma goto out; } =20 + for ( i =3D 0; i < ARRAY_SIZE(pit->hw.channels); ++i ) + { + struct hvm_hw_pit_channel *ch =3D &pit->hw.channels[i]; + + if ( (ch->mode &=3D 7) > 5 ) + ch->mode -=3D 4; + } + /* * Recreate platform timers from hardware state. There will be some=20 * time jitter here, but the wall-clock will have jumped massively, so=20 @@ -458,7 +508,7 @@ static int cf_check pit_load(struct doma return rc; } =20 -HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, NULL, pit_load, 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_check, pit_load, 1, HVMSR_PER= _DOM); #endif =20 /* The intercept action for PIT DM retval: 0--not handled; 1--handled. */ @@ -575,7 +625,7 @@ void pit_reset(struct domain *d) for ( i =3D 0; i < 3; i++ ) { s =3D &pit->hw.channels[i]; - s->mode =3D 0xff; /* the init mode */ + s->mode =3D 7; /* unreachable sentinel */ s->gate =3D (i !=3D 2); pit_load_count(pit, i, 0); } From nobody Thu May 16 20:10:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1704898717; cv=none; d=zohomail.com; s=zohoarc; b=WpsLTdg99OJgC9BWh6aG8vtWNCJj4wcvMlZpFsb7YeRr8MF9k2fTeeGoEdNnkv4DZcy2xSJ0GxK7AoBmJY2QKuyFz8kODud0o9h0v59RVfI2G33nRuVh6YhEahpN0evXkSqPCHqjBNPZClOVEuTdDYhI4rFJyLCxqfj9pBtpkjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704898717; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ymXg0bpmFz+1mXkWwxvgqG3wuNIkNAkO2q/Jn5XmZJc=; b=Gsdf0rVUp2dbch5TaljUJMHRB2wEA/cPhBWsPtICo+m5q3qO/R/u5qj6q5VyKekPgjPvNNRDKLAA7/I1MkW/oV3FlO9mlPEC3K0jo6W9YnH48haJMRczX1NbMi8x5PYBYv0vZJdgOtW7LtVPPRafqoNLgzJ6OiPX5f5YD38vbPQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1704898717790138.74736152162416; Wed, 10 Jan 2024 06:58:37 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.665556.1035783 (Exim 4.92) (envelope-from ) id 1rNa2E-000083-FO; Wed, 10 Jan 2024 14:58:26 +0000 Received: by outflank-mailman (output) from mailman id 665556.1035783; Wed, 10 Jan 2024 14:58:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa2E-00007t-CQ; Wed, 10 Jan 2024 14:58:26 +0000 Received: by outflank-mailman (input) for mailman id 665556; Wed, 10 Jan 2024 14:58:24 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa2C-0006ap-JA for xen-devel@lists.xenproject.org; Wed, 10 Jan 2024 14:58:24 +0000 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [2a00:1450:4864:20::329]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b308f556-afc8-11ee-9b0f-b553b5be7939; Wed, 10 Jan 2024 15:58:22 +0100 (CET) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40d8902da73so40293545e9.2 for ; Wed, 10 Jan 2024 06:58:22 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id bg3-20020a05600c3c8300b0040d91fa270fsm2449640wmb.36.2024.01.10.06.58.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jan 2024 06:58:22 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b308f556-afc8-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1704898702; x=1705503502; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=ymXg0bpmFz+1mXkWwxvgqG3wuNIkNAkO2q/Jn5XmZJc=; b=BBxPKhk/Bh+Qm8tpX2EQ9OH9XMPhqAmh2J/8DNvCNehmOkiVeTq2rKNmoQWZX/PObw tCTHlTIKO27O0GBqCB4ClOr5Lovw9OVmTTbHGvVgGVPjevg1kcdhK6SiTDpypqB7ji6D MR+jKwfPgFsocG8ODcRxylN2fnQh7vJt8iXF9W3H7BOWMeKRmgVU7uzIBajfXCfSa9w4 iMIQl2nhFBwWdv1Z5BB+Z8RwvIeUwb/5EJDzaOR0hHwPRLSzqqubQgBoAkUERolcQcLu jjCjf7B3r37balHeAIvxA8k7F+04bbOyal6IgHzkL+WWQ+HdDB0xW+7VgV66OK1RFFMh objQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898702; x=1705503502; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ymXg0bpmFz+1mXkWwxvgqG3wuNIkNAkO2q/Jn5XmZJc=; b=PtgUitod+TboyHowhqg3EmnFAL8deK+ijNi57vxZTUJNhzOQ5dPqAKK90ZAXrx1JhH S1NvwFBwBXixcgxJSJkXZE6NmuqXFhBObci/fFwcthFiAbYwbtU7/fv3uP9gSuKVoFrb LtBaIDIQM6BG9BMZsNINl+uI6zZie2sokdkTuJmQjin6Fa3yzCSJ/fJWJItbxUNNq5Gi Wa8Oj2X+NaYtORwPdhsK2DESb0lJDjHFvHn82F0yeWQVt0Naeo1lr69qY2BQSp1ZE9ts GsyV+NlcJEWPZ1AJN0YWe/siqTnoa1RcKl23yqE6yQqD5ebAYk3LJ4DsgEhxU4vhGSiY y66g== X-Gm-Message-State: AOJu0YyFDRdjt5hW8mqSx6y90aPEVNAgkEKlN+KT8pi8E9WyRkQAhkya xHgiSffw2yqRuw1d4zczxx15TxBr/1jcBXImd2MGBKy39g== X-Google-Smtp-Source: AGHT+IFCaiRv24o3bDw9N2BNcvtjXE01o5QxDf3PNFqJMyakBhMThs2ZpoGXKh7zM9QwlPCXo3yo/g== X-Received: by 2002:a05:600c:4b8a:b0:40e:4cc6:b4b4 with SMTP id e10-20020a05600c4b8a00b0040e4cc6b4b4mr770987wmp.36.1704898702379; Wed, 10 Jan 2024 06:58:22 -0800 (PST) Message-ID: <5d68379d-a08b-48bf-a73f-2ef1486c5984@suse.com> Date: Wed, 10 Jan 2024 15:58:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 4/5] x86/vPIC: check values loaded from state save record Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1704898718755100001 Loading is_master from the state save record can lead to out-of-bounds accesses via at least the two container_of() uses by vpic_domain() and __vpic_lock(). Make sure the value is consistent with the instance being loaded. For ->int_output (which for whatever reason isn't a 1-bit bitfield), besides bounds checking also take ->init_state into account. For ELCR follow what vpic_intercept_elcr_io()'s write path and vpic_reset() do, i.e. don't insist on the internal view of the value to be saved. Move the instance range check as well, leaving just an assertion in the load handler. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- v3: vpic_domain() fix and vpic_elcr_mask() adjustment split out. Re-base over rename in earlier patch. v2: Introduce separate checking function; switch to refusing to load bogus values. Re-base. --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -429,6 +429,38 @@ static int cf_check vpic_save(struct vcp return 0; } =20 +static int cf_check vpic_check(const struct domain *d, hvm_domain_context_= t *h) +{ + unsigned int inst =3D hvm_load_instance(h); + const struct hvm_hw_vpic *s; + + if ( !has_vpic(d) ) + return -ENODEV; + + /* Which PIC is this? */ + if ( inst >=3D ARRAY_SIZE(d->arch.hvm.vpic) ) + return -ENOENT; + + s =3D hvm_get_entry(PIC, h); + if ( !s ) + return -ENODATA; + + /* + * Check to-be-loaded values are within valid range, for them to repre= sent + * actually reachable state. Uses of some of the values elsewhere ass= ume + * this is the case. + */ + if ( s->int_output > 1 ) + return -EDOM; + + if ( s->is_master !=3D !inst || + (s->int_output && s->init_state) || + (s->elcr & ~vpic_elcr_mask(s, 1)) ) + return -EINVAL; + + return 0; +} + static int cf_check vpic_load(struct domain *d, hvm_domain_context_t *h) { struct hvm_hw_vpic *s; @@ -438,18 +470,21 @@ static int cf_check vpic_load(struct dom return -ENODEV; =20 /* Which PIC is this? */ - if ( inst > 1 ) - return -ENOENT; + ASSERT(inst < ARRAY_SIZE(d->arch.hvm.vpic)); s =3D &d->arch.hvm.vpic[inst]; =20 /* Load the state */ if ( hvm_load_entry(PIC, h, s) !=3D 0 ) return -EINVAL; =20 + if ( s->is_master ) + s->elcr |=3D 1 << 2; + return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(PIC, vpic_save, NULL, vpic_load, 2, HVMSR_PER_DO= M); +HVM_REGISTER_SAVE_RESTORE(PIC, vpic_save, vpic_check, vpic_load, 2, + HVMSR_PER_DOM); =20 void vpic_reset(struct domain *d) { From nobody Thu May 16 20:10:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1704899559; cv=none; d=zohomail.com; s=zohoarc; b=jDrwNG/hQ3E12NFGtgLy3oSSa6vFw40OCK9hSrcBbtWpRZIpnKGNH5cXZr/xAdrtV+khvqQ17mVjvAAZ+pWxpvQoYhAqcGST9eZgcNVcHrFfktKF95X9Lkx/PW6ft+8qtMZ+7ccLDTxNACCC/fEQNZJaXH5P5+SLfcDOc9aD6D0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704899559; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FVPwAQJHu1Ys1D1OFhmt8x4WU9vXNMKYubLdP+XfH6Q=; b=DHmucKxiTVKP+aggxnZvnA9cuZ1o47TqFRbdRHU0ithWzg6p4X/tyMx4pGJp59cu4xK4CaqDbV8BelR8y6Skc3dS9ust6L6MEYwpOcR9Hi1OO92Mlqs4YeMsNu1SOWeiMlmSghPd9xSWbUhH9Ij0E2ByAAx2UoEhhkWFsFYCX7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1704899559597380.19052240530857; Wed, 10 Jan 2024 07:12:39 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.665585.1035809 (Exim 4.92) (envelope-from ) id 1rNaFi-0004ic-51; Wed, 10 Jan 2024 15:12:22 +0000 Received: by outflank-mailman (output) from mailman id 665585.1035809; Wed, 10 Jan 2024 15:12:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNaFi-0004iV-2O; Wed, 10 Jan 2024 15:12:22 +0000 Received: by outflank-mailman (input) for mailman id 665585; Wed, 10 Jan 2024 15:12:20 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rNa2Y-0006ap-VU for xen-devel@lists.xenproject.org; Wed, 10 Jan 2024 14:58:46 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c069aa27-afc8-11ee-9b0f-b553b5be7939; Wed, 10 Jan 2024 15:58:45 +0100 (CET) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40e4d515cdeso23232845e9.1 for ; Wed, 10 Jan 2024 06:58:45 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id bg3-20020a05600c3c8300b0040d91fa270fsm2449640wmb.36.2024.01.10.06.58.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Jan 2024 06:58:44 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c069aa27-afc8-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1704898725; x=1705503525; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=FVPwAQJHu1Ys1D1OFhmt8x4WU9vXNMKYubLdP+XfH6Q=; b=erFj5vJh2thQooT5vy0Rw1I1D2RNBdGO1OmrTPd1QJxRCN6+fGdM7G/+BP6Z1Sr1KY XuNrcrwQ+HIGEV0BgH2YBstosPGXLnS7mQ0EebsfYKc0c1P3WkZEnUWqaVh28BjyPWqG 1R/pHyNMwANdHs2f02DI8zvkmtYTeIclsyhn5VWBswym5L6hZm9QLs1o+wk4GeQCwyHa nNKbtZ1BhLI6ST1tabT360tI7XpI7i5KReexK9ctoS4lJDAqePv7gqQY6EjvK/jQPwQI W+hKtbgAIU7sNUfEQIzMpySg7UC0C9Ft0EETHxXwwNmNyPgDJw7L0K/MXs9JHeuqRjhY 7EyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898725; x=1705503525; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FVPwAQJHu1Ys1D1OFhmt8x4WU9vXNMKYubLdP+XfH6Q=; b=X36EksVIZ7lh+P3X9RCVdBCeHQsa3o6HG5i34g+bfUxygmKzQLMtZEVBesnlmulbzW PvsVHMn054sYYcYsLBzb+MZSvcAv7b+MfPiR2QKhfx2non0Aty4Mr9cLf/eqVDPvlB8v PeJhtQ5TWnGLfwXrHfJAakQyPNAFnNDB8unwPNI4TLkvuN0/Qlsxe8l05yHMwe5Rgiwl cmL6ftuMl3eTllA0iohcX5NdQWhYLHM0OGBvfxT66wy8jcH1CxErQpCktCpfTIuk+nDJ V9WElFJWP5/o3p4dhGz/rKRpe5GcaCTZE7sWS4UYgI3nSLzNIuLNlbUUTubb4xVX3YFr XSBQ== X-Gm-Message-State: AOJu0YzhQalEH08FwBq2Hw+EG8wmzSctVrhC66/+rfZdnm0eaGW1WHWJ ifzbv0/hBBhTImLttdaSql95nxq7D6/P/dwl4W9yfVEFJA== X-Google-Smtp-Source: AGHT+IEQURZurI+Nxdoq5cj14seNph29kf5M31nmN8egPlPmbh4clEL0LBFkFua7s/5+4DXD7kcgDA== X-Received: by 2002:a05:600c:1e88:b0:40e:4daf:b73d with SMTP id be8-20020a05600c1e8800b0040e4dafb73dmr635076wmb.169.1704898724921; Wed, 10 Jan 2024 06:58:44 -0800 (PST) Message-ID: Date: Wed, 10 Jan 2024 15:58:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v5 5/5] x86/vIRQ: split PCI link load state checking from actual loading Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <8110e31e-5411-467e-9c59-06751902853a@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1704899561762100001 Move the checking into a check hook, and add checking of the padding fields as well. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- v4: New. --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -749,6 +749,30 @@ static int cf_check irq_load_isa(struct return 0; } =20 +static int cf_check irq_check_link(const struct domain *d, + hvm_domain_context_t *h) +{ + const struct hvm_hw_pci_link *pci_link =3D hvm_get_entry(PCI_LINK, h); + unsigned int link; + + if ( !pci_link ) + return -ENODATA; + + for ( link =3D 0; link < ARRAY_SIZE(pci_link->pad0); link++ ) + if ( pci_link->pad0[link] ) + return -EINVAL; + + for ( link =3D 0; link < ARRAY_SIZE(pci_link->route); link++ ) + if ( pci_link->route[link] > 15 ) + { + printk(XENLOG_G_ERR + "HVM restore: PCI-ISA link %u out of range (%u)\n", + link, pci_link->route[link]); + return -EINVAL; + } + + return 0; +} =20 static int cf_check irq_load_link(struct domain *d, hvm_domain_context_t *= h) { @@ -759,16 +783,6 @@ static int cf_check irq_load_link(struct if ( hvm_load_entry(PCI_LINK, h, &hvm_irq->pci_link) !=3D 0 ) return -EINVAL; =20 - /* Sanity check */ - for ( link =3D 0; link < 4; link++ ) - if ( hvm_irq->pci_link.route[link] > 15 ) - { - printk(XENLOG_G_ERR - "HVM restore: PCI-ISA link %u out of range (%u)\n", - link, hvm_irq->pci_link.route[link]); - return -EINVAL; - } - /* Adjust the GSI assert counts for the link outputs. * This relies on the PCI and ISA IRQ state being loaded first */ for ( link =3D 0; link < 4; link++ ) @@ -788,5 +802,5 @@ HVM_REGISTER_SAVE_RESTORE(PCI_IRQ, irq_s 1, HVMSR_PER_DOM); HVM_REGISTER_SAVE_RESTORE(ISA_IRQ, irq_save_isa, NULL, irq_load_isa, 1, HVMSR_PER_DOM); -HVM_REGISTER_SAVE_RESTORE(PCI_LINK, irq_save_link, NULL, irq_load_link, - 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(PCI_LINK, irq_save_link, irq_check_link, + irq_load_link, 1, HVMSR_PER_DOM);