From nobody Mon Feb 9 17:37:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641922780473869.0995695539533; Tue, 11 Jan 2022 09:39:40 -0800 (PST) Received: from localhost ([::1]:58158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7L7S-0007M4-La for importer@patchew.org; Tue, 11 Jan 2022 12:39:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7Kfl-0005CF-Ka for qemu-devel@nongnu.org; Tue, 11 Jan 2022 12:11:03 -0500 Received: from [2a00:1450:4864:20::429] (port=34625 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7Kfg-0007J8-9z for qemu-devel@nongnu.org; Tue, 11 Jan 2022 12:10:58 -0500 Received: by mail-wr1-x429.google.com with SMTP id h10so24085322wrb.1 for ; Tue, 11 Jan 2022 09:10:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c7sm11157941wri.21.2022.01.11.09.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 09:10:54 -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=77Xvvb93kRuq0kwxqLtAzTJqRqACUWX5HzdBepSqjy8=; b=fB1udekkew8p9fl1lMj8nTubohB41kthGpHkzhz96ijoAwJs56H5h7fvkBXnS86AGS dlVSZUn8jhIT1uHjjiZUR41Y0RgYtWE5xpufZbOyDnYt+j9aYtfQ677xzgKcR0BRgus8 dexklcYGB1CHJTIfXtPkR2mMaBK83LeHfPMU5PE5Tz+CmCrmuhBHX7qIT2ymJdJtJxbe nVLxbXlqGkL360D6GUzWrYMOn60gbnxJpOj46fP1Y1WzoIL1CGIEElNldKRZgHeKwW15 bfTm3W2brplHZ6ar3WA2NrxdntReNkCFkUfMNwE9YVS8wUnpxd51IcNCLKvnB70UeaAd YtGA== 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=77Xvvb93kRuq0kwxqLtAzTJqRqACUWX5HzdBepSqjy8=; b=Y2uSxxsXfjwE6MfrdxrDBD4t4sVYvhRt8E0g7rtjuGa8cXLIfkeBC0/og5+J+BKK/K XVVOIciFeRIegYJyCGlwmWkTY2v/i1lrlrbEIFbtaCssPDtDkxl+vc7ZlIpYrmPJ7Qo7 QO4vEshcuOQ40oKBnswUH/UhQVqEsRQXPOkO2YH0Y6QaNbMqi0Q8VaU2voSIe+UiN8wr i/Bktk3b7Y6D+CdLhaB9opMm13FPHhzrWd4Uf+wEQWP0C4YArxT8XCYVvBtA14zHMZEW RC1Tido0Eax1+GhhJcPDbqQHZ9nroTV5TgOMwQWM+xNgnAWQ9TduqTDgn/Bptov0J9wB OyKQ== X-Gm-Message-State: AOAM531SFJ3g6Ms01I/cbVdrsGYldew1+vSFsMo560p3MNekHUgsvhN8 UFH9C0X+Emso9kCUWk/wAqmziw== X-Google-Smtp-Source: ABdhPJznJ9+oka+YpbyoUZdjte7wkJrizD1mRILeW9z63s3EIZofOzDGmCeYJUH4ZWWHeoUnyMXnNw== X-Received: by 2002:adf:dd88:: with SMTP id x8mr4719929wrl.586.1641921055060; Tue, 11 Jan 2022 09:10:55 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 06/13] hw/intc/arm_gicv3_its: Fix return codes in process_its_cmd() Date: Tue, 11 Jan 2022 17:10:41 +0000 Message-Id: <20220111171048.3545974-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111171048.3545974-1-peter.maydell@linaro.org> References: <20220111171048.3545974-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Shashi Mallela , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641922782395100001 Fix process_its_cmd() to consistently return CMD_STALL for memory errors and CMD_CONTINUE for parameter errors, as we claim in the comments that we do. Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- hw/intc/arm_gicv3_its.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 10901a5e709..0929116c0fe 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -248,7 +248,6 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, u= int64_t value, bool ite_valid =3D false; uint64_t cte =3D 0; bool cte_valid =3D false; - ItsCmdResult result =3D CMD_STALL; uint64_t rdbase; =20 if (cmd =3D=3D NONE) { @@ -262,7 +261,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, u= int64_t value, } =20 if (res !=3D MEMTX_OK) { - return result; + return CMD_STALL; } =20 eventid =3D (value & EVENTID_MASK); @@ -270,7 +269,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, u= int64_t value, dte =3D get_dte(s, devid, &res); =20 if (res !=3D MEMTX_OK) { - return result; + return CMD_STALL; } dte_valid =3D FIELD_EX64(dte, DTE, VALID); =20 @@ -280,7 +279,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, u= int64_t value, ite_valid =3D get_ite(s, eventid, dte, &icid, &pIntid, &res); =20 if (res !=3D MEMTX_OK) { - return result; + return CMD_STALL; } =20 if (ite_valid) { @@ -288,14 +287,14 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s,= uint64_t value, } =20 if (res !=3D MEMTX_OK) { - return result; + return CMD_STALL; } } else { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command attributes: " "invalid dte: %"PRIx64" for %d (MEM_TX: %d)\n", __func__, dte, devid, res); - return result; + return CMD_CONTINUE; } =20 =20 @@ -307,7 +306,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, u= int64_t value, qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command attributes: devid %d>=3D%d", __func__, devid, s->dt.num_ids); - + return CMD_CONTINUE; } else if (!dte_valid || !ite_valid || !cte_valid) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command attributes: " @@ -316,11 +315,13 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s,= uint64_t value, dte_valid ? "valid" : "invalid", ite_valid ? "valid" : "invalid", cte_valid ? "valid" : "invalid"); + return CMD_CONTINUE; } else if (eventid >=3D num_eventids) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command attributes: eventid %d >=3D %" PRId64 "\n", __func__, eventid, num_eventids); + return CMD_CONTINUE; } else { /* * Current implementation only supports rdbase =3D=3D procnum @@ -329,7 +330,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, u= int64_t value, rdbase =3D FIELD_EX64(cte, CTE, RDBASE); =20 if (rdbase >=3D s->gicv3->num_cpu) { - return result; + return CMD_CONTINUE; } =20 if ((cmd =3D=3D CLEAR) || (cmd =3D=3D DISCARD)) { @@ -341,11 +342,10 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s,= uint64_t value, if (cmd =3D=3D DISCARD) { IteEntry ite =3D {}; /* remove mapping from interrupt translation table */ - result =3D update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : C= MD_STALL; + return update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_S= TALL; } + return CMD_CONTINUE; } - - return result; } =20 static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, --=20 2.25.1