Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.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 BBB291D63E4 for ; Wed, 5 Aug 2026 02:46:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785897984; cv=none; b=Ps1TLv3wGg7ZhDpSLiXaCnE+yDEbNREb8QFRVKFlIIe1g8PONkJFb+ARnUaTj+vWCSI5j0We/NtjpXqUvmXelsloT9INq2UJS6jaXvZSbHo8tIsRwAH4jYkK0wiF0x0Ul1abUWJvjZjXsTElieyf+JclnCDKO2DAOFCgXJLTrD4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785897984; c=relaxed/simple; bh=kkkbWFEad2jCZkYx/BXO9OTl7dUc//cvAOhZQvgNBIw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=advfhaYlC9fY7Nwr0BQNdZAp7mAKzO4//koDK9Okgvp6ougQW6lhZwoAK/1DE/ngc1IVHzls7GftozwBcel+uxA/WZouBDROgIVMUbPPGlFdBsVECywMI5XzMs4ZgVVuGUgjjBoHIdr+A7ZgN0yGgUiSrQ/nj7wGaEk+PwC+wZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ATHtiKxF; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ATHtiKxF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785897983; x=1817433983; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kkkbWFEad2jCZkYx/BXO9OTl7dUc//cvAOhZQvgNBIw=; b=ATHtiKxFp8dOTbNWIqBW35IyHYdwmGw/nehP7p0gM7IcczCQQC4gWUFP rh5t6YeJ7Lt0zAWCnZQc8JRkxWRW9kKfQWcQlVTCHVZWHfcAiCx0PUBQV fJgZAAdW8n0yDmDJKNkSEu+mUpgNkG11anOCLz1tejrA1OO0AY4dhhLno hCmH4765GAjDcguuKGAkkgIP60t8cFu1LcoIdgVJWSpTvnRy1PtsmzJ7L d83dnuldCS7yPAftzBkTKVvliypEipJac0z6GtXHfLdiZ6KbttshWvgiG X+0f37fg3p2S02R4NkQ0L7cd5zUItxLuyHgZAU0a6BxstyMheqPw6GPhr Q==; X-CSE-ConnectionGUID: ZmxSpaxdSL+HSjWICbaJhA== X-CSE-MsgGUID: gigc49Q6T2iCqpFujG2FVg== X-IronPort-AV: E=McAfee;i="6800,10657,11865"; a="85586044" X-IronPort-AV: E=Sophos;i="6.25,205,1779174000"; d="scan'208";a="85586044" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2026 19:46:20 -0700 X-CSE-ConnectionGUID: Y9IQ9l33QdGN05M/JHytsw== X-CSE-MsgGUID: ofys0BS3QyOnkfhxbVtogA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,205,1779174000"; d="scan'208";a="265925511" Received: from orsosgc001.jf.intel.com ([10.88.27.185]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2026 19:46:20 -0700 From: Ashutosh Dixit To: stable@vger.kernel.org Cc: Sasha Levin Subject: [PATCH 6.18.y v2 02/10] drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists Date: Tue, 4 Aug 2026 19:46:06 -0700 Message-ID: <20260805024614.3406679-3-ashutosh.dixit@intel.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260805024614.3406679-1-ashutosh.dixit@intel.com> References: <20260805024614.3406679-1-ashutosh.dixit@intel.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [ Upstream commit e70086a3a06d276b4a5d9a2c51c9330c6cf72780 ] Unconditionally whitelisting OA registers is a security violation. Set RING_FORCE_TO_NONPRIV_DENY bit in OA nonpriv slots, so that OA registers don't get whitelisted by default after probe, gt reset, resume and engine reset. Fixes: 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support") Cc: stable@vger.kernel.org # v6.12+ Suggested-by: Umesh Nerlige Ramappa Signed-off-by: Ashutosh Dixit Reviewed-by: Umesh Nerlige Ramappa Link: https://patch.msgid.link/20260615224227.34880-2-ashutosh.dixit@intel.com --- drivers/gpu/drm/xe/xe_reg_whitelist.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_reg_whitelist.c b/drivers/gpu/drm/xe/xe_reg_whitelist.c index 47fb3e74b567c..5cb7e0e3a66bd 100644 --- a/drivers/gpu/drm/xe/xe_reg_whitelist.c +++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c @@ -67,10 +67,12 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { XE_RTP_ACTIONS(WHITELIST(CSBE_DEBUG_STATUS(RENDER_RING_BASE), 0)) }, +#define WHITELIST_DENY(r, f) WHITELIST(r, (f) | RING_FORCE_TO_NONPRIV_DENY) + #define WHITELIST_OA_MMIO_TRG(trg, status, head) \ - WHITELIST(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ - WHITELIST(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ - WHITELIST(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4) + WHITELIST_DENY(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \ + WHITELIST_DENY(status, RING_FORCE_TO_NONPRIV_ACCESS_RD), \ + WHITELIST_DENY(head, RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4) #define WHITELIST_OAG_MMIO_TRG \ WHITELIST_OA_MMIO_TRG(OAG_MMIOTRIGGER, OAG_OASTATUS, OAG_OAHEADPTR) -- 2.54.0