| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <48235DA1.5060809@numericable.fr>
Date: Thu, 08 May 2008 22:08:01 +0200
From: Rufus & Azrael <rufus-azrael@...ericable.fr>
To: Venki Pallipadi <venkatesh.pallipadi@...el.com>
CC: Ingo Molnar <mingo@...e.hu>,
"Siddha, Suresh B" <suresh.b.siddha@...el.com>,
Linux-kernel Mailing List <linux-kernel@...r.kernel.org>,
Yinghai Lu <yhlu.kernel@...il.com>
Subject: Re: [2.6.25-git18 => 2.6.26-rc1-git1] Xorg crash with xf86MapVidMem
error
Venki Pallipadi a écrit :
> On Thu, May 08, 2008 at 06:18:48AM -0700, Pallipadi, Venkatesh wrote:
>
>>
>>
>>
>>> -----Original Message-----
>>> From: Rufus & Azrael [mailto:rufus-azrael@...ericable.fr]
>>> Sent: Thursday, May 08, 2008 12:09 AM
>>> To: Pallipadi, Venkatesh
>>> Cc: Ingo Molnar; Siddha, Suresh B; Linux-kernel Mailing List
>>> Subject: Re: [2.6.25-git18 => 2.6.26-rc1-git1] Xorg crash with
>>> xf86MapVidMem error
>>>
>>> Pallipadi, Venkatesh a écrit :
>>>
>>>>
>>>> One more piece of data I need. Can you please send the
>>>>
>>> output of `cat /proc/mtrr` from this system (after the X
>>> failure has happened)
>>>
>>>> Thanks,
>>>> Venki
>>>>
>>>>
>>>>
>>> Hi Venki,
>>>
>>>
>>> See my /proc/mtrr file attached.
>>>
>>>
>> OK. Thanks for all the info.
>>
>> I think I figured out what is going wrong here:
>> 1) uvesafb is mapping 0xf0000000-0xf1000000
>> [4294014.924303] reserve_memtype added 0xf0000000-0xf1000000, track
>> uncached-minus, req uncached-minus, ret uncached-minus
>>
>> 2) Set up the framebuffer within that mapped region. Uvesafb is setting
>> "write-combine" mtrr for framebuffer for this 16M. 0xf0000000-0xf1000000
>> [4294015.649340] uvesafb: framebuffer at 0xf0000000, mapped to
>> 0xffffc20010a80000, using 16384k, total 16384k
>> [4294015.649340] fb0: VESA VGA frame buffer device
>>
>> 3) Later when X starts up, it tries to map bigger PCI range
>> 0xf0000000-0xf8000000 from /dev/mem.
>>
>> 4) PAT check tries to make sure the entire region being mmap'ed is of the
>> same effective memory type. But in this case start of the address
>> (0xf0000000) is write-combine and end of the address is uncached. So,
>> with the new PAT code mmap fails with EINVAL, resulting in X failure.
>> xf86MapVidMem: Could not mmap framebuffer (0xf0000000,0x8000000) (Invalid
>> argument)
>>
>>
>> Now we need to figure out a clean solution for this problem. I think we
>> don't have to check the full range of address is of same type as long as we
>> are requesting for PAT type UC_MINUS and MTRR has WC sub ranges. But, we
>> need to think about other such conflict conditiond when having multiple
>> users of same range (uvesafb and X) also. Will be back with a patch for
>> you to try and test.
>>
>>
>
> Hi,
>
> Can you please check whether the patch below solves this problem. Also, please
> send in 'dmesg' and /proc/mtrr output after you boot with this patch.
>
> Thanks,
> Venki
>
>
> Use UC_MINUS in reserve_memtype call with -1, when MTRR lookup fails for any
> reason.
>
> Change the logic in mtrr_type_lookup to just get the type from the start
> address. Using start and end adddress is not right/complete as start and
> end can be covered by different mtrr (where old code will fail) or
> start and end can be in same mtrr, but still have some different
> memory type region in between. Using only start is less restrictive and
> deterministic.
>
> Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@...el.com>
>
> ---
> arch/x86/kernel/cpu/mtrr/generic.c | 7 ++-----
> arch/x86/mm/pat.c | 8 +-------
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
> Index: linux-2.6/arch/x86/kernel/cpu/mtrr/generic.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/cpu/mtrr/generic.c 2008-05-02 09:45:23.000000000 -0700
> +++ linux-2.6/arch/x86/kernel/cpu/mtrr/generic.c 2008-05-08 12:22:16.000000000 -0700
> @@ -48,7 +48,6 @@ module_param_named(show, mtrr_show, bool
> /*
> * Returns the effective MTRR type for the region
> * Error returns:
> - * - 0xFE - when the range is "not entirely covered" by _any_ var range MTRR
> * - 0xFF - when MTRR is not enabled
> */
> u8 mtrr_type_lookup(u64 start, u64 end)
> @@ -96,7 +95,7 @@ u8 mtrr_type_lookup(u64 start, u64 end)
>
> prev_match = 0xFF;
> for (i = 0; i < num_var_ranges; ++i) {
> - unsigned short start_state, end_state;
> + unsigned short start_state;
>
> if (!(mtrr_state.var_ranges[i].mask_lo & (1 << 11)))
> continue;
> @@ -107,9 +106,7 @@ u8 mtrr_type_lookup(u64 start, u64 end)
> (mtrr_state.var_ranges[i].mask_lo & PAGE_MASK);
>
> start_state = ((start & mask) == (base & mask));
> - end_state = ((end & mask) == (base & mask));
> - if (start_state != end_state)
> - return 0xFE;
> + /* Just check the type of start address */
>
> if ((start & mask) != (base & mask)) {
> continue;
> Index: linux-2.6/arch/x86/mm/pat.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/pat.c 2008-05-07 13:35:56.000000000 -0700
> +++ linux-2.6/arch/x86/mm/pat.c 2008-05-08 12:22:35.000000000 -0700
> @@ -162,10 +162,6 @@ static int pat_x_mtrr_type(u64 start, u6
> *ret_prot = prot;
> return 0;
> }
> - if (mtrr_type == 0xFE) { /* MTRR match error */
> - *ret_prot = _PAGE_CACHE_UC;
> - return -1;
> - }
> if (mtrr_type != MTRR_TYPE_UNCACHABLE &&
> mtrr_type != MTRR_TYPE_WRBACK &&
> mtrr_type != MTRR_TYPE_WRCOMB) { /* MTRR type unhandled */
> @@ -244,9 +240,7 @@ int reserve_memtype(u64 start, u64 end,
> * no match.
> */
> u8 mtrr_type = mtrr_type_lookup(start, end);
> - if (mtrr_type == 0xFE) { /* MTRR match error */
> - err = -1;
> - }
> + /* MTRR lookup failed - Use UC_MINUS*/
>
> if (mtrr_type == MTRR_TYPE_WRBACK) {
> req_type = _PAGE_CACHE_WB;
>
>
Hi Venki,
Patch applied on 2.6.26-rc1-git5 and all works fine in X server with
CONFIG_X86_PAT=y.
See dmesg and mtrr files attached.
Thanks for all,
Regards.
View attachment "dmesg.log" of type "text/plain" (31427 bytes)
View attachment "mtrr" of type "text/plain" (138 bytes)
Powered by blists - more mailing lists