From patchwork Tue Jan 11 17:10:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 531128 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3687447imp; Tue, 11 Jan 2022 09:37:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfpZvNMCeOeo6BKopBNGyyOvz0WETics8fdIDGHAAsWTzxZOQEwjNYq+JejF/Ww9TtJVO8 X-Received: by 2002:a02:a187:: with SMTP id n7mr3050839jah.178.1641922649365; Tue, 11 Jan 2022 09:37:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641922649; cv=none; d=google.com; s=arc-20160816; b=wcPBWKf3HVt+rsuhUSUhcR41bIozkZD4f9CLFSPXXBljgGyPn5MNVXqvHYsgRpXRSi rLqFunZTcR0vUAqvxf/p7DS3aJPyMRkT8uJzlRBGIh991hyTlepdbKVv8y8sFzLe1IZ9 qFwyzbtdCUmdvz9VdzRRQcW+erzw8mKvd+wYRks9CILpzZ7Us8s/IGmDWfkIfr1DUhCO xywbkaloK2L4yQ8ejwvVUqkmua3lVKFnMNOych9Iv44maiu5V6P657DAUUZbeDFEoBxI xb5uU34AqPqXgNlBtB8OlUa5tP+Yb7deTZ31J+2ApgLyFRmtlKB+zMa+Dbxhd7nylWa9 Safw== 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=77Xvvb93kRuq0kwxqLtAzTJqRqACUWX5HzdBepSqjy8=; b=sHFQMJjwtlA45P1FAHSUm7AkZZK5ZYGGJ4mWNB0+5nE8lw4V0XrdAlSuklNS+uFILl KLVlN7v0Mp4QY2em5J5tGsiMlloSPU/MQFHcknJ4QHOUxngo9OqT7cnM1PKkDh/nGf/Y eU6KVr9O6Vboq7bVOqMEeoPa33e70FUJt4L+WekzN42SkyiOA8gJ8ULyknkAYegzyVCE 8SCnyVvJImOo8Iz3C33IDXRrSq24WZAsYH43aqFRxz9sqNB9yTZ1uy9monyD0tShBzV9 pzwNJOHR42dI47FGDrY20kzDGt0egKPtyxYO9pPL0JqL06DY5hJqIlinyk0zvmltY2YT 2yoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fB1udekk; 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 r12si5083899ill.102.2022.01.11.09.37.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 09:37:29 -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=fB1udekk; 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]:54234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7L5M-0003p3-MS for patch@linaro.org; Tue, 11 Jan 2022 12:37:28 -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) 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-Received: by 2002:adf:dd88:: with SMTP id x8mr4719929wrl.586.1641921055060; 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) 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) 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_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée 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, uint64_t value, bool ite_valid = false; uint64_t cte = 0; bool cte_valid = false; - ItsCmdResult result = CMD_STALL; uint64_t rdbase; if (cmd == NONE) { @@ -262,7 +261,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, } if (res != MEMTX_OK) { - return result; + return CMD_STALL; } eventid = (value & EVENTID_MASK); @@ -270,7 +269,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, dte = get_dte(s, devid, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } dte_valid = FIELD_EX64(dte, DTE, VALID); @@ -280,7 +279,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, ite_valid = get_ite(s, eventid, dte, &icid, &pIntid, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } if (ite_valid) { @@ -288,14 +287,14 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, } if (res != 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; } @@ -307,7 +306,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command attributes: devid %d>=%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 >= num_eventids) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command attributes: eventid %d >= %" PRId64 "\n", __func__, eventid, num_eventids); + return CMD_CONTINUE; } else { /* * Current implementation only supports rdbase == procnum @@ -329,7 +330,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, rdbase = FIELD_EX64(cte, CTE, RDBASE); if (rdbase >= s->gicv3->num_cpu) { - return result; + return CMD_CONTINUE; } if ((cmd == CLEAR) || (cmd == DISCARD)) { @@ -341,11 +342,10 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, if (cmd == DISCARD) { IteEntry ite = {}; /* remove mapping from interrupt translation table */ - result = update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL; + return update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL; } + return CMD_CONTINUE; } - - return result; } static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value,