Re: [PATCH v2 3/8] lib: move list sorting code

[Julien Grall <julien@xxxxxxx>]

Hi Jan,

On 23/10/2020 11:17, Jan Beulich wrote:
> Build the source file always, as by putting it into an archive it still
> won't be linked into final binaries when not needed. This way possible
> build breakage will be easier to notice, and it's more consistent with
> us unconditionally building other library kind of code (e.g. sort() or
> bsearch()).
>
> While moving the source file, take the opportunity and drop the
> pointless EXPORT_SYMBOL().
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
It looks like the commit message was duplicated.

> Build the source file always, as by putting it into an archive it still
> won't be linked into final binaries when not needed. This way possible
> build breakage will be easier to notice, and it's more consistent with
> us unconditionally building other library kind of code (e.g. sort() or
> bsearch()).
>
> While moving the source file, take the opportunity and drop the
> pointless EXPORT_SYMBOL().
You are mentioning the EXPORT_SYMBOL() but...

> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
> ---
>   xen/arch/arm/Kconfig                        | 4 +---
>   xen/common/Kconfig                          | 3 ---
>   xen/common/Makefile                         | 1 -
>   xen/lib/Makefile                            | 1 +
>   xen/{common/list_sort.c => lib/list-sort.c} | 2 --
>   5 files changed, 2 insertions(+), 9 deletions(-)
>   rename xen/{common/list_sort.c => lib/list-sort.c} (98%)
>
> diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
> index 277738826581..cb7e2523b6de 100644
> --- a/xen/arch/arm/Kconfig
> +++ b/xen/arch/arm/Kconfig
> @@ -56,9 +56,7 @@ config HVM
>           def_bool y
>   
>   config NEW_VGIC
> -       bool
> -       prompt "Use new VGIC implementation"
> -       select NEEDS_LIST_SORT
> +       bool "Use new VGIC implementation"
>         ---help---
>   
>   	This is an alternative implementation of the ARM GIC interrupt
> diff --git a/xen/common/Kconfig b/xen/common/Kconfig
> index 3e2cf2508899..0661328a99e7 100644
> --- a/xen/common/Kconfig
> +++ b/xen/common/Kconfig
> @@ -66,9 +66,6 @@ config MEM_ACCESS
>   config NEEDS_LIBELF
>         bool
>   
> -config NEEDS_LIST_SORT
> -       bool
> -
>   menu "Speculative hardening"
>   
>   config SPECULATIVE_HARDEN_ARRAY
> diff --git a/xen/common/Makefile b/xen/common/Makefile
> index 083f62acb634..52d3c2aa9384 100644
> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -21,7 +21,6 @@ obj-y += keyhandler.o
>   obj-$(CONFIG_KEXEC) += kexec.o
>   obj-$(CONFIG_KEXEC) += kimage.o
>   obj-y += lib.o
> -obj-$(CONFIG_NEEDS_LIST_SORT) += list_sort.o
>   obj-$(CONFIG_LIVEPATCH) += livepatch.o livepatch_elf.o
>   obj-$(CONFIG_MEM_ACCESS) += mem_access.o
>   obj-y += memory.o
> diff --git a/xen/lib/Makefile b/xen/lib/Makefile
> index b8814361d63e..764f3624b5f9 100644
> --- a/xen/lib/Makefile
> +++ b/xen/lib/Makefile
> @@ -1,3 +1,4 @@
>   obj-$(CONFIG_X86) += x86/
>   
>   lib-y += ctype.o
> +lib-y += list-sort.o
> diff --git a/xen/common/list_sort.c b/xen/lib/list-sort.c
> similarity index 98%
> rename from xen/common/list_sort.c
> rename to xen/lib/list-sort.c
> index af2b2f6519f1..f8d8bbf28178 100644
> --- a/xen/common/list_sort.c
> +++ b/xen/lib/list-sort.c
> @@ -15,7 +15,6 @@
>    * this program; If not, see <http://www.gnu.org/licenses/>.
>    */
>   
> -#include <xen/lib.h>
... this is not mentionned.

>   #include <xen/list.h>
>   
>   #define MAX_LIST_LENGTH_BITS 20
> @@ -154,4 +153,3 @@ void list_sort(void *priv, struct list_head *head,
>   
>   	merge_and_restore_back_links(priv, cmp, head, part[max_lev], list);
>   }
> -EXPORT_SYMBOL(list_sort);
Cheers,

--
Julien Grall