From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65F1637BE60 for ; Wed, 8 Jul 2026 07:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783496093; cv=none; b=HzvgU1BANPWl2csRMTj6KuuNc97zJD3QE4JsQuT8RWelJwiaR3JNDAYsZxqxdgaUEKwQDTQBG9yIDtIsnEuHxRhpIeP3ODrDq8dA9z6BBUJEJbRUzQOj3s35AiBrlwgx4Tzb9T153Rf4Doiix1a/MzV0CMHd9w8bayhDAyyEIbo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783496093; c=relaxed/simple; bh=6oWtNHJIX8ZXSEUh9zOCCJY6vMPSDw+rOtuluPWrrDQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bVw49uMbWhM7YVrBWFuLWP4fFXRvQqsyxAft2wsqV88n6snB0vOx/51UKJOmhxxHEal5nTf8CODS35NuXr4PyvYRJ+4qxh5qbrgE3MYB7ttIdrJ5wjeeBpMvf/VAE7GrjYsVM29jptNXCtDrdPC6/nQ49esXPzdfm9pHOig4jpY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AkoEKTqw; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AkoEKTqw" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2cac59f8b64so4602195ad.0 for ; Wed, 08 Jul 2026 00:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783496073; x=1784100873; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=QYyfRzVZfVK7y35yaNbampPDVaTcx8NzqBZy7M6l9p8=; b=AkoEKTqwaKGGU/4qiRoQfNb7DlVF2G35ALfBfS5V8R4iAO96vSbz2cTGWv7VCQvK7j 7KEl/1HInrj88xd+oyK7iGQ00fHC1WCHT6cOn5+84d/vmIsgog4LYT4x9Y78B1eYn7sZ Rf4+U20GzYIttwokc/8hib6HIWKOvZL4w66WGbpwbno52EixUsZj0ZuFJjb2qFmNN0d2 /k7E63FrDoCJoouGlab0pcRT9FpfblXqKg+/Za12js6awwmEJaHIo7BpZF9TlbSLIXdR nC7LEhziUUWDydhBEulqvNI2dDvHFZfLrtpFsTwVczNdEWa4Bo+iuM8vvAqgkwW/jbtO rMsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783496073; x=1784100873; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=QYyfRzVZfVK7y35yaNbampPDVaTcx8NzqBZy7M6l9p8=; b=WgS+hyEgLmrnqaMSi4skdrbUuZyYJtkypPO2Puy2QNGEe4J+5R2LClZvqAAkTwQyZc VLRWYXIA8DhkZ1nm3OJInXC1Vfp9yIsQySqIwDiglORBHFiBbcXXam63VX1o+DzuU2ov 7nBWwEBCsA0ycbSYdEMTCTYKnPtmLoHth6f8oespFOTEH4jpBFUp3/T03t4YobQBi1yq ItqRrbQZaktlQETr3nu7g4ZEVmRzo0bqg71tG7xc0Xl+ubCS7eUPW9EQWBLAcoDzpz9w eiegaGCjlGfhPyCL3HT7m6BhjDdUBIqvipMRIomwHHwnGQZnvVxz/+VJisksnkR5mBbd Bxfg== X-Forwarded-Encrypted: i=1; AHgh+RpABwv7VarfztuWJps/blE/HkiLUJaEDvD5JxNmA3pj+OSuer8tAVANyv4NdYbYgR7/k9gM0rziIYla44Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2avXJw4cXJtvP9r7tG2fnbl7f97wxxvT0oVuDX3vnx1UAfUpF Rj5ZSTtIKRnM5N7peRRU3ipDP+epHKe8evAAUzZiNxeUVBdUOGmMykNj X-Gm-Gg: AfdE7ckCS8dhDKdTd+Gd2CpcfxPQcNl9FLuGkeoUOrC0UgyxKhNHx12HuIVwBg8L8WM wKwEevXkKmsKjiN3YbWeF5qGtZk/kczSbvcKCRiOkzUMCsqK4WVarJKjms1LR6XkezrkI3aqv5S EtH79zPx8XqpSxRQaJiyg8YH7e+bcxJFl7Vqa2iM3z0Ada7uK3Zbya5SRk0vUgJ0WFsa/tXqJ6u 0t6wRnibs3G2bvV/GmsUcfNf+HpXPqVd336g6ScoVR4XmtLxZ83cfLOUt92yVviYPV7vbEioT/x tO+kq3p9krByil5UioVMJcLK381iqZ0AQ6ghTkNU4v2niFZlK+RCo/JuoX7n06LU1Q/prw3X6qX 2xcVXM3Zp/YN6GSdZ+Jgad4rlnpib2p5iA39+1N3iYdt9ThpXIj2QFswKUxufqmDP8TsABMwK1B iLlJ7aeWSWaw== X-Received: by 2002:a17:902:d4cf:b0:2c8:2808:3ec4 with SMTP id d9443c01a7336-2ccea37bd07mr14929815ad.24.1783496073389; Wed, 08 Jul 2026 00:34:33 -0700 (PDT) Received: from lgs.. ([101.76.249.46]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3d952sm23359955ad.61.2026.07.08.00.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 00:34:32 -0700 (PDT) From: Guangshuo Li To: Matthew Brost , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi , David Airlie , Simona Vetter , =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= , Michal Mrozek , Tejas Upadhyay , Matthew Auld , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] drm/xe: free madvise VMA array on L2 flush failure Date: Wed, 8 Jul 2026 15:34:22 +0800 Message-ID: <20260708073422.725186-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit xe_vm_madvise_ioctl() allocates madvise_range.vmas in get_vmas(). After get_vmas() succeeds with at least one VMA, error paths must go through free_vmas so the array is released before the madvise details are destroyed. The L2 flush validation path added for PAT madvise rejects some SVM/userptr ranges after get_vmas() has succeeded, but jumps directly to madv_fini. This skips kfree(madvise_range.vmas), leaking the VMA array on each failed ioctl. Jump to free_vmas instead, matching the other validation failure paths after get_vmas() has succeeded. Fixes: 4f39a194d41e ("drm/xe/xe3p_lpg: Restrict UAPI to enable L2 flush optimization") Signed-off-by: Guangshuo Li --- drivers/gpu/drm/xe/xe_vm_madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_vm_madvise.c b/drivers/gpu/drm/xe/xe_vm_madvise.c index c4fb29004195..246fe1843142 100644 --- a/drivers/gpu/drm/xe/xe_vm_madvise.c +++ b/drivers/gpu/drm/xe/xe_vm_madvise.c @@ -643,7 +643,7 @@ int xe_vm_madvise_ioctl(struct drm_device *dev, void *data, struct drm_file *fil xe_device_is_l2_flush_optimized(xe) && (pat_index != 19 && coh_mode != XE_COH_2WAY))) { err = -EINVAL; - goto madv_fini; + goto free_vmas; } } -- 2.43.0