From: Marco Felsch <m.felsch@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: "barebox@lists.infradead.org" <barebox@lists.infradead.org>
Subject: Re: [PATCH 17/18] common: partitions: efi: record type UUID in cdev
Date: Wed, 7 Jun 2023 10:55:54 +0200 [thread overview]
Message-ID: <20230607085554.ldozottnbuu4pzmu@pengutronix.de> (raw)
In-Reply-To: <5ac40228-5bfa-982a-af99-cf3aafa6016d@pengutronix.de>
On 23-06-06, Ahmad Fatoum wrote:
> On 31.05.23 21:31, Marco Felsch wrote:
> > Hi Ahmad,
> >
> > On 23-05-31, Ahmad Fatoum wrote:
> >> We already record DOS partition type in cdev, so let's do the same for
> >> GPT Type UUID. This will be used in a later commit to identify
> >> barebox-state partitions.
> >>
> >> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> >> ---
> >> common/partitions.c | 2 +-
> >> common/partitions/efi.c | 1 +
> >> common/partitions/parser.h | 5 ++++-
> >> fs/fs.c | 2 ++
> >> include/driver.h | 6 +++++-
> >> 5 files changed, 13 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/common/partitions.c b/common/partitions.c
> >> index b579559672a0..e3e8a9f3044d 100644
> >> --- a/common/partitions.c
> >> +++ b/common/partitions.c
> >> @@ -50,7 +50,7 @@ static int register_one_partition(struct block_device *blk,
> >>
> >> cdev->flags |= DEVFS_PARTITION_FROM_TABLE;
> >>
> >> - cdev->dos_partition_type = part->dos_partition_type;
> >> + cdev->typeuuid = part->typeuuid;
> >
> > Even though it's an union I would prefer to make it easier for the
> > reader (without checking the header and noticing that it is an union).
> > So the above code would be:
> >
> > if (blkdev_is_gpt_partitioned(blk))
> > cdev->typeuuid = part->typeuuid;
> > else if (blkdev_is_mbr_partitioned(blk))
> > cdev->dos_partition_type = part->dos_partition_type;
>
> I don't think this is implementable without a runtime cost. I'd leave
> it as is.
I agree if this code path is called often. Anyway, I have no strong
opinion on this but at least to me it is more clear.
Regards,
Marco
>
> >
> > with
> >
> > static inline blkdev_is_gpt_partitioned(struct block_device *blkdev)
> > {
> > return cdev_is_gpt_partitioned(&blkdev->cdev);
> > }
> >
> > Regards,
> > Marco
> >
> >> strcpy(cdev->partuuid, part->partuuid);
> >>
> >> free(partition_name);
> >> diff --git a/common/partitions/efi.c b/common/partitions/efi.c
> >> index df63b82afe24..2756337ab284 100644
> >> --- a/common/partitions/efi.c
> >> +++ b/common/partitions/efi.c
> >> @@ -471,6 +471,7 @@ static void efi_partition(void *buf, struct block_device *blk,
> >> pentry->size++;
> >> part_set_efi_name(&ptes[i], pentry->name);
> >> snprintf(pentry->partuuid, sizeof(pentry->partuuid), "%pUl", &ptes[i].unique_partition_guid);
> >> + pentry->typeuuid = ptes[i].partition_type_guid;
> >> pd->used_entries++;
> >> }
> >> }
> >> diff --git a/common/partitions/parser.h b/common/partitions/parser.h
> >> index f2f692f7903b..9cc41a7573fe 100644
> >> --- a/common/partitions/parser.h
> >> +++ b/common/partitions/parser.h
> >> @@ -17,10 +17,13 @@
> >>
> >> struct partition {
> >> char name[MAX_PARTITION_NAME];
> >> - u8 dos_partition_type;
> >> char partuuid[MAX_UUID_STR];
> >> uint64_t first_sec;
> >> uint64_t size;
> >> + union {
> >> + u8 dos_partition_type;
> >> + guid_t typeuuid;
> >> + };
> >> };
> >>
> >> struct partition_desc {
> >> diff --git a/fs/fs.c b/fs/fs.c
> >> index 9a92e6e251e5..16cc072adfaf 100644
> >> --- a/fs/fs.c
> >> +++ b/fs/fs.c
> >> @@ -110,6 +110,8 @@ void cdev_print(const struct cdev *cdev)
> >> nbytes += printf("Filetype: %s\t", file_type_to_string(cdev->filetype));
> >> if (cdev_is_mbr_partitioned(cdev->master))
> >> nbytes += printf("DOS parttype: 0x%02x\t", cdev->dos_partition_type);
> >> + else if (cdev_is_gpt_partitioned(cdev->master))
> >> + nbytes += printf("GPT typeuuid: %pUl\t", &cdev->typeuuid);
> >> if (*cdev->partuuid || *cdev->diskuuid)
> >> nbytes += printf("%sUUID: %s", cdev_is_partition(cdev) ? "PART" : "DISK",
> >> cdev_is_partition(cdev) ? cdev->partuuid : cdev->diskuuid);
> >> diff --git a/include/driver.h b/include/driver.h
> >> index 5f2eae65466f..6407f7d6ba36 100644
> >> --- a/include/driver.h
> >> +++ b/include/driver.h
> >> @@ -8,6 +8,7 @@
> >>
> >> #include <linux/list.h>
> >> #include <linux/ioport.h>
> >> +#include <linux/uuid.h>
> >> #include <of.h>
> >> #include <filetype.h>
> >>
> >> @@ -536,12 +537,15 @@ struct cdev {
> >> unsigned int flags;
> >> int open;
> >> struct mtd_info *mtd;
> >> - u8 dos_partition_type;
> >> struct cdev *link;
> >> struct list_head link_entry, links;
> >> struct list_head partition_entry, partitions;
> >> struct cdev *master;
> >> enum filetype filetype;
> >> + union {
> >> + u8 dos_partition_type;
> >> + guid_t typeuuid;
> >> + };
> >> };
> >>
> >> int devfs_create(struct cdev *);
> >> --
> >> 2.39.2
> >>
> >>
> >>
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
>
next prev parent reply other threads:[~2023-06-07 8:57 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 14:59 [PATCH 00/18] state: allow lookup of barebox state partition by Type GUID Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 01/18] common: partitions: decouple from EFI GUID definition Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 02/18] efi: define efi_guid_t as 32-bit aligned guid_t Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 03/18] cdev: fix for_each_cdev macro Ahmad Fatoum
2023-05-31 15:37 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 04/18] of: partition: support of_partition_ensure_probed on parent device Ahmad Fatoum
2023-05-31 16:30 ` Marco Felsch
2023-06-01 4:48 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 05/18] of: of_path: always call of_partition_ensure_probed before resolving Ahmad Fatoum
2023-05-31 16:34 ` Marco Felsch
2023-06-01 7:00 ` Ulrich Ölmann
2023-05-31 14:59 ` [PATCH 06/18] driver: add new cdev_is_partition helper Ahmad Fatoum
2023-05-31 16:36 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 07/18] commands: stat: remove code duplication for type info Ahmad Fatoum
2023-05-31 16:44 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 08/18] cdev: use more descriptive struct cdev::diskuuid/partuuid Ahmad Fatoum
2023-05-31 16:56 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 09/18] cdev: record whether partition is parsed from OF Ahmad Fatoum
2023-05-31 17:04 ` Marco Felsch
2023-06-06 19:31 ` Ahmad Fatoum
2023-06-01 8:03 ` Ulrich Ölmann
2023-05-31 14:59 ` [PATCH 10/18] cdev: have devfs_add_partition return existing identical partition, not NULL Ahmad Fatoum
2023-05-31 17:23 ` Marco Felsch
2023-06-01 4:56 ` Ahmad Fatoum
2023-06-01 7:32 ` Sascha Hauer
2023-06-01 8:26 ` Marco Felsch
2023-06-01 7:36 ` Sascha Hauer
2023-06-07 8:06 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 11/18] block: parse partition table on block device registration Ahmad Fatoum
2023-05-31 17:25 ` Marco Felsch
2023-06-01 7:42 ` Sascha Hauer
2023-06-01 8:33 ` Marco Felsch
2023-06-06 19:30 ` Ahmad Fatoum
2023-06-01 8:24 ` Ulrich Ölmann
2023-06-01 8:31 ` Ahmad Fatoum
2023-06-01 10:33 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 12/18] common: partitions: record whether disk is GPT or MBR partitioned Ahmad Fatoum
2023-05-31 17:33 ` Marco Felsch
2023-06-01 5:08 ` Ahmad Fatoum
2023-06-01 5:58 ` Ahmad Fatoum
2023-06-01 8:19 ` Marco Felsch
2023-06-01 10:40 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 13/18] block: add cdev_is_block_(device,partition,disk) helpers Ahmad Fatoum
2023-05-31 17:35 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 14/18] of: export new of_cdev_find helper Ahmad Fatoum
2023-05-31 17:41 ` Marco Felsch
2023-06-01 8:41 ` Ulrich Ölmann
2023-05-31 14:59 ` [PATCH 15/18] state: factor device path lookup into helper function Ahmad Fatoum
2023-05-31 17:54 ` Marco Felsch
2023-06-01 5:14 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 16/18] cdev: use cdev::dos_partition_type only if cdev_is_mbr_partitioned Ahmad Fatoum
2023-05-31 18:54 ` Marco Felsch
2023-06-01 5:30 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 17/18] common: partitions: efi: record type UUID in cdev Ahmad Fatoum
[not found] ` <20230531193130.fgmvxm27dh3gbvhh@pengutronix.de>
2023-06-06 19:28 ` Ahmad Fatoum
2023-06-07 8:55 ` Marco Felsch [this message]
2023-05-31 14:59 ` [PATCH 18/18] state: allow lookup of barebox state partition by Type GUID Ahmad Fatoum
2023-05-31 20:01 ` Marco Felsch
2023-06-01 5:49 ` Ahmad Fatoum
2023-06-01 8:11 ` Marco Felsch
2023-06-01 10:44 ` Ahmad Fatoum
2023-06-01 8:05 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230607085554.ldozottnbuu4pzmu@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox