From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26FFCC4363D for ; Thu, 24 Sep 2020 10:36:31 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA6ED2396E for ; Thu, 24 Sep 2020 10:36:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o6dxQfnD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA6ED2396E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kLObm-0005vx-7w; Thu, 24 Sep 2020 10:36:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kLObk-0005vs-8G for xen-devel@lists.xenproject.org; Thu, 24 Sep 2020 10:36:12 +0000 X-Inumbo-ID: cca73e52-9f96-4c10-8b01-ebf8098650c3 Received: from mail-wr1-x441.google.com (unknown [2a00:1450:4864:20::441]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cca73e52-9f96-4c10-8b01-ebf8098650c3; Thu, 24 Sep 2020 10:36:11 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id w5so3222084wrp.8 for ; Thu, 24 Sep 2020 03:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:reply-to:to:cc:references:in-reply-to:subject:date:message-id :mime-version:content-transfer-encoding:content-language :thread-index; bh=phNkZME285VUJc1oyO1kXyPVhxSzLg1oEzRYJAmdsgU=; b=o6dxQfnDjQwCNEcWrdDDXzLj1T5Ghmvuqe62Ss1nWeDNIXHHNymVoqe9W8EwZdH+go hEDcIKVS8ByNgbnAdaoHrCWyhnv1TNqyviERChiQ6j9Px8/BWhQtVV00WMxLBrDJv/Fe svxHquqVrQezv9S/OWeaFg1a2LW9URwK5Z75B8n+wXarms2FpL330jaOTMhzzcD4FkdN C+OUeA3ZPc7OCEqxPxctmZ2w/z391vWyarOhYMR1T6yceOk5gMOApckrn8VxFUvPQKAQ NtkhSxPk1OfRXSO2l//kwL/vjLeC6XDBtl+B0FCPZzTLMwIkA1/x8w7Y1KiPglnHe/nl 8mMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:reply-to:to:cc:references:in-reply-to :subject:date:message-id:mime-version:content-transfer-encoding :content-language:thread-index; bh=phNkZME285VUJc1oyO1kXyPVhxSzLg1oEzRYJAmdsgU=; b=Q3KBdEdzPLpJ7JkF3UiQ1t8p2ZNgRdPzKbeNah1dLKzMwk4shdNrU4RExZf+j58ZoF OppOkIMSLhA962RcALZaRvUdXk/qeaLS8m9XLB+UzJ/5nhFdr3H01cT6RNZ3y9vnjMK2 ePdUqrMHTy/HxRCyFV+2EjWtsuQo80taJdaYt1GdzwdPFYdwGwivUuhZX/y3YFFnHbHp t29sjJFhoG32qU0h5JCf/9iGK5h3YyMp0JWYtPs6dQ/wbBYrdxxV2v+YADjkhKY+lw0B Fza6uF1vzHQGj5en5syzpN3SG7zxgQOeAaLut4QScWc9tFvLoA3J9shVj4oXdSTSVXO9 q3uw== X-Gm-Message-State: AOAM5315i2u27PlfM/6Rr386SvbPTDndi/Cth8OCDpBoxFelMl/SZli+ ZdCI5zRd8tFdfpsxMXZzFpE= X-Google-Smtp-Source: ABdhPJzTPc0LvsCh0Xq+8znANuVSRMkiKOWJhRsv7ooo3S59bQmWs5RID5A9d34xPUnAx5Vj4QDRGA== X-Received: by 2002:adf:ec87:: with SMTP id z7mr4737896wrn.57.1600943770391; Thu, 24 Sep 2020 03:36:10 -0700 (PDT) Received: from CBGR90WXYV0 (host86-176-94-160.range86-176.btcentralplus.com. [86.176.94.160]) by smtp.gmail.com with ESMTPSA id h204sm2923900wmf.35.2020.09.24.03.36.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 03:36:09 -0700 (PDT) From: Paul Durrant X-Google-Original-From: "Paul Durrant" To: "'Andrew Cooper'" , "'Xen-devel'" Cc: "'George Dunlap'" , "'Ian Jackson'" , "'Jan Beulich'" , "'Stefano Stabellini'" , "'Wei Liu'" , "'Julien Grall'" , =?utf-8?Q?'Micha=C5=82_Leszczy=C5=84ski'?= , "'Hubert Jasudowicz'" , "'Tamas K Lengyel'" References: <20200922182444.12350-1-andrew.cooper3@citrix.com> <20200922182444.12350-9-andrew.cooper3@citrix.com> In-Reply-To: <20200922182444.12350-9-andrew.cooper3@citrix.com> Subject: RE: [PATCH v2 08/11] xen/memory: Indent part of acquire_resource() Date: Thu, 24 Sep 2020 11:36:08 +0100 Message-ID: <004a01d6925e$84126ef0$8c374cd0$@xen.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 16.0 Content-Language: en-gb Thread-Index: AQIFh6M/JBUQh1P0MghANJzmhArOyAH+X8dcqQm1XqA= X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: paul@xen.org Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" > -----Original Message----- > From: Andrew Cooper > Sent: 22 September 2020 19:25 > To: Xen-devel > Cc: Andrew Cooper ; George Dunlap = ; Ian > Jackson ; Jan Beulich ; Stefano = Stabellini > ; Wei Liu ; Julien Grall = ; Paul Durrant > ; Micha=C5=82 Leszczy=C5=84ski = ; Hubert Jasudowicz > ; Tamas K Lengyel > Subject: [PATCH v2 08/11] xen/memory: Indent part of = acquire_resource() >=20 > Indent the middle of acquire_resource() inside a do {} while ( 0 ) = loop. This > is broken out specifically to make the following change readable. >=20 > No functional change. >=20 > Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant > --- > CC: George Dunlap > CC: Ian Jackson > CC: Jan Beulich > CC: Stefano Stabellini > CC: Wei Liu > CC: Julien Grall > CC: Paul Durrant > CC: Micha=C5=82 Leszczy=C5=84ski > CC: Hubert Jasudowicz > CC: Tamas K Lengyel > --- > xen/common/memory.c | 66 = +++++++++++++++++++++++++++-------------------------- > 1 file changed, 34 insertions(+), 32 deletions(-) >=20 > diff --git a/xen/common/memory.c b/xen/common/memory.c > index c559935732..369154b7c0 100644 > --- a/xen/common/memory.c > +++ b/xen/common/memory.c > @@ -1087,44 +1087,46 @@ static int acquire_resource( > goto out; > } >=20 > - switch ( xmar.type ) > - { > - case XENMEM_resource_grant_table: > - rc =3D gnttab_acquire_resource(d, xmar.id, xmar.frame, = xmar.nr_frames, > - mfn_list); > - break; > + do { > + switch ( xmar.type ) > + { > + case XENMEM_resource_grant_table: > + rc =3D gnttab_acquire_resource(d, xmar.id, xmar.frame, = xmar.nr_frames, > + mfn_list); > + break; >=20 > - default: > - rc =3D arch_acquire_resource(d, xmar.type, xmar.id, = xmar.frame, > - xmar.nr_frames, mfn_list); > - break; > - } > + default: > + rc =3D arch_acquire_resource(d, xmar.type, xmar.id, = xmar.frame, > + xmar.nr_frames, mfn_list); > + break; > + } >=20 > - if ( rc ) > - goto out; > + if ( rc ) > + goto out; >=20 > - if ( !paging_mode_translate(currd) ) > - { > - if ( copy_to_guest(xmar.frame_list, mfn_list, xmar.nr_frames) = ) > - rc =3D -EFAULT; > - } > - else > - { > - xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; > - unsigned int i; > + if ( !paging_mode_translate(currd) ) > + { > + if ( copy_to_guest(xmar.frame_list, mfn_list, = xmar.nr_frames) ) > + rc =3D -EFAULT; > + } > + else > + { > + xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; > + unsigned int i; >=20 > - if ( copy_from_guest(gfn_list, xmar.frame_list, = xmar.nr_frames) ) > - rc =3D -EFAULT; > + if ( copy_from_guest(gfn_list, xmar.frame_list, = xmar.nr_frames) ) > + rc =3D -EFAULT; >=20 > - for ( i =3D 0; !rc && i < xmar.nr_frames; i++ ) > - { > - rc =3D set_foreign_p2m_entry(currd, gfn_list[i], > - _mfn(mfn_list[i])); > - /* rc should be -EIO for any iteration other than the = first */ > - if ( rc && i ) > - rc =3D -EIO; > + for ( i =3D 0; !rc && i < xmar.nr_frames; i++ ) > + { > + rc =3D set_foreign_p2m_entry(currd, gfn_list[i], > + _mfn(mfn_list[i])); > + /* rc should be -EIO for any iteration other than the = first */ > + if ( rc && i ) > + rc =3D -EIO; > + } > } > - } > + } while ( 0 ); >=20 > out: > rcu_unlock_domain(d); > -- > 2.11.0