From: Julien Grall <julien@xen.org>
To: Jan Beulich <jbeulich@suse.com>
Cc: xen-devel@lists.xenproject.org, alex.bennee@linaro.org,
masami.hiramatsu@linaro.org, ehem+xen@m5p.com,
bertrand.marquis@arm.com, andre.przywara@arm.com,
"Julien Grall" <jgrall@amazon.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Volodymyr Babchuk" <Volodymyr_Babchuk@epam.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Ian Jackson" <iwj@xenproject.org>, "Wei Liu" <wl@xen.org>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: Re: [PATCH 1/4] xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory()
Date: Mon, 28 Sep 2020 10:58:39 +0100 [thread overview]
Message-ID: <b5624bfa-f24b-4c0a-6735-3473892fbd2f@xen.org> (raw)
In-Reply-To: <fe055799-de10-891a-bcee-bbb01a8c0b3d@suse.com>
Hi Jan,
On 28/09/2020 09:18, Jan Beulich wrote:
> On 26.09.2020 22:55, Julien Grall wrote:
>> @@ -49,6 +53,12 @@ char *__acpi_map_table(paddr_t phys, unsigned long size)
>> return ((char *) base + offset);
>> }
>>
>> +bool __acpi_unmap_table(void *ptr, unsigned long size)
>> +{
>> + return ( vaddr >= FIXMAP_ADDR(FIXMAP_ACPI_BEGIN) &&
>> + vaddr < (FIXMAP_ADDR(FIXMAP_ACPI_END) + PAGE_SIZE) );
>
> Nit: If this wasn't Arm code, I'd ask for the parentheses to be
> dropped altogether, but at least the stray blanks should go away
> imo.
I will drop the stray blanks.
>
>> --- a/xen/arch/x86/acpi/lib.c
>> +++ b/xen/arch/x86/acpi/lib.c
>> @@ -46,6 +46,10 @@ char *__acpi_map_table(paddr_t phys, unsigned long size)
>> if ((phys + size) <= (1 * 1024 * 1024))
>> return __va(phys);
>>
>> + /* No arch specific implementation after early boot */
>> + if (system_state >= SYS_STATE_boot)
>> + return NULL;
>
> Considering the code in context above, the comment isn't entirely
> correct.
How about "No arch specific implementation after early boot but for the
first 1MB"?
>
>> @@ -66,6 +70,20 @@ char *__acpi_map_table(paddr_t phys, unsigned long size)
>> return ((char *) base + offset);
>> }
>>
>> +bool __acpi_unmap_table(void *ptr, unsigned long size)
>
> Is there anything standing in the way of making ptr "const void *"?
It might be possible, I will have a look.
>> +{
>> + unsigned long vaddr = (unsigned long)ptr;
>> +
>> + if (vaddr >= DIRECTMAP_VIRT_START &&
>> + vaddr < DIRECTMAP_VIRT_END) {
>> + ASSERT(!((__pa(ptr) + size - 1) >> 20));
>> + return true;
>> + }
>> +
>> + return (vaddr >= __fix_to_virt(FIX_ACPI_END)) &&
>> + (vaddr < (__fix_to_virt(FIX_ACPI_BEGIN) + PAGE_SIZE));
>
> Indentation is slightly wrong here.
This is Linux coding style and therefore is using hard tab. Care to
explain the problem?
> Also please consider reducing
> the number of parentheses here; at the very least the return and
> the earlier if() want to be consistent in when ones are(n't) used.
I will add extra parentheses in the if.
>
>> --- a/xen/drivers/acpi/osl.c
>> +++ b/xen/drivers/acpi/osl.c
>> @@ -92,27 +92,29 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
>> void __iomem *
>> acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
>> {
>> - if (system_state >= SYS_STATE_boot) {
>> - mfn_t mfn = _mfn(PFN_DOWN(phys));
>> - unsigned int offs = phys & (PAGE_SIZE - 1);
>> -
>> - /* The low first Mb is always mapped on x86. */
>> - if (IS_ENABLED(CONFIG_X86) && !((phys + size - 1) >> 20))
>> - return __va(phys);
>> - return __vmap(&mfn, PFN_UP(offs + size), 1, 1,
>> - ACPI_MAP_MEM_ATTR, VMAP_DEFAULT) + offs;
>> - }
>> - return __acpi_map_table(phys, size);
>> + void *ptr;
>> + mfn_t mfn = _mfn(PFN_DOWN(phys));
>> + unsigned int offs = phys & (PAGE_SIZE - 1);
>
> Open-coding PAGE_OFFSET()?
I was looking for a macro to avoid open-coding but I couldn't find it. I
will use it in the next version.
>> + /* Try the arch specific implementation first */
>> + ptr = __acpi_map_table(phys, size);
>> + if (ptr)
>> + return ptr;
>> +
>> + /* No common implementation for early boot map */
>> + if (unlikely(system_state < SYS_STATE_boot))
>> + return NULL;
>
> Consistently hard tabs for indentation here, please.
Will do.
>> + ptr = __vmap(&mfn, PFN_UP(offs + size), 1, 1,
>> + ACPI_MAP_MEM_ATTR, VMAP_DEFAULT);
>> +
>> + return !ptr ? NULL : (ptr + offs);
>
> Slightly odd that you don't let the success case go first,
I don't really see the problem. Are you nitpicking?
> the more that it's minimally shorter:
>
> return ptr ? ptr + offs : NULL;
Cheers,
--
Julien Grall
next prev parent reply other threads:[~2020-09-28 9:59 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-26 20:55 [PATCH 0/4] xen/arm: Unbreak ACPI Julien Grall
2020-09-26 20:55 ` [PATCH 1/4] xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory() Julien Grall
2020-09-28 8:18 ` Jan Beulich
2020-09-28 9:58 ` Julien Grall [this message]
2020-09-28 10:09 ` Jan Beulich
2020-09-28 10:39 ` Julien Grall
2020-10-10 9:49 ` Julien Grall
2020-10-10 10:04 ` Julien Grall
2020-09-29 11:10 ` Rahul Singh
2020-10-01 0:06 ` Stefano Stabellini
2020-10-01 15:09 ` Julien Grall
2020-09-26 20:55 ` [PATCH 2/4] xen/arm: acpi: The fixmap area should always be cleared during failure/unmap Julien Grall
2020-09-29 11:13 ` Rahul Singh
2020-10-01 0:30 ` Stefano Stabellini
2020-10-01 15:14 ` Julien Grall
2020-09-26 20:55 ` [PATCH 3/4] xen/arm: Check if the platform is not using ACPI before initializing Dom0less Julien Grall
2020-09-29 11:17 ` Rahul Singh
2020-09-30 23:26 ` Stefano Stabellini
2020-09-26 20:55 ` [PATCH 4/4] xen/arm: Introduce fw_unreserved_regions() and use it Julien Grall
2020-09-30 23:40 ` Stefano Stabellini
2020-10-01 15:34 ` Julien Grall
2020-09-27 1:47 ` [PATCH 0/4] xen/arm: Unbreak ACPI Elliott Mitchell
2020-09-29 15:28 ` Elliott Mitchell
2020-09-28 6:47 ` Masami Hiramatsu
2020-09-28 12:41 ` [PATCH] xen: acpi: Hide UART address only if SPCR exists Masami Hiramatsu
2020-09-28 12:42 ` Masami Hiramatsu
2021-01-19 7:25 ` Elliott Mitchell
2021-01-20 18:05 ` Julien Grall
2020-09-28 13:00 ` [PATCH 0/4] xen/arm: Unbreak ACPI Masami Hiramatsu
2020-10-16 22:33 ` Xen-ARM EFI/ACPI problems (was: Re: [PATCH 0/4] xen/arm: Unbreak ACPI) Elliott Mitchell
2020-10-17 5:12 ` Elliott Mitchell
2020-10-08 18:39 ` [PATCH 0/4] xen/arm: Unbreak ACPI Elliott Mitchell
2020-10-09 9:39 ` Julien Grall
2020-10-09 14:22 ` Elliott Mitchell
2020-10-09 18:15 ` Julien Grall
2020-10-09 22:36 ` Elliott Mitchell
2020-10-09 21:49 ` Elliott Mitchell
2020-10-10 11:02 ` Julien Grall
2020-10-12 19:02 ` Stefano Stabellini
2020-10-12 21:34 ` Elliott Mitchell
2020-10-14 1:06 ` Stefano Stabellini
2020-10-14 1:37 ` Elliott Mitchell
2020-10-14 17:47 ` Julien Grall
2020-10-15 18:00 ` Stefano Stabellini
2020-10-14 17:44 ` Julien Grall
2020-09-29 11:10 ` Rahul Singh
2020-09-29 15:29 ` Alex Bennée
2020-09-29 17:07 ` Julien Grall
2020-09-29 21:11 ` Alex Bennée
2020-09-29 23:39 ` André Przywara
2020-09-30 8:51 ` Alex Bennée
2020-09-30 10:35 ` Julien Grall
2020-09-30 9:42 ` Julien Grall
2020-09-30 10:38 ` Alex Bennée
2020-09-30 11:10 ` Julien Grall
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=b5624bfa-f24b-4c0a-6735-3473892fbd2f@xen.org \
--to=julien@xen.org \
--cc=Volodymyr_Babchuk@epam.com \
--cc=alex.bennee@linaro.org \
--cc=andre.przywara@arm.com \
--cc=andrew.cooper3@citrix.com \
--cc=bertrand.marquis@arm.com \
--cc=ehem+xen@m5p.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=jgrall@amazon.com \
--cc=masami.hiramatsu@linaro.org \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).