[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] lib: drop size parameter from sort()'s swap callback
- To: Jan Beulich <jbeulich@xxxxxxxx>
- From: Bertrand Marquis <Bertrand.Marquis@xxxxxxx>
- Date: Wed, 30 Jul 2025 07:24:01 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 4.158.2.129) smtp.rcpttodomain=suse.com smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=arm.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com])
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=2; 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=1QgKfnUhCc3H+yyRddPCJli3ardu41zHUMdphs4xJkA=; b=SvpYGf8DI4EmeXa/7Qxvtu7i8LjxIpgs4Uc84qi5lKzzSzA01pXhx99ZwEpcVYN3zDBpSCdPzJ6woxSfubxSEagdPpbKPoVm00imr5K+iWHSTybJroettvLIiGazraOCCtBnrTTn+61DePXAXkmVVyUTb+1/Kp6jZNft1ZIYxDX86+nYFXlhXTEdM+cH5vX6wOdiLSetkaQz+1pEVDAA+lJpKbhlVVE53XBXzvFdzoGFgrDDg5+3kC/mV/D9Br/XYqGuuMqLcTJj8TIKNC2RnM8kUavN3Vkmv5EPlYEaEoqWDF9m0Bb8lGntXpeIZIokAfdjYE26ZHocu/f1Y7fbQA==
- 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=1QgKfnUhCc3H+yyRddPCJli3ardu41zHUMdphs4xJkA=; b=x8UPnPwESTEMVAnUJn89uKM1XxmQMHTxjyJKUZnjmgrLVJ2x4qVEh0M7Fu1liKz9fodKtcDCSE5CJ3ohvKHL9stZ9Q/bfHQmb5UpBZnJa+TFEmnnfz4Kf/k3zNOD0h/zV+kW/9B1nKDL5xXimxqgSog5NgkAaNlO6daK+Ic1AXmPHhFQuw5BoDSp7xy3cbe7is2+1QL8zPndyFkifq1+fqu4rSsvaFvNrH97ZxINad3Bmqfk6GqHFAVQWTCBydALrFlrZXqfzUQLLNAtj7PbDnw29SGmH7QzUPK8joeYHXjmGHVcC78mxORqKgDaEcivZV5Sj5gz1HNKqKrnr29FIA==
- Arc-seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=x7AEbMaCa70H7aPe8cOz/MxxoXEvXl6UpkXvUMUuq8iRKRdF6Hlth4HPfxk0F3kyzRpFq07kYx196v3phXPepLSXbwrHHuCgc+GmR7q0/41L5rHVXT2/xFsTfkTzXqfoKIp2u+cjuuuud1UEqTkl7OKrqF8fBUFQIbyJemupB5Xb9+I02TnPuUaY8M4G4B9yIk+1dXLrw88EmfONKoyytdm2mZ32SnvhG0Erd5Mj2uGL/mpRaYbvV4UsKGdOVOOO6/mpbeNKjDPbS+ZKHMI1j0Dh0ZKWsir/lbXVXiSbwcuP9lZzAjIqBWBpc2OT898U2W28SlU9gIa7t+Eq/vOqwA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dqS24SM1mV0f+4NT2wHfKAVHifm5cGB/HeNp4fkLC0ViZ9rIAU1OO9FmN0xdY5p+jXXzIh6vPGWpzM1Gueq0JJ6iLS58K9PW6v5f7F3YeGpn4uVMNeiKwyznkOrcuZfc5mPMpuBCdlVplu08wCbugED1s9Jm4DAyGg85y8hPtD3QbNSW9ncYlVcdb4aO9zy46wFo3L+t8SGBT7bB87qJQ6BBRVrW27+HUGnCmg40P8ZbYZDkFtZeunbV5KFQZzpgSWpdYlWlAnLOpyL1wjyx3Ke4FLG6iC35qy5PfSjZNZodjdA0nU3tZWQCXn2SyS/RrsKCil8mldwEuY+lUx/AZQ==
- Authentication-results-original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Cc: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Volodymyr Babchuk <volodymyr_babchuk@xxxxxxxx>
- Delivery-date: Wed, 30 Jul 2025 07:25:14 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Thread-index: AQHcAJTgZe0uOtfsl0SCb5wVYhpgX7RKRKAA
- Thread-topic: [PATCH] lib: drop size parameter from sort()'s swap callback
Hi,
> On 29 Jul 2025, at 16:26, Jan Beulich <jbeulich@xxxxxxxx> wrote:
>
> This was needed only for generic_swap(), which disappeared in
> 8cb0341a61fa ("xen/sort: Switch to an extern inline implementation").
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
For arm part:
Acked-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
Cheers
Bertrand
>
> --- a/xen/arch/arm/io.c
> +++ b/xen/arch/arm/io.c
> @@ -100,7 +100,7 @@ static int cmp_mmio_handler(const void *
> return 0;
> }
>
> -static void swap_mmio_handler(void *_a, void *_b, size_t size)
> +static void swap_mmio_handler(void *_a, void *_b)
> {
> struct mmio_handler *a = _a, *b = _b;
>
> --- a/xen/arch/x86/extable.c
> +++ b/xen/arch/x86/extable.c
> @@ -39,7 +39,7 @@ static int init_or_livepatch cf_check cm
> return 0;
> }
>
> -static void init_or_livepatch cf_check swap_ex(void *a, void *b, size_t size)
> +static void init_or_livepatch cf_check swap_ex(void *a, void *b)
> {
> struct exception_table_entry *l = a, *r = b, tmp;
> long delta = b - a;
> --- a/xen/common/device-tree/bootinfo-fdt.c
> +++ b/xen/common/device-tree/bootinfo-fdt.c
> @@ -449,7 +449,7 @@ static int __init cmp_memory_node(const
> return 0;
> }
>
> -static void __init swap_memory_node(void *_a, void *_b, size_t size)
> +static void __init swap_memory_node(void *_a, void *_b)
> {
> struct membank *a = _a, *b = _b;
>
> --- a/xen/include/xen/sort.h
> +++ b/xen/include/xen/sort.h
> @@ -24,7 +24,7 @@ extern gnu_inline
> #endif
> void sort(void *base, size_t num, size_t size,
> int (*cmp)(const void *a, const void *b),
> - void (*swap)(void *a, void *b, size_t size))
> + void (*swap)(void *a, void *b))
> {
> /* pre-scale counters for performance */
> size_t i = (num / 2) * size, n = num * size, c, r;
> @@ -39,7 +39,7 @@ void sort(void *base, size_t num, size_t
> c += size;
> if ( cmp(base + r, base + c) >= 0 )
> break;
> - swap(base + r, base + c, size);
> + swap(base + r, base + c);
> }
> }
>
> @@ -47,7 +47,7 @@ void sort(void *base, size_t num, size_t
> for ( i = n; i > 0; )
> {
> i -= size;
> - swap(base, base + i, size);
> + swap(base, base + i);
> for ( r = 0; r * 2 + size < i; r = c )
> {
> c = r * 2 + size;
> @@ -55,7 +55,7 @@ void sort(void *base, size_t num, size_t
> c += size;
> if ( cmp(base + r, base + c) >= 0 )
> break;
> - swap(base + r, base + c, size);
> + swap(base + r, base + c);
> }
> }
> }
|
