From nobody Mon Apr 13 05:27:09 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 header.i=julian.vetter@vates.tech; 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=none dis=none) header.from=vates.tech ARC-Seal: i=1; a=rsa-sha256; t=1771249463; cv=none; d=zohomail.com; s=zohoarc; b=QSohnIHG7/+SU5wjphX1SVZiRAsPEJb4eNlUCo9jeJTqALnqfIA6D53bFko0gSfENFEarVGvmAozYeKVfh4Jno8p6rOvcBdLbbea9/jZHpgJObFUk9q4cgSBzJBKP1qgJl2yplf0NxIY+92HgNw/cOww0IzsA57Spbs12Qz8zzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771249463; 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=8ylKuGd2BMY1tYigbaDonsjt+0UlJARYpSIysh5XnsQ=; b=adDlwXSVkGAPXRXaYNUnP0FwCSKXf92R/WAg+idtxb5Q2fNsw3XS4hfBktaykdBdbC6dLXQgKNSmB6DUCj+74kioNOaKha3ziL/tSKbgLa6hWNbnS3k/bPd9C7wp8BYZHJGDDjeNxJ+8ofiDYBHz8x/JRdcP4MxZkntAGFRXEpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=julian.vetter@vates.tech; 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1771249463190891.2458754682826; Mon, 16 Feb 2026 05:44:23 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1234162.1537494 (Exim 4.92) (envelope-from ) id 1vrytQ-0007yF-GO; Mon, 16 Feb 2026 13:44:04 +0000 Received: by outflank-mailman (output) from mailman id 1234162.1537494; Mon, 16 Feb 2026 13:44:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vrytQ-0007xF-8u; Mon, 16 Feb 2026 13:44:04 +0000 Received: by outflank-mailman (input) for mailman id 1234162; Mon, 16 Feb 2026 13:44:03 +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 1vrytP-0007hl-4B for xen-devel@lists.xenproject.org; Mon, 16 Feb 2026 13:44:03 +0000 Received: from mail187-15.suw11.mandrillapp.com (mail187-15.suw11.mandrillapp.com [198.2.187.15]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8c74fc17-0b3d-11f1-9ccf-f158ae23cfc8; Mon, 16 Feb 2026 14:44:01 +0100 (CET) Received: from pmta09.mandrill.prod.suw01.rsglab.com (localhost [127.0.0.1]) by mail187-15.suw11.mandrillapp.com (Mailchimp) with ESMTP id 4fF3sC4xYlzPm0PYM for ; Mon, 16 Feb 2026 13:43:59 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id b9b5c5ead9004716bf05dfc35d46d2e5; Mon, 16 Feb 2026 13:43:59 +0000 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: 8c74fc17-0b3d-11f1-9ccf-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1771249439; x=1771519439; bh=8ylKuGd2BMY1tYigbaDonsjt+0UlJARYpSIysh5XnsQ=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=g3t1tEAUX/Hwr7m69E0W6oiHtXKiEPgfO9J9r4Z5VzSohA553lrdkgklB4mX72s2P 3gZtkRT6aOUSXkfDOrcF1sjWow0otGnD9CGDaB4v5hnUvP2ZJ7QsP9JuDglXBE89u8 0JqBL3PADqwtBprHaEsbmVZ9k1+F3K1f7ATksZtekspbs2YtqFdGZDRZgizTxDRf3e 5ym27DIri9lwjxEOJiThMdrgbW0Jh/3wj/JXhckr++8YGZ0LLIJI+Q9zTjYuZTF8h1 C/e6XAeiDSF5I7wQVynccrtvlQ+D90eqaYFS92Em4GUV8PWuN1HBNfPn6nfYIM3JqZ ECH7h836za+xA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1771249439; x=1771509939; i=julian.vetter@vates.tech; bh=8ylKuGd2BMY1tYigbaDonsjt+0UlJARYpSIysh5XnsQ=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=zFWanLLTSQ9GDGybif5GeUk2sTb9nGOi87qcVSLNwYp9WwWTRK3X7o5zmh4GM2T5L lu4SgSRayHsFwuXr9hzLwB2fUQBZK1C5Bje/LVEIQYmsUO+W+IzkfhfmCBqaihsv5A aTfiNTUCg2jDXeRAKb2/5P0gG6JdEoZ6wunpR+A7U4wVDVgO5DgFh7aHUY/hoPB4SC CND4AJTSmBivv/hiChQaWKv+O1TfpX+yDDWlh81YnYqZycPGkYlLSz7a4yX8ee9cev Qhouf0t8THvQfQxNpFWWeGF8Oijh3iZ4A5l8lpKN+Gf8diyztHMhO39URbj3A2JSp/ 3BvIwKAqW46Ng== From: "Julian Vetter" Subject: =?utf-8?Q?[PATCH=20v2=202/3]=20x86/ioreq:=20Prepare=20spacing=20for=20upcoming=20patch?= X-Mailer: git-send-email 2.51.0 X-Bm-Disclaimer: Yes X-Bm-Milter-Handled: 4ffbd6c1-ee69-4e1b-aabd-f977039bd3e2 X-Bm-Transport-Timestamp: 1771249437847 To: xen-devel@lists.xenproject.org Cc: "Jan Beulich" , "Andrew Cooper" , "=?utf-8?Q?Roger=20Pau=20Monn=C3=A9?=" , "Anthony PERARD" , "Michal Orzel" , "Julien Grall" , "Stefano Stabellini" , "Julian Vetter" Message-Id: <20260216134334.3510048-3-julian.vetter@vates.tech> In-Reply-To: <20260216134334.3510048-1-julian.vetter@vates.tech> References: <20260216134334.3510048-1-julian.vetter@vates.tech> X-Native-Encoded: 1 X-Report-Abuse: =?UTF-8?Q?Please=20forward=20a=20copy=20of=20this=20message,=20including=20all=20headers,=20to=20abuse@mandrill.com.=20You=20can=20also=20report=20abuse=20here:=20https://mandrillapp.com/contact/abuse=3Fid=3D30504962.b9b5c5ead9004716bf05dfc35d46d2e5?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20260216:md Date: Mon, 16 Feb 2026 13:43:59 +0000 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @mandrillapp.com) (identity julian.vetter@vates.tech) X-ZM-MESSAGEID: 1771249465798154100 Content-Type: text/plain; charset="utf-8" This patch just changes indentation, to make the next patch easier to review. Signed-off-by: Julian Vetter --- Changes in v2 - New patch --- xen/arch/x86/hvm/ioreq.c | 86 ++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index a5fa97e149..5ebc48dbd4 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -125,14 +125,16 @@ static void hvm_unmap_ioreq_gfn(struct ioreq_server *= s, bool buf) { struct ioreq_page *iorp =3D buf ? &s->bufioreq : &s->ioreq; =20 - if ( gfn_eq(iorp->gfn, INVALID_GFN) ) - return; + { + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) + return; =20 - destroy_ring_for_helper(&iorp->va, iorp->page); - iorp->page =3D NULL; + destroy_ring_for_helper(&iorp->va, iorp->page); + iorp->page =3D NULL; =20 - hvm_free_ioreq_gfn(s, iorp->gfn); - iorp->gfn =3D INVALID_GFN; + hvm_free_ioreq_gfn(s, iorp->gfn); + iorp->gfn =3D INVALID_GFN; + } } =20 static int hvm_map_ioreq_gfn(struct ioreq_server *s, bool buf) @@ -141,34 +143,36 @@ static int hvm_map_ioreq_gfn(struct ioreq_server *s, = bool buf) struct ioreq_page *iorp =3D buf ? &s->bufioreq : &s->ioreq; int rc; =20 - if ( iorp->page ) { - /* - * If a page has already been allocated (which will happen on - * demand if ioreq_server_get_frame() is called), then - * mapping a guest frame is not permitted. - */ - if ( gfn_eq(iorp->gfn, INVALID_GFN) ) - return -EPERM; - - return 0; - } + if ( iorp->page ) + { + /* + * If a page has already been allocated (which will happen on + * demand if ioreq_server_get_frame() is called), then + * mapping a guest frame is not permitted. + */ + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) + return -EPERM; + + return 0; + } =20 - if ( d->is_dying ) - return -EINVAL; + if ( d->is_dying ) + return -EINVAL; =20 - iorp->gfn =3D hvm_alloc_ioreq_gfn(s); + iorp->gfn =3D hvm_alloc_ioreq_gfn(s); =20 - if ( gfn_eq(iorp->gfn, INVALID_GFN) ) - return -ENOMEM; + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) + return -ENOMEM; =20 - rc =3D prepare_ring_for_helper(d, gfn_x(iorp->gfn), &iorp->page, - &iorp->va); + rc =3D prepare_ring_for_helper(d, gfn_x(iorp->gfn), &iorp->page, + &iorp->va); =20 - if ( rc ) - hvm_unmap_ioreq_gfn(s, buf); + if ( rc ) + hvm_unmap_ioreq_gfn(s, buf); =20 - return rc; + return rc; + } } =20 static void hvm_remove_ioreq_gfn(struct ioreq_server *s, bool buf) @@ -176,12 +180,14 @@ static void hvm_remove_ioreq_gfn(struct ioreq_server = *s, bool buf) struct domain *d =3D s->target; struct ioreq_page *iorp =3D buf ? &s->bufioreq : &s->ioreq; =20 - if ( gfn_eq(iorp->gfn, INVALID_GFN) ) - return; + { + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) + return; =20 - if ( p2m_remove_page(d, iorp->gfn, page_to_mfn(iorp->page), 0) ) - domain_crash(d); - clear_page(iorp->va); + if ( p2m_remove_page(d, iorp->gfn, page_to_mfn(iorp->page), 0) ) + domain_crash(d); + clear_page(iorp->va); + } } =20 static int hvm_add_ioreq_gfn(struct ioreq_server *s, bool buf) @@ -190,16 +196,18 @@ static int hvm_add_ioreq_gfn(struct ioreq_server *s, = bool buf) struct ioreq_page *iorp =3D buf ? &s->bufioreq : &s->ioreq; int rc; =20 - if ( gfn_eq(iorp->gfn, INVALID_GFN) ) - return 0; + { + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) + return 0; =20 - clear_page(iorp->va); + clear_page(iorp->va); =20 - rc =3D p2m_add_page(d, iorp->gfn, page_to_mfn(iorp->page), 0, p2m_ram_= rw); - if ( rc =3D=3D 0 ) - paging_mark_pfn_dirty(d, _pfn(gfn_x(iorp->gfn))); + rc =3D p2m_add_page(d, iorp->gfn, page_to_mfn(iorp->page), 0, p2m_= ram_rw); + if ( rc =3D=3D 0 ) + paging_mark_pfn_dirty(d, _pfn(gfn_x(iorp->gfn))); =20 - return rc; + return rc; + } } =20 int arch_ioreq_server_map_pages(struct ioreq_server *s) --=20 2.51.0 -- Julian Vetter | Vates Hypervisor & Kernel Developer XCP-ng & Xen Orchestra - Vates solutions web: https://vates.tech