From nobody Sat Jul 4 21:10:46 2026 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=1782827664; cv=none; d=zohomail.com; s=zohoarc; b=AXqQPnm0p8e3ndGXZjypoCqidpVdxOG6NrXUsFjjfuKRhrclyVb61RRQEazQC7+noMacKFtLHOWAHWBwHAY6nbDCB5QZ+fxgTG9qd2AO0fiCmTbkUrEiWO0RKn4xaDVAQ4/OWgZOH2YWdJDvnKVtTd0tYRaIQCchgvR3SMAa/wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782827664; 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=FL3xJ3R9ME6XiZOg1Vkm6Xt5EM0+KhV2x1X4ZdfMeFw=; b=O8V/UxdoQAhgSewROByUJF8OzkOJIMpnnBb8YT4lFpnfIczSNd7MzExf+1FyhZ9ndGml3IT5py3ZXUb2BfDYBHuA8gCwT0pXvvoI01AYiLpY6iysMjmvZVOwoYM3Zt0RrUj22naCs/V0EsOitJr3bpof69y/tCkiYRroIaZ8rPo= 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 1782827664558749.8014222233253; Tue, 30 Jun 2026 06:54:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1348972.1606758 (Exim 4.92) (envelope-from ) id 1weYuf-0001is-00; Tue, 30 Jun 2026 13:54:09 +0000 Received: by outflank-mailman (output) from mailman id 1348972.1606758; Tue, 30 Jun 2026 13:54:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1weYue-0001il-SU; Tue, 30 Jun 2026 13:54:08 +0000 Received: by outflank-mailman (input) for mailman id 1348972; Tue, 30 Jun 2026 13:54:07 +0000 Received: from mx.expurgate.net ([194.145.224.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1weYud-0001ia-Ct for xen-devel@lists.xenproject.org; Tue, 30 Jun 2026 13:54:07 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1weYuc-00GrL2-HD for xen-devel@lists.xenproject.org; Tue, 30 Jun 2026 15:54:06 +0200 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a43ca78-e002-0a2a0a5209dd-0a2a4509e71c-18 for ; Tue, 30 Jun 2026 15:54:06 +0200 Received: from [209.85.221.46] (helo=mail-wr1-f46.google.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a43ca7e-97e6-0a2a45090019-d155dd2ec5f5-3 for ; Tue, 30 Jun 2026 15:54:06 +0200 Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-47640541585so235378f8f.1 for ; Tue, 30 Jun 2026 06:54:06 -0700 (PDT) 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 ffacd0b85a97d-47563d194bbsm7216382f8f.3.2026.06.30.06.54.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Jun 2026 06:54:05 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1782827646; x=1783432446; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=FL3xJ3R9ME6XiZOg1Vkm6Xt5EM0+KhV2x1X4ZdfMeFw=; b=TZTXZbyQg4PTdpqGQ3oXQpcIgnLoFkLFvRF4bE8Yn5U3vjxI7bgySM8ur4VEpXwu9t EE6HWqN9YR16zNRy2lknnBMg0CzhXk1fks039/3Nq+2jnjYi9Q43r46AsOY1KvXVElE4 2JaYtsv2y11kmf27NZWXrcFUeqmxGQqD3un86fJdtUzFjM0OnDqxxaubPqznjJmkPTPx chzs6L33XooYxKSXR2ZA2Bx6ygI4xvGLWGCruy7oiiDeARNYE6t9Uf34cXNLDlDR8mWj zJ/CU8J/XaLW+4PwxyAD67IklKuxkq7FeNwZtMlIA4leU+mKvjfCEEZPnbbbWQcFeb25 kTeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782827646; x=1783432446; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FL3xJ3R9ME6XiZOg1Vkm6Xt5EM0+KhV2x1X4ZdfMeFw=; b=JM40bEfGTp+vcjxdpKCBFAjkTHzVEXGaBZBOQQBz2fNjGyceIlU8K1zC2ffhLjxKnh mNKzENbDrrXLfejbYfI3o8kVRZCTElbAoEND+nwHbtF89jNJhFwBpzMk+sG6OHVouI2N QnEPyevE4NHEplcuQokc+b6jW8QGpSfpZiv1KaYTT4L+vxOJ3tuUx8KyZJVh57VROB2r 5w3ewEzXi6o9C24ybvEuPDAzf3bUjWv7UZFxZJ6Ot/N1ZlR5zEOYfXurrbv2Iv54KtMM cgQbdx8K3h8dY4PJeiTOX0DNbqdDTfq3hDL+e9dRGpQZ6QlC68giIK6WdZ8jH3I3V0xg XKoA== X-Gm-Message-State: AOJu0YyBMxy+JEyIeWzzs7GX/Hh2x3qNUblIJo4jwTB9Ag3JuVKCaecQ TsyGh8M4tEavTttKQ3X0GPbciMw41rzeKwM5n06gSfsC0Z/N8ast/vYILLcBwE8XDR2iuJwof5q ov8bqlw== X-Gm-Gg: AfdE7ckoZS4Ks9KI9kWNB8rSn293wI7zX5l2bHTIkwaU9bTUbmufn5OnlX8DE8EXHNl bfZS5eQf8gNSSKfIFu4zGf7DUDTOiz8Ich9IeRi6wNeOYOF2r+4IZjjP6SKRjQAFy+d4uQyuHry PUOBo+HaIKRalZOkydtpSZdTcTslQzVzRzZ2RphJOsH2lAodqoo8r1q+ywPGh4+d2mmn3XjsKwH aJZL9c+QxrgRf37DqrKyhVzC10jGqeNoI2tkpqvRIdUy/4+YTNqd7Fp75zE8mYW6+1Y/CU5z55C huOgxXT3ju0IzKstXosoNOd5rpU+PdhNhYzf9+qFbxlvb+viN6W6IKJXY7g17GcF7qrKx6WwBOU n3BKvWleKH/4PkWY+iHhxwuFXNJZfII1fpQJX0L8hOFoXiajV5Z5FIaOEmyw9KTgAMAiVglpFYs sE6pa+JceqmOiiWSq8Lsmbh9Lmpd3u0EqsLGEunOsjRvQuZh9SB88r1Z59RertSDNmU8+StQTyj Ktr X-Received: by 2002:a5d:6308:0:b0:475:f0f0:9f04 with SMTP id ffacd0b85a97d-4765b418b0bmr840570f8f.59.1782827645814; Tue, 30 Jun 2026 06:54:05 -0700 (PDT) Message-ID: <724bd14c-ebba-4e29-be7c-012aa7aa82b2@suse.com> Date: Tue, 30 Jun 2026 15:54:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 1/2] x86/domctl: don't imply I/O port permissions from I/O port mapping From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie , Oleksii Kurochko References: <65f69026-f284-4cfd-b502-8d8955b412f5@suse.com> Content-Language: en-US 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: <65f69026-f284-4cfd-b502-8d8955b412f5@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1782827646-44B2B986-E511BD74/0/0 X-purgate-type: clean X-purgate-size: 4935 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1782827666053158500 Content-Type: text/plain; charset="utf-8" Rather than granting permissions when mapping (an operation that DM-s are allowed to carry out, while they can't invoke ioport-permission), check whether permissions actually were granted when adding a mapping. This then also allows relaxing the necessary locking. While no longer granting permissions upon mapping is "only" at risk of breaking guests, no longer revoking permissions upon unmapping strictly requires callers to additionally invoke XEN_DOMCTL_ioport_permission. Or else a security issue would arise. In-tree code already does so. While there switch to using %pd in the two log messages. Fixes: 192c4dabc344 ("domctl and p2m changes for PCI passthru") Signed-off-by: Jan Beulich --- libxl has libxl__grant_vga_iomem_permission(), but I can't spot any I/O port equivalent (nor a revoke counterpart, btw). Everywhere else MMIO and I/O ports look to be treated equally. Qemu uses both xc_domain_{iomem_permission,memory_mapping}() in igd_write_opregion(), but only xc_domain_{memory,ioport}_mapping() in xen_pt_region_update() and xen_pt_{,un}register_vga_regions(). Is the IGD region special in any way? Clearly this can't work from a stubdom. --- v3: Further extend ChangeLog entry. v2: Avoid double evaluation of "add". Add ChangeLog entry. --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ The format is based on [Keep a Changelog ## [4.23.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=3Dxen.git;= a=3Dshortlog;h=3Dstaging) - TBD =20 ### Changed + - On x86: + - XEN_DOMCTL_ioport_mapping no longer implicitly grants or revokes + permissions for the port range in question. + XEN_DOMCTL_ioport_permission now needs invoking up front / + afterwards. =20 ### Added =20 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -714,15 +714,35 @@ long arch_do_domctl( break; =20 hvm =3D &d->arch.hvm; - iocaps_double_lock(d, true); + /* + * NB: The double lock isn't really needed when !add, but is used = anyway + * to keep things simple. + */ + iocaps_double_lock(d, false); =20 if ( !ioports_access_permitted(currd, fmp, fmp + np - 1) ) ret =3D -EPERM; - else if ( add ) + else if ( !add ) { printk(XENLOG_G_INFO - "ioport_map:add: dom%d gport=3D%x mport=3D%x nr=3D%x\n", - d->domain_id, fgp, fmp, np); + "ioport_map:remove: %pd gport=3D%x mport=3D%x nr=3D%x\n= ", + d, fgp, fmp, np); + + write_lock(&hvm->g2m_ioport_lock); + list_for_each_entry(g2m_ioport, &hvm->g2m_ioport_list, list) + if ( g2m_ioport->mport =3D=3D fmp ) + { + list_del(&g2m_ioport->list); + xfree(g2m_ioport); + break; + } + write_unlock(&hvm->g2m_ioport_lock); + } + else if ( ioports_access_permitted(d, fmp, fmp + np - 1) ) + { + printk(XENLOG_G_INFO + "ioport_map:add: %pd gport=3D%x mport=3D%x nr=3D%x\n", + d, fgp, fmp, np); =20 write_lock(&hvm->g2m_ioport_lock); list_for_each_entry(g2m_ioport, &hvm->g2m_ioport_list, list) @@ -747,40 +767,11 @@ long arch_do_domctl( list_add_tail(&g2m_ioport->list, &hvm->g2m_ioport_list); } write_unlock(&hvm->g2m_ioport_lock); - if ( !ret ) - ret =3D ioports_permit_access(d, fmp, fmp + np - 1); - if ( ret && !found && g2m_ioport ) - { - write_lock(&hvm->g2m_ioport_lock); - list_del(&g2m_ioport->list); - write_unlock(&hvm->g2m_ioport_lock); - xfree(g2m_ioport); - } } else - { - printk(XENLOG_G_INFO - "ioport_map:remove: dom%d gport=3D%x mport=3D%x nr=3D%x= \n", - d->domain_id, fgp, fmp, np); - - write_lock(&hvm->g2m_ioport_lock); - list_for_each_entry(g2m_ioport, &hvm->g2m_ioport_list, list) - if ( g2m_ioport->mport =3D=3D fmp ) - { - list_del(&g2m_ioport->list); - xfree(g2m_ioport); - break; - } - write_unlock(&hvm->g2m_ioport_lock); - - ret =3D ioports_deny_access(d, fmp, fmp + np - 1); - if ( ret && is_hardware_domain(currd) ) - printk(XENLOG_ERR - "ioport_map: error %ld denying dom%d access to [%x,= %x]\n", - ret, d->domain_id, fmp, fmp + np - 1); - } + ret =3D -EPERM; =20 - iocaps_double_unlock(d, true); + iocaps_double_unlock(d, false); break; } From nobody Sat Jul 4 21:10:46 2026 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=1782827683; cv=none; d=zohomail.com; s=zohoarc; b=g4Dn8yC7rcDicm7+itYUNz1d+68moTvBsRDIkFcH0FnNawTehkr8fojnf+7dbKbs1Koa4y8IH3JS6GcrP9U1KbLBZIWlUl8GSVCbIiUwql+Ww/vN/TiXgv8yXpjWM19dwUTL3Aoh45RTjsp9lzCCIou9pBwQX9I3FVxTzYHZ8ac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782827683; 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=7VObdJ/Ay7YvnO1Jkamyr9ljoHlqZ5SKP2YYwI2w7ZY=; b=k1s2oyzTjKVfOM1jWWIl2qMU6KJiMxbQQTer6OuEN8f5YqAOK66mIePDiwZ5PP48owEqNArkBVxPECG+jmwSym6VgqTWN57u6+GFoSpnq4ibr5ZX67Zm8ftxvMpZTD493aFysan/BRuTrL/W1QtHFsh0TvdofXogddtYzJsZmx8= 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 1782827683345767.0777656325173; Tue, 30 Jun 2026 06:54:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1348977.1606768 (Exim 4.92) (envelope-from ) id 1weYux-00026k-9p; Tue, 30 Jun 2026 13:54:27 +0000 Received: by outflank-mailman (output) from mailman id 1348977.1606768; Tue, 30 Jun 2026 13:54:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1weYux-00026b-4F; Tue, 30 Jun 2026 13:54:27 +0000 Received: by outflank-mailman (input) for mailman id 1348977; Tue, 30 Jun 2026 13:54:26 +0000 Received: from mx.expurgate.net ([194.145.224.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1weYuw-000269-Aa for xen-devel@lists.xenproject.org; Tue, 30 Jun 2026 13:54:26 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1weYuv-000DWt-MY for xen-devel@lists.xenproject.org; Tue, 30 Jun 2026 15:54:25 +0200 Received: from [10.42.69.7] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a43ca85-2eae-0a2a0a5409dd-0a2a45078548-46 for ; Tue, 30 Jun 2026 15:54:25 +0200 Received: from [209.85.128.48] (helo=mail-wm1-f48.google.com) by tlsNG-ef75cf.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a43ca91-9c8e-0a2a45070019-d1558030c43b-3 for ; Tue, 30 Jun 2026 15:54:25 +0200 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4926f8e02e8so27978785e9.0 for ; Tue, 30 Jun 2026 06:54:25 -0700 (PDT) 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 5b1f17b1804b1-493b8ca8a81sm71394735e9.10.2026.06.30.06.54.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Jun 2026 06:54:24 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1782827665; x=1783432465; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=7VObdJ/Ay7YvnO1Jkamyr9ljoHlqZ5SKP2YYwI2w7ZY=; b=Ieqq6+GGBU3va/ophsoGd+rAU038dOVIdmTXiVOz699blm/AuZT0+IWHiTdIkJI1kZ +Fm3YOdbFpH/lK0+AdaLAXJhKpFvgiBPJTq1wqVya4rS5KpK4xOFp4Tkwvf18DW/RfT1 zA1gQpEv++b12ppIw/VNkLqU3ElKHRWsRo+oMpg3Vas3yMz/lfD9V+EjNzovLNKmaNzn 6IgXTKZ6xXw7iDqfFO8sD1gRf85wdmXKaat39IK5wUWV3RIXq4KwvbLo0nHEABlzbWLG NKDKVjs2Dr4EvLGZcwBWm9sdQMo5Y3vXca8bHbUxXsviGjt+X9vNqMibbF7kmWOhr+fy q5MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782827665; x=1783432465; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7VObdJ/Ay7YvnO1Jkamyr9ljoHlqZ5SKP2YYwI2w7ZY=; b=Il2dEkJ1y0H4dtgYr2ciHM667Bc1P3bzuIS08O5S4dpfmVf0dbJP/qUUOcIy2MaYdj bShAGbMfBPG7CcNe1XFAhX3GYyKwbymHoULwtWFCkDYtsWJ/3G0lRYkfrGSLwW7kw06t eSO31e0kL+6IGzQD+rQx3+6IkJvSbc9DyN0Z7WOrmvpxZlIdqndUGsDSG5BoKJar/P2O /0FQtgq1fX94xbecBM2cBiVHYrGLD2wF88X9oR/eHczALnB1mQ8b06qjjVGecLwCeEi3 EsAV0kgJL8HggTDTobgvZngJumckPiTRefxukVl94HEXXMMo1cv+jVjgKqopxvF3x3DO hYtg== X-Gm-Message-State: AOJu0Yzr2CcXmGzlgZhnwRumXxi8UyoL1NQ8zp1cWz1s/JteM3hWyUzC LPiws9bu21xju92unpVaSMt89KPevBHKm+KEYPTPZ9+l0K40I/Yceg/5yl5oKsRdnKRbZSDfSvo 6l/lg7A== X-Gm-Gg: AfdE7cnHthfTS6nYNTTEOVBTqlv6HfRV4IN9VRAIEkq+eRq7fVTWtzVy4OgMPBr45OJ e85Jlf26M0scEqP4+hdffmgM6EW+IhbJIiP6EoxKzy1ME+Hvbo6yUFtIiHi/O5zWPSPeKVE73F9 FkAOik7GLsJoqgM3/obAfWarDcHi3TF87kB44BKnVgp++NMerCLY2qTzS0QEt29Wm8EliDYrFvK LI8gWUfVQ2+7QG3qwiwQ6cXMGHuo8cGtsk3mxVV3rQqpmV9xH4iR8gWa3dkLbvetucKZrzHOgzr ewFsrR1Ys6Z0sMULrSh8rkct4I8Uot9LeuojR9ANn2FKLLlFnLraaIRNcghX6CMdF0VVs0YV1Vt m03fq+lz6jxQ5D1useZRxZrn/HSPx0lKtcieZQgunmf0JYNrxr/BE+gTg+BfmoI99zrL67vR9Gw Iq7rv1xfZek2aZyr5RD770SJCoM+BMlP5mBIhXZd7DJgH25yd2vPs872A20T+GQWfDd4H80KsS1 YK4 X-Received: by 2002:a05:600c:810b:b0:493:bc4a:d5f5 with SMTP id 5b1f17b1804b1-493bda928edmr10545345e9.39.1782827664971; Tue, 30 Jun 2026 06:54:24 -0700 (PDT) Message-ID: Date: Tue, 30 Jun 2026 15:54:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 2/2] x86/HVM: more checking for XEN_DOMCTL_ioport_mapping From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <65f69026-f284-4cfd-b502-8d8955b412f5@suse.com> Content-Language: en-US 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: <65f69026-f284-4cfd-b502-8d8955b412f5@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-ef75cf/1782827665-FC11625E-240ED00C/0/0 X-purgate-type: clean X-purgate-size: 2315 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1782827684201158500 When adding ranges, only alter existing ones when there is an exact match. Don't accept ranges overlapping existing ones. When removing ranges, only remove a range if there's an exact match. Return an error when the range isn't found. Fixes: 192c4dabc344 ("domctl and p2m changes for PCI passthru") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- Should "exact match" perhaps also include the guest port number? I'm uncertain here as that kind of conflicts with "add" being treated as "change" when the host port (and now count) match. --- v2: Re-base over change to earlier patch. --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -728,12 +728,14 @@ long arch_do_domctl( "ioport_map:remove: %pd gport=3D%x mport=3D%x nr=3D%x\n= ", d, fgp, fmp, np); =20 + ret =3D -ENOENT; write_lock(&hvm->g2m_ioport_lock); list_for_each_entry(g2m_ioport, &hvm->g2m_ioport_list, list) - if ( g2m_ioport->mport =3D=3D fmp ) + if ( g2m_ioport->mport =3D=3D fmp && g2m_ioport->np =3D=3D= np ) { list_del(&g2m_ioport->list); xfree(g2m_ioport); + ret =3D 0; break; } write_unlock(&hvm->g2m_ioport_lock); @@ -746,14 +748,21 @@ long arch_do_domctl( =20 write_lock(&hvm->g2m_ioport_lock); list_for_each_entry(g2m_ioport, &hvm->g2m_ioport_list, list) - if (g2m_ioport->mport =3D=3D fmp ) + { + if ( g2m_ioport->mport =3D=3D fmp && g2m_ioport->np =3D=3D= np ) { g2m_ioport->gport =3D fgp; - g2m_ioport->np =3D np; found =3D 1; break; } - if ( !found ) + if ( fmp + np >=3D g2m_ioport->mport && + g2m_ioport->mport + g2m_ioport->np >=3D fmp ) + { + ret =3D -EBUSY; + break; + } + } + if ( !found && !ret ) { g2m_ioport =3D xmalloc(struct g2m_ioport); if ( !g2m_ioport )