From patchwork Fri Mar 14 14:42:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikolaj Wasiak X-Patchwork-Id: 14016983 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 EAD12C282EC for ; Fri, 14 Mar 2025 14:43:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E3EE10E9F4; Fri, 14 Mar 2025 14:43:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="gCbzMeIs"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 802C310E9F4 for ; Fri, 14 Mar 2025 14:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741963383; x=1773499383; h=date:from:to:subject:message-id:mime-version; bh=QehHkMdcYuMbMIOCQFKiinqQpOFwHLuCpHXoMb+pLRU=; b=gCbzMeIsO0Zgc8aLkQQzpeFqAq1VMoLljyEiAd0McFluOUjyTVo0XFlI ZunNM6ZS4F/0Bx5YUhsYjNZBUousGL6feONO0fLUGs9l5EGC5h3h4zmLg kfvDhNS02M9vV9dZXLxtHLuMF8KTT/cVC7IZSyM3XfOw9ymxI1z6bv/+i uVu9ZHpZtcLE0wFNSb6QIsGpZVwaI7EdDy7ut09m2wpPlxaQK1jm+7uHh a1dwNBaMUulxw3oGAvxCc1lu+W4rU6yXlOh9brg2T68hbfvQozwSO3xVv dOQVL7IQ+phLKSdeJgzw1hfr2fs2SuPEQtTlF0iyKSAXPcT7eQV3CBEln g==; X-CSE-ConnectionGUID: N+g7gCtWSK64h7ZULe/6+Q== X-CSE-MsgGUID: nExE9TYeTVCnjlN9khrxCw== X-IronPort-AV: E=McAfee;i="6700,10204,11373"; a="42845963" X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="42845963" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 07:43:03 -0700 X-CSE-ConnectionGUID: Dqdg3TNpT4KRbEpOJgSFyw== X-CSE-MsgGUID: 742Fx2HBR7GTdrZ+3UDs4A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="126348159" Received: from orsmsx903.amr.corp.intel.com ([10.22.229.25]) by orviesa004.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 07:43:03 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1544.14; Fri, 14 Mar 2025 07:43:03 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44 via Frontend Transport; Fri, 14 Mar 2025 07:43:02 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.177) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Fri, 14 Mar 2025 07:43:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xetZqoDmmXBWaLSq2xUIVO87D2HpRwG/9ZFe2o3ta5fON9L0opxw7v3LIJkqlXmbSqArL8APxH10vW1AqlTcov6VXED6n6dGPdumWJYEMnxu9UxWD/+8NGT7gzT4p+no3dV9Wv4vj0Kl6OsGK01Q5NSX58wj3OFfNRi831nwzLl3B7uHcMIvl/YmuUo/nj05iEXNwGx6aIMWjvAD8ZgxoSkwG4NxMDzF4lrEM1zJgtX8xBshpH0C8X56KoC4TXHQ3w9uKDrPy8tNr1BzlNWMnENWybxvvCCERWmquvOmA9XqZIm6b8AZoWDX4rvubtJVSqTZMFWvSsKPhbj+GtnLPA== 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=0+fDJTWuxTtnZ7BpHOHJ5Rq+4QIhGboEnw/XrtVGf94=; b=bxPvH0Ave3i+fsRHnS3Z2ji5VdJFjhxMRqPrdXgkAE4Y5HDZtdxzc6yx0wkfWe5JlqeP2AEzLyY1vc5gg3Q02oNTR5K8TzpC4HwRW5JPchKPtd1LoKnIVK+DD9AcFgDdS4fqTmZ/s0e9m03e1DPxQ+UO9fAS3YpS1F6kRWKdm5NJwCbGGDeMIXyEmm1NH+xEnNqScd76QuWT603xYIU8qu2qv1dsrANqIpMXCAL3OEDYl8S8LCXLa3C/soEUYf/Wtv4/auqqJ1KGaQFghd7+Xbvi5SXao13UP9XUbjcNA8bbs0HM4Zy/WySc/JtsOS4YbjDy2oT3ofutnj/SK6wzZA== 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 BL3PR11MB6409.namprd11.prod.outlook.com (2603:10b6:208:3b8::18) by IA1PR11MB7385.namprd11.prod.outlook.com (2603:10b6:208:423::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Fri, 14 Mar 2025 14:42:32 +0000 Received: from BL3PR11MB6409.namprd11.prod.outlook.com ([fe80::74e:6abd:bab0:3d0b]) by BL3PR11MB6409.namprd11.prod.outlook.com ([fe80::74e:6abd:bab0:3d0b%3]) with mapi id 15.20.8511.026; Fri, 14 Mar 2025 14:42:32 +0000 Date: Fri, 14 Mar 2025 15:42:23 +0100 From: Mikolaj Wasiak To: , Andi Shyti , Krzysztof Karas , Krzysztof Niemiec Subject: [PATCH] drm/i915/selftest: allow larger memory allocation Message-ID: Content-Disposition: inline X-ClientProxiedBy: ZR0P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::7) To BL3PR11MB6409.namprd11.prod.outlook.com (2603:10b6:208:3b8::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL3PR11MB6409:EE_|IA1PR11MB7385:EE_ X-MS-Office365-Filtering-Correlation-Id: 8400fa28-2e27-4322-c0f8-08dd630673fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?GZIcTcLGTiu2W+zmZtLgcO7X82pYish?= =?utf-8?q?Kt6n8Jb6G7i7A8w5sQ3L1tKQZsIzPsboVgg1lgKXIcnUHD1A922Kxc3OQ4K9vCmvU?= =?utf-8?q?hPGcW91UbV8M5vPbrverPU8AqJim1ojUbBarK2bHALrD+oPw02YDivqCUMSQQrIne?= =?utf-8?q?RvWhKd/eRrBLcf5RvwA+cDaj3PgCphmvB9pR9RcYWEaaBNldcNBolyvmwCkjQpaYg?= =?utf-8?q?jNrX4E5MXSmLd/P3Ae7DCG3oSC6lcDvEnKXGyOLrUQhDy6Mmh2UePDxvxPPvT8UX1?= =?utf-8?q?jAFCmWUfeFwrezi4znZE5MKjmDpso31s4Aa3/UNeqgVTeATB/gS2x7O82uJ1S5ckH?= =?utf-8?q?TUuZdxVvYZO5A/R79nLUcToRMqBxmvlv/qfDZ03CXSd8g9ivcveRGK3wHkJO0jDoh?= =?utf-8?q?I5iU1KHKNS/qPQDN7zALOc4Fd2S+NiHJD6/1ri+GtaE3dfyJeD1F4vKIbqZButl49?= =?utf-8?q?wlubqr/Avawn1Eimb7CzPiuXMuJ8Mxo47P2xWRNDRlt1SP+DtpfxQvFs1H9E4ATtk?= =?utf-8?q?qiaQxMSiAKhNhlsE7DEvhYBcEDb+S+1PHOEelx4CaaGmXfF8c+PSdwUxu1zT6/h2u?= =?utf-8?q?08q9KuMWz2NI8d1ZbNhuq651aWlDYiJgEaDFZqTVK169ZJhy2gGIg9NMoSKj3LmjS?= =?utf-8?q?HeMWbjuaoHBs28Qlgf1kpVF27/tj6obVN0Q7EtE+M+sU1MCTUBwJ6bAxz9jZVqV+i?= =?utf-8?q?rs5eG22sRN04YwRvXq8XRxBE/DOouuV/TJtot8el4BeD3rJBXbxB33yaBq1y40rs9?= =?utf-8?q?ZchouWsRBZ6C8HFOcvJSrDGKUQX//9eU5erJigQRbCv1t5sFxJA/B1uHrpJ7IL02N?= =?utf-8?q?zLMKelFc4tp+ODSD6AmYBdLyViaMw0LsCi9GuvrkMt26lsXQ6WahhInPspXRIegNO?= =?utf-8?q?P+ZwkaAnYj1x+IyjVlM2mkAjZ8QRPJQq1sA7YFcTSgrIoRqyE0CzJglwPrFsTq2LN?= =?utf-8?q?x/wRF885xjUanO5Fzs1kTianDCYrVIXt5cznPnqb/DyCg4Ax3WS8nYnv+EnJELFCg?= =?utf-8?q?x5s1ZJf47ES0BSBB/2NMt2J+NAhlDWQIborWRKDyspID5g0zAXkuQdejLcflYVlOs?= =?utf-8?q?hTSb6IK558LspkfcLK2nggFbmXcb/lqvb8QSB/dd964KUjq9+crkQjCAUpck1uV2f?= =?utf-8?q?ebFrxXGx+3OLd8m3PwRtsnbs4OI760WSi+by+miUbkYt/2Mnrip34K5RjyKQZvDB/?= =?utf-8?q?frYAuxMCKBOAyFVe/8ZrLP50kkpdpAQrcXypgYrbxfhYY/vaJ0xLGZYvgGFS0EVwJ?= =?utf-8?q?MS8+7sQdPuOTWyMlxUTJblbIrbEWKxrMSUw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL3PR11MB6409.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?oHiDHu7NWJeyLsg1vtPm05Km4sJ2?= =?utf-8?q?Uw3IK32oIp3e5XGlNJPhqrF2wwUn0bwniM2ctA3/yuEthNqxc2Tr3zH2SFi1lIRBQ?= =?utf-8?q?dmXHh0PdnEONOuMQRH8rZjmGld68hZw29sYi3/qGuu74H0zZGle/OOdV+otWIdabh?= =?utf-8?q?G/Fmv9YcZkupIRdWGsTZ46IqtDShUo7hKc6DYsvL1BSlB4/sqF5dEpZP6rS2MKwR9?= =?utf-8?q?MLOaucJftxe1YugLMu9cq7bCUIkxjXZs/YPNIQTBsKm6sxzxRqS3w4yx+0as4bd2+?= =?utf-8?q?U3qSM8WBdfl+CJSGPtFcgrKIDCB9Zx8wtzIs2sMYSWLDZdJlPN/dt7Q/T+KD16HXX?= =?utf-8?q?UJyloWZRMiqCsiQC86mcim74TvA/XiJ+0wqbFpXDlnyUg1vBElNT00MYfXiH3q7d/?= =?utf-8?q?hh9Ni5z6b4eYFzSP5GAvRKCcnqQcoqd5FpCh3FjMcLSTzNw6atX+sfaCErxDGQqI8?= =?utf-8?q?8PxjDV6LQ0SLkHSJPEvB0MQvE7E3DZUp1fyPa3nkUhm7PUWKv3TDIMP4OBzDiq0hV?= =?utf-8?q?D2X5/vcu9il6lBR0LLPDr0zmPbOa8byXXDwjC2nAkwvgFZj79061dDwJhaKBmWoGQ?= =?utf-8?q?LlaAqptX1KEMS/bA1I34ojDyPc9FNph1QxZUbRaik2t/YNQXsJucZtY8je4G/QZZ1?= =?utf-8?q?JDlz6J3LqXjGDQzenj2FKtFZxpCcVw8LirkkocGd60RdnP1wcxmckdr1U5l4vUBNT?= =?utf-8?q?azyf8Di1J3NwgLQV3PC2fL9fHo4cdgpA3Z9pW4PhiO1uvXmztjanvnTHTHkrWMxwf?= =?utf-8?q?9O+y+FZk/V/AdN4FJ6AS8LxMhDdkMzJdHpalcKP2r7gsj7avk5ClQdnAL1f5Bkz6A?= =?utf-8?q?p5gACAvlBRvwRb621/3ENKcO6sc2uZRdsfSeozPSN1COrZvvmR64IUtyojXHnlOAm?= =?utf-8?q?etBdivX3DI5JdJ7LccMRMXPfF64rDO7N+AkbSf+ude49tXzjtiijkRJ1FdACaXxN9?= =?utf-8?q?NLMfX9d4Gz5V90FmNGj2zv9Ly4b2F0PAsCSgv0fMssxwMI/yc9tEqdVogNRHFIYB1?= =?utf-8?q?Y06j2+B0jbJdp1ayscB6mP6tAzZazlEX+TTGf53f/VK2ZI6iGuPf+N3LB8rZWvPhu?= =?utf-8?q?WJTzoMfsQhOHNMiFlR2rB7OR2ZQtA02nKGFK6uRRMwFIheBoaeR1Z6XCfWLQDcHsi?= =?utf-8?q?pOz3TQlHE1R2D0caDFkyT/VhsCd40VQRe/TkNSpbfcwXJ1cfPaYLe8UEt16c7CNfu?= =?utf-8?q?mkjwlc6YWQi5KoX3clrsSokGni53IJoNk30kt1heO4hiDorIwDe59IXDuIL2zj5v9?= =?utf-8?q?3R/JoY5Gv784jh3qVAdwn2BjHbewWWkUm+w5uuWHhamj0+H06VS9g/GG8ltEiz/dv?= =?utf-8?q?FWPvcigreeON3rPZsfZ/dONg7hTeIAXQYLd6Neg6g7fHCFGzTvV0GbH6DdQtSPuO0?= =?utf-8?q?ywdnBzfFG2k6VtI5/LrvPSsBEhaAC4pV+eehOQ6uHs9RQIcvnKuuwVhBGuqSpRvtM?= =?utf-8?q?pAtXnNBN+4NPETyeATRSgytY0dSl9IJ3SHuOJ1RnNICfJillMwWzOQZDtgtcKUsOj?= =?utf-8?q?hSzZ9R1mhmycSAEQqXxSExYJqSowuhpVPg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 8400fa28-2e27-4322-c0f8-08dd630673fb X-MS-Exchange-CrossTenant-AuthSource: BL3PR11MB6409.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2025 14:42:32.4634 (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: kZLW7PQHJIM8VxQ5A1LFU9HP3nsx84SxNOjd8h1dj6EG7wjS1SOiJpDajqml5w+6kbwuQP9Lx3NbjHsVXc+cztUFZlueubni9F8CkIIQfxE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7385 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" Due to changes in allocator, the size of the allocation for contiguous region is not rounded up to a power-of-two and instead allocated as is. Thus, change the part of test that expected the allocation to fail. Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9311 Signed-off-by: Mikolaj Wasiak --- .../gpu/drm/i915/selftests/intel_memory_region.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c index f08f6674911e..ce848ae878c8 100644 --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c @@ -413,22 +413,17 @@ static int igt_mock_splintered_region(void *arg) close_objects(mem, &objects); - /* - * While we should be able allocate everything without any flag - * restrictions, if we consider I915_BO_ALLOC_CONTIGUOUS then we are - * actually limited to the largest power-of-two for the region size i.e - * max_order, due to the inner workings of the buddy allocator. So make - * sure that does indeed hold true. - */ - obj = igt_object_create(mem, &objects, size, I915_BO_ALLOC_CONTIGUOUS); - if (!IS_ERR(obj)) { - pr_err("%s too large contiguous allocation was not rejected\n", + if (!IS_ERR(obj) && !is_contiguous(obj)) { + pr_err("%s large allocation was not contiguous\n", __func__); err = -EINVAL; goto out_close; } + if (!IS_ERR(obj)) + close_objects(mem, &objects); + obj = igt_object_create(mem, &objects, rounddown_pow_of_two(size), I915_BO_ALLOC_CONTIGUOUS); if (IS_ERR(obj)) {