From patchwork Fri Mar 21 14:02:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikolaj Wasiak X-Patchwork-Id: 14025512 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 75B2BC36000 for ; Fri, 21 Mar 2025 14:03:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E372010E796; Fri, 21 Mar 2025 14:03:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BQ4BoqI9"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id B085510E796 for ; Fri, 21 Mar 2025 14:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742565782; x=1774101782; h=date:from:to:cc:subject:message-id:mime-version; bh=LFXdPJZe5YAR1avweKwVUXvAGI0bGzlwFdabuA04N9U=; b=BQ4BoqI9T8AV61w1m7mJ8pREdB+08oOP8A21yo09dsijjTDqllkmVPdI 1dUO7c/Uf+nwzkErZ2BMcuL7M/2mcLbBCoDeIx1C2FpJFxbTnNzzQpY8H BPBm4Z41kE5l9xQjT4xpSTcVVg5sS645yFyD4xY+axQnBsovIIPSumZKv lCrKohsLHeF+R0ogePZGT8mbl1D6yTE5cSOU03Nj5KyKhS/K7eRgHLyy4 yjWZRHcFNdP0k18wFOelAVC3u8DMSYZqJ3aWpgE2wxWDWicL7ACWlDdnk siUDr5E7FADT4xLK+RuVFFfQ5vAkYhsS081NFaOlPXME/9BZAPlQ0UrgS A==; X-CSE-ConnectionGUID: 5rCCGz/3SK6AD8A0WQhIuw== X-CSE-MsgGUID: EveeAfiJQVO/w7+++P//6g== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="43846492" X-IronPort-AV: E=Sophos;i="6.14,264,1736841600"; d="scan'208";a="43846492" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 07:03:01 -0700 X-CSE-ConnectionGUID: VJQIg6yVQUmDrOmxYR6nzQ== X-CSE-MsgGUID: ER6D7k5LQaqsnfB8FSyIAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,264,1736841600"; d="scan'208";a="123924998" Received: from orsmsx903.amr.corp.intel.com ([10.22.229.25]) by orviesa007.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 07:03:02 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Fri, 21 Mar 2025 07:03:01 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Fri, 21 Mar 2025 07:03:01 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.172) 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, 21 Mar 2025 07:03:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gooY+wv7CQy4AJtk5NF7hnGsaiu+Yir0nYXm14etnAwCEd25yJiwP6fM8ieVW1T9ilOd4bTDlkAZWG0PUAeP7DMd/+xfZ4NMsF3y6nBLlafPXF0fKPDgCxck8zgiTm0Nb0Ig0ZuNS4CmB7wF5Xj5az5HzcB/jGXSS86erIB2NZmYXrTXA2riJ2IbTakdFq2iQqqRqVEefV3upbEZRiidPGJeRJyI3IMxbka+5cBU0jJb5L58CrgVK6AIzBZdOWnYQmbRH5KUkldAiqnPHA238T/DkAnMGeGB636yMdY9wGQWg9rMfOl6VO4XXtERkcwnBAGrL5f8DijVgf4O6Xhaew== 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=L9vkDW3P+LSB9/S/b8K6QoEvbYZSwKIopTs9ozDFkaQ=; b=dqecPgjqmbSh7mV2ywicXVJIcdgSKxXgnQhVwKB8nPn4XDQhjbZcgY5uoJuLqVe3KgkP+eojQBMO+agYWYwhT2U11whsFwRS+x5AoVElxgWJgwuvicgQ5IM6h9MfplQDa2cAHxvC2tBxkrxMZaN7iFmwM4hTqSzvttbEkpQi5EDuDLBq3ebbjCQSpz1+LDtJKfG1/rLtqtwRxIhTjebwmungpOc1OpfPlQxSO8tjhUuAFA0cK6zU/pol3aUItEyqq21wPY8iuwg6aWOLpFee8M0FS7rNhe+Nl0AbglRTeaXm9d7IGOoTg8FG4Q3zVtkcYcU9TQZiTcK7Vp96x8uVjA== 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 PH8PR11MB7967.namprd11.prod.outlook.com (2603:10b6:510:25e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 14:02:57 +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.8534.036; Fri, 21 Mar 2025 14:02:57 +0000 Date: Fri, 21 Mar 2025 15:02:49 +0100 From: Mikolaj Wasiak To: CC: Andi Shyti , Krzysztof Karas , Krzysztof Niemiec Subject: [PATCH v2] drm/i915/selftest: allow larger memory allocation Message-ID: <2vie3dumx3ajb7lwhiotxs4wj6zcr2fq6on3ebd2vsm2qb3k6l@s5uny4fry4gr> Content-Disposition: inline X-ClientProxiedBy: WA1P291CA0022.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:19::29) To BL3PR11MB6409.namprd11.prod.outlook.com (2603:10b6:208:3b8::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL3PR11MB6409:EE_|PH8PR11MB7967:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c8e8b0c-2526-47af-ee21-08dd6881150c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?rGgbNt/k8QI1DestynRmLMhXFOvDwCh?= =?utf-8?q?lPGVcpm+LzJOJftD3cxXWUgz0UWWPUpAIaebAK+jq4WRL1kGAAFMqgLsXiLfSea2O?= =?utf-8?q?f5979CfRdqoShjPy5f2SEOvjBBEO4kLvzxWSmv+uxj+iCFlVJwMNYsndNMZ0NXIp2?= =?utf-8?q?WaE8SjNZQVZqHTUSgHUtjqpqHg3VYkfMejmsdemNocnKACYyjg5lDgg0u5ywY9AiD?= =?utf-8?q?+GcWd2T/QFa9kOZFRwVmoY+LXUN9DVlKEuSJIJITnDIQIMyopmkaITGMcnVYDP4La?= =?utf-8?q?6GSJnyXyJzWpzL28G+9XW1pf68Bcl39At2UhNUuqeagXlz3A96U+j/Ks8F6qulw7z?= =?utf-8?q?dQu4IptkSYhrWIQPHpwfyqP8epuK5Z6BlztFuYqhx1w9zQTckJcx1vr2V+Y3EgG6s?= =?utf-8?q?xusW23Wf80eyedaqWt8F2OwpwA0hQNo9udO7xK+sC6PvR3ueLo7Q083yuWBtP+twu?= =?utf-8?q?j0ZVQZwh3m0YXXVKJnTX8v0LhLV7CSnLcwMvaCZRFhQ3pw6/DEZHfKQfAW7eE+qrU?= =?utf-8?q?CjtAB0eEsE/VhQLOrMvQ9WQcCqhvmb7nNOAlpxOORVhnilx7N8AwcAQzPhFhKRaL0?= =?utf-8?q?bFbzbvbPMxoAtb3rDv1JxU10SJ4VKWqir+TY27rwRPuDtJ2RQcmykBjavcRqhbhbK?= =?utf-8?q?fC7utV1SkEIdY5scXczDL4xouzg8Nu3d0gsavzNvbVo21lLWUwFb38lFi2Kp3dTAy?= =?utf-8?q?NeaYJt0nMtr3aw1+r1sySwKfDINPQKzGjwiMkRA7NTuFMBzCU9d3P1yeqWMzahEEA?= =?utf-8?q?4io5lyCj8p/L2m+jgzJ6LjALz5uoMNvp3o47ujTP1Y9xQqivhJ1DViKNTEnioJHEH?= =?utf-8?q?opnkKTd9Z5TBZTLOfMnWOFgWlEWBXLgVcBPpVV6JtGPyoUTk4OzJbmwaSZn7mRlB+?= =?utf-8?q?zpz0f8sBgAbnvvzAcm2Yh9EPs7RR9TNpic68uW7EjitGsODHPnxZXBqPOEgNMsBLs?= =?utf-8?q?DJZ37DwCUlH3J9Ole0GSRCJaymKlJfEFBruibIvs0KOPgCXPlj6Wc+UR8kj0n/ACv?= =?utf-8?q?gf4vj/8jfy97w+0LRh5IwVOj5VwMppDgoE/qU7MauX+Ckxo+ydWM9h9tEsHfJ8Vcj?= =?utf-8?q?0I4ihH9083Y9kmGlleA4uhXZGBeuX9Sxw7XvvfvQiZ6CjaaseYJhDKnm/ZsygmLm1?= =?utf-8?q?fvQk11GMMsaOls2fEfn0g7LpvvZfmMd+/joRPL0NYyFTOKodKyFBsqJWNvej/oaJE?= =?utf-8?q?toaK1HFzuTd34ZACn7Pox+hjg9F/+V7Yms7rPzrEHxhNF7NLLRXCFNkI27VBNq4lY?= =?utf-8?q?WQZro3Dso8EUWnktBW0qwNaAZyam3/Ni/wkZ28U9/mLIfLTig36a25ZAc/LrXZTNr?= =?utf-8?q?v5+wIMmNtpHx?= 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Rcv3L9ozQQJfaGC4HTSuEezhksWP?= =?utf-8?q?beziBWwD30AAg2QZvF0+RlIP1T9QAgEi8gjShodZw7I4NRcx6pAysF2SEbtoXuBAI?= =?utf-8?q?S1mvnrrx+wXANcZc7lZLeDzw49iW/VWynHz0uryJ4ENkn6RSnH099IgsclWIWU8DI?= =?utf-8?q?AmdYjOctkXp3XdabHbMAI5Ql3kXeAv5OV8t/ePH8Ft2y8U5ECGwOXQTNqqRHfQudG?= =?utf-8?q?YcAnrBRY7KdDNlpOPlfGLeFWL0u2YDatSagNFaAzSgaWzvLlRPuAxQh/yJ5abTyPL?= =?utf-8?q?m9ptBI3JyPejE10Exg/a6DCK1472DB2wrXx9icNBz+f6+2AAFPPnqv/4QCF+voBsX?= =?utf-8?q?CMCwvnyFjFHQSBALld9v7LabzWOgWN5MEqELM9rlOwLQB6RpjLKY4pSWNMj/JrPCl?= =?utf-8?q?qGqs/uXtuq7rm+GVMNBIEGZsOPVSWGpHSW8dChVOXmOd4k+uiPsPe/jce7eWZRS/+?= =?utf-8?q?AXj3BtdybhOSTlivf8+7kKRlGqjt7LS66vb5utzPHso9CEYlwTsMgqvjA47HwG1xd?= =?utf-8?q?btVe000apEnFzIHMxbiqv8vNS9PIZTTAXsWMq2MzR+SrNvf+mONhEIpmle5MU82am?= =?utf-8?q?oNckmzEWdDCwebzm/8l+KG7Yrb25nFxtknFa2L1VykcLC8ydXvK21HezzhYIp0Xfh?= =?utf-8?q?CE5Z2e8eNK3Rv55XB6A+CdAmQ0VXHkvNQMyke2+/HYJ0ER6sSFYJgIdJMVzjPgVLV?= =?utf-8?q?OujCa1Gcfg3TI7c9R3SrXwq7o5jrj2Hs+8b7/9pclskiG4pGubLsueiocs39T8ZNk?= =?utf-8?q?yJtLq8toXadXTgVR7b0li+4X5iNpGzSWl4LV/6ytLpbxrIm/6MSpA+4fWCTbaGejO?= =?utf-8?q?GLh2JnXiEphh5r/vhMvPP76hfT77qgaaI2CMco55rsKE109ixrJXFSN8bJt8/pvOz?= =?utf-8?q?E30yLQKgzagglGJZq2AlM6XYX7PCMotJf64R8fBfIC71JSGPX/3RQ30cz7sljsMfO?= =?utf-8?q?C69zZNeRDNONI1YkPozaBrt5B6ec+CzPRGewt2bwKWpiJw0zDtCnVRSRmccA48wyC?= =?utf-8?q?MuOTVAxGhYr/Q4oNXS4U+S2gvQSYB77VLqzY/rnQ4ULx80sj92w1QDMc6PNIRmQ9x?= =?utf-8?q?7+mBMVIkO0saxeru1xzd0czZ9fnWRrltWe+oOujbGMcHFmjhcdj2Nr4EYlAsq+Elf?= =?utf-8?q?cNuleiROHlAh5Iz0xNUrEAErpraAzO9jE8o2rkLm/k6nJUMSEOESl1ixNA5FHlk1H?= =?utf-8?q?r0i2XvsOEv1erDnlZL/T8P5WMXYekXVmNRbrRDv0AmHxxn4m961mUY6+ukt771+yC?= =?utf-8?q?bq0YTCJG1Ik4SAITx1ngKAMIchgh6tv2ZlJfwxYGL45yIUraf7KqfElu9GR3f9th9?= =?utf-8?q?B/7OjWtjJLz/xz4LV8w1IDhb2Wk7N3i/jtp+zPqfuGJea2oJhJ/ymCs7zEhpk3xCq?= =?utf-8?q?Acq2lpuWc1jZX2VIugYwbsXTZ7wm/CxfpBcHhViTrVOr9bAU3lobFawb979VGN55l?= =?utf-8?q?bBKDg6bq1lyIzls7YswIyhsVKgZVpqlPNRb1/6e6DpXlTD/hKNbEMikQjUTTvPbL1?= =?utf-8?q?Vf0X9rG2CJBHqi7cvMQtn3IudLJtT6roZA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 1c8e8b0c-2526-47af-ee21-08dd6881150c X-MS-Exchange-CrossTenant-AuthSource: BL3PR11MB6409.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 14:02:57.3515 (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: CvN7ZYnIzs8WeYuODD3wp9Wt5eAWAB/JYtTZUx4JgmtdRjCoo7UqglyTHZERMbxsc4m+Olx0KAd0cdypFiUzlRj5gSyiahwBzF040PpuqfI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB7967 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. Signed-off-by: Mikolaj Wasiak --- v1 -> v2: - Added negative test for too large allocation .../drm/i915/selftests/intel_memory_region.c | 22 ++++++++++--------- 1 file changed, 12 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..7e72e12b26ca 100644 --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c @@ -413,15 +413,8 @@ 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); + obj = igt_object_create(mem, &objects, roundup_pow_of_two(size), + I915_BO_ALLOC_CONTIGUOUS); if (!IS_ERR(obj)) { pr_err("%s too large contiguous allocation was not rejected\n", __func__); @@ -429,10 +422,19 @@ static int igt_mock_splintered_region(void *arg) goto out_close; } + obj = igt_object_create(mem, &objects, size, I915_BO_ALLOC_CONTIGUOUS); + if (IS_ERR(obj)) { + pr_err("%s largest possible contiguous allocation failed\n", + __func__); + err = PTR_ERR(obj); + goto out_close; + } + close_objects(mem, &objects); + obj = igt_object_create(mem, &objects, rounddown_pow_of_two(size), I915_BO_ALLOC_CONTIGUOUS); if (IS_ERR(obj)) { - pr_err("%s largest possible contiguous allocation failed\n", + pr_err("%s largest rounded possible contiguous allocation failed\n", __func__); err = PTR_ERR(obj); goto out_close;