From patchwork Fri Oct 25 10:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Karas X-Patchwork-Id: 13850517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C261AD0C5FB for ; Fri, 25 Oct 2024 10:57:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 53E0F10E2B3; Fri, 25 Oct 2024 10:57:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="QJWjC/Bl"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E4DA10E2B3 for ; Fri, 25 Oct 2024 10:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729853868; x=1761389868; h=date:from:to:cc:subject:message-id:mime-version; bh=P7NeDjCRks1p9Wuk8P7MtYKA0aQnbd1yoCu1hY3F9+8=; b=QJWjC/Bl0G3l/b8ogsSc84DJcLcPdzCw5XAtZ3CxuIA9iQEM8KgJjO6H RjIvsLqdAxb30C6nsMee6Mbfmrb7rJ9FQVwzRX/x4N35xGUh0SW23T4B6 03on0iGYLFSvRRqqfHNj+30UhLHFci4I/AtpNslY9njPqyHWtMzcLGB24 lPEr3eKXGMlWtqRGaH8j6DsxYMcXlKv8Vv8+UstxoeHLVNlPkLoSRHK4i KIV+OFSHwHc/NcQYxYc33KfTEBWpadIe/+CAr58AbaQm+z10Fljt9/HEE teiXl+S82N6iKRxb29tYDd+snW5H5ChRTQqKRmwKcFdV355jG/YR0WzEK w==; X-CSE-ConnectionGUID: qGrp9E5mS4awjF/r/gSZsA== X-CSE-MsgGUID: m0I/Il23Q3mD+iyj+99JjA== X-IronPort-AV: E=McAfee;i="6700,10204,11235"; a="29737357" X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="29737357" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2024 03:57:48 -0700 X-CSE-ConnectionGUID: 1rnQQ2R4QwCP7X56bRLnZQ== X-CSE-MsgGUID: TGW86kMsRZedqVZ078hioA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="80991299" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmviesa008.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 25 Oct 2024 03:57:48 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 25 Oct 2024 03:57:47 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Fri, 25 Oct 2024 03:57:47 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.174) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 25 Oct 2024 03:57:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bFFWZFNY31qmzXtEMozC5DMQ7SvhwrLyPm4jP06HyOxlXT5zFVUGnyIgIfrqryrRxKrdSPo0/WgyL3t5lejUB2gSbJgoRAgaYxm0AZJ4GMrA0RBpIAtNwo9EEX9qbKq/0tHqhQ9PvfZrL20sthgwNBlDarnG28p2oguO3jVGLd0dmxvVXKCw2S/CJLaCDyz5TuV0b5yw0OVjYzCT0ltBTcplluQ24uqImcMxlkq4dcibxGpH2n65Ztq1impSJsb8kQHtyM5Ig154S61tDguRmY8fD4W65c2mB/2B7cLYP9LFbbLecJtGJe5Zugc9CAe1Xcz7spK0L69etAgpRQOgwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fXxGEvmgtISJKNuGVOOjAKlO3NulIfMw2hULu3FzLRw=; b=T9mNurNXPK1meVsPnLDp5QxYAWfTn4K/AeWfKZmaNEsM1q7rqSx00DYNDowhza2t1votPKSzyanyGOP56rDuo85HJN02Oi40lK9FiIA3bZVmS/uFunN3kUZd/FBSsLEytaRHoScCp4/JA4nYjJDclgBcam4cyOyBkeW0esN7CcXIp1is87EasLVlJRURjt98Pg/XLhv10fDC3cgJzHCla2QIPh+kcehHFv4eduvgIo4eAr8uZZH6RHa6SB1Zo0OykdEdMKLON+zvr8u6UhB186IX4VI1rJBR2EUW1XJJ8BksgdmnlTrhrJTamJM/pZoyMNtX+RpRkvxihufIJRXhKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from CO1PR11MB5057.namprd11.prod.outlook.com (2603:10b6:303:6c::15) by CH3PR11MB7769.namprd11.prod.outlook.com (2603:10b6:610:123::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.21; Fri, 25 Oct 2024 10:57:45 +0000 Received: from CO1PR11MB5057.namprd11.prod.outlook.com ([fe80::4610:6d6c:9af6:2548]) by CO1PR11MB5057.namprd11.prod.outlook.com ([fe80::4610:6d6c:9af6:2548%7]) with mapi id 15.20.8093.018; Fri, 25 Oct 2024 10:57:45 +0000 Date: Fri, 25 Oct 2024 10:57:35 +0000 From: Krzysztof Karas To: CC: Andi Shyti Subject: [PATCH] drm/i915: add GEM_WARN_ON to remap_io_sg Message-ID: "Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316" Content-Disposition: inline X-ClientProxiedBy: MI0P293CA0013.ITAP293.PROD.OUTLOOK.COM (2603:10a6:290:44::18) To CO1PR11MB5057.namprd11.prod.outlook.com (2603:10b6:303:6c::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB5057:EE_|CH3PR11MB7769:EE_ X-MS-Office365-Filtering-Correlation-Id: e94f17e2-a849-4fc2-5152-08dcf4e3db1a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?+OdAa81g+O70J9A5lRvxFzIdws0qs95?= =?utf-8?q?9MzSqNPPZzlk7OHyfav9dkCZ7m+luxzNUOEi21wnw79o9IVOyThrTAI/SVIR1qyL0?= =?utf-8?q?KDU6SAHDYTla76PAei2A18Dl28eUFepz9n+UCRs1cQlf7XmHIJyDNv6+ZkHyWCP5j?= =?utf-8?q?LQ1sKvz/SiBBTDF0e0vptdJmPnPpu1uERBCY7wHIaZwHrFCKL42LOA4mcXl+vvmgf?= =?utf-8?q?Cux8PFZIWw8cutKbbO1FmQyfNHf1icDF/WVe7OSPIrRF2jkIls1aYcIaC0F3hUVBH?= =?utf-8?q?AqBFKy9K6qV6b8pW7Rb6/vooYTcOx/yj82CxUgyQn3iZvTo9XT86z7Tnqwsa/NUWc?= =?utf-8?q?XmxATHQirSNrCeoF6L3v775tR4dGZmJmmujeceqF3GAYILMN99v2Gch9Pg3uC+gFs?= =?utf-8?q?9lfnGTbgJ1fym1sBqYANwGMvSWFC5Uxt5U/mSo2vAeyA6uXTkN67V/EAFExgqtZTq?= =?utf-8?q?ezesbKK7kFfZ1U+RtY+FwfGvkpwRqi1BCh6YP+3Opp57OxxaJukjrwOfdqgxSRMYR?= =?utf-8?q?2/Bw0NnsmVSPQ//R0drpAHTEH7BdiHIqUUR5f1RpFENKn+GM3DqwsQfMBeOSThXO2?= =?utf-8?q?mSLWmY1KeOkHKdVr2sYneAQhQZfDV88AaQx7FHSVabtxVX4tghiYmUZd2YAXgH7Ob?= =?utf-8?q?s1HMvA7gMNQaTGhMxd28n3WEHEglRDnpeuD34wZ270U5k1IpHsoAkm35mJ5aKbwJy?= =?utf-8?q?zJnzm0zDz0zSVK0URS4fdPyg3JwjRszEh6S7mrLaYhSh56UrtEbU1xykMxOYWA6tY?= =?utf-8?q?0jIvW3xhNp/HaiZXqfYDUZ7C9v4Q5q8UsFTiM2FGF0MMk0+0AQAz9+oIoK55WZi+i?= =?utf-8?q?lOwoKBjPJszhR1Ii/SWx54YauI1cRWVunT1B7LMSk1AyrOWlOUmHu7dRLhe+vg5B8?= =?utf-8?q?6RxNlxzkhlUQ/+AZ7+OrwLmFdPIrTVcEsUXPbyvGuqfF6PntdnoP0LOyfPkWz54i/?= =?utf-8?q?/Oy14PfTlhP5tzL/2ODfEct3hd/rKQRpd0U7XJU2Q71R6jNri0lS9rEVYjvjOJ06H?= =?utf-8?q?dKdKMhVGEH/hd/1oCjcWCIrD7by2SmaLyO2Hq8HxBbfcIYmHm6ZLDrCwo3yLViGh4?= =?utf-8?q?C/DraEm8yUlmPyHoUyFXo1Ds9wOc+BZlJaGq6A99e6QsteyyggtfZGi9bCDMFmKYX?= =?utf-8?q?A5yCz76djlWBqBYtk6+TmCjTFeaET2bqdSoR0NtakI8p/ah3UV1OOBpbxpE7jlY43?= =?utf-8?q?c4DsQ37uR7VAbkulilrt+1Z0HQaxgNfm7PgYZmtByikmY1QTIPYZa74cb351kxdCF?= =?utf-8?q?GMJ05u8s4IMm8?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO1PR11MB5057.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Kllznee8eLzWQPYTfA9PQyWrJSqd?= =?utf-8?q?ZZ7r0tRutc9f1FGThqtkDnQ0KhCtUxk4qtAqf8oXGWb2GQv7LH5zJ60/rxykgsePI?= =?utf-8?q?1KuiV+Ld26FhfqHaGNPEH7ab/pXKJgNvty0YVqyZgXQogDUf6LRoaxH+I3IXuKP9/?= =?utf-8?q?u9/wcGfYvUB3ravdyf4FGwjABYkUw+oWSzUPzBqYcBOEU2IcnJOR0Avw7yBqxMfuT?= =?utf-8?q?wbZ48nnm6e3UgjyrlRDeeWIZYl93mMfiQ4zhCKWbZtzmMcL0EwPsTEVgDhKLhD3yD?= =?utf-8?q?CD69PmnvPdLT/dGWRA179FGy/2oaLaVQWsL1gCR8+P7A6mXXtVMjITZs8CAknT36F?= =?utf-8?q?itxERdZYjyAKU5J694z2u+10rd1CXfE3s9nidIVMVXhNDlT/cM6yv2hDWmYmZip4y?= =?utf-8?q?XqUWCySWuoRZA/+xGJIaWiyCJm0GTNfaPzttYQabz0Use7KXcrozV+qcbOCGET8e4?= =?utf-8?q?Tq3j7Kj0a22/ItZhq8M1d//mMjUQDEll2V9Q3awFSGneC/NQXXvb2lInIb49sdJb+?= =?utf-8?q?pNujevKLVqPMdRHZfpFOR5XfPUFi1fMK39HbVrzOlzHZPQsirQaQshVmo/WdVqzpR?= =?utf-8?q?ywbApY+0mWOPDDURu8vcCJxVdI9ScXt70AhetuMrf0uBp9HLiq2jgB3BsHliWHDsZ?= =?utf-8?q?Z1fx/ySpnarnHzjn6dzivMAQAag083MssKAkbkaqAWlt/EnL0+Jvxh9cGDEbVNHgk?= =?utf-8?q?6LyBUF7O3sMYWKniToqefkhAs3zMMWiiZXhHKNbkF2n5PZcNZGB6j+5IhbbJqhE1Y?= =?utf-8?q?lQSON/s6wrpX2jlVnseikJ/wjR7xyfWGmx59e+I/gv9DlpKMfWmg4NFfFCNphD937?= =?utf-8?q?UVhoYf3bmFRj/PxvNatQyNlRK3EZ+TzQz5V4xuC7cUhVwCVuraTyo690c5UtbcmXf?= =?utf-8?q?bncHMYJziAGDSldHt0Wzl6D5qLKLtdga2kt7nVT09aatn2+P/9HS3z5VWfvk4BitM?= =?utf-8?q?i9LWZwGaKYF/iF+9D9rYRsX9TE4bpu/TQfEj6uNPIgFaAbV/D61sgBL3fXKLmkW/Q?= =?utf-8?q?WiD+ocHv0wtMj1bH1NZokQne1k+PEGR5oCJQqBpw9sHMuAR4EfDZEiDZMP2H6AV3D?= =?utf-8?q?aNd0f3xnHrroxm8hVR5HYop5J7jr7AJRe+OlBQ0v4X2AO5EHnZkO4JiI+yf/UuYu1?= =?utf-8?q?sbx0dIDWf9zSrFVP8FpoApoZzNis+HFZvcTgRAiXxCxtRb6me45gkGeematlJjEoa?= =?utf-8?q?7T31+J6YTn5t4/lu1rBUTEjZVTASRMJgr1FdaGdOTbkfyA/uVeiLvRzcQc2xE4+c+?= =?utf-8?q?8j3b8yKobxPVkI6S/p+dETb4gtVHSdC3+i2H+NKkAOaQNodGHwRJcXz6QJUwF85rz?= =?utf-8?q?FYKlC7TmYdJvdVwq59UvjuQCaV+pMoe74R8hOq6T/PVYrv3YCVcyDVPB655JMLQCy?= =?utf-8?q?92eNhPwZgnT7B8lRmDqOE6/iOGGT0e5IAaMIBkPhS+RJ2fXqPKQhlVCYMrNo/R+05?= =?utf-8?q?8UThwG/QLCgjqJlfLAmcd3X4gzSCLfaTLbqInEQzEAcqLSZlf8xTWLzuGvsNHClWJ?= =?utf-8?q?OeqY92je/M8Z0cMDJp0k5APMfafL9/vvEg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: e94f17e2-a849-4fc2-5152-08dcf4e3db1a X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5057.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2024 10:57:45.1505 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hzgsTGJ/f84nk0XgGeXZCo9rTwAysobQJ86spdnCX7/r03g7nnkeM8DtvJFz6ZBo7bQqiV7aOfKSYIsIeVrEOZPJsDPCKSatqC1VrrX2yvk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB7769 X-OriginatorOrg: intel.com 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Since we already have that warning inside `remap_sg` we can also catch this condition inside `remap_io_sg`. Signed-off-by: Krzysztof Karas --- drivers/gpu/drm/i915/i915_mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_mm.c index f5c97a620962..8a2779191f18 100644 --- a/drivers/gpu/drm/i915/i915_mm.c +++ b/drivers/gpu/drm/i915/i915_mm.c @@ -146,7 +146,7 @@ int remap_io_sg(struct vm_area_struct *vma, while (offset >= sg_dma_len(r.sgt.sgp) >> PAGE_SHIFT) { offset -= sg_dma_len(r.sgt.sgp) >> PAGE_SHIFT; r.sgt = __sgt_iter(__sg_next(r.sgt.sgp), use_dma(iobase)); - if (!r.sgt.sgp) + if (GEM_WARN_ON(!r.sgt.sgp)) return -EINVAL; } r.sgt.curr = offset << PAGE_SHIFT;