From patchwork Fri May 21 21:18:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luben Tuikov X-Patchwork-Id: 446229 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 B852AC4707A for ; Fri, 21 May 2021 21:19:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97ED4613EE for ; Fri, 21 May 2021 21:19:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229589AbhEUVUX (ORCPT ); Fri, 21 May 2021 17:20:23 -0400 Received: from mail-co1nam11on2055.outbound.protection.outlook.com ([40.107.220.55]:40612 "EHLO NAM11-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229503AbhEUVUX (ORCPT ); Fri, 21 May 2021 17:20:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0utOfG/1UK3Vsv3ruDydw+M2Qv1P0Fqa+/gUd1tLnhvKoEK4yjwTo7Fd9OePCv2Jmcc+DsZjVo2Q+9pTrVS4eqOa9p2pdVnduFct20FG6x/rkpdt0TGB9G5qTQvDoEXv2/2jg3DzQzZk3DlprKL+1PD4FLJsqZXN0X4XDNpgYSmyK4OJYR0zYDf9Lcf4U051ymD8o8nEPskRhTiyIiGBIF95mjS3wmVQiyfIx5WTOP51GOeL4eiCSPWr6hAPEf5Sh1sC9Iaqt8AlN2uKM//EIgyLH7GlH6sFpzn0+73QZlhQTjV7NPsR0sS5fzuxevArUPVQW86KdcgdbMypyiruw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=thYq2Esz0vf37i10TbZnnuX1JIJipYyS9YLuRo1m3C4=; b=QQ0Uk9XGtiMN24cw8ZGyd9ieoqv76+JA5fFQBMBk6zTf+x76m50hls106kOaoZwzxVwlsFNurGPq12vczD8OBBu3oHJZ8YtM3iNkZF9TJzndXaV1M44nrnD8KDbQFCSIqN5TwM52JFOUUUyTAejn/ERrBtiRcV/fiMRC2qHv0erXyIb28IWoZ2AInhuyRsSOGzYlrsbfamtQeun6q2PLd8nVkuxah/LqJuSVNt8/JgRU4VEAHZQ9nucU0HR/NLRJP/EsY+EI0tPNsDNLrMqZNHT+wQX/19pbAW2mhlFGRNCFH9ksZq67S1T5S2J03bOa1gbqahN9ejGzSzsoj5eMlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=thYq2Esz0vf37i10TbZnnuX1JIJipYyS9YLuRo1m3C4=; b=vW+a3cTabr4fKVxoOEdtq6C0zHAszkQB/ZCAPzKjOwteWyd3EPVUiWRcnmcVUvynz15dZBF8Fzbb/b0Sw7+pf6+5jg/DNU8eC9P5sljhU05UbTHST2Cl9oqv31QjrR9U3WVD4M2XMw/v61OibbM634cK93FhBj/SoqtUkrY1TnU= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=amd.com; Received: from DM6PR12MB3962.namprd12.prod.outlook.com (2603:10b6:5:1ce::21) by DM6PR12MB4516.namprd12.prod.outlook.com (2603:10b6:5:2ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23; Fri, 21 May 2021 21:18:56 +0000 Received: from DM6PR12MB3962.namprd12.prod.outlook.com ([fe80::142:82e3:7e9d:55a0]) by DM6PR12MB3962.namprd12.prod.outlook.com ([fe80::142:82e3:7e9d:55a0%6]) with mapi id 15.20.4150.026; Fri, 21 May 2021 21:18:56 +0000 From: Luben Tuikov To: amd-gfx@lists.freedesktop.org Cc: Luben Tuikov , Alexander Deucher , stable@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= Subject: [PATCH 1/3] drm/amdgpu: Don't query CE and UE errors Date: Fri, 21 May 2021 17:18:34 -0400 Message-Id: <20210521211836.4839-1-luben.tuikov@amd.com> X-Mailer: git-send-email 2.31.1.527.g2d677e5b15 X-Originating-IP: [108.162.138.69] X-ClientProxiedBy: YT1PR01CA0085.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::24) To DM6PR12MB3962.namprd12.prod.outlook.com (2603:10b6:5:1ce::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (108.162.138.69) by YT1PR01CA0085.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.31 via Frontend Transport; Fri, 21 May 2021 21:18:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42bcad78-58d4-4a54-aab3-08d91c9e0ab3 X-MS-TrafficTypeDiagnostic: DM6PR12MB4516: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g/O0nDEEG1Hghi6eP1XGxaeCDsaZU1P+Ul99pIWuBlN+dWtHoA/01880nHqeZvObXix4IobfI6Su9pQ92cFtl8ygrEJ6H79bOWX55d37s/Umms4YJ9/wK3Ki98PoOrxTYmT6KHtQv+wWjxfHNnKzKQTTHYVhpD8b/ykxzEzAhWw+1xnk4m6P7xf6YRyLgz1lxl9IPHVJNGRBEvfjd6clxA/1+rgshHYe6IPeWsq69yRGliQtiCgdUT7TKmuOWB+tQOuU0BM6P8pKiowb/ivx7fL2kA8E3x98PQ5CoRJaTDZ8A4TlKwlNMC7EErjQoJFETM9TzcDooxdwHsah6JmP6Azx1tdXTp8Ci4EsZYMfbkgtudPZAXUh9JfrOHrVmY3W6BarBloZMdgdjtRvKvPaILNv8kT7vkLuNAjueS+Bmi2hqAxwrazHtqWjqG77X96kxekHcZgVeMCwFPkmpbMaYEwlkt5svmbRfA6QA2+8olVD+ANfdGx4X7k5Mu2/Rjae2j4KXQKpXoii4nbTz4wChiymYnskL9TBpLIHcUys6kUec4QbsT4Smkjv7mV/hwjAqKBYzP88yg3GVxS3vg5p0dU/crUhcD+GyDn/8shAqPNxDxVknrmnPE2jEFtWTP8h2CzeqYucG1MK8nILl3tZ1g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB3962.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(396003)(376002)(39860400002)(136003)(8936002)(2906002)(8676002)(6916009)(1076003)(66574015)(186003)(54906003)(66946007)(26005)(83380400001)(66476007)(6486002)(66556008)(6666004)(55236004)(6506007)(6512007)(316002)(38100700002)(52116002)(38350700002)(16526019)(2616005)(956004)(86362001)(478600001)(4326008)(5660300002)(36756003)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?GiK1JK3DPzQsf5CgOMDGFyvzzL5?= =?utf-8?q?udLYl5L+dild8xJeupZ7uEmWt4o+RKo9pcE4bPJrbdU73+CWKhBpTiTB?= =?utf-8?q?vq9L2VeB7w5WV858POhyX2TbthOxkT15XrKp6vq7Pviqq1T0dHWDXDuw?= =?utf-8?q?C0LBC3AhgUjQn2jhP6T3jIXqfJq3jAkycMush1jJW1vNCcydlQ3weyih?= =?utf-8?q?CkF3yx4PmvTvj98fTALhEPyNpPjXkxvE7z6zuh8dZdD1Cmli2yrEPDPK?= =?utf-8?q?XCJ3wY/KBkkfkNusTGy/ScD9ONKPxXyLie4imz2vOefOhZSD1JNjz8rq?= =?utf-8?q?zj2oqk4IouEEM3cyOxh+73JH35Tl53EM80MaOueJY2l0OPtg/BICGqFx?= =?utf-8?q?TLnRI8IlELrsDBIe5eQy7o8HXIU8su4nvXggeCDzyyCDt3YVFmH0Otyh?= =?utf-8?q?kIMEtW7dNjU1quHnr/nurAKRHMOUvNk7FuQAKsGAX4vW4EY7MaYTCh/F?= =?utf-8?q?Gv1rnPHxswzQ09ykM+fI2752DZBliE0KPRmD9a4E+Ad0betBGZPLdAjp?= =?utf-8?q?gVHQYjcQ+sU8ma2tW3W/3uk1jk7c7o3w8uh4I61uO18pUq5mf0bBPTEj?= =?utf-8?q?0HOegMLx7vDsSuYTUS+egt4Ecq1XLRJkvId9/FoyvwQVY7O+FsJAhUFU?= =?utf-8?q?rgmQsEQH2gVtETsEWmySLfIT7iCCt4THeY97mzj0yeKmUDml4Hr2dqlO?= =?utf-8?q?DjvHmxuKkz49RiqzVVFyOJd6O7Ps0IeUzvM3tHyH6Ri7n2GgZ/x5wTVk?= =?utf-8?q?Q1kSVlU9mXmwvbyANjnKYM/J0b16pdNo+EDjQAoVDkYJBv0LT/h747wE?= =?utf-8?q?uXBXFLzHtOWWIpgUvpcMoeET+IGVvEQbSRexY3ugHNzQ3yNOo8H7fVLw?= =?utf-8?q?KrXKhpM7oSbKNalX4aAx5MG+WiPIZ5ye6Q9HCkC4NnnruJVPbZy9+i/C?= =?utf-8?q?v81hoXCQsgIsqNQjzBpHBsvu5Bi0XZD1Dw5nANLejcKI+F0uFLVSB7QM?= =?utf-8?q?BwQLbDWEmEIpvb90T4UYwMZ7BtzuvYCJZ8nLag87+99VAfmgTxjtcGwX?= =?utf-8?q?KJrcLNgJ4mh1pajzFnWI9mdsBKsg4PorPlaNTGUqPGLBUpT/7JAc0mRG?= =?utf-8?q?T3/4mPa0Tg0LD7WqiEE18l6KZI/RBAZOoxTLSRNkB88MmjZPaTCyNLck?= =?utf-8?q?jr/FvQZ5MenYAJ9OVOcgK7PH0MckvQPLSfWZpH8AzqbpPtkGjdHS7RNS?= =?utf-8?q?cuq2ZBAaX3gGJ8MJEziNtwi2l2XLyia4SvcPWUz6Hv+2D7DTithlKJao?= =?utf-8?q?/+bs4+gvODSYVskYK4548AHcyBY3fjYzyue/8P6iMhLUK4Sq9r2MdjWj?= =?utf-8?q?Bli50zlMfBOjz6znLs7niWlfDNKyl?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42bcad78-58d4-4a54-aab3-08d91c9e0ab3 X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3962.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 21:18:56.0922 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wZzw2W7S+GSKzq4uc93fyDXpsx4sj5O2AD0XhEIZ26bXoOmd4o0FttOjiiWfbOwW X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4516 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On QUERY2 IOCTL don't query counts of correctable and uncorrectable errors, since when RAS is enabled and supported on Vega20 server boards, this takes insurmountably long time, in O(n^3), which slows the system down to the point of it being unusable when we have GUI up. Fixes: ae363a212b14 ("drm/amdgpu: Add a new flag to AMDGPU_CTX_OP_QUERY_STATE2") Cc: Alexander Deucher Cc: stable@vger.kernel.org Signed-off-by: Luben Tuikov Reviewed-by: Alexander Deucher Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index fc83445fbc40..bb0cfe871aba 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -337,7 +337,6 @@ static int amdgpu_ctx_query2(struct amdgpu_device *adev, { struct amdgpu_ctx *ctx; struct amdgpu_ctx_mgr *mgr; - unsigned long ras_counter; if (!fpriv) return -EINVAL; @@ -362,21 +361,6 @@ static int amdgpu_ctx_query2(struct amdgpu_device *adev, if (atomic_read(&ctx->guilty)) out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_GUILTY; - /*query ue count*/ - ras_counter = amdgpu_ras_query_error_count(adev, false); - /*ras counter is monotonic increasing*/ - if (ras_counter != ctx->ras_counter_ue) { - out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_RAS_UE; - ctx->ras_counter_ue = ras_counter; - } - - /*query ce count*/ - ras_counter = amdgpu_ras_query_error_count(adev, true); - if (ras_counter != ctx->ras_counter_ce) { - out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_RAS_CE; - ctx->ras_counter_ce = ras_counter; - } - mutex_unlock(&mgr->lock); return 0; }