From patchwork Mon Jul 6 14:01:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 11645931 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 680741398 for ; Mon, 6 Jul 2020 14:01:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4656A2070C for ; Mon, 6 Jul 2020 14:01:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=hardline-pl.20150623.gappssmtp.com header.i=@hardline-pl.20150623.gappssmtp.com header.b="PfeYfb6m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4656A2070C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hardline.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A97356E40A; Mon, 6 Jul 2020 14:01:38 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52B366E400 for ; Mon, 6 Jul 2020 14:01:37 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id h22so38337348lji.9 for ; Mon, 06 Jul 2020 07:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardline-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ARtxJHAmq2rLwO3GXVq96zy02FcId+bnZjHOsn5eodo=; b=PfeYfb6mSsHJzTT+h7GXB/e+xZPA00Id/jjwntw2zPCRTJg/i75N0w2JtWZtRENJik fVDlL7V43lZtClmzLOLVES4kOmk2ntjnDLfvFl4zrdPoAWtv/G7BQI4Y7SVpQjwY0+cr fKF+16/PufzqkPk/EYxEaLwkN47acW20XZWQ/1427OtnonYtJxiqc1URDn/BnDTKGj8+ nfDyGlTatec6wsh/+UoY7L0yM4owNW5CvVOUpqY6W/yZPLDURzRopeI+Bf7jlI9pisSN Yy+wWLQEgQTFE8tI0rFnexS6U8wsnB3yZ0Uh4pD07i1GmeRJ62nR9JgWS1IM+GkZb4QT AQYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ARtxJHAmq2rLwO3GXVq96zy02FcId+bnZjHOsn5eodo=; b=G5AcsJV+9k8XZbAD2k/8EBNeAm9D6WvJra26yFX/w3L40NhhATyvRO3oJmJDG2RC7J V2WYRT5zH7I4YKxq9CmnFg7dU6qPff5GQEPfsII5s/Jqx76Z9VY83HlPYLcTbncQKpaG YnsMBsdgbXqn0M0JNa4h5NRm6cBrur9NJehwyc9GpEcvo0sMINGb/D7aF8iTu1BRPe2c wQoQ06ov41d0vWgJTpytK5FP08f7Rogeex+NoQtLo2PEquxm9BtVo0bLEn934mwVE7Jn hansq1pGyZ5jDfBXlotMGSroPZq0KODDH50IZoV3vym5zxcGmTIJlRPUevxWpfvB+5Wm VkDw== X-Gm-Message-State: AOAM531p6ReezZW/PdhP0f/DOWFzhH3YOw0cDxE+s7knyQ14hjFe8DmD WGk7jqWgAhF/jcje4P3PNyPfawwlrS5KJw== X-Google-Smtp-Source: ABdhPJwriwDd/+DAxYLXbbYi05yFY50thgIcayUCNx5dQtGW/ASS/wINIkgnjxgzrPWuweAtJEG23w== X-Received: by 2002:a2e:91c9:: with SMTP id u9mr16899801ljg.147.1594044095388; Mon, 06 Jul 2020 07:01:35 -0700 (PDT) Received: from localhost (109241244009.gdansk.vectranet.pl. [109.241.244.9]) by smtp.gmail.com with ESMTPSA id u15sm7861294ljh.56.2020.07.06.07.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2020 07:01:34 -0700 (PDT) From: =?utf-8?q?Micha=C5=82_Winiarski?= To: intel-gfx@lists.freedesktop.org Date: Mon, 6 Jul 2020 16:01:25 +0200 Message-Id: <20200706140125.172844-3-michal@hardline.pl> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200706140125.172844-1-michal@hardline.pl> References: <20200706140125.172844-1-michal@hardline.pl> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/3] drm/i915: Don't taint when using fault injection X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Micha=C5=82_Winiarski?= , Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Michał Winiarski It is not really unexpected to hit wedge on init this way. We're already downgrading error printk when running with fault injection, let's use the same approach for CI tainting. Signed-off-by: Michał Winiarski Cc: Chris Wilson Cc: Michal Wajdeczko Cc: Petri Latvala Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_utils.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 82fada1e7552..d84c23592942 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -438,7 +438,9 @@ static inline const char *enableddisabled(bool v) static inline void __add_taint_for_CI(unsigned int taint) { - add_taint(taint, LOCKDEP_STILL_OK); + /* Failures that occur during fault injection testing are expected */ + if (!i915_error_injected()) + add_taint(taint, LOCKDEP_STILL_OK); } static inline void