Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3236899yba; Sat, 11 May 2019 06:42:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPOnxv1s3XxJ8V9OqBtpo/dT/yAmvuKePhBtbmg/RNW2vXwru8uR9DRXoGtzjV4QwfZSNX X-Received: by 2002:a17:902:2e81:: with SMTP id r1mr4002147plb.0.1557582149460; Sat, 11 May 2019 06:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557582149; cv=none; d=google.com; s=arc-20160816; b=cGIUMErcGRFUU7wfJpQj8TNm11t6mLjN08eh0eZ6XE3eVcIubzmDUGm4zkUZQCJ9wx c5WnNIg+tv8jR7QWKACKx6QfGy8X+G3YRE81Q4NCl+eOH7MmM+y5GJxsUWPI3y7UIT5h ZiZ8LeERN1Wz1xRU7s7LAfu+MldwaGDN+ijlsUdobvkuhvwQPRz4LIrfOr/gfAnu6q2Z QTXbkEX4aJjNv0p/Q8UiBjcOP9Z5o/8s3FpPzOawycK33/C1vH3D4i3QvQdfVPR9KZ9N mAQRjicbkh8054xnKlr3xyDBGuZx+sAN7iWgQR9PQQzDljuT4kzmkxtfQFDv4J1I1CFP Qj+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=om+HgdwAcINI6Oq6ym1E6XmU+iF8TsnGtT0W1uJf3VM=; b=rkcIzMTLGaYMd3I8/dQNxDud9wynWduDCzWjEsHDMXMcEE4rbMtUZEVj2Xoed0votQ 0JhcdENiaXRe5BXmcokAlf+J287AoZTf3BiCM9t5jD9IG19y/CYxu5TNMaUyjzH4mNjD XjzqVVc74htmLLGERSrUga+a6OCsLZZNsabyHRXbyMwmqHTD8QmflTyDzr5e3PNN+XW3 J34/q3yME407bD1va/WOA2PwuNWtEZ2MxQoIJ3c5rUwrQUOYZL9z/9fHODJk94nkGnJf GDXKlmrJleeMs8mttGs4vcqgXWw9TkZvCl/6C08NAXevILK5u8X2vEg9xaHWkDZ0Tuh/ lXPQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t8si10565405plq.268.2019.05.11.06.42.11; Sat, 11 May 2019 06:42:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728588AbfEKNjn (ORCPT + 99 others); Sat, 11 May 2019 09:39:43 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:60868 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726147AbfEKNjn (ORCPT ); Sat, 11 May 2019 09:39:43 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id C77D2DB4F40640748510; Sat, 11 May 2019 21:39:36 +0800 (CST) Received: from linux-wjgadX.huawei.com (10.90.31.46) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.439.0; Sat, 11 May 2019 21:39:29 +0800 From: Heyi Guo To: CC: , Heyi Guo , "Thomas Gleixner" , Jason Cooper , "Marc Zyngier" Subject: [RFC] irqchip/gic-its: fix command queue pointer comparison bug Date: Sat, 11 May 2019 21:34:44 +0800 Message-ID: <1557581684-71297-1-git-send-email-guoheyi@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.90.31.46] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we run several VMs with PCI passthrough and GICv4 enabled, not pinning vCPUs, we will occasionally see below warnings in dmesg: ITS queue timeout (65440 65504 480) ITS cmd its_build_vmovp_cmd failed The reason for the above issue is that in BUILD_SINGLE_CMD_FUNC: 1. Post the write command. 2. Release the lock. 3. Start to read GITS_CREADR to get the reader pointer. 4. Compare the reader pointer to the target pointer. 5. If reader pointer does not reach the target, sleep 1us and continue to try. If we have several processors running the above concurrently, other CPUs will post write commands while the 1st CPU is waiting the completion. So we may have below issue: phase 1: ---rd_idx-----from_idx-----to_idx--0--------- wait 1us: phase 2: --------------from_idx-----to_idx--0-rd_idx-- That is the rd_idx may fly ahead of to_idx, and if in case to_idx is near the wrap point, rd_idx will wrap around. So the below condition will not be met even after 1s: if (from_idx < to_idx && rd_idx >= to_idx) There is another theoretical issue. For a slow and busy ITS, the initial rd_idx may fall behind from_idx a lot, just as below: ---rd_idx---0--from_idx-----to_idx----------- This will cause the wait function exit too early. Actually, it does not make much sense to use from_idx to judge if to_idx is wrapped, but we need a initial rd_idx when lock is still acquired, and it can be used to judge whether to_idx is wrapped and the current rd_idx is wrapped. Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier Signed-off-by: Heyi Guo --- This patch has only been tested on 4.19.36, for my NIC device driver has something wrong with mainline kernel, so I mark it as a RFC until test has been done upon mainline kernel. drivers/irqchip/irq-gic-v3-its.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 7577755..d14f3fbc 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -745,30 +745,30 @@ static void its_flush_cmd(struct its_node *its, struct its_cmd_block *cmd) } static int its_wait_for_range_completion(struct its_node *its, - struct its_cmd_block *from, + u64 origin_rd_idx, struct its_cmd_block *to) { - u64 rd_idx, from_idx, to_idx; + u64 rd_idx, to_idx; u32 count = 1000000; /* 1s! */ - from_idx = its_cmd_ptr_to_offset(its, from); to_idx = its_cmd_ptr_to_offset(its, to); + if (to_idx < origin_rd_idx) + to_idx += ITS_CMD_QUEUE_SZ; while (1) { rd_idx = readl_relaxed(its->base + GITS_CREADR); - /* Direct case */ - if (from_idx < to_idx && rd_idx >= to_idx) - break; + /* Wrap around for CREADR */ + if (rd_idx < origin_rd_idx) + rd_idx += ITS_CMD_QUEUE_SZ; - /* Wrapped case */ - if (from_idx >= to_idx && rd_idx >= to_idx && rd_idx < from_idx) + if (rd_idx >= to_idx) break; count--; if (!count) { pr_err_ratelimited("ITS queue timeout (%llu %llu %llu)\n", - from_idx, to_idx, rd_idx); + origin_rd_idx, to_idx, rd_idx); return -1; } cpu_relax(); @@ -787,6 +787,7 @@ void name(struct its_node *its, \ struct its_cmd_block *cmd, *sync_cmd, *next_cmd; \ synctype *sync_obj; \ unsigned long flags; \ + u64 rd_idx; \ \ raw_spin_lock_irqsave(&its->lock, flags); \ \ @@ -808,10 +809,11 @@ void name(struct its_node *its, \ } \ \ post: \ + rd_idx = readl_relaxed(its->base + GITS_CREADR); \ next_cmd = its_post_commands(its); \ raw_spin_unlock_irqrestore(&its->lock, flags); \ \ - if (its_wait_for_range_completion(its, cmd, next_cmd)) \ + if (its_wait_for_range_completion(its, rd_idx, next_cmd)) \ pr_err_ratelimited("ITS cmd %ps failed\n", builder); \ } -- 1.8.3.1