From nobody Mon Apr 6 10:42:00 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 690E63FEB01 for ; Thu, 19 Mar 2026 20:25:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773951962; cv=none; b=ZneTbZPRFpYlxFj8BiRMCrcQutkw24xNbmqeR/LBCv2DO4A6LvnmXfXg5SUY+sPQSpDGbVWo5jRJCZOXJIXD8b3UiXiDj290UFi0J93Mi/0XA3gClZ5agzkoyGBZvrjwGv5+MDDq3/J5Q9JGSQOh0Fy11BMBDtr/BhznV6avkrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773951962; c=relaxed/simple; bh=DuJ8GPWtRYe59JyQ0xpsGX/NM7LsTLaRAKg6Jd0tfj4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g2Hn5vQw9OfeiztzG3fiy1ZL5oDU87Y+4E6uJ5RuvthWL7+Mbf6bOLqRykUVdYRTUJbHQM6FSZegP93d9mepaTaKqdsVY9pai+Wc13giPQC1OOMt6/jE/V5QI/wTquIiioc4uJHnQW+ntKelWRszCFn4Kre9zba5OKXKEfHAObI= 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=eOjZCh+2; arc=none smtp.client-ip=209.85.221.50 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="eOjZCh+2" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-439bcec8613so990871f8f.3 for ; Thu, 19 Mar 2026 13:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773951957; x=1774556757; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y5xlpp3seHS2jHJVmRJ+q5QD0+MRQpYSw44Wf7oGTOI=; b=eOjZCh+2K+msWjeGh2booTgTbAHpUkkfPbRIy81aoWIWDkcjzFhDzkhFfQOY26nckt XQxiwSRYfcOyus2c5/8uVxCQWgX69MJCr1GVXWU4gjJZMDHt+UqD4vNCgllyp8GmPlAX cI6i07L/okZky9hpemkoc3whHNw2T8eCMw2P2hxVaA6j+3wphKVTVJlFLoDBrioWP3MG blXrUA7A0HKul6NPYHLlBLKbgQqJYYgghhjunA3jZ4jL9LM2M+06suHGQLe3x61r8GY7 pMknyYSD8Uc/UhrFr9Mhs9KU49S054++ozRnGkLdVewYCjN37RF7+ArNo9NwRifnfuK5 4yBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773951957; x=1774556757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y5xlpp3seHS2jHJVmRJ+q5QD0+MRQpYSw44Wf7oGTOI=; b=prUZWEsmio5a5mOsvRHRb4Cnh6uhNju67zX8pYgjE24eNJS93CTLUzVn+Pr7bt0BWT +WhavRUE/urruGnhMs8xIpTqoht7zNGhoLgyIeAK7hKiRY+cWqe/XJavWTNUts/C9/Tc i4dJetmoVBP7A/MUh/mQ1xHSz1oCdZAjWbzrv+fFCH3q8Fkq5k4AXre6xQicBqtE5Tyo HpF//SZNMdZBZpKnx0w2TUt1cnchbQHc7bSpiI8/1wMtpC3cYkcj9QPL/Ndif7LYyghu nWxzZofqvWRd7q/+gLHzpNIZ4+EcGHQV39yAb8imWFdoGlwktYglw/VzSaf4gPcOI0W9 P+1w== X-Gm-Message-State: AOJu0YzAdwwqNPoUmg2AsrEYscZ7/2mAvxp8fzYUTVVuG9l+TnKz+grw zqvAHUL0Bds847/O6vs3oZhUK0uVlUjOkhuGuseP9IWRLkn+MymUeXwrhgKXzXcHmuk= X-Gm-Gg: ATEYQzwFCiHD9oeaHQdXrBi8XTj5pvcr3ZHpVyNesVHLy+beEQcFog+DfI9aN83faJZ jYdbX8goXkaY8Y0tCiX2BUE4/notS8IAXqzAT+bGUV2eR8CHj9w+mekWVzThYT9eyXnHLvVZ2Nw hdJ/XSC3vWQsQozMhkNPiDoJ0bi6HtyVMbgdstSXxBgaEEEpzitrvhJASXLhoH7hYbydbME1izl mtHxmNO9C8DgirkodmFTKqmCrMcEQNKIWFwjpvsFyMGDUhW/ERpITEZr+h0ZNgAyBKM37xZRp+u m6djLSNGiFL68oN+S5wk/nLwO6VkD98maoJdjuV8gzXXQCBfLSaeYSjsKANktB96wAuR9Fuin2F CAoktwRLfbYwYosCTmAkHwefTPsTt8qmAVyCL+k+kpmRt1Iql38MwhOCCEFSFUIExVxDMZLOFFS +YsT+QlETHPAEkkzx/YFbvpbhGI+5wXC8MJInO1CMEipgGN9+7 X-Received: by 2002:a05:6000:26c4:b0:43b:4ef0:e13 with SMTP id ffacd0b85a97d-43b6424e18emr1338932f8f.12.1773951956581; Thu, 19 Mar 2026 13:25:56 -0700 (PDT) Received: from LQ5W56KC4T ([2001:8a0:672f:7800:e0e1:55cd:f0b:b1e5]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644ae16fsm1347544f8f.8.2026.03.19.13.25.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Mar 2026 13:25:56 -0700 (PDT) From: Eric Curtin X-Google-Original-From: Eric Curtin To: linux-hyperv@vger.kernel.org Cc: linux-kernel@vger.kernel.org, iourit@linux.microsoft.com, wei.liu@kernel.org, decui@microsoft.com, haiyangz@microsoft.com Subject: [PATCH 38/55] drivers: hv: dxgkrnl: Fixed dxgkrnl to build for the 6.1 kernel Date: Thu, 19 Mar 2026 20:24:52 +0000 Message-ID: <20260319202509.63802-39-eric.curtin@docker.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260319202509.63802-1-eric.curtin@docker.com> References: <20260319202509.63802-1-eric.curtin@docker.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Iouri Tarassov Definition for GPADL was changed from u32 to struct vmbus_gpadl. Signed-off-by: Iouri Tarassov [kms: forward port to 6.6 from 6.1. No code changes made.] Signed-off-by: Kelsey Steele --- drivers/hv/dxgkrnl/dxgadapter.c | 8 -------- drivers/hv/dxgkrnl/dxgkrnl.h | 4 ---- drivers/hv/dxgkrnl/dxgvmbus.c | 8 -------- 3 files changed, 20 deletions(-) diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapte= r.c index d9d45bd4a31e..bcd19b7267d1 100644 --- a/drivers/hv/dxgkrnl/dxgadapter.c +++ b/drivers/hv/dxgkrnl/dxgadapter.c @@ -927,19 +927,11 @@ void dxgallocation_destroy(struct dxgallocation *allo= c) alloc->owner.device, &args, &alloc->alloc_handle); } -#ifdef _MAIN_KERNEL_ if (alloc->gpadl.gpadl_handle) { DXG_TRACE("Teardown gpadl %d", alloc->gpadl.gpadl_handle); vmbus_teardown_gpadl(dxgglobal_get_vmbus(), &alloc->gpadl); alloc->gpadl.gpadl_handle =3D 0; } -#else - if (alloc->gpadl) { - DXG_TRACE("Teardown gpadl %d", alloc->gpadl); - vmbus_teardown_gpadl(dxgglobal_get_vmbus(), alloc->gpadl); - alloc->gpadl =3D 0; - } -#endif if (alloc->priv_drv_data) vfree(alloc->priv_drv_data); if (alloc->cpu_address_mapped) diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h index 1b40d6e39085..c5ed23cb90df 100644 --- a/drivers/hv/dxgkrnl/dxgkrnl.h +++ b/drivers/hv/dxgkrnl/dxgkrnl.h @@ -728,11 +728,7 @@ struct dxgallocation { u32 cached:1; u32 handle_valid:1; /* GPADL address list for existing sysmem allocations */ -#ifdef _MAIN_KERNEL_ struct vmbus_gpadl gpadl; -#else - u32 gpadl; -#endif /* Number of pages in the 'pages' array */ u32 num_pages; /* diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c index 8c99f141482e..eb3f4c5153a6 100644 --- a/drivers/hv/dxgkrnl/dxgvmbus.c +++ b/drivers/hv/dxgkrnl/dxgvmbus.c @@ -1493,22 +1493,14 @@ int create_existing_sysmem(struct dxgdevice *device, ret =3D -ENOMEM; goto cleanup; } -#ifdef _MAIN_KERNEL_ DXG_TRACE("New gpadl %d", dxgalloc->gpadl.gpadl_handle); -#else - DXG_TRACE("New gpadl %d", dxgalloc->gpadl); -#endif =20 command_vgpu_to_host_init2(&set_store_command->hdr, DXGK_VMBCOMMAND_SETEXISTINGSYSMEMSTORE, device->process->host_handle); set_store_command->device =3D device->handle; set_store_command->allocation =3D host_alloc->allocation; -#ifdef _MAIN_KERNEL_ set_store_command->gpadl =3D dxgalloc->gpadl.gpadl_handle; -#else - set_store_command->gpadl =3D dxgalloc->gpadl; -#endif ret =3D dxgvmb_send_sync_msg_ntstatus(msg.channel, msg.hdr, msg.size); if (ret < 0)