lkml.org 
[lkml]   [2006]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 2.6.17-rc5-mm1
So it seems that this issue was page migration specific. Patch 
would need to go with the swapless-pm-add-r-w-migration-entries.patch

Acked-by: Christoph Lameter <clameter@sgi.com>

> Remove unnecessary obfuscation from sys_swapon's range check on swap
> type, which blew up causing memory corruption once swapless migration
> made MAX_SWAPFILES no longer 2 ^ MAX_SWAPFILES_SHIFT.
>
> Signed-off-by: Hugh Dickins <hugh@veritas.com>
> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
>
> --- 2.6.17-rc5-mm3/mm/swapfile.c 2006-06-04 11:52:47.000000000 +0100
> +++ linux/mm/swapfile.c 2006-06-06 19:08:51.000000000 +0100
> @@ -1392,19 +1392,7 @@ asmlinkage long sys_swapon(const char __
> if (!(p->flags & SWP_USED))
> break;
> error = -EPERM;
> - /*
> - * Test if adding another swap device is possible. There are
> - * two limiting factors: 1) the number of bits for the swap
> - * type swp_entry_t definition and 2) the number of bits for
> - * the swap type in the swap ptes as defined by the different
> - * architectures. To honor both limitations a swap entry
> - * with swap offset 0 and swap type ~0UL is created, encoded
> - * to a swap pte, decoded to a swp_entry_t again and finally
> - * the swap type part is extracted. This will mask all bits
> - * from the initial ~0UL that can't be encoded in either the
> - * swp_entry_t or the architecture definition of a swap pte.
> - */
> - if (type > swp_type(pte_to_swp_entry(swp_entry_to_pte(swp_entry(~0UL,0))))) {
> + if (type >= MAX_SWAPFILES) {
> spin_unlock(&swap_lock);
> goto out;
> }
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-06-06 20:31    [W:0.047 / U:0.880 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site