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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76C68C43217 for ; Sat, 21 May 2022 19:05:02 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web08.8689.1653159900650114625 for ; Sat, 21 May 2022 12:05:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XsRjUkeX; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: christopher.w.clark@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id bo5so10345129pfb.4 for ; Sat, 21 May 2022 12:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nGCuOJmUiRYi/Gn7ZipuFHk3yhKSxdyK6YFij30/cLk=; b=XsRjUkeX6HH0inRt0PSYnwFpyn06PftxkO2sOrY3mjSd12pG/DE7StIPjvz+vvyQVo UtbwAod3cF73nEpBOyBg9pdsK4RxmdpKcqPGvxEUWaje2pFE3+9yTSR3jQCS1lQLJ4iJ 0qzsn4oLbmhrxpOwqaDQV8M/21+eLhtPXLM4LbKOdnWJlCOLBkKDZ1iN7yT2q3GyJKpG EjDkYUAnt7zjyJTDf5TkVt1uvlFHGS6CfHMripeFAW6XJe20aANr7U96MXm75wqRCZeT nzXUss5WToTu1S3EUb2b4s11k+i94hkMdGk3qlXJUO40JdCQjEibIDtdD1vRDbWvYCqO buPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nGCuOJmUiRYi/Gn7ZipuFHk3yhKSxdyK6YFij30/cLk=; b=l5VTZaiqmD98dYwS5iP4e4cCn8Tsaql665UMpWPQtUSnexYkXR4Y1F2cTy2K9xdb3r a/kZdp9JEMzD0vm3lBY2gcdnxuqGo/ZYu17UqLc//BTEs1Y3FHAEBHaEXnj03F9TWEzi PKOQSiTaAt016yfW/VC4+BK+CrKLW6illNFu6K9BPOr4v/f/LQGPnP9hXdFPsvXl/tbf ZrcIkEm2o3t50A/ddMKNw/F1s+cr/3cY//3Z2qu04RnL0R2NJVfsDx64c3af5H2fseWN UUQf7306z3URo0lgzBKxP/0fhAe/jHjooWt1YMrfn51ozo3geISx8GymY8f5qaMnbNKp SDNQ== X-Gm-Message-State: AOAM532Vkc17dX0lB4/Zt7CCybU4TIvbE+tI/Th4muLnncxUqzjM3w9O RgDrFycMScI9gwb7xvCUdPDrthY7F2Q= X-Google-Smtp-Source: ABdhPJx6bXXKhEjlX/H2Iu+/v4DHkNyyrrMxFGDBOB5vMTDndHqkkc2ENrpNobnDPlaRGeuQybzLAg== X-Received: by 2002:a05:6a00:1488:b0:510:4e64:fb80 with SMTP id v8-20020a056a00148800b005104e64fb80mr15952465pfu.58.1653159900012; Sat, 21 May 2022 12:05:00 -0700 (PDT) Received: from cog-dev.home ([70.103.208.83]) by smtp.gmail.com with ESMTPSA id c16-20020a170902d49000b001620a2737b6sm1592856plg.74.2022.05.21.12.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 May 2022 12:04:59 -0700 (PDT) From: Christopher Clark To: meta-virtualization@lists.yoctoproject.org Cc: bruce.ashfield@gmail.com, cardoe@gentoo.org, Bertrand.Marquis@arm.com Subject: [meta-virtualization][honister][PATCH 2/3] xen: drop patch to workaround prelink on aarch64 Date: Sat, 21 May 2022 12:04:44 -0700 Message-Id: <20220521190447.135705-9-christopher.w.clark@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220521190447.135705-1-christopher.w.clark@gmail.com> References: <20220521190447.135705-1-christopher.w.clark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 21 May 2022 19:05:02 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-virtualization/message/7306 Patch is not needed for image prelinking since the gcc toolchain in this branch successfully links Xen without it. Remove the patch from the stable branch since the BSD license of the modified header file differs vs the GPLv2 source code referenced. Removal preferred to replacement with a new patch that moves the function into GPLv2 .c source files since the build now succeeds without it. Signed-off-by: Christopher Clark --- ...xen-arm64-implement-atomic-fetch-add.patch | 50 ------------------- recipes-extended/xen/xen_4.14.bb | 1 - recipes-extended/xen/xen_4.15.bb | 1 - recipes-extended/xen/xen_git.bb | 1 - 4 files changed, 53 deletions(-) delete mode 100644 recipes-extended/xen/files/xen-arm64-implement-atomic-fetch-add.patch diff --git a/recipes-extended/xen/files/xen-arm64-implement-atomic-fetch-add.patch b/recipes-extended/xen/files/xen-arm64-implement-atomic-fetch-add.patch deleted file mode 100644 index 6e957a5..0000000 --- a/recipes-extended/xen/files/xen-arm64-implement-atomic-fetch-add.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christopher Clark -Date: Fri, 26 June 2020 16:34:00 -0800 -Subject: [PATCH] xen: implement atomic op to fix arm64 compilation - -Xen's ARM implementation of arch_fetch_and_add since f9cc3cd9 -uses a builtin, despite the build being performed with -fno-builtin. -With gcc 10.1.0, this now breaks prelinking spinlock.c, so -implement the one atomic operation that is required with logic -derived from Linux's atomic_ll_sc.h: ATOMIC_FETCH_OP and comparison with -the binary produced with and without the patch with gcc 9.2.0. - -Signed-off-by: Christopher Clark -diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h -index e5d062667d..c46dd3ac71 100644 ---- a/xen/include/asm-arm/system.h -+++ b/xen/include/asm-arm/system.h -@@ -55,7 +55,32 @@ static inline int local_abort_is_enabled(void) - return !(flags & PSR_ABT_MASK); - } - -+#ifdef CONFIG_ARM_64 -+ -+/* see atomic_ll_sc.h: ATOMIC_FETCH_OP(name, mb, acq, rel, cl, op, asm_op, constraint) */ -+static inline int arch_fetch_and_add(unsigned int *ptr, unsigned long i) -+{ -+ int register lptr asm("x0"); -+ int register result asm("w1"); -+ int register newval asm("w2"); -+ int register status asm("w3"); -+ -+ asm volatile( -+ " mov %[lptr], %[ptr]\n" -+ "1: ldxr %w[result], [%[lptr]]\n" -+ " add %w[newval], %w[result], %w[i]\n" -+ " stlxr %w[status], %w[newval], [%[lptr]]\n" -+ " cbnz %w[status], 1b\n" -+ " dmb ish\n" -+ : [result] "=&r" (result), [lptr] "=&r" (lptr), [newval] "=&r" (newval), [status] "=&r" (status), [i] "+r" (i), "+Q" (*ptr) -+ : [ptr] "r" (ptr), "r" (i) -+ : "memory"); -+ -+ return result; -+} -+#else - #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) -+#endif - - extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); - diff --git a/recipes-extended/xen/xen_4.14.bb b/recipes-extended/xen/xen_4.14.bb index 0d7d20b..267db16 100644 --- a/recipes-extended/xen/xen_4.14.bb +++ b/recipes-extended/xen/xen_4.14.bb @@ -6,7 +6,6 @@ XEN_BRANCH ?= "stable-${XEN_REL}" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://xen-arm64-implement-atomic-fetch-add.patch \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ " diff --git a/recipes-extended/xen/xen_4.15.bb b/recipes-extended/xen/xen_4.15.bb index 0cfaf0c..1b87ae8 100644 --- a/recipes-extended/xen/xen_4.15.bb +++ b/recipes-extended/xen/xen_4.15.bb @@ -6,7 +6,6 @@ XEN_BRANCH ?= "stable-${XEN_REL}" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://xen-arm64-implement-atomic-fetch-add.patch \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ " diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb index 3957de1..2fbfb54 100644 --- a/recipes-extended/xen/xen_git.bb +++ b/recipes-extended/xen/xen_git.bb @@ -6,7 +6,6 @@ XEN_BRANCH ?= "master" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://xen-arm64-implement-atomic-fetch-add.patch \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ " -- 2.25.1