Re: Linux 2.4.5-ac14
Em Sat, Jun 16, 2001 at 05:56:08PM -0300, Thiago Vinhas de Moraes escreveu: > Em Sex 15 Jun 2001 18:15, Alan Cox escreveu: > > > Why the 2.4.5-ac series doesn't have merges from Linus 2.4.6-pre anymore? > > > > Because right now I dont consider the 2.4.6 page cache ext2 stuff safe > > enough to merge. I'm letting someone else be the sucide squad.. so far it > > looks like it is indeed fine but I want to wait and see more yet > > But wouldn't be safe/possible/viable to merge 2.4.6-pre partially, excluding > the page cache stuff for the moment? > IMHO, the 2.4.6-pre has important improvements, and it would be difficult to > merge to it later. > Just a stupid opinion. No offenses. If you look closely, some of the good things in 2.4.6-pre3 were backported by Marcelo and included in 2.4.5-ac15 - Arnaldo - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.4.5-ac14
Em Sex 15 Jun 2001 18:15, Alan Cox escreveu: > > Why the 2.4.5-ac series doesn't have merges from Linus 2.4.6-pre anymore? > > Because right now I dont consider the 2.4.6 page cache ext2 stuff safe > enough to merge. I'm letting someone else be the sucide squad.. so far it > looks like it is indeed fine but I want to wait and see more yet But wouldn't be safe/possible/viable to merge 2.4.6-pre partially, excluding the page cache stuff for the moment? IMHO, the 2.4.6-pre has important improvements, and it would be difficult to merge to it later. Just a stupid opinion. No offenses. Regards, -- Thiago Vinhas de Moraes NetWorx - A SuaCompanhia.com - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.4.5-ac14
Hi! Why the 2.4.5-ac series doesn't have merges from Linus 2.4.6-pre anymore? Regards, -- Thiago Vinhas de Moraes NetWorx - A SuaCompanhia.com - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.4.5-ac14
Hi Dieter, On Fri, 15 Jun 2001, Dieter Nützel wrote: > I see 4.29 GB under shm with your latest try. > something wrong? Yes, this is nasty. The appended patch fixes that. (I am not really happy to need the PG_marker flag for writepage.) The patch also fixes two other problems: - shmem_file_setup has to check the given size. Else we can corrupt kernel memory on 64bit machines. (Thanks to Oliver Paukstadt for detecting this) - shmem_remount_fs does not initialize the parameters and thus corrupts the sizes (detected by Joris van Rantwijk) Alan, please apply. Greetings Christoph diff -uNr 5-ac14/include/linux/mm.h 5-ac14-fix/include/linux/mm.h --- 5-ac14/include/linux/mm.h Fri Jun 15 10:37:21 2001 +++ 5-ac14-fix/include/linux/mm.h Fri Jun 15 11:24:06 2001 @@ -357,6 +357,7 @@ #define PageMarker(page) test_bit(PG_marker, &(page)->flags) #define SetPageMarker(page)set_bit(PG_marker, &(page)->flags) +#define ClearPageMarker(page) clear_bit(PG_marker, &(page)->flags) #ifdef CONFIG_HIGHMEM #define PageHighMem(page) test_bit(PG_highmem, &(page)->flags) diff -uNr 5-ac14/mm/shmem.c 5-ac14-fix/mm/shmem.c --- 5-ac14/mm/shmem.c Fri Jun 15 10:09:21 2001 +++ 5-ac14-fix/mm/shmem.c Fri Jun 15 11:37:44 2001 @@ -34,6 +34,7 @@ #define TMPFS_MAGIC0x01021994 #define ENTRIES_PER_PAGE (PAGE_SIZE/sizeof(unsigned long)) +#define SHMEM_MAX_BLOCKS (SHMEM_NR_DIRECT + ENTRIES_PER_PAGE*ENTRIES_PER_PAGE) #define SHMEM_SB(sb) (&sb->u.shmem_sb) @@ -56,10 +57,12 @@ struct inode *inode = (struct inode *)page->mapping->host; struct shmem_sb_info * sbinfo = SHMEM_SB(inode->i_sb); - inode->i_blocks -= BLOCKS_PER_PAGE; - spin_lock (&sbinfo->stat_lock); - sbinfo->free_blocks++; - spin_unlock (&sbinfo->stat_lock); + if (!PageMarker(page)) { + inode->i_blocks -= BLOCKS_PER_PAGE; + spin_lock (&sbinfo->stat_lock); + sbinfo->free_blocks++; + spin_unlock (&sbinfo->stat_lock); + } atomic_dec(&shmem_nrpages); } @@ -241,9 +244,10 @@ *entry = swap; error = 0; /* Remove the page from the page cache */ - atomic_dec(&shmem_nrpages); lru_cache_del(page); + SetPageMarker(page); remove_inode_page(page); + ClearPageMarker(page); /* Add it to the swap cache */ add_to_swap_cache(page, swap); @@ -1062,6 +1066,8 @@ unsigned long max_inodes, inodes; struct shmem_sb_info *sbinfo = SHMEM_SB(sb); + max_blocks = sbinfo->max_blocks; + max_inodes = sbinfo->max_inodes; if (shmem_parse_options (data, NULL, &max_blocks, &max_inodes)) return -EINVAL; @@ -1110,7 +1116,7 @@ sbinfo->free_blocks = blocks; sbinfo->max_inodes = inodes; sbinfo->free_inodes = inodes; - sb->s_maxbytes = (unsigned long long)(SHMEM_NR_DIRECT + (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)) << PAGE_CACHE_SHIFT; + sb->s_maxbytes = (unsigned long long) SHMEM_MAX_BLOCKS << PAGE_CACHE_SHIFT; sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; sb->s_magic = TMPFS_MAGIC; @@ -1311,9 +1317,11 @@ struct qstr this; int vm_enough_memory(long pages); - error = -ENOMEM; + if (size > (unsigned long long) SHMEM_MAX_BLOCKS << PAGE_CACHE_SHIFT) + return ERR_PTR(-EINVAL); + if (!vm_enough_memory((size) >> PAGE_SHIFT)) - goto out; + return ERR_PTR(-ENOMEM); this.name = name; this.len = strlen(name); @@ -1321,7 +1329,7 @@ root = tmpfs_fs_type.kern_mnt->mnt_root; dentry = d_alloc(root, &this); if (!dentry) - goto out; + return ERR_PTR(-ENOMEM); error = -ENFILE; file = get_empty_filp(); @@ -1347,7 +1355,6 @@ put_filp(file); put_dentry: dput (dentry); -out: return ERR_PTR(error); } /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.4.5-ac14
Am Freitag, 15. Juni 2001 04:30 schrieb John Cavan: > Dieter Nützel wrote: > > Hello Alan, > > > > I see 4.29 GB under shm with your latest try. > > something wrong? > > total:used:free: shared: buffers: cached: > Mem: 1053483008 431419392 622063616 122880 24387584 260923392 > Swap: 3947642880 394764288 > MemTotal: 1028792 kB > MemFree:607484 kB > MemShared: 120 kB > Buffers: 23816 kB > Cached: 254808 kB > Active: 225536 kB > Inact_dirty: 53208 kB > Inact_clean: 0 kB > Inact_target: 44 kB > HighTotal: 131056 kB > HighFree: 1048 kB > LowTotal: 897736 kB > LowFree:606436 kB > SwapTotal: 385512 kB > SwapFree: 385512 kB > > I don't seem to have the problem... You are using HIGHMEM?! -Dieter - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.4.5-ac14
Hello Alan, I see 4.29 GB under shm with your latest try. something wrong? Regards, Dieter SunWave1>cat /proc/meminfo total:used:free: shared: buffers: cached: Mem: 327802880 322592768 5210112 4294184960 8417280 253640704 Swap: 1052794880 95768576 957026304 MemTotal: 320120 kB MemFree: 5088 kB MemShared:4294966532 kB Buffers: 8220 kB Cached: 247696 kB Active: 228008 kB Inact_dirty: 24552 kB Inact_clean: 2592 kB Inact_target: 468 kB HighTotal: 0 kB HighFree:0 kB LowTotal: 320120 kB LowFree: 5088 kB SwapTotal: 1028120 kB SwapFree: 934596 kB - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.4.5-ac14
Dieter Nützel wrote: > > Hello Alan, > > I see 4.29 GB under shm with your latest try. > something wrong? total:used:free: shared: buffers: cached: Mem: 1053483008 431419392 622063616 122880 24387584 260923392 Swap: 3947642880 394764288 MemTotal: 1028792 kB MemFree:607484 kB MemShared: 120 kB Buffers: 23816 kB Cached: 254808 kB Active: 225536 kB Inact_dirty: 53208 kB Inact_clean: 0 kB Inact_target: 44 kB HighTotal: 131056 kB HighFree: 1048 kB LowTotal: 897736 kB LowFree:606436 kB SwapTotal: 385512 kB SwapFree: 385512 kB I don't seem to have the problem... John - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Linux 2.4.5-ac14
ftp://ftp.kernel.org/pub/linux/kernel/people/alan/2.4/ Intermediate diffs are available from http://www.bzimage.org In terms of going through the code audit almost all the sound drivers still need fixing to lock against format changes during a read/write. Poll creating and starting a buffer as write does and also mmap during write, write during an mmap. 2.4.5-ac14 o Fix oops on command abort on aha152x(me) | This so far is only a partial fix o Switch to unlazy swap cache free up (Marcelo Tosatti) o Page launder changes(Rik van Riel) o Remove dead irda irlap compression code (Dag Brattli) o Fix bug where init/main.c executes freed code (Hans-Peter Nilsson) o Fix ramfs accounting. truncate/freepage hook(Christoph Rohland) o Add MTWEOF ioctl to parallel tape (Russ Ingram) o Add driver for CATC based USB ethernet (Vojtech Pavlik) o Update cris architecture code (Bjorn Wesen) o Clean up reiserfs tail->full page convert (Chris Mason) o Clean up lp init, fix lp= option handling (Tim Waugh) o Don't panic on out of memory during ps/2 setup (Andrey Panin) o Initialise vc_cons objects in full (Richard Hirst) o Futher Configure.help resync(Eric Raymond) o Fix misdeclaration of xtime (Petr Vandrovec) o Add yet more sb variants(Andrey Panin) o Fix bogus VIA warning triggers (I hope) (me) o Fix 3c509 symbols when building nonpnp (Keith Owens) o Make pid on core dump configurable (Ben LaHaise) 2.4.5-ac13 o Fix i2o_block to use invalidate_device (me) o Fix viodasd to use invalidate_device(me) o Fix missing ipc alloc check (Manfred Spraul) o Use skb_purge_queue in isdn (Kai Germaschewski) o Fix epic100 printk error(Francois Romieu) o Resync with master Configure.help (Eric Raymond) o Avoid oops when reading swap proc during swapon (Paul Menage) o Sony pi driver update (Stelian Pop) o Sony motioneye camera driver(Stelian Pop, Andrew Tridgell) o Fix eepro100 access by user to some registers (Andrey Savochkin) o Small APM real mode reboot clean ups(Stephen Rothwell) o Fix isofs buffer leak on invalid iocharset (Tachino Nobuhiro) o Fix default encoding on pwc videocam(Mark Cooke) o Clean up FAT further, fix endian bug, and times (OGAWA Hirofumi) before 1/1/1980 o Support combo parallel/serial PCI cards (Tim Waugh) o CS46xx mmap oops fix(me) 2.4.5-ac12 o Report apic timer vector in hex too (Philip Pokorny) | With 0x in front so we can tell on reports.. o Report card services differently if kernel (Jeff Garzik) o Don't terminate init on sysrq (Adam Slattery) unless forced o Add more pci wrappers when PCI is off (Jeff Garzik) o Remove 4K object from the stack in emu10k1 (me) o Remove 3.5K object from the i2o_proc stack (me) o Remove 3K object from the ewrk3 ioctl stack (me) o Fix bugs in the es1371 locking (me) o Fix ohci iso alignments (Roman Weissgaerber) o Updated megaraid driver (Atul Mukker) | In paticular this now uses the new PCI api 2.4.5-ac11 o Fix the megaraid driver ioctl check (me) o Fix the moxa ioctl checks (me) o Fix the i810 dri length check (me) o Fix array check in se401.c (me) o Fix scc irq array problems (me) o Fix sign check on zr36120 (me) o Fix sign check in raw driver(me) o Fix zr36067 array size check(me) | All the above from the Stanford checker o Fix an irq order assumption in the i810 audio (Doug Ledford) o Make real mode poweroff configurable and also (Arjan van de Ven) add DMI entries for it o Clean up Alpha oops reporting (Will Woods) o Fix ia64 build bug from mmap change (Bill Nottingham) o Fix sysinfo padding so m68k comes out right (Jes Sorensen) o Update pci ids related to ide devices (Andre Hedrick) o Update ide registers/ioctl numbers/info (Andre Hedrick) o Fix speed detection on slc90e66 (