From patchwork Thu Aug 10 19:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Almeida?= X-Patchwork-Id: 134190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp646402vqi; Thu, 10 Aug 2023 12:47:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6l7kQI8bRppySY5Fk4w4U7bB3de6g/mz5kpSGLetfwQfApqu89/KQTlbh4wqJ2JUF2lKQ X-Received: by 2002:a17:907:7858:b0:994:1eb4:6896 with SMTP id lb24-20020a170907785800b009941eb46896mr4347740ejc.25.1691696867895; Thu, 10 Aug 2023 12:47:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691696867; cv=none; d=google.com; s=arc-20160816; b=yq9d4OIRPi35LW8cPqr6eiaQkUtwbKYSXZMlBu6VTTAFH4c96VHc78TZcPJl//6MBW iJiICoGxajHbLNTcKApY1zva3ySZiUEAMCmHMUU8ZIDFc9+dvUAAzGlj0soHBBsnjq7X VCSvopILU4oFI3eBE9Y2Pzwsno2bg67nMkjGeo1t2YUidDiqtBiItcBiUkEgVEvFgWjB LkhyFsQzYyfbzY1fyHxzp6Mu2FrqPhJ4GS4/LvADsDmglqx7dMHakK6Si2xpVGfqddVU 3T3G+kGA0H5bVUe2YrOIBUm/ZSaHHCLPGCMaeB6Ma4HBfHE9ybgQ+HwO9beJe12skHsb J9ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dcuRWjKEibu5/0vjSaykxKjeqvQgt2SPzDx/e4NVNvc=; fh=4drWZfXh6M/zU5TbzJpAHkpGJffjB2tpWVKmXKr8SAQ=; b=wYDdSdAkUW8Xri9Yamtjyn9UwOTn7DSS/NtHEf8GKJrSJoiCA+fSHPcB5U3I+waHiw Qxub93q1D/wZlSqrCFjKeCZEQsR7PlRfUUFhKnMW+HhwX2hm588aiD0f0irKBhYD51EE Uk3souUd4ZeWAQNaTqxgz+uwfMoFUJ/Mj1WicyKUn/vWsas4sCSdlTcj/KLe7aGwoZdG del+fkjnBMulFVZrChZss1zutr+sVKNCjldO78MkLV9iwHl0bcXQKTTjVN49vtTcL49f GkcNJ/DcIu0tnU2jWAp7Rsq2Bff5Rxpp2DYmWQFNDw+C00YNUw0JXyTKlA29Ix9NwgE9 nLXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=XqtCUJC7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p16-20020a1709060e9000b00992d6e88081si2025736ejf.956.2023.08.10.12.47.22; Thu, 10 Aug 2023 12:47:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=XqtCUJC7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236373AbjHJTYF (ORCPT + 99 others); Thu, 10 Aug 2023 15:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236464AbjHJTX4 (ORCPT ); Thu, 10 Aug 2023 15:23:56 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75C0530C1 for ; Thu, 10 Aug 2023 12:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=dcuRWjKEibu5/0vjSaykxKjeqvQgt2SPzDx/e4NVNvc=; b=XqtCUJC7LDhNyQMtH8Jj9RzZ18 WtDOO7H0+xFyDiaruEhXLmN8wER5+9/ifQLTZt1F6EeP385ZQFuBDwdscfJjUqgjqazyHXyPyUYMF ljNui/3agCH426yetDYS+HYR5VmlWWkaBRhihcg0KsnbD8AWULVbp+nvx9y3fMRpyaWBM03KjI0yc iYVmibZpeD47K2R3Y39YKSt8OPg5VINi+T/wJ3LHmrVYgue0XE43RKVCfABk3+KX13IdDtAmeSpBG gYcMMtsFgCWdgqBcAYKSQu00nd8zMbDYXu4ALs2rH6c8/EQgVrhiF9gXvc0K8Y/GgSQrzfH+Z/yjc yIK3ZPlw==; Received: from [191.193.179.209] (helo=steammachine.lan) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qUBGA-00Gp5H-VE; Thu, 10 Aug 2023 21:23:51 +0200 From: =?utf-8?q?Andr=C3=A9_Almeida?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: kernel-dev@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, pierre-eric.pelloux-prayer@amd.com, =?utf-8?b?J01hcmVrIE9sxaHDoWsn?= , Samuel Pitoiset , Bas Nieuwenhuizen , =?utf-8?q?Timur_Krist=C3=B3f?= , =?utf-8?q?Andr?= =?utf-8?q?=C3=A9_Almeida?= Subject: [RESEND v3 5/5] drm/amdgpu: Create version number for coredumps Date: Thu, 10 Aug 2023 16:23:30 -0300 Message-ID: <20230810192330.198326-6-andrealmeid@igalia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810192330.198326-1-andrealmeid@igalia.com> References: <20230810192330.198326-1-andrealmeid@igalia.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773872735227689628 X-GMAIL-MSGID: 1773872735227689628 Even if there's nothing currently parsing amdgpu's coredump files, if we eventually have such tools they will be glad to find a version field to properly read the file. Create a version number to be displayed on top of coredump file, to be incremented when the file format or content get changed. Signed-off-by: André Almeida --- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c index b02b56193447..202c101772a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c @@ -192,6 +192,7 @@ static ssize_t amdgpu_devcoredump_read(char *buffer, loff_t offset, p = drm_coredump_printer(&iter); drm_printf(&p, "**** AMDGPU Device Coredump ****\n"); + drm_printf(&p, "version: " AMDGPU_COREDUMP_VERSION "\n"); drm_printf(&p, "kernel: " UTS_RELEASE "\n"); drm_printf(&p, "module: " KBUILD_MODNAME "\n"); drm_printf(&p, "time: %lld.%09ld\n", coredump->reset_time.tv_sec, coredump->reset_time.tv_nsec); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h index 362954521721..7b6767ca8127 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h @@ -88,6 +88,9 @@ struct amdgpu_reset_domain { }; #ifdef CONFIG_DEV_COREDUMP + +#define AMDGPU_COREDUMP_VERSION "1" + struct amdgpu_coredump_info { struct amdgpu_device *adev; struct amdgpu_task_info reset_task_info;