[cip-dev][isar-cip-core][PATCH v2 0/4] SWUpdate abort on installing indentical image

[cip-dev][isar-cip-core][PATCH v2 0/4] SWUpdate abort on installing indentical image

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Use a pre/post function of the SWUpdate handler round robin to check if the given uuid
is already in the current root file system and abort if the uuid matches.

This fixes https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/43

Changes in V2:
 - remove RFC
 - Use upstream version instead of patch
 - add comment for variable expension

Quirin Gylstorff (4):
  core/images/swupdate.inc: Move image_uuid to swupdate.inc
  swupdate-handler-roundrobin: Increase revision for configfilecheck
  image_uuid: read target_image_uuid
  recipe-core/images: Integrate configfilecheck into sw-description

 classes/image_uuid.bbclass                    | 19 +++++++++++++++++++
 kas/opt/ebg-swu.yml                           |  2 +-
 recipes-core/images/files/sw-description.tmpl |  1 +
 recipes-core/images/image-uuid.inc            | 12 ------------
 recipes-core/images/swupdate.inc              |  6 +++++-
 .../swupdate-handler-roundrobin_0.1.bb        |  2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)
 delete mode 100644 recipes-core/images/image-uuid.inc

-- 
2.35.1

[cip-dev][isar-cip-core][PATCH v2 1/4] core/images/swupdate.inc: Move image_uuid to swupdate.inc

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Prerequisite for the changes to check the uuid.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/ebg-swu.yml                |  2 +-
 recipes-core/images/image-uuid.inc | 12 ------------
 recipes-core/images/swupdate.inc   |  1 +
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 recipes-core/images/image-uuid.inc

diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index ce37c36..6aa411b 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml
@@ -20,7 +20,7 @@ local_conf_header:
     SWUPDATE_BOOTLOADER = "efibootguard"
     IMAGE_INSTALL_remove = "u-boot-script"
   ebg_swu_image_options: |
-    CIP_IMAGE_OPTIONS_append = " efibootguard.inc image-uuid.inc"
+    CIP_IMAGE_OPTIONS_append = " efibootguard.inc"
   initramfs: |
     INITRAMFS_INSTALL_append = " initramfs-abrootfs-hook"
   firmware-binaries: |
diff --git a/recipes-core/images/image-uuid.inc b/recipes-core/images/image-uuid.inc
deleted file mode 100644
index 5e5a727..0000000
--- a/recipes-core/images/image-uuid.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2022
-#
-# Authors:
-#  Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-inherit image_uuid
diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index edc41a0..6cf9bb1 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
+inherit image_uuid
 inherit swupdate
 inherit read-only-rootfs
 
-- 
2.35.1

[cip-dev][isar-cip-core][PATCH v2 2/4] swupdate-handler-roundrobin: Increase revision for configfilecheck

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This new revision allows use to check if an update is already installed.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../swupdate-handler-roundrobin_0.1.bb                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
index 5801113..b39278e 100644
--- a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
+++ b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
@@ -13,7 +13,7 @@ inherit dpkg-raw
 PROVIDES = "swupdate-handlers"
 
 SRC_URI += "git://gitlab.com/cip-project/cip-sw-updates/swupdate-handler-roundrobin.git;protocol=https;destsuffix=swupdate-handler-roundrobin;name=swupdate-handler-roundrobin;nobranch=1"
-SRCREV_swupdate-handler-roundrobin ?= "bf73f04b1eec0b8714d3a1b56bfcd1431c58ba10"
+SRCREV_swupdate-handler-roundrobin ?= "bb35127231ec08a67f79a7584ccfc0cada88cc4e"
 
 SWUPDATE_LUASCRIPT = "swupdate-handler-roundrobin/swupdate_handlers_roundrobin.lua"
 
-- 
2.35.1

Re: [cip-dev][isar-cip-core][PATCH v2 2/4] swupdate-handler-roundrobin: Increase revision for configfilecheck

[Jan Kiszka]

On 09.12.22 15:58, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> This new revision allows use to check if an update is already installed.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  .../swupdate-handler-roundrobin_0.1.bb                          | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
> index 5801113..b39278e 100644
> --- a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
> +++ b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
> @@ -13,7 +13,7 @@ inherit dpkg-raw
>  PROVIDES = "swupdate-handlers"
>  
>  SRC_URI += "git://gitlab.com/cip-project/cip-sw-updates/swupdate-handler-roundrobin.git;protocol=https;destsuffix=swupdate-handler-roundrobin;name=swupdate-handler-roundrobin;nobranch=1"
> -SRCREV_swupdate-handler-roundrobin ?= "bf73f04b1eec0b8714d3a1b56bfcd1431c58ba10"
> +SRCREV_swupdate-handler-roundrobin ?= "bb35127231ec08a67f79a7584ccfc0cada88cc4e"
>  
>  SWUPDATE_LUASCRIPT = "swupdate-handler-roundrobin/swupdate_handlers_roundrobin.lua"
>  

Should we also bump the recipe version, even if there are no
corresponding upstream releases?

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [cip-dev][isar-cip-core][PATCH v2 2/4] swupdate-handler-roundrobin: Increase revision for configfilecheck

[Jan Kiszka]

On 13.12.22 13:49, Jan Kiszka wrote:
> On 09.12.22 15:58, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> This new revision allows use to check if an update is already installed.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>  .../swupdate-handler-roundrobin_0.1.bb                          | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
>> index 5801113..b39278e 100644
>> --- a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
>> +++ b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb
>> @@ -13,7 +13,7 @@ inherit dpkg-raw
>>  PROVIDES = "swupdate-handlers"
>>  
>>  SRC_URI += "git://gitlab.com/cip-project/cip-sw-updates/swupdate-handler-roundrobin.git;protocol=https;destsuffix=swupdate-handler-roundrobin;name=swupdate-handler-roundrobin;nobranch=1"
>> -SRCREV_swupdate-handler-roundrobin ?= "bf73f04b1eec0b8714d3a1b56bfcd1431c58ba10"
>> +SRCREV_swupdate-handler-roundrobin ?= "bb35127231ec08a67f79a7584ccfc0cada88cc4e"
>>  
>>  SWUPDATE_LUASCRIPT = "swupdate-handler-roundrobin/swupdate_handlers_roundrobin.lua"
>>  
> 
> Should we also bump the recipe version, even if there are no
> corresponding upstream releases?
> 

On second thought, not critical in the given context as we should not
expect anyone doing packet-based updating for a target that does
image-based updates. And I hope this separate recipe is gone soon if we
get the code into swupdate directly.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

[cip-dev][isar-cip-core][PATCH v2 3/4] image_uuid: read target_image_uuid

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This writes the target_image_uuid to the Variable TARGET_IMAGE_UUID
which can be used to validate a update against the root file system.

"${@} is evaluated when the variable is expanded. Variables are expanded
when the are used." [1]

[1]: https://www.openembedded.org/pipermail/bitbake-devel/2012-April/011704.html

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 classes/image_uuid.bbclass | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
index 277941b..3e2e3de 100644
--- a/classes/image_uuid.bbclass
+++ b/classes/image_uuid.bbclass
@@ -13,6 +13,8 @@
 inherit rootfs
 inherit image
 
+# Generate the uuid from BB_TASKHASH to ensure a new
+# hash on each rebuild
 def generate_image_uuid(d):
     import uuid
 
@@ -23,6 +25,23 @@ def generate_image_uuid(d):
 
 IMAGE_UUID ?= "${@generate_image_uuid(d)}"
 
+def read_target_image_uuid(d):
+    import os.path
+
+    deploy_dir = d.getVar("DEPLOY_DIR_IMAGE")
+    image_full_name = d.getVar("IMAGE_FULLNAME")
+    uuid_file = f"{deploy_dir}/{image_full_name}.uuid.env"
+    if not os.path.isfile(uuid_file):
+        return None
+
+    target_image_uuid = None
+    with open(uuid_file, "r") as f:
+       uuid_file_content = f.read()
+       target_image_uuid = uuid_file_content.split('=')[1].strip(' \t\n\r').strip('\"')
+    return target_image_uuid
+
+TARGET_IMAGE_UUID = "${@read_target_image_uuid(d)}"
+
 do_generate_image_uuid[vardeps] += "IMAGE_UUID"
 do_generate_image_uuid[depends] = "buildchroot-target:do_build"
 do_generate_image_uuid[dirs] = "${DEPLOY_DIR_IMAGE}"
-- 
2.35.1

[cip-dev][isar-cip-core][PATCH v2 4/4] recipe-core/images: Integrate configfilecheck into sw-description

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 recipes-core/images/files/sw-description.tmpl | 1 +
 recipes-core/images/swupdate.inc              | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/recipes-core/images/files/sw-description.tmpl b/recipes-core/images/files/sw-description.tmpl
index 1c0db02..f7105c7 100644
--- a/recipes-core/images/files/sw-description.tmpl
+++ b/recipes-core/images/files/sw-description.tmpl
@@ -20,6 +20,7 @@ software =
             filesystem = "ext4";
             properties: {
                         subtype = "image";
+                        configfilecheck = "/etc/os-release@not_match@IMAGE_UUID=${TARGET_IMAGE_UUID}";
             };
             sha256 = "${ROOTFS_PARTITION_NAME}-sha256";
     });
diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index 6cf9bb1..0ba3a0e 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -23,6 +23,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI += "file://sw-description.tmpl"
 TEMPLATE_FILES += "sw-description.tmpl"
 
-TEMPLATE_VARS += "ROOTFS_PARTITION_NAME"
+do_transform_template[vardeps] += "TARGET_IMAGE_UUID"
+addtask do_transform_template before do_swupdate_binary after do_generate_image_uuid
+
+TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID"
 
 SWU_ADDITIONAL_FILES += "linux.efi ${ROOTFS_PARTITION_NAME}"
-- 
2.35.1

Re: [cip-dev][isar-cip-core][PATCH v2 0/4] SWUpdate abort on installing indentical image

[Jan Kiszka]

On 09.12.22 15:58, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Use a pre/post function of the SWUpdate handler round robin to check if the given uuid
> is already in the current root file system and abort if the uuid matches.
> 
> This fixes https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/43
> 
> Changes in V2:
>  - remove RFC
>  - Use upstream version instead of patch
>  - add comment for variable expension
> 
> Quirin Gylstorff (4):
>   core/images/swupdate.inc: Move image_uuid to swupdate.inc
>   swupdate-handler-roundrobin: Increase revision for configfilecheck
>   image_uuid: read target_image_uuid
>   recipe-core/images: Integrate configfilecheck into sw-description
> 
>  classes/image_uuid.bbclass                    | 19 +++++++++++++++++++
>  kas/opt/ebg-swu.yml                           |  2 +-
>  recipes-core/images/files/sw-description.tmpl |  1 +
>  recipes-core/images/image-uuid.inc            | 12 ------------
>  recipes-core/images/swupdate.inc              |  6 +++++-
>  .../swupdate-handler-roundrobin_0.1.bb        |  2 +-
>  6 files changed, 27 insertions(+), 15 deletions(-)
>  delete mode 100644 recipes-core/images/image-uuid.inc
> 

Thanks, applied.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

[Biju Das]

Hi Pavel and Nobuhiro-San,

We are missing this patch from 5.10 stable[1] in 5.10.y-cip[2]. Can you please add it?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.158&id=eb69c07eca22ffd8621d9de9378e4b3ce7965190

[2] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/drivers/net/can/rcar?h=linux-5.10.y-cip

Cheers,
Biju

RE: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

[Biju Das]

Anyway, I will post this patch to CIP ML today.

> -----Original Message-----
> From: Biju Das
> Sent: 13 December 2022 15:19
> To: cip-dev@lists.cip-project.org; Pavel Machek <pavel@denx.de>; Nobuhiro
> Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190
> 
> Hi Pavel and Nobuhiro-San,
> 
> We are missing this patch from 5.10 stable[1] in 5.10.y-cip[2]. Can you
> please add it?
> 
> [1]
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h
> =v5.10.158&id=eb69c07eca22ffd8621d9de9378e4b3ce7965190
> 
> [2] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-
> cip.git/log/drivers/net/can/rcar?h=linux-5.10.y-cip
> 
> Cheers,
> Biju

Re: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

Hi!

> Anyway, I will post this patch to CIP ML today.

Let me investigate. We _do_ have that patch in 5.10.y-cip and that
patch does not "simply apply".

commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

    can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive


Best regards,
								Pavel
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 879 bytes --]

Hi!

> Anyway, I will post this patch to CIP ML today.

The code was moved around with

commit 59a641368b460e4d1e8dc58a922915591303bd54
Author: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Date:   Wed Dec 22 13:49:45 2021 +0000

    can: rcar_canfd: Add support for RZ/G2L family
    
    commit 76e9353a80e9e9ff65b362a6dd8545d84427ec30 upstream.

Sometimes later, I see your commit:

commit 702de2c21eed04c67cefaaedc248ef16e5f6b293
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date:   Tue Oct 25 16:56:55 2022 +0100

    can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global
 FIFO receive

...and yes, it looks like we may want that one.

Best regards,
								Pavel

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

RE: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

[Biju Das]

Hi Pavel,

No worries, I am doing some testing with couple of CAN patches along with IRQ storm patch. I will post soon.

Cheers,
Biju

> -----Original Message-----
> From: Pavel Machek <pavel@denx.de>
> Sent: 13 December 2022 16:06
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Cc: cip-dev@lists.cip-project.org; Pavel Machek <pavel@denx.de>; Nobuhiro
> Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: Re: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190
> 
> Hi!
> 
> > Anyway, I will post this patch to CIP ML today.
> 
> The code was moved around with
> 
> commit 59a641368b460e4d1e8dc58a922915591303bd54
> Author: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Date:   Wed Dec 22 13:49:45 2021 +0000
> 
>     can: rcar_canfd: Add support for RZ/G2L family
> 
>     commit 76e9353a80e9e9ff65b362a6dd8545d84427ec30 upstream.
> 
> Sometimes later, I see your commit:
> 
> commit 702de2c21eed04c67cefaaedc248ef16e5f6b293
> Author: Biju Das <biju.das.jz@bp.renesas.com>
> Date:   Tue Oct 25 16:56:55 2022 +0100
> 
>     can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on
> global  FIFO receive
> 
> ...and yes, it looks like we may want that one.
> 
> Best regards,
> 								Pavel
> 
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany