From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DCCD3B38B1 for ; Wed, 29 Jul 2026 11:06:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323202; cv=none; b=kLJVXHvhsbMsV309wABr9HmMzNrterRqYxhfCT5xac0ehZNljsD+hO3mYLsED30BC4asnjjVqlQE1kjHfxyz6ZoDwcDSZNNUag/TfxssuQZmS0TWHW63BZAKgtES8oFdv4nT1f6XGwF12hVIP3+7S06BxsDVyQrRTFL6UY105y4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785323202; c=relaxed/simple; bh=2kF1VjKwKW1nAuX+3of6fD0WPkQbNNdJ7Wac+MAEzEM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=i+bUbSXTg3QmqqBl7JB8PIhtYDA3Mqm51JhLXC+qIXPKKTDOe3bxKscMSqUzKZmQRuePcmVq+vepr7cuVYozcDz9IzzUpl885p/GtkXjelCGdjfHr5PhuQSVstWfZl7yd0+Y48rVZYttkc/mGfja58yUPMX4pND/IszxiFP3dTA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qrqpyZf5; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qrqpyZf5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA1731F000E9; Wed, 29 Jul 2026 11:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785323201; bh=U9lKo13AVW1H6Zl194cQatJUaC65GqkinHE2VWlOAJA=; h=Subject:To:Cc:From:Date; b=qrqpyZf5j3H4WLy28A4mBT/jyQe+9DilNC1EtJgMUXrSK3ejvu4a2oBJOeyMfEh+q z6gQJu/4XuhvusD9zb/2X9DhTh53Q2G+L8hUWo6gjeoKcmK6ItNzA8tDUl4OYZVCe3 BcQsZVyUC/W+REkvmI3ngPGntdri9GIhEIjfNnfQ= Subject: FAILED: patch "[PATCH] drm/xe/oa: (De-)whitelist OA registers on OA stream" failed to apply to 6.18-stable tree To: ashutosh.dixit@intel.com,thomas.hellstrom@linux.intel.com,umesh.nerlige.ramappa@intel.com Cc: From: Date: Wed, 29 Jul 2026 13:06:17 +0200 Message-ID: <2026072917-flatfoot-diploma-4c0c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 63ddb3ad08ff4e89c108499dfec5e9be5ddc25c9 # git commit -s git send-email --to '' --in-reply-to '2026072917-flatfoot-diploma-4c0c@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 63ddb3ad08ff4e89c108499dfec5e9be5ddc25c9 Mon Sep 17 00:00:00 2001 From: Ashutosh Dixit Date: Mon, 15 Jun 2026 15:42:26 -0700 Subject: [PATCH] drm/xe/oa: (De-)whitelist OA registers on OA stream open/release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Whitelist OA registers on stream open and de-whitelist on stream close/release. Whitelisting is only done when 'stream->sample' is true. 'stream->sample' is only true when (a) xe_observation_paranoid is set to false by system admin, or (b) the process is perfmon_capable(). This therefore enforces the OA register whitelisting security requirements. Fixes: 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support") Cc: stable@vger.kernel.org # v6.12+ Signed-off-by: Ashutosh Dixit Reviewed-by: Umesh Nerlige Ramappa Link: https://patch.msgid.link/20260615224227.34880-9-ashutosh.dixit@intel.com (cherry picked from commit f8e6874f46f19a6a2a0f24a81689f90641bb402a) Signed-off-by: Thomas Hellström diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c index 4bf4b1f65929..2dce6a47202c 100644 --- a/drivers/gpu/drm/xe/xe_oa.c +++ b/drivers/gpu/drm/xe/xe_oa.c @@ -37,6 +37,7 @@ #include "xe_oa.h" #include "xe_observation.h" #include "xe_pm.h" +#include "xe_reg_whitelist.h" #include "xe_sched_job.h" #include "xe_sriov.h" #include "xe_sync.h" @@ -885,6 +886,9 @@ static void xe_oa_stream_destroy(struct xe_oa_stream *stream) mutex_destroy(&stream->stream_lock); + if (stream->sample) + xe_reg_dewhitelist_oa_regs(stream->gt); + xe_oa_disable_metric_set(stream); xe_exec_queue_put(stream->k_exec_q); @@ -1885,6 +1889,9 @@ static int xe_oa_stream_open_ioctl_locked(struct xe_oa *oa, goto err_disable; } + if (stream->sample) + xe_reg_whitelist_oa_regs(stream->gt); + /* Hold a reference on the drm device till stream_fd is released */ drm_dev_get(&stream->oa->xe->drm);