From patchwork Tue Feb 1 19:32:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 538986 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp1158842imr; Tue, 1 Feb 2022 15:44:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAO4SpBF7L1WBzIehVz3Vi5TngH7UefiVzrDzkZ4ELQBYBcmxz+wskj20PDhmRFdgWnn4k X-Received: by 2002:a25:f404:: with SMTP id q4mr39945864ybd.146.1643759077709; Tue, 01 Feb 2022 15:44:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643759077; cv=none; d=google.com; s=arc-20160816; b=nfdyhdQH7h/lelTM4gfj+KUH7PiOVWMtPDG7OS1jrZScx4K6PpeNfyXIvSShC+EEf2 /pl5ZYU3zcixoce6UFsflRSZshCx9ISyXjrjj6qaTXteHZi6fB5hJU6S9AulvjkfXgTD aSSpbjo2HChsKyq99zVEC1TC9TyeecnPu3fLbevOFLEcSQGwm32EBRya71nx1mln1DC2 b7e6c86g1PwurhuJ3E0Wol/QAayiaYkc/rNG4VnCt7IVFzQecp2E/FfSaR6M3F3ZP3IW cMS7zsN71rY4X+227RSkw+gSmm+vs7bd6qrAGZPKGroAGy9c+4rSnlaPa0D7PaRQpyy5 uIHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=49llGIcUTgJBFjwDsRuayXX0Chj7UB+qkc+tnZISWh0=; b=Cyz8SY7DW5WLdPlWD5rUIc4W3P2plGb6tL3eNSPz/1GYAjp4UAAJxFtz+/NISf/UIR XljEpLa+u8NBVP/wU2gwCZsCD/1ksjQTaW15HXuFijFkGfjjywYsdAS7EpPFCj9sFUaX Qk/UK6SlEjwsKzYiOQ5wf/Hb+xKYF6ZDuJnAkEu+rmIRYeQC4kK1WoPjku8LAaausmkF OG0wFLkguOcTtXeE4rbcEF2l0yw43kP4dsQmETVmk7t4vAkcUU27VtZ3I3jpWFRNG0Nw Y3aUwVqFTbi6MqqpHUV7od0UX62t2Mc6Ft5kLBctVclf7sJyLm5b+f2b/o01K9PP4J4r z1GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=txoqg5oD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o13si50091971ybu.694.2022.02.01.15.44.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 15:44:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=txoqg5oD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF2pA-0002xw-Bm for patch@linaro.org; Tue, 01 Feb 2022 18:44:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEytI-0001p3-5s for qemu-devel@nongnu.org; Tue, 01 Feb 2022 14:32:37 -0500 Received: from [2a00:1450:4864:20::32c] (port=34439 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEytA-0002XA-Rm for qemu-devel@nongnu.org; Tue, 01 Feb 2022 14:32:32 -0500 Received: by mail-wm1-x32c.google.com with SMTP id bg19-20020a05600c3c9300b0034565e837b6so1599087wmb.1 for ; Tue, 01 Feb 2022 11:32:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=49llGIcUTgJBFjwDsRuayXX0Chj7UB+qkc+tnZISWh0=; b=txoqg5oDrlGlq/mxk692by0zNf7x04hs/CImsmQBZUYpyaRqAOgEdQ54JCJ5NnxLzM EeRDn78NG3OJRSrUlqMV3oiPoS5uFbDU4lnLQeBQwD0DJi88OToqnrKgi8X6yE3GNZoS wuyRXbe8MkXxzCtQ33idu433HfKQcFK+PcGmlfNDceZblTf1xcsWFk6GpBofOq19E1Vi JpBOgXPRa9mjfRPHzIPMyCgrGFGbkFVdJzvz6hznYxDyW44tEY+wtnlULq6RMLjvv4KF AXB3iKfBHQ/mtEDIaHfwJUUYn9+JTnjFdAqLtScH6OD/sBzvF9fkXypFeyvyoHPTtZyq Hp2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=49llGIcUTgJBFjwDsRuayXX0Chj7UB+qkc+tnZISWh0=; b=4jcmQYE7pdbomQuuOOZiZNNeffxBXJ990yuegtPupKQxlIlGDqNj5tRbv2Vbp+ey9q hJ0PyiuGPIPrp1ZqDFDbzsI3WuKrtlJ3RyGT+4KjToraeY1XGAo/fPjLxhhgy7+plHYL 53ZByZB8ElMAbSUe75w+8cQUptXn20ia+jPN6cvzfFhpGv3VfUH2RDAToQZKZfbEIf8d Tt5x+ewjzj5/QldWZjt7+BbkiWfwDip3dWo4+qKHzdIpSZh0pEls/UZkzYB6I7ZsISRy ssUZy5SYUyAKSQdcp4KP3HYYLvjiIF8nS+tSKXBedqatYi2CBAVFimpSnDfG5RJ4nvuw dSsA== X-Gm-Message-State: AOAM530CkArGORW63x3zsfaRaUD0smRaH6yI+tRsOny0FhEGdV+1vTuc RgzVURyR2HnjvKgxkUYGbp254Bebz24afQ== X-Received: by 2002:a05:600c:3b25:: with SMTP id m37mr3082886wms.40.1643743935666; Tue, 01 Feb 2022 11:32:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id z5sm3491265wmp.10.2022.02.01.11.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 11:32:15 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 07/13] hw/intc/arm_gicv3_its: Avoid nested ifs in get_ite() Date: Tue, 1 Feb 2022 19:32:01 +0000 Message-Id: <20220201193207.2771604-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220201193207.2771604-1-peter.maydell@linaro.org> References: <20220201193207.2771604-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Shashi Mallela , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The get_ite() code has some awkward nested if statements; clean them up by returning early if the memory accesses fail. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- hw/intc/arm_gicv3_its.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 48eaf20a6c9..6975a349f62 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -197,20 +197,22 @@ static bool get_ite(GICv3ITSState *s, uint32_t eventid, const DTEntry *dte, hwaddr iteaddr = dte->ittaddr + eventid * ITS_ITT_ENTRY_SIZE; ite.itel = address_space_ldq_le(as, iteaddr, MEMTXATTRS_UNSPECIFIED, res); + if (*res != MEMTX_OK) { + return false; + } - if (*res == MEMTX_OK) { - ite.iteh = address_space_ldl_le(as, iteaddr + 8, - MEMTXATTRS_UNSPECIFIED, res); + ite.iteh = address_space_ldl_le(as, iteaddr + 8, + MEMTXATTRS_UNSPECIFIED, res); + if (*res != MEMTX_OK) { + return false; + } - if (*res == MEMTX_OK) { - if (FIELD_EX64(ite.itel, ITE_L, VALID)) { - int inttype = FIELD_EX64(ite.itel, ITE_L, INTTYPE); - if (inttype == ITE_INTTYPE_PHYSICAL) { - *pIntid = FIELD_EX64(ite.itel, ITE_L, INTID); - *icid = FIELD_EX64(ite.itel, ITE_L, ICID); - status = true; - } - } + if (FIELD_EX64(ite.itel, ITE_L, VALID)) { + int inttype = FIELD_EX64(ite.itel, ITE_L, INTTYPE); + if (inttype == ITE_INTTYPE_PHYSICAL) { + *pIntid = FIELD_EX64(ite.itel, ITE_L, INTID); + *icid = FIELD_EX64(ite.itel, ITE_L, ICID); + status = true; } } return status;