Ho ho ho - Linux v2.6.10
Linus Torvalds
Ok, with a lot of people taking an xmas break, here's something to play
with over the holidays (not to mention an excuse for me to get into the
Glögg for real ;)
Mostly a lot of small fixes since 2.6.10-rc3, with the biggest thing being
probably the CIFS update and the switch-over to the new DVB frontend
driver world order. Some MMC and USB work too, and ARM updates as usual.
Shortlog from 2.6.10-rc3 appended, with the full log from 2.6.9 on the
normal distribution sites.
Linus
------
Summary of changes from v2.6.10-rc3 to v2.6.10
============================================
<sundarapandian:gmail.com>:
o Code to register amba serial console is missing
<vs:namesys.com>:
o reiserfs bug fix: add missing pair of lock_kernel()/unlock_kernel()
Adrian Bunk:
o USB uhci-debug.c: remove an unused function (fwd)
o scsi/qla2xxx/qla_rscn.c: remove unused functions
o fm801_gp_probe: fix use after free
Alan Cox:
o Intel/Cyrix typo
o [ide] ide-cd: fix possible race in PIO mode
o Bring Moxa serial back into being
Alan Stern:
o USB UHCI: minor bugfix for port resume
Andi Kleen:
o x86_64: fix syscall/signal restart bug
Andreas Herrmann:
o zfcp: act enhancements corrections
Andrew Morton:
o direct-io: set PF_SYNCWRITE
o do_task_stat() use pid_alive()
o remove speedstep_coppermine docs
o parenthesize init_wait() macro parameters
o AB-BA deadlock between uidhash_lock and tasklist_lock
o fix CONFIG_SWAP=n build
Andries E. Brouwer:
o restore BLKRRPART semantics
Anton Blanchard:
o ppc64: pSeries shared processor fixes
Bartlomiej Zolnierkiewicz:
o [ide] remove PLEXTOR CD-R PX-W8432T from the DMA blacklist
o [ide] remove SAMSUNG CD-ROM SC-148F from the DMA blacklist
o [ide] pdc202xx_old: fix cable detection
o [ide] fix creating of /proc/ide/ entries for legacy VLB modules
o [ide] remove obsolete comment from ide-probe.c
Ben Dooks:
o [ARM PATCH] 2290/1: S3C2410 - timer usec fixes
o [ARM PATCH] 2299/1: S3C2410 - pm debug patch
o [ARM PATCH] 2317/1: S3C2410 - fix clkout0 name in clock.c
Benjamin Herrenschmidt:
o remove some PowerMac cruft from USB
o ppc64: Workaround PCI issue on g5
Bjorn Helgaas:
o [IA64] Document serial device names on ia64
o Documentation for ia64 serial device name changes
o hisax: don't look at pci_dev->irq before calling
pci_enable_device()
Castor Fu:
o support for 3PAR sparse SCSI LUNs
Catalin Marinas:
o [ARM PATCH] 2304/1: versatile_defconfig fixed after adding
Versatile/AB support
o [ARM PATCH] 2309/1: ARCH->MACH replacement for the Versatile/AB
platform
o [ARM PATCH] 2310/1: CONFIG_FPE_NWFPE enabled in
(integrator|versatile)_defconfig
o [ARM PATCH] 2311/1: ARM1176 CPU detection
o [ARM PATCH] 2312/1: Cache type information fix
o [ARM PATCH] 2316/1: cacheflush.h included in copypage-v6.c
Chris Wright:
o [IPV4/IPV6]: IGMP source filter fixes
Christoph Hellwig:
o [XFS] remove useless S_ISREG check in ->mmap and ->mprotect
o [XFS] split pagebuf_get into xfs_buf_get_flags and
xfs_buf_read_flags
o [XFS] handle inode creating race
o [XFS] call the right function in pagebuf_readahead
Clear Zhang:
o [ide] alim15x3: add support for ULi M5228
Con Kolivas:
o vm: disable thrashing control by default
Dave Jiang:
o [ARM PATCH] 2303/1: Remove unused file in iop331 port
o [ARM PATCH] 2314/1: Enable physmap MTD driver for IOP platforms
David Brownell:
o USB: EHCI qh update race fix
o USB: OHCI "resume"/smp fix
o USB: sl811-hcd driver, replaces hc_sl811
o reduce ext3 log spamming (blank lines)
o USB: fix Scheduling while atomic warning when resuming
David Mosberger:
o [IA64] do early_console_setup() on UP, too
David S. Miller:
o [SPARC64]: Fix SMP cpu bringup bug when bigkernel
o [SPARC]: Fix syscall return value errno comparison
o [IPV4]: Do not leak IP options
o [NET]: CMSG compat code needs signedness fixes too
o [SPARC]: asm/mostek.h needs asm/io.h
o [SPARC64]: Update defconfig
o [IPV6]: Do not use udp_poll for RAW sockets
o [SPARC]: Adjust 32-bit ELF_ET_DYN_BASE
David Vrabel:
o [ARM PATCH] 2298/1: Fix minor typo in ixp4xx_wdt
o [ARM PATCH] 2300/1: IXP4xx: remove minor type mismatch warnings
Deepak Saxena:
o [ARM PATCH] 2305/1: Add IXP46x CPU support
Dmitry Torokhov:
o fix possible evdev usb mouse disconnect oops
Douglas Gilbert:
o extracting resid from struct scsi_cmnd
o off-by-1 libata-scsi INQUIRY VPD pages 0x80 and 0x83
Edward Falk:
o [ide] final polish on disk ioctl documentation
Eric Moore:
o mptfusion: delete MPTSCSIH_DBG_TIMEOUT
o mptfusion: streamline slave_alloc
o mptfusion: streamline queuecommand
o mptfusion: replace chip_type
o mptfusion: resid cleanup
o mptfusion: kill fusion init called
Eric Sandeen:
o [XFS] Wait for all async buffers to complete before tearing down
the filesystem at umount time
Fenghua Yu:
o Add cpu_relax in idle spin loop for no-hlt kernel option
François Romieu:
o r8169: new PCI id
Geert Uytterhoeven:
o M68k: Update defconfigs for 2.6.10-rc3
Geoffrey Wehrman:
o [XFS] Add xfs_rotorstep sysctl for controlling placement of extents
for new files by the inode32 allocator.
George G. Davis:
o [ARM PATCH] 2318/1: Enable access to ARMv6 VFP coprocessr
o [ARM PATCH] 2321/1: Update integrator_defconfig
Gerald Schaefer:
o s390: z/VM monreader driver bugfix
o s390: z/VM watchdog driver bugfix
Gerd Knorr:
o msp3400 quick fix
o uml: ramdisk config fix
Greg Kroah-Hartman:
o USB: fix sparse warnings in sl811-hcd driver
o USB: fix sparse warning in ehci-hcd driver
o USB: removed unused hc_sl811 driver from the tree
o USB: fix obvious build error in hc_chrisv10.c driver
o USB: fix another sparse warning in the USB core
o usbfs: Remove extraneous disconnection checks
o USB: avoid OHCI autosuspend on some boxes
o USB: drivers/usb/atm/usb_atm.c: fix nonzero snd_padding case
o USB: fix up warning messages spit out by the keyspan driver
Heiko Carstens:
o fix ext2/ext3 memory leak
Herbert Pötzl:
o normalise wall_to_monotonic for i386 and m32r
Herbert Xu:
o [NET]: Fix CMSG validation checks wrt. signedness
Hideaki Yoshifuji:
o [IPV6]: Fix check if we're a router
Holger Freyther:
o [ARM PATCH] 2294/1: SA1100 ide.h change superseed 2282/1
o [ARM PATCH] 2319/1: SIMpad cill exportation of ChipSelect via
ProcFS
o [ARM PATCH] 2320/1: SIMpad add Flash device depends on 2319/1
Hugh Dickins:
o shmctl SHM_LOCK perms
o VmLib wrapped: executable brk
o VmLib wrapped: mprotect flags
James Bottomley:
o mptfusion: command line parameters
o aic7xxx: fix compiler warning from dma mask assignement
o Fix cable pull problem with USB storage
James Nelson:
o rocket: documentation changes
Jean Tourrilhes:
o [IRDA]: Try to fix the worst abuse of the pci init code in via_ircc
o [IRDA]: Use kill_urb() in stir4200
o [IRDA]: Use kill_urb() in irda-usb
Jeff Garzik:
o [libata] only DMA map data for DMA commands (fix >=4GB bug)
o [libata sata_nv] fix dev detect by removing sata-reset flag
Jens Axboe:
o cfq-iosched: bad accounting on non-fs requests
o hack imm.c to work in highmem machines
o highmem.c: fix bio error propagation
o cfq-iosched: exit deadlock
Jeremy Huddleston:
o [SPARC]: Make some asm headers more userland friendly
Jesper Juhl:
o fix inlining related build failures in mxser.c
Johannes Stezenbach:
o fix dvb-net Oops
Jon Krueger:
o [XFS] Allow the option of skipping quotacheck processing
Jozsef Kadlecsik:
o [NETFILTER]: TCP window tracking bug fixes
Jurij Smakov:
o [SUNSAB]: Fix serial break handling
Jörn Engel:
o phram maintainer update
Kumar Gala:
o ppc32: fix SPE state corruption on e500
Li Shaohua:
o eepro100 resume failure
Linus Torvalds:
o Revert double patch application
o Revert recent ext3_dx_readdir changes
o Revert isolcpus option fix, pending better fix from Nick
o Make sure VC resizing fits in s16
o Clean up open_exec()/kmalloc() error case handling
o x86 sysenter: clear %ebp on exit
o Fix x86 src pointer type for memcpy_fromio()
o Don't use "-march=pentium3" for gcc tuning
o Linux 2.6.10
Luca Tettamanti:
o ide-cd: Unable to read multisession DVDs
Magnus Damm:
o documentation for mem=
o aty128fb: do not release unrequested range
Marc Singer:
o [ARM PATCH] 2293/1: Corrections to build for LPD7a400
o [ARM PATCH] 2296/1: Corrections to build for LPD7a404
o [ARM PATCH] 2297/1: SMC91x patch (#2) for LPD7a40x CardEngines
Marcel Holtmann:
o [Bluetooth] Use separate inquiry data structure
o [Bluetooth] Track the class of device value
o [Bluetooth] Use module parameter for ISOC alternate setting
Mark Haverkamp:
o 2.6.9 aacraid: Support ROMB RAID/SCSI mode - Resend -
o aacraid: 2.6 fix panic on module removal
Markus Lidel:
o i2o: increase timeout for LCT_NOTIFY
Martin Josefsson:
o Fix ALSA resume
Matt Mackall:
o Fix concurrent access to /dev/urandom
Matt Porter:
o ppc32: PPC4XX DMA polarity init fix
Matthew Wilcox:
o SCSI: spi_transport set_signalling is buggy
o Blacklist devices that falsely claim an echo buffer
o [IA64]delay.h: udelay() should call cpu_relax()
Michael Hunold:
o dvb: documentation update
o dvb: collateral frontend changes
o dvb: frontend driver refactoring
o dvb: saa7146 changes
o dvb: follow frontend changes in drivers
o dvb: Cinergy T2 update
o dvb: dibusb driver update
o dvb: core changes
o dvb: remove dead files
o dvb: follow changes in dvb-ttpci and budget drivers
o dvb: saa7146 driver + misc updates
o dvb: B2C2 driver splitup
o dvb: update dib-usb driver
o dvb: dvb-core update
o dvb: frontend update
o dvb: av7110 driver update
Mike Miller:
o cciss: cciss_ioctl return code fix
o cciss: cciss_ioctl return code fix
Mitchell Blank Jr.:
o [IPV4]: Do not use udp_poll for RAW sockets
Nathan Scott:
o [XFS] Low memory allocation improvements (quietness and blockdev
congestion checks).
o [XFS] Mark several functions as being static
Nick Piggin:
o Fix broken domain debugging (aka "isolcpus option broken")
Nicolas Pitre:
o [ARM PATCH] 2301/1: fix PXA definition of PSSR_OTGPH
o [ARM PATCH] 2289/2: turn off PXA clock to MMC block when not in use
Nishanth Aravamudan:
o USB: add wake-up for waitqueues in usbfs_remove_file() to fix bug
387
Olaf Hering:
o dvb: Kconfig help typo fix
Parag Warudkar:
o ohci1394.c - Correct kmalloc usage in interrupt
Pascal Lengard:
o [ide] atiixp: add new PCI identifier
Patrick McHardy:
o [PKT_SCHED]: Fix hard freeze with QoS in 2.6.10-rc3
o [NETFILTER]: Fix memory leak in ip_conntrack_ftp
o [PKT_SCHED]: Fix oops in ipt action error path
o [PKT_SCHED]: Keep netem queue running until inner qdisc is empty
Paul Mackerras:
o PPC64: close firmware stdin
o ppc64: make sure lppaca doesn't cross page boundary
o ppc64: make UP kernel run on POWER4 logical partition
o ppc64: fix signal handler arguments
o ppc64: fix single-stepping into/out of signal handlers
o ppc64: fix signal mask restoration when delivery fails
Pavel Machek:
o swsusp bugfixes: do not oops when not enough memory during resume
o swsusp bugfixes: fix memory leak
o swsusp fixes: fix confusing printk
o swsusp: Fix header typo
o swsusp: fix types
Pavel Pisa:
o VM86 interrupt emulation fix
Pawel Sikora:
o gcc4 fixes
Philip R. Auld:
o fix memory leak in free_percpu
Pierre Ossman:
o [MMC] Add Winbond SD/MMC driver
Randy Dunlap:
o PCI/x86-64: build with PCI=n
Richard Purdie:
o [ARM PATCH] 2315/1: PXA PCMCIA Suspend/Resume bugfix
Roland McGrath:
o fix bogus ECHILD return from wait* with zombie group leader
o back out CPU clock additions to posix-timers
Russell King:
o [SERIAL] Add missing definition for PORT_IMX
o [ARM] Ensure user ops pass 64-bit constants in even,odd registers
o [ARM] Add per_cpu data area to linker script
o [SERIAL] Ensure correct units for close_delay and closing_wait
o [ARM] Add platform-based IrDA device support
o [ARM] Add resources for sa11x0ir device
o [ARM] Fix compiler warning for set_speed irda method
o [ARM] Fix ZBOOT_ROM configuration
o [ARM] Clean up vector support code
o [ARM] Deny user space mappings in first page even on hi-vec CPUs
o [ARM] Add missing newline to a printk message
Rusty Russell:
o ip_conntrack_irc:parse_dcc should be static
o Fix return value when proc file creation fails in ip_conntrack
Santiago Leon:
o fix buffer starvation race in ibmveth
Solar Designer:
o [TCP]: Missing KERN_INFO in remotely triggerable printk
Sreenivas Bagalkote:
o megaraid: fix a bug in kioc dma buffer deallocation
Stelian Pop:
o enable meye even when CONFIG_HIGHMEM64G=y
o correct dma_set_mask return code in DMA-API.txt
Stephen Hemminger:
o [PKT_SCHED]: netem forgets to restart device after inserting
packets
o [TCP]: Missing newline character in printk
Steve French:
o [CIFS] ignore guest mount option do not log warning on it
o [CIFS] treat NTFS junctions (reparse points) as directories rather
than symlinks since we can not follow them
o [CIFS] Add cifs serverino mount parm to allow use of inode numbers
reported from the server (rather than generated by the client).
Some apps require inode numbers to persist or inode numbers of
hardlinked files to match and this requires trusting the servers
inode number.
o [CIFS] level 261 findfirst part one (will help with returning
stable server inode numbers from Windows servers)
o [CIFS] level 261 findfirst part 2
o [CIFS] cifs readdir fixes part 1
o cifs readdir fixes part 2
o [CIFS] cifs readdir changes part 3
o [CIFS] CIFS readdir fixes part 4
o [CIFS] Improve SMB transact2 error checking and fix typo in warning
message
o [CIFS] smb transact2 cleanup
o CIFS: additional smb trans2 cleanup
o [CIFS] Improve SMB buffer allocation make SMB sending more
efficient part 1
o [CIFS} cifs readdir part 5
o [CIFS] cifs readdir changes part 6
o [CIFS] POSIX ACL support part 1
o [CIFS] cifs readdir changes part 7
o [CIFS] cifs readdir rewrite part 8
o [CIFS] cifs readdir rewrite part 9 - fix unicode strlen to be more
readable following Shaggy's suggestion
o [CIFS] POSIX ACL support part 2
o [CIFS] POSIX ACL support part 3
o [CIFS] cifs readdir changes part 10 remove unneeded debug function
o [CIFS] fix ls -l warning on dirs when POSIX ACLs enabled
o [CIFS] cifs readdir part 11. Also renames unused
/proc/fs/cifs/QuotaEnabled config switch to NewReaddirEnabled for
turning on testing of new readdir code
o [CIFS] Add setfacl support to cifs
o [CIFS] cifs readdir rewrite fix resume key handling
o [CIFS] CIFS buffer management improvements part 1
o [CIFS] minor cleanup to cifs buffer allocation code
o [CIFS] fix size of cifs small buffers to just barely fit within
slab limit (which appears to be 116 bytes), otherwise they take 1
page each.
o [CIFS] Set inode number properly on new cifs_readdir code to
Windows servers
o [CIFS] fix error mapping on getfacl to windows and old samba
servers to map to EOPNOTSUPP so the kernel's fall back mechanism
works
o [CIFS] Update Kconfig to make CIFS POSIX ACLs dependent on xattrs
and fix related ifdef in fs/cifs/xattr.c
o [CIFS] Add missing quote to cifs kconfig item
o [CIFS] Make new cifs readdir code the default and rename the proc
entry to /proc/fs/cifs/ReenableOldCifsReaddirCode (which is off by
default, causing the new cifs_readdir2 code to be executed by
default)
o [CIFS] Fix endianness bug in new cifs_readdir2 in calculating dir
entry name length. Fix "badness in" message on rmmod cifs caused by
rename of /proc/fs/cifs/NewReaddirEnabled config switch (pointed
out by Shaggy).
o add direct mount options to optionally bypass the page cache on
reads and writes
o [CIFS] zero more of SMB param area on SMB allocation
o [CIFS] fix spelling of CONFIG_CIFS_EXPERIMENTAL ifdef in direct i/o
write
o [CIFS] cleanup various warning/debug messages
o [CIFS] add debug message for trusted and security xattrs
o [CIFS] Increase size of small SMB pool (and decrease number) and do
not zero the beginning of the header twice.
o [CIFS] parse ipv6 addresses on mount (ipv6 support for cifs part 2)
o [CIFS] Check right mid state on hung network responses. Fix remote
dnotify to be disabled by default. Fix dnotify endianness.
o [CIFS] Do not block on FindNotify response
o [CIFS] Allow peek to return less than smb header so we do not
prematurely kill session to server when socket stack is busy.
o Add support for module init parms for number of small and large
cifs network buffers and for maximum number of simultaneous
requests. Fix directio of userbuffers to use copy_to_user.
o [CIFS] remove sparse warning
o [CIFS] Remove sparse warning in use of cifs_write function
o [CIFS] Fix CIFS_MAX_MSGSIZE so it can be configured at
module_install time, allowing buffer size to be changed
o return the right return code on failed ExtendedSecurity mount to
SPNEGO enabled servers to avoid mount oops. Fix case in which tcp
stack only returns 3 bytes
o [CIFS] Fix path based calls to consistently allow up to PATH_MAX
(some were incorrectly limited to just over 512)
o Error mapping workaround for NT4 bug of reporting oldstyle DOS
error for ERR invalid level (shows up on attempts to do SetPathInfo
to NT4)
Stéphane Eranian:
o [IA64] fix pfm_force_terminate() to really cleanup the state
o [IA64] perfmon.c: fix bug in previous "fix"
Takashi Iwai:
o alsa: fix sleep in atomic during prepare callback
o alsa: add pci_disable_device() to removal and error paths
o alsa: fix iomem mmap
o alsa: fix oops with ALSA OSS emulation on PPC
Thomas Graf:
o [PKT_SCHED]: Fix double locking in tcindex destroy path
o [PKT_SCHED]: Provide compat policer stats in action policer
Timothy Shimmin:
o [XFS] xfs reservation issues with xlog_sync roundoff
Tom Rini:
o ppc32: fix Motorola PReP (PowerstackII Utah) PCI IRQ map
o Add missing __KERNEL__ (or other) protections
o ppc32: Compile classic PPC specific ASM only on CONFIG_6xx
Tony Luck:
o [IA64] delete offsets.h in mrproper, not in clean rule
o [IA64] Delete: Documentation/ia64/serial.txt
Wensong Zhang:
o [IPVS] add a sysctl variable to expire quiescent template
Zou Nanhai:
o Fix a race condition in pty.c
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Andrew Walrond
> Ok, with a lot of people taking an xmas break, here's something to play
> with over the holidays (not to mention an excuse for me to get into the
> Glögg for real ;)
Merry Christmas!
Alan Cox
> Ok, with a lot of people taking an xmas break, here's something to play
> with over the holidays (not to mention an excuse for me to get into the
> Glögg for real ;)
Merry Yule to you too.
Not wishing to be too ungrateful to Santa but
- The broken AX.25 patches are not reverted so that doesn't work on some
networks
- It seems the security hole inducing exec_id change was not reverted
and I've not yet found any other changes that fix the same problem
(setuid_app >/proc/self/mem) in 2.6.10. It was actually quite nasty as a
hole because you can seek the fd to the right target address before
execing. With the other /proc changes did I miss something on this one
I'll check it all over in more detail when I generate 2.6.10-ac
(probably tomorrow), which will be nice as the patch will be a _lot_
shorter and USB storage a lot happier than 2.6.9 based systems.
Alan
Bill Davidsen
> Ok, with a lot of people taking an xmas break, here's something to play
> with over the holidays (not to mention an excuse for me to get into the
> Glögg for real ;)
>
> Mostly a lot of small fixes since 2.6.10-rc3, with the biggest thing being
> probably the CIFS update and the switch-over to the new DVB frontend
> driver world order. Some MMC and USB work too, and ARM updates as usual.
Alas, It sort-of boots but is terminally slow. I see the log with
endless repetitions of "irq 18 nobody cared" and some trace, then
"disabling irq 18." Unfortunately it lies, after about 20MB of this I
decided it had no real intention of disabling irq 18 and tried to stop
it. After ten minutes I had to pull the plug and it's still cleaning
filesystems.
I will dig through the log after it gets back up, but there is clearly a
problem in the logic to ignore garbage irq's, or at least stop whining.
If there is any similarity between the traces I'll post, but I suspect
that it was one of those edge vs. level things by the behaviour.
Just a warning in case others are seeing a failure of irq disable to
actually work.
--
bill davidsen <davi...@tmr.com>
CTO TMR Associates, Inc
Doing interesting things with small computers since 1979
Linus Torvalds
On Sat, 25 Dec 2004, Bill Davidsen wrote:
>
> Alas, It sort-of boots but is terminally slow. I see the log with
> endless repetitions of "irq 18 nobody cared" and some trace, then
> "disabling irq 18." Unfortunately it lies, after about 20MB of this I
> decided it had no real intention of disabling irq 18 and tried to stop
> it. After ten minutes I had to pull the plug and it's still cleaning
> filesystems.
Can you send a (normal) dmesg output for this machine, and describe what
is normally on irq18?
It _sounds_ like it's a confusion between level and edge, with the usual
suspects. Does it go away if you disable acpi?
Linus
Alexander E. Patrakov
> Ok, with a lot of people taking an xmas break, here's something to play
> with over the holidays (not to mention an excuse for me to get into the
> Gl?gg for real ;)
Here it boots and works, but I can't say that I have done any serious
testing. The following message appears in the kernel log:
Dec 25 11:38:09 lfs parport_pc: Ignoring new-style parameters in presence of
obsolete ones
Dec 25 11:38:09 lfs parport_pc: VIA 686A/8231 detected
Dec 25 11:38:09 lfs parport_pc: probing current configuration
Dec 25 11:38:09 lfs parport_pc: Current parallel port base: 0x378
Dec 25 11:38:09 lfs parport0: PC-style at 0x378 (0x778), irq 7, using FIFO
[PCSPP,TRISTATE,COMPAT,ECP]
Dec 25 11:38:09 lfs parport_pc: VIA parallel port: io=0x378, irq=7
I don't understand the first line, and it wasn't there in 2.6.9. Could you
please explain what it means? I don't pass any parameters to the module. I
use module-init-tools version 3.0 although I know it is not the latest.
Relevant .config portion:
#
# Parallel port support
#
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_PC_CML1=m
# CONFIG_PARPORT_SERIAL is not set
CONFIG_PARPORT_PC_FIFO=y
CONFIG_PARPORT_PC_SUPERIO=y
# CONFIG_PARPORT_OTHER is not set
CONFIG_PARPORT_1284=y
--
Alexander E. Patrakov
Randy.Dunlap
>
> Here it boots and works, but I can't say that I have done any serious
> testing. The following message appears in the kernel log:
>
> Dec 25 11:38:09 lfs parport_pc: Ignoring new-style parameters in presence of
> obsolete ones
> Dec 25 11:38:09 lfs parport_pc: VIA 686A/8231 detected
> Dec 25 11:38:09 lfs parport_pc: probing current configuration
> Dec 25 11:38:09 lfs parport_pc: Current parallel port base: 0x378
> Dec 25 11:38:09 lfs parport0: PC-style at 0x378 (0x778), irq 7, using FIFO
> [PCSPP,TRISTATE,COMPAT,ECP]
> Dec 25 11:38:09 lfs parport_pc: VIA parallel port: io=0x378, irq=7
>
> I don't understand the first line, and it wasn't there in 2.6.9. Could you
> please explain what it means? I don't pass any parameters to the module. I
> use module-init-tools version 3.0 although I know it is not the latest.
Somehow parport_pc.c ended up with mixed old-style and
new-style module parameters, but mixing them is not
allowed.
Use module_param() instead of MODULE_PARM() -- cannot be mixed.
Signed-off-by: Randy Dunlap <rddu...@osdl.org>
diffstat:=
drivers/parport/parport_pc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Linus Torvalds
On Sat, 25 Dec 2004, Paul Blazejowski wrote:
>
> Ho ho ho, my NFS is no go!
>
> NFS needs some symbols here and SCSI prints DV failed to configure device.
That sounds like a configuration error, or not running depmod/modprobe
properly. svc_wake_up() &co are exported by the sunrpc module, and you've
apparently not loaded it..
As to what the "DV failed", it's apparently normal if DV is disabled,
whatever the hell that is. James will know whether it's something to
worry about..
Linus
Wichert Akkerman
suspend the machine again but gets stuck after suspending USB.
Wichert.
--
Wichert Akkerman <wic...@wiggy.net> It is simple to make things.
http://www.wiggy.net/ It is hard to make things simple.
R. J. Wysocki
> 2.6.10 broke resume for me: when I resume it immediately tries to
> suspend the machine again but gets stuck after suspending USB.
Usually, it resumes sucessfully for me, but sometimes it fails, like this (on
an AMD64):
swsusp: Image: 43552 Pages
swsusp: Pagedir: 341 Pages
pmdisk: Reading pagedir (341 Pages)
Relocating
pagedir ...........................................................................................................................0
Call Trace:<ffffffff8016de7e>{__alloc_pages+766}
<ffffffff8016df21>{__get_free_pages+33}
<ffffffff8056191c>{swsusp_read+1020}
<ffffffff8015f711>{software_resume+33}
<ffffffff8010c142>{init+162} <ffffffff8010f57b>{child_rip+8}
<ffffffff8010c0a0>{init+0} <ffffffff8010f573>{child_rip+0}
out of memory
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::g
PM: Resume from disk failed.
Greets,
RJW
James Bottomley
> As to what the "DV failed", it's apparently normal if DV is disabled,
> whatever the hell that is. James will know whether it's something to
> worry about..
DV is Domain Validation. It's a way of probing the SCSI bus to see what
type of transfer speeds and widths it can support. DV is part of the
mid-layer SPI transport class, which is where most drivers get it from.
However, this message is from the aic7xxx which does its own DV
separately from the mid-layer. As far as I can tell from the aic7xxx
code, it has a state machine model of DV and it prints this message if
it goes through an unexpected transition of that state machine, but I've
no idea from the message what actually happened. Everything seems to
proceed normally, since the device that caused the problems is later
configured at 160MB/s (the maximum the aic7xxx can do).
James
Alan Cox
> - It seems the security hole inducing exec_id change was not reverted
> and I've not yet found any other changes that fix the same problem
> (setuid_app >/proc/self/mem) in 2.6.10. It was actually quite nasty as a
> hole because you can seek the fd to the right target address before
> execing. With the other /proc changes did I miss something on this one
Thankfully I missed something as the test app shows
static char foo[5]="GOOD";
int main(int argc, char *argv[])
{
lseek(1, (unsigned long) foo, 0);
if(write(1, "BAD!", 4) != 4)
perror("write");
write(2, foo, 4);
}
Running ./a.out >/proc/self/mem produces the desired write error still
in 2.6.10
Pavel Machek
> > 2.6.10 broke resume for me: when I resume it immediately tries to
> > suspend the machine again but gets stuck after suspending USB.
>
> Usually, it resumes sucessfully for me, but sometimes it fails, like this (on
> an AMD64):
>
> swsusp: Image: 43552 Pages
> swsusp: Pagedir: 341 Pages
> pmdisk: Reading pagedir (341 Pages)
> Relocating
> pagedir ...........................................................................................................................0
>
> Call Trace:<ffffffff8016de7e>{__alloc_pages+766}
> <ffffffff8016df21>{__get_free_pages+33}
> <ffffffff8056191c>{swsusp_read+1020}
> <ffffffff8015f711>{software_resume+33}
> <ffffffff8010c142>{init+162} <ffffffff8010f57b>{child_rip+8}
> <ffffffff8010c0a0>{init+0} <ffffffff8010f573>{child_rip+0}
>
> out of memory
> ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::g
> PM: Resume from disk failed.
Hmm, this is probably "big order" allocation failing during
resume. hugang's patch could help here...
Pavel
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Pavel Machek
> > 2.6.10 broke resume for me: when I resume it immediately tries to
> > suspend the machine again but gets stuck after suspending USB.
>
> Usually, it resumes sucessfully for me, but sometimes it fails, like this (on
> an AMD64):
>
> swsusp: Image: 43552 Pages
> swsusp: Pagedir: 341 Pages
> pmdisk: Reading pagedir (341 Pages)
> Relocating
> pagedir ...........................................................................................................................0
>
> Call Trace:<ffffffff8016de7e>{__alloc_pages+766}
> <ffffffff8016df21>{__get_free_pages+33}
> <ffffffff8056191c>{swsusp_read+1020}
> <ffffffff8015f711>{software_resume+33}
> <ffffffff8010c142>{init+162} <ffffffff8010f57b>{child_rip+8}
> <ffffffff8010c0a0>{init+0} <ffffffff8010f573>{child_rip+0}
>
> out of memory
> ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::g
> PM: Resume from disk failed.
Can you try this one? It would be nice to have reproducible way to
trigger this before trying to fix it, through.
[Patch is for 2.6.9something+my bigdiff, may need small tweaks]
Pavel
> I can not merge anything before 2.6.10. As you have seen, I have quite
> a lot of patches in my tree, and I do not want mix them with these...
>
> > device-tree.diff
> > base from suspend2 with a little changed.
>
> I do not want this one.
>
> > core.diff
> > 1: redefine struct pbe for using _no_ continuous as pagedir.
>
> Can I get this one as a separate diff?
Here is it.
=== kernel/power/swsusp.c
==================================================================
--- kernel/power/swsusp.c (revision 24520)
+++ kernel/power/swsusp.c (local)
@@ -74,9 +74,6 @@
/* References to section boundaries */
extern char __nosave_begin, __nosave_end;
-/* Variables to be preserved over suspend */
-static int pagedir_order_check;
-
extern char resume_file[];
static dev_t resume_device;
/* Local variables that should not be affected by save */
@@ -97,7 +94,6 @@
*/
suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
static suspend_pagedir_t *pagedir_save;
-static int pagedir_order __nosavedata = 0;
#define SWSUSP_SIG "S1SUSPEND"
@@ -223,9 +219,63 @@
swap_list_unlock();
}
+#define ONE_PAGE_PBE_NUM (PAGE_SIZE/sizeof(struct pbe))
+#define PBE_IS_PAGE_END(x) \
+ ( PAGE_SIZE - sizeof(struct pbe) == ((x) - ((~(PAGE_SIZE - 1)) & (x))) )
+#define pgdir_for_each(pos, n, head) \
+ for(pos = head, n = pos ? (suspend_pagedir_t*)pos->dummy.val : NULL; \
+ pos != NULL; \
+ pos = n, n = pos ? (suspend_pagedir_t *)pos->dummy.val : NULL)
+#define pbe_for_each(pos, n, index, max, head) \
+ for(pos = head, index = 0, \
+ n = pos ? (struct pbe *)pos->dummy.val : NULL; \
+ (pos != NULL) && (index < max); \
+ pos = (PBE_IS_PAGE_END((unsigned long)pos)) ? n : \
+ ((struct pbe *)((unsigned long)pos + sizeof(struct pbe))), \
+ index ++, \
+ n = pos ? (struct pbe*)pos->dummy.val : NULL)
/**
+ * find_pbe_by_index -
+ * @pgdir:
+ * @index:
+ *
+ *
+ */
+static struct pbe *find_pbe_by_index(struct pbe *pgdir, int index)
+{
+ unsigned long p = 0;
+ struct pbe *pbe, *next;
+
+ pr_debug("find_pbe_by_index: %p, 0x%03x", pgdir, index);
+ pgdir_for_each(pbe, next, pgdir) {
+ if (p == index / ONE_PAGE_PBE_NUM) {
+ pbe = (struct pbe *)((unsigned long)pbe +
+ (index % ONE_PAGE_PBE_NUM) * sizeof(struct pbe));
+ pr_debug(" %p, o{%p} c{%p}\n",
+ pbe, (void*)pbe->orig_address, (void*)pbe->address);
+ return pbe;
+ }
+ p ++;
+ }
+ return (NULL);
+}
+
+/**
+ * pagedir_free -
+ * @head:
+ *
+ */
+static void pagedir_free(suspend_pagedir_t *head)
+{
+ suspend_pagedir_t *next, *cur;
+ pgdir_for_each(cur, next, head)
+ free_page((unsigned long)cur);
+}
+
+
+/**
* write_swap_page - Write one page to a fresh swap location.
* @addr: Address we're writing.
* @loc: Place to store the entry we used.
@@ -269,19 +319,76 @@
{
swp_entry_t entry;
int i;
+ struct pbe *next, *pos;
- for (i = 0; i < nr_copy_pages; i++) {
- entry = (pagedir_nosave + i)->swap_address;
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ entry = pos->swap_address;
if (entry.val)
swap_free(entry);
else
break;
- (pagedir_nosave + i)->swap_address = (swp_entry_t){0};
+ pos->swap_address = (swp_entry_t){0};
}
}
+static int mod_progress = 1;
+static void inline mod_printk_progress(int i)
+{
+ if (mod_progress == 0) mod_progress = 1;
+ if (!(i%100))
+ printk( "\b\b\b\b%3d%%", i / mod_progress );
+}
+
/**
+ * write_one_pbe -
+ * @p:
+ * @data:
+ * @cur:
+ *
+ */
+static int write_one_pbe(struct pbe *p, void *data, int cur)
+{
+ int error = 0;
+
+ mod_printk_progress(cur);
+
+ pr_debug("write_one_pbe: %p, o{%p} c{%p} %d ",
+ p, (void *)p->orig_address, (void *)p->address, cur);
+ error = write_page((unsigned long)data, &p->swap_address);
+ if (error) return error;
+ pr_debug("%lu\n", swp_offset(p->swap_address));
+
+ return 0;
+}
+
+static int bio_read_page(pgoff_t page_off, void * page);
+
+/**
+ * read_one_pbe -
+ * @p:
+ * @data:
+ * @cur
+ *
+ */
+static int read_one_pbe(struct pbe *p, void *data, int cur)
+{
+ int error = 0;
+
+ mod_printk_progress(cur);
+
+ pr_debug("read_one_pbe: %p, o{%p} c{%p} %lu\n",
+ p, (void *)p->orig_address, data,
+ swp_offset(p->swap_address));
+
+ error = bio_read_page(swp_offset(p->swap_address), data);
+ if (error) return error;
+
+ return 0;
+}
+
+
+/**
* data_write - Write saved image to swap.
*
* Walk the list of pages in the image and sync each one to swap.
@@ -291,17 +398,15 @@
{
int error = 0;
int i;
- unsigned int mod = nr_copy_pages / 100;
+ struct pbe *pos, *next;
- if (!mod)
- mod = 1;
+ mod_progress = nr_copy_pages / 100;
printk( "Writing data to swap (%d pages)... ", nr_copy_pages );
- for (i = 0; i < nr_copy_pages && !error; i++) {
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
- error = write_page((pagedir_nosave+i)->address,
- &((pagedir_nosave+i)->swap_address));
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ BUG_ON(pos->orig_address == 0);
+ error = write_one_pbe(pos, (void*)pos->address, i);
+ if (error) break;
}
printk("\b\b\b\bdone\n");
return error;
@@ -371,15 +476,17 @@
static int write_pagedir(void)
{
- unsigned long addr = (unsigned long)pagedir_nosave;
int error = 0;
- int n = SUSPEND_PD_PAGES(nr_copy_pages);
- int i;
+ int n = 0;
+ suspend_pagedir_t *pgdir, *next;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = write_page((unsigned long)pgdir, &swsusp_info.pagedir[n]);
+ if (error) break;
+ n ++;
+ }
+ printk( "Writing pagedir (%d pages)\n", n);
swsusp_info.pagedir_pages = n;
- printk( "Writing pagedir (%d pages)\n", n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE)
- error = write_page(addr, &swsusp_info.pagedir[i]);
return error;
}
@@ -564,7 +671,7 @@
{
struct zone *zone;
unsigned long zone_pfn;
- struct pbe * pbe = pagedir_nosave;
+ struct pbe * pbe = NULL;
int pages_copied = 0;
for_each_zone(zone) {
@@ -574,11 +681,14 @@
for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn) {
if (saveable(zone, &zone_pfn)) {
struct page * page;
+ pbe = find_pbe_by_index(pagedir_nosave, pages_copied);
+ BUG_ON(pbe == NULL);
page = pfn_to_page(zone_pfn + zone->zone_start_pfn);
pbe->orig_address = (long) page_address(page);
+ BUG_ON(pbe->orig_address == 0);
+ BUG_ON(pbe->address == 0);
/* copy_page is not usable for copying task structs. */
memcpy((void *)pbe->address, (void *)pbe->orig_address, PAGE_SIZE);
- pbe++;
pages_copied++;
}
}
@@ -587,67 +697,160 @@
nr_copy_pages = pages_copied;
}
+#define pointer2num(x) ((x - PAGE_OFFSET) >> 12)
+#define num2pointer(x) ((x << 12) + PAGE_OFFSET)
+static inline void collide_set_bit(unsigned char *bitmap,
+ unsigned long bitnum)
+{
+ bitnum = pointer2num(bitnum);
+ bitmap[bitnum / 8] |= (1 << (bitnum%8));
+}
+static inline int collide_is_bit_set(unsigned char *bitmap,
+ unsigned long bitnum)
+{
+ bitnum = pointer2num(bitnum);
+ return !!(bitmap[bitnum / 8] & (1 << (bitnum%8)));
+}
+static void collide_bitmap_free(unsigned char *bitmap)
+{
+ free_pages((unsigned long)bitmap, 2);
+}
+/* ((1 << COLLIDE_BITMAP_ORDER) * PAGE_SIZE * 8) << 12 + PAGE_OFFSET */
+#define COLLIDE_BITMAP_ORDER 3
+
+static unsigned char *collide_bitmap_init(struct pbe *pgdir)
+{
+ unsigned char *bitmap =
+ (unsigned char *)__get_free_pages(GFP_ATOMIC | __GFP_COLD,
+ COLLIDE_BITMAP_ORDER);
+ struct pbe *next;
+
+ if (bitmap == NULL) {
+ return NULL;
+ }
+ memset(bitmap, 0, (1 << COLLIDE_BITMAP_ORDER) * PAGE_SIZE);
+
+ /* do base check */
+ BUG_ON(collide_is_bit_set(bitmap, (unsigned long)bitmap) == 1);
+ collide_set_bit(bitmap, (unsigned long)bitmap);
+ BUG_ON(collide_is_bit_set(bitmap, (unsigned long)bitmap) == 0);
+ while (pgdir != NULL) {
+ unsigned long nums;
+ next = (struct pbe*)pgdir->dummy.val;
+ for (nums = 0; nums < ONE_PAGE_PBE_NUM; nums++) {
+ collide_set_bit(bitmap, (unsigned long)pgdir);
+ collide_set_bit(bitmap, (unsigned long)pgdir->orig_address);
+ pgdir ++;
+ }
+ pgdir = next;
+ }
+ return bitmap;
+}
+
+static void **eaten_memory = NULL;
+
+static void *swsusp_get_safe_free_page(unsigned char *collide)
+{
+ void *addr = NULL;
+ void **c = eaten_memory;
+
+ do {
+ if (addr) {
+ eaten_memory = (void**)addr;
+ *eaten_memory = c;
+ c = eaten_memory;
+ }
+ addr = (void*)__get_free_pages(GFP_ATOMIC | __GFP_COLD, 0);
+ if (!addr)
+ return NULL;
+ } while (collide && collide_is_bit_set(collide, (unsigned long)addr));
+
+ return addr;
+}
+
/**
- * calc_order - Determine the order of allocation needed for pagedir_save.
+ * alloc_one_pagedir -
+ * @prev:
+ * @collide:
*
- * This looks tricky, but is just subtle. Please fix it some time.
- * Since there are %nr_copy_pages worth of pages in the snapshot, we need
- * to allocate enough contiguous space to hold
- * (%nr_copy_pages * sizeof(struct pbe)),
- * which has the saved/orig locations of the page..
- *
- * SUSPEND_PD_PAGES() tells us how many pages we need to hold those
- * structures, then we call get_bitmask_order(), which will tell us the
- * last bit set in the number, starting with 1. (If we need 30 pages, that
- * is 0x0000001e in hex. The last bit is the 5th, which is the order we
- * would use to allocate 32 contiguous pages).
- *
- * Since we also need to save those pages, we add the number of pages that
- * we need to nr_copy_pages, and in case of an overflow, do the
- * calculation again to update the number of pages needed.
- *
- * With this model, we will tend to waste a lot of memory if we just cross
- * an order boundary. Plus, the higher the order of allocation that we try
- * to do, the more likely we are to fail in a low-memory situtation
- * (though we're unlikely to get this far in such a case, since swsusp
- * requires half of memory to be free anyway).
*/
+static suspend_pagedir_t * alloc_one_pagedir(suspend_pagedir_t *prev,
+ unsigned char *collide)
+{
+ suspend_pagedir_t *pgdir = NULL;
+ int i;
+ pgdir = (suspend_pagedir_t *)swsusp_get_safe_free_page(collide);
-static void calc_order(void)
+ /*pr_debug("pgdir: %p, %p, %d\n",
+ pgdir, prev, sizeof(suspend_pagedir_t)); */
+ for (i = 0; i < ONE_PAGE_PBE_NUM; i++) {
+ pgdir[i].dummy.val = 0;
+ pgdir[i].address = 0;
+ pgdir[i].orig_address = 0;
+ if (prev)
+ prev[i].dummy.val= (unsigned long)pgdir;
+ }
+
+ return (pgdir);
+}
+
+/* calc_nums - Determine the nums of allocation needed for pagedir_save. */
+static int calc_nums(int nr_copy)
{
- int diff = 0;
- int order = 0;
-
+ int diff = 0, ret = 0;
do {
- diff = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages)) - order;
+ diff = (nr_copy / ONE_PAGE_PBE_NUM) - ret + 1;
if (diff) {
- order += diff;
- nr_copy_pages += 1 << diff;
+ ret += diff;
+ nr_copy += diff;
}
- } while(diff);
- pagedir_order = order;
+ } while (diff);
+ return nr_copy;
}
-
/**
* alloc_pagedir - Allocate the page directory.
+ * @pbe:
+ * @pbe_nums:
+ * @collide:
+ * @page_nums:
*
* First, determine exactly how many contiguous pages we need and
* allocate them.
*/
-static int alloc_pagedir(void)
+static int alloc_pagedir(struct pbe **pbe, int pbe_nums,
+ unsigned char *collide, int page_nums)
{
- calc_order();
- pagedir_save = (suspend_pagedir_t *)__get_free_pages(GFP_ATOMIC | __GFP_COLD,
- pagedir_order);
- if (!pagedir_save)
- return -ENOMEM;
- memset(pagedir_save, 0, (1 << pagedir_order) * PAGE_SIZE);
- pagedir_nosave = pagedir_save;
- return 0;
+ unsigned int nums = 0;
+ unsigned int after_alloc = pbe_nums;
+ suspend_pagedir_t *prev = NULL, *cur = NULL;
+
+ if (page_nums)
+ after_alloc = ONE_PAGE_PBE_NUM * page_nums;
+ else
+ after_alloc = calc_nums(after_alloc);
+ pr_debug("alloc_pagedir: %d, %d\n", pbe_nums, after_alloc);
+ for (nums = 0 ; nums < after_alloc ; nums += ONE_PAGE_PBE_NUM) {
+ cur = alloc_one_pagedir(prev, collide);
+ pr_debug("alloc_one_pagedir: %p\n", cur);
+ if (!cur) { /* get page failed */
+ goto no_mem;
+ }
+ if (nums == 0) { /* setup the head */
+ *pbe = cur;
+ }
+ prev = cur;
+ }
+ return after_alloc - pbe_nums;
+
+no_mem:
+ pagedir_free(*pbe);
+ *pbe = NULL;
+
+ return (-ENOMEM);
}
/**
@@ -656,11 +859,10 @@
static void free_image_pages(void)
{
- struct pbe * p;
+ struct pbe * p, * n;
int i;
- p = pagedir_save;
- for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) {
+ pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) {
if (p->address) {
ClearPageNosave(virt_to_page(p->address));
free_page(p->address);
@@ -676,10 +878,10 @@
static int alloc_image_pages(void)
{
- struct pbe * p;
+ struct pbe * p, * n;
int i;
- for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) {
+ pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) {
p->address = get_zeroed_page(GFP_ATOMIC | __GFP_COLD);
if (!p->address)
return -ENOMEM;
@@ -693,7 +895,7 @@
BUG_ON(PageNosave(virt_to_page(pagedir_save)));
BUG_ON(PageNosaveFree(virt_to_page(pagedir_save)));
free_image_pages();
- free_pages((unsigned long) pagedir_save, pagedir_order);
+ pagedir_free(pagedir_save);
}
@@ -751,17 +953,20 @@
if (!enough_swap())
return -ENOSPC;
- if ((error = alloc_pagedir())) {
+ error = alloc_pagedir(&pagedir_save, nr_copy_pages, NULL, 0);
+ if (error < 0) {
pr_debug("suspend: Allocating pagedir failed.\n");
return error;
}
+ pr_debug("alloc_pagedir: addon %d\n", error);
+ nr_copy_pages += error;
if ((error = alloc_image_pages())) {
pr_debug("suspend: Allocating image pages failed.\n");
swsusp_free();
return error;
}
+ pagedir_nosave = pagedir_save;
- pagedir_order_check = pagedir_order;
return 0;
}
@@ -854,8 +1059,6 @@
asmlinkage int swsusp_restore(void)
{
- BUG_ON (pagedir_order_check != pagedir_order);
-
/* Even mappings of "global" things (vmalloc) need to be fixed */
__flush_tlb_global();
wbinvd(); /* Nigel says wbinvd here is good idea... */
@@ -882,98 +1085,6 @@
}
-
-/* More restore stuff */
-
-#define does_collide(addr) does_collide_order(pagedir_nosave, addr, 0)
-
-/*
- * Returns true if given address/order collides with any orig_address
- */
-static int __init does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr,
- int order)
-{
- int i;
- unsigned long addre = addr + (PAGE_SIZE<<order);
-
- for (i=0; i < nr_copy_pages; i++)
- if ((pagedir+i)->orig_address >= addr &&
- (pagedir+i)->orig_address < addre)
- return 1;
-
- return 0;
-}
-
-/*
- * We check here that pagedir & pages it points to won't collide with pages
- * where we're going to restore from the loaded pages later
- */
-static int __init check_pagedir(void)
-{
- int i;
-
- for(i=0; i < nr_copy_pages; i++) {
- unsigned long addr;
-
- do {
- addr = get_zeroed_page(GFP_ATOMIC);
- if(!addr)
- return -ENOMEM;
- } while (does_collide(addr));
-
- (pagedir_nosave+i)->address = addr;
- }
- return 0;
-}
-
-static int __init swsusp_pagedir_relocate(void)
-{
- /*
- * We have to avoid recursion (not to overflow kernel stack),
- * and that's why code looks pretty cryptic
- */
- suspend_pagedir_t *old_pagedir = pagedir_nosave;
- void **eaten_memory = NULL;
- void **c = eaten_memory, *m, *f;
- int ret = 0;
-
- printk("Relocating pagedir ");
-
- if (!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) {
- printk("not necessary\n");
- return check_pagedir();
- }
-
- while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) {
- if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order))
- break;
- eaten_memory = m;
- printk( "." );
- *eaten_memory = c;
- c = eaten_memory;
- }
-
- if (!m) {
- printk("out of memory\n");
- ret = -ENOMEM;
- } else {
- pagedir_nosave =
- memcpy(m, old_pagedir, PAGE_SIZE << pagedir_order);
- }
-
- c = eaten_memory;
- while (c) {
- printk(":");
- f = c;
- c = *c;
- free_pages((unsigned long)f, pagedir_order);
- }
- if (ret)
- return ret;
- printk("|\n");
- return check_pagedir();
-}
-
/**
* Using bio to read from swap.
* This code requires a bit more work than just using buffer heads
@@ -1038,12 +1149,12 @@
return error;
}
-int bio_read_page(pgoff_t page_off, void * page)
+static int bio_read_page(pgoff_t page_off, void * page)
{
return submit(READ, page_off, page);
}
-int bio_write_page(pgoff_t page_off, void * page)
+static int bio_write_page(pgoff_t page_off, void * page)
{
return submit(WRITE, page_off, page);
}
@@ -1088,7 +1199,6 @@
return -EPERM;
}
nr_copy_pages = swsusp_info.image_pages;
- pagedir_order = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages));
return error;
}
@@ -1115,7 +1225,96 @@
return error;
}
+static void __init eat_progress(void)
+{
+ char *eaten_progess = "-\\|/";
+ static int eaten_i = 0;
+
+ printk("\b%c", eaten_progess[eaten_i]);
+ eaten_i ++;
+ if (eaten_i > 3) eaten_i = 0;
+}
+
+static int __init check_one_pbe(struct pbe *p, void *collide, int cur)
+{
+ unsigned long addr = 0;
+
+ pr_debug("check_one_pbe: %p %lu o{%p} ",
+ p, p->swap_address.val, (void*)p->orig_address);
+ addr = (unsigned long)swsusp_get_safe_free_page(collide);
+ if(!addr)
+ return -ENOMEM;
+ pr_debug("c{%p} done\n", (void*)addr);
+ p->address = addr;
+
+ return 0;
+}
+
+static void __init swsusp_copy_pagedir(suspend_pagedir_t *d_pgdir,
+ suspend_pagedir_t *s_pgdir)
+{
+ int i = 0;
+
+ while (s_pgdir != NULL) {
+ suspend_pagedir_t *s_next = (suspend_pagedir_t *)s_pgdir->dummy.val;
+ suspend_pagedir_t *d_next = (suspend_pagedir_t *)d_pgdir->dummy.val;
+ for (i = 0; i < ONE_PAGE_PBE_NUM; i++) {
+ d_pgdir->address = s_pgdir->address;
+ d_pgdir->orig_address = s_pgdir->orig_address;
+ d_pgdir->swap_address = s_pgdir->swap_address;
+ s_pgdir ++; d_pgdir ++;
+ }
+ d_pgdir = d_next;
+ s_pgdir = s_next;
+ };
+}
/**
+ * We check here that pagedir & pages it points to won't collide with pages
+ * where we're going to restore from the loaded pages later
+ */
+static int __init check_pagedir(void)
+{
+ void **c, *f;
+ struct pbe *next, *pos;
+ int error, index;
+ suspend_pagedir_t *addr = NULL;
+ unsigned char *bitmap = collide_bitmap_init(pagedir_nosave);
+
+ BUG_ON(bitmap == NULL);
+
+ printk("Relocating pagedir ... ");
+ error = alloc_pagedir(&addr, nr_copy_pages, bitmap,
+ swsusp_info.pagedir_pages);
+ if (error < 0) {
+ return error;
+ }
+ swsusp_copy_pagedir(addr, pagedir_nosave);
+ pagedir_free(pagedir_nosave);
+
+ /* check copy address */
+ pbe_for_each(pos, next, index, nr_copy_pages, addr) {
+ error = check_one_pbe(pos, bitmap, index);
+ BUG_ON(error);
+ }
+
+ /* free eaten memory */
+ c = eaten_memory;
+ while (c) {
+ eat_progress();
+ f = c;
+ c = *c;
+ free_pages((unsigned long)f, 0);
+ }
+ /* free unused memory */
+ collide_bitmap_free(bitmap);
+ printk(" done\n");
+
+ pagedir_nosave = addr;
+
+ return 0;
+}
+
+/**
* swsusp_read_data - Read image pages from swap.
*
* You do not need to check for overlaps, check_pagedir()
@@ -1124,53 +1323,67 @@
static int __init data_read(void)
{
- struct pbe * p;
+ struct pbe * p, * n;
int error;
int i;
- int mod = nr_copy_pages / 100;
- if (!mod)
- mod = 1;
+ if ((error = check_pagedir())) {
+ return -ENOMEM;
+ }
- if ((error = swsusp_pagedir_relocate()))
- return error;
+ mod_progress = nr_copy_pages / 100;
printk( "Reading image data (%d pages): ", nr_copy_pages );
- for(i = 0, p = pagedir_nosave; i < nr_copy_pages && !error; i++, p++) {
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
- error = bio_read_page(swp_offset(p->swap_address),
- (void *)p->address);
+ pbe_for_each(p, n, i, nr_copy_pages, pagedir_nosave) {
+ error = read_one_pbe(p, (void*)p->address, i);
+ if (error) break;
}
printk(" %d done.\n",i);
return error;
-
}
extern dev_t __init name_to_dev_t(const char *line);
+static int __init read_one_pagedir(suspend_pagedir_t *pgdir, int i)
+{
+ unsigned long offset = swp_offset(swsusp_info.pagedir[i]);
+ unsigned long next;
+ int error = 0;
+
+ next = pgdir->dummy.val;
+ pr_debug("read_one_pagedir: %p, %d, %lu, %p\n",
+ pgdir, i, offset, (void*)next);
+ if ((error = bio_read_page(offset, (void *)pgdir))) {
+ return error;
+ }
+ pgdir->dummy.val = next;
+
+ return error;
+}
+
+/*
+ * reading pagedir from swap device
+ */
static int __init read_pagedir(void)
{
- unsigned long addr;
- int i, n = swsusp_info.pagedir_pages;
+ int i = 0, n = swsusp_info.pagedir_pages;
int error = 0;
+ suspend_pagedir_t *pgdir, *next;
- addr = __get_free_pages(GFP_ATOMIC, pagedir_order);
- if (!addr)
+ error = alloc_pagedir(&pagedir_nosave, nr_copy_pages, NULL, n);
+ if (error < 0)
return -ENOMEM;
- pagedir_nosave = (struct pbe *)addr;
- pr_debug("pmdisk: Reading pagedir (%d Pages)\n",n);
+ printk("pmdisk: Reading pagedir (%d Pages)\n",n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE) {
- unsigned long offset = swp_offset(swsusp_info.pagedir[i]);
- if (offset)
- error = bio_read_page(offset, (void *)addr);
- else
- error = -EFAULT;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = read_one_pagedir(pgdir, i);
+ if (error) break;
+ i++;
}
+ BUG_ON(i != n);
if (error)
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
@@ -1185,7 +1398,7 @@
if ((error = read_pagedir()))
return error;
if ((error = data_read()))
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
@@ -1217,3 +1430,50 @@
pr_debug("pmdisk: Error %d resuming\n", error);
return error;
}
+
+/**
+ * for_each_pbe_copy_back -
+ *
+ * That usefuly for help us writing the code in assemble code
+ *
+ */
+/* #define CREATE_ASM_CODE */
+#ifdef CREATE_ASM_CODE
+#if 0 /* if your copy back code is running in real mode, enable it */
+#define GET_ADDRESS(x) __pa(x)
+#else
+#define GET_ADDRESS(x) (x)
+#endif
+asmlinkage void for_each_pbe_copy_back(void)
+{
+ struct pbe *pgdir, *next;
+
+ pgdir = pagedir_nosave;
+ while (pgdir != NULL) {
+ unsigned long nums, i;
+ pgdir = (struct pbe *)GET_ADDRESS(pgdir);
+ next = (struct pbe*)pgdir->dummy.val;
+ for (nums = 0; nums < ONE_PAGE_PBE_NUM; nums++) {
+ register unsigned long *orig, *copy;
+ orig = (unsigned long *)pgdir->orig_address;
+ if (orig == 0) goto end;
+ orig = (unsigned long *)GET_ADDRESS(orig);
+ copy = (unsigned long *)GET_ADDRESS(pgdir->address);
+#if 0
+ memcpy(orig, copy, PAGE_SIZE);
+#else
+ for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i+=4) {
+ *(orig + i) = *(copy + i);
+ *(orig + i+1) = *(copy + i+1);
+ *(orig + i+2) = *(copy + i+2);
+ *(orig + i+3) = *(copy + i+3);
+ }
+#endif
+ pgdir ++;
+ }
+ pgdir = next;
+ }
+end:
+ panic("just asm code");
+}
+#endif
=== arch/i386/power/swsusp.S
==================================================================
--- arch/i386/power/swsusp.S (revision 24520)
+++ arch/i386/power/swsusp.S (local)
@@ -31,25 +31,34 @@
movl $swsusp_pg_dir-__PAGE_OFFSET,%ecx
movl %ecx,%cr3
- movl pagedir_nosave, %ebx
- xorl %eax, %eax
- xorl %edx, %edx
- .p2align 4,,7
+ movl pagedir_nosave, %eax
+ test %eax, %eax
+ je copy_loop_end
+ movl $1024, %edx
-copy_loop:
- movl 4(%ebx,%edx),%edi
- movl (%ebx,%edx),%esi
+copy_loop_start:
+ movl 0xc(%eax), %ebp
+ xorl %ebx, %ebx
+ leal 0x0(%esi),%esi
- movl $1024, %ecx
- rep
- movsl
+copy_one_pgdir:
+ movl 0x4(%eax),%edi
+ test %edi, %edi
+ je copy_loop_end
- incl %eax
- addl $16, %edx
- cmpl nr_copy_pages,%eax
- jb copy_loop
- .p2align 4,,7
+ movl (%eax), %esi
+ movl %edx, %ecx
+ repz movsl %ds:(%esi),%es:(%edi)
+ incl %ebx
+ addl $0x10, %eax
+ cmpl $0xff, %ebx
+ jbe copy_one_pgdir
+ test %ebp, %ebp
+ movl %ebp, %eax
+ jne copy_loop_start
+copy_loop_end:
+
movl saved_context_esp, %esp
movl saved_context_ebp, %ebp
movl saved_context_ebx, %ebx
--
Hu Gang / Steve
Linux Registered User 204016
GPG Public Key: http://soulinfo.com/~hugang/hugang.asc
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
R. J. Wysocki
> Hi!
>
> > > 2.6.10 broke resume for me: when I resume it immediately tries to
> > > suspend the machine again but gets stuck after suspending USB.
> >
> > Usually, it resumes sucessfully for me, but sometimes it fails, like this
(on
> > an AMD64):
> >
> > swsusp: Image: 43552 Pages
> > swsusp: Pagedir: 341 Pages
> > pmdisk: Reading pagedir (341 Pages)
> > Relocating
> >
pagedir ...........................................................................................................................0
> >
> > Call Trace:<ffffffff8016de7e>{__alloc_pages+766}
> > <ffffffff8016df21>{__get_free_pages+33}
> > <ffffffff8056191c>{swsusp_read+1020}
> > <ffffffff8015f711>{software_resume+33}
> > <ffffffff8010c142>{init+162} <ffffffff8010f57b>{child_rip+8}
> > <ffffffff8010c0a0>{init+0} <ffffffff8010f573>{child_rip+0}
> >
> > out of memory
>
> ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::g
> > PM: Resume from disk failed.
>
> Can you try this one? It would be nice to have reproducible way to
> trigger this before trying to fix it, through.
>
> [Patch is for 2.6.9something+my bigdiff, may need small tweaks]
It's for i386, isn't it? Will it work as expected on AMD64?
RJW
Greg Norris
> Ok, with a lot of people taking an xmas break, here's something to play
> with over the holidays (not to mention an excuse for me to get into the
> Glögg for real ;)
My ps/2 keyboard (an relatively uninteresting Labtec 104-key model)
doesn't work with 2.6.10, although 2.6.9 and the BIOS seem to have no
issues with it. I've gone through the changelog and double-checked my
.config (attached), and don't see any obvious problems... any thoughts?
Pavel Machek
> > > Usually, it resumes sucessfully for me, but sometimes it fails, like this
> (on
> > > an AMD64):
> > >
> > > swsusp: Image: 43552 Pages
> > > swsusp: Pagedir: 341 Pages
> > > pmdisk: Reading pagedir (341 Pages)
> > > Relocating
> > >
> pagedir ...........................................................................................................................0
> > >
> > > Call Trace:<ffffffff8016de7e>{__alloc_pages+766}
> > > <ffffffff8016df21>{__get_free_pages+33}
> > > <ffffffff8056191c>{swsusp_read+1020}
> > > <ffffffff8015f711>{software_resume+33}
> > > <ffffffff8010c142>{init+162} <ffffffff8010f57b>{child_rip+8}
> > > <ffffffff8010c0a0>{init+0} <ffffffff8010f573>{child_rip+0}
> > >
> > > out of memory
> >
> > ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::g
> > > PM: Resume from disk failed.
> >
> > Can you try this one? It would be nice to have reproducible way to
> > trigger this before trying to fix it, through.
> >
> > [Patch is for 2.6.9something+my bigdiff, may need small tweaks]
>
> It's for i386, isn't it? Will it work as expected on AMD64?
Ouch, no, it probably will not work on amd64. Some assembly tweaks
would be needed.
Anyway here's that patch ported to 2.6.10+my_bigdiff (just in case
anyone has the same problem on i386).
hugang, I noticed you changed collision code to use a bitmap. This
should reduce complexity from O(n^2) to O(n) [good!], but I'm
concerned about bitmap size you need -- it seems to be big order
allocation. Perhaps you could reuse PageNosaveFree or something like
that?
Also that code should be pretty much separate from "convert pagedir to
linklist", right? Could you separate them?
Pavel
--- clean-mm/arch/i386/power/swsusp.S 2004-10-19 14:37:44.000000000 +0200
+++ linux-mm/arch/i386/power/swsusp.S 2004-12-26 21:03:30.000000000 +0100
@@ -31,24 +31,33 @@
movl $swsusp_pg_dir-__PAGE_OFFSET,%ecx
movl %ecx,%cr3
- movl pagedir_nosave, %ebx
- xorl %eax, %eax
- xorl %edx, %edx
- .p2align 4,,7
-
-copy_loop:
- movl 4(%ebx,%edx),%edi
- movl (%ebx,%edx),%esi
-
- movl $1024, %ecx
- rep
- movsl
-
- incl %eax
- addl $16, %edx
- cmpl nr_copy_pages,%eax
- jb copy_loop
- .p2align 4,,7
+ movl pagedir_nosave, %eax
+ test %eax, %eax
+ je copy_loop_end
+ movl $1024, %edx
+
+copy_loop_start:
+ movl 0xc(%eax), %ebp
+ xorl %ebx, %ebx
+ leal 0x0(%esi),%esi
+
+copy_one_pgdir:
+ movl 0x4(%eax),%edi
+ test %edi, %edi
+ je copy_loop_end
+
+ movl (%eax), %esi
+ movl %edx, %ecx
+ repz movsl %ds:(%esi),%es:(%edi)
+
+ incl %ebx
+ addl $0x10, %eax
+ cmpl $0xff, %ebx
+ jbe copy_one_pgdir
+ test %ebp, %ebp
+ movl %ebp, %eax
+ jne copy_loop_start
+copy_loop_end:
movl saved_context_esp, %esp
movl saved_context_ebp, %ebp
--- clean-mm/kernel/power/swsusp.c 2004-12-25 15:50:29.000000000 +0100
+++ linux-mm/kernel/power/swsusp.c 2004-12-26 21:08:12.000000000 +0100
@@ -74,9 +74,6 @@
/* References to section boundaries */
extern char __nosave_begin, __nosave_end;
-/* Variables to be preserved over suspend */
-static int pagedir_order_check;
-
extern char resume_file[];
static dev_t resume_device;
/* Local variables that should not be affected by save */
@@ -97,7 +94,6 @@
*/
suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
static suspend_pagedir_t *pagedir_save;
-static int pagedir_order __nosavedata = 0;
#define SWSUSP_SIG "S1SUSPEND"
@@ -223,6 +219,60 @@
swap_list_unlock();
}
+#define ONE_PAGE_PBE_NUM (PAGE_SIZE/sizeof(struct pbe))
+#define PBE_IS_PAGE_END(x) \
+ ( PAGE_SIZE - sizeof(struct pbe) == ((x) - ((~(PAGE_SIZE - 1)) & (x))) )
+
+#define pgdir_for_each(pos, n, head) \
+ for(pos = head, n = pos ? (suspend_pagedir_t*)pos->dummy.val : NULL; \
+ pos != NULL; \
+ pos = n, n = pos ? (suspend_pagedir_t *)pos->dummy.val : NULL)
+
+#define pbe_for_each(pos, n, index, max, head) \
+ for(pos = head, index = 0, \
+ n = pos ? (struct pbe *)pos->dummy.val : NULL; \
+ (pos != NULL) && (index < max); \
+ pos = (PBE_IS_PAGE_END((unsigned long)pos)) ? n : \
+ ((struct pbe *)((unsigned long)pos + sizeof(struct pbe))), \
+ index ++, \
+ n = pos ? (struct pbe*)pos->dummy.val : NULL)
+/**
/**
@@ -269,17 +319,74 @@
{
swp_entry_t entry;
int i;
+ struct pbe *next, *pos;
- for (i = 0; i < nr_copy_pages; i++) {
- entry = (pagedir_nosave + i)->swap_address;
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ entry = pos->swap_address;
if (entry.val)
swap_free(entry);
else
break;
- (pagedir_nosave + i)->swap_address = (swp_entry_t){0};
+ pos->swap_address = (swp_entry_t){0};
}
}
+static int mod_progress = 1;
+
+static void inline mod_printk_progress(int i)
+{
+ if (mod_progress == 0) mod_progress = 1;
+ if (!(i%100))
+ printk( "\b\b\b\b%3d%%", i / mod_progress );
+}
+
+/**
/**
* data_write - Write saved image to swap.
- swsusp_info.pagedir_pages = n;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = write_page((unsigned long)pgdir, &swsusp_info.pagedir[n]);
+ if (error) break;
+ n ++;
+ }
printk( "Writing pagedir (%d pages)\n", n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE)
- error = write_page(addr, &swsusp_info.pagedir[i]);
+ swsusp_info.pagedir_pages = n;
/**
- * calc_order - Determine the order of allocation needed for pagedir_save.
- *
- * This looks tricky, but is just subtle. Please fix it some time.
- * Since there are %nr_copy_pages worth of pages in the snapshot, we need
- * to allocate enough contiguous space to hold
- * (%nr_copy_pages * sizeof(struct pbe)),
- * which has the saved/orig locations of the page..
- *
- * SUSPEND_PD_PAGES() tells us how many pages we need to hold those
- * structures, then we call get_bitmask_order(), which will tell us the
- * last bit set in the number, starting with 1. (If we need 30 pages, that
- * is 0x0000001e in hex. The last bit is the 5th, which is the order we
- * would use to allocate 32 contiguous pages).
- *
- * Since we also need to save those pages, we add the number of pages that
- * we need to nr_copy_pages, and in case of an overflow, do the
- * calculation again to update the number of pages needed.
+ * alloc_one_pagedir -
+ * @prev:
+ * @collide:
*
- * With this model, we will tend to waste a lot of memory if we just cross
- * an order boundary. Plus, the higher the order of allocation that we try
- * to do, the more likely we are to fail in a low-memory situtation
- * (though we're unlikely to get this far in such a case, since swsusp
- * requires half of memory to be free anyway).
*/
+static suspend_pagedir_t * alloc_one_pagedir(suspend_pagedir_t *prev,
+ unsigned char *collide)
+{
+ suspend_pagedir_t *pgdir = NULL;
+ int i;
+ pgdir = (suspend_pagedir_t *)swsusp_get_safe_free_page(collide);
-static void calc_order(void)
-{
- int diff = 0;
- int order = 0;
+ /*pr_debug("pgdir: %p, %p, %d\n",
+ pgdir, prev, sizeof(suspend_pagedir_t)); */
+ for (i = 0; i < ONE_PAGE_PBE_NUM; i++) {
+ pgdir[i].dummy.val = 0;
+ pgdir[i].address = 0;
+ pgdir[i].orig_address = 0;
+ if (prev)
+ prev[i].dummy.val= (unsigned long)pgdir;
+ }
+
+ return (pgdir);
+}
+/* calc_nums - Determine the nums of allocation needed for pagedir_save. */
+static int calc_nums(int nr_copy)
+{
@@ -751,17 +953,19 @@
if (!enough_swap())
return -ENOSPC;
- if ((error = alloc_pagedir())) {
+ error = alloc_pagedir(&pagedir_save, nr_copy_pages, NULL, 0);
+ if (error < 0) {
printk("suspend: Allocating pagedir failed.\n");
return error;
}
+ pr_debug("alloc_pagedir: addon %d\n", error);
+ nr_copy_pages += error;
if ((error = alloc_image_pages())) {
printk("suspend: Allocating image pages failed.\n");
swsusp_free();
return error;
}
-
- pagedir_order_check = pagedir_order;
+ pagedir_nosave = pagedir_save;
return 0;
}
@@ -855,8 +1059,6 @@
asmlinkage int swsusp_restore(void)
{
- BUG_ON (pagedir_order_check != pagedir_order);
-
/* Even mappings of "global" things (vmalloc) need to be fixed */
__flush_tlb_global();
wbinvd(); /* Nigel says wbinvd here is good idea... */
@@ -882,104 +1084,6 @@
return error;
}
-/* More restore stuff */
-
-/*
- * Returns true if given address/order collides with any orig_address
- */
-static int __init does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr,
- int order)
-{
- int i;
- unsigned long addre = addr + (PAGE_SIZE<<order);
-
- for (i=0; i < nr_copy_pages; i++)
- if ((pagedir+i)->orig_address >= addr &&
- (pagedir+i)->orig_address < addre)
- return 1;
-
- return 0;
-}
-
-/*
- * We check here that pagedir & pages it points to won't collide with pages
- * where we're going to restore from the loaded pages later
- */
-static int __init check_pagedir(void)
-{
- int i;
- unsigned int mod = nr_copy_pages / 100;
-
- if (!mod)
- mod = 1;
-
- printk("Relocating pages... ");
- for (i=0; i < nr_copy_pages; i++) {
- unsigned long addr;
-
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
-
- do {
- addr = get_zeroed_page(GFP_ATOMIC);
- if (!addr)
- return -ENOMEM;
- } while (does_collide_order(pagedir_nosave, addr, 0));
-
- (pagedir_nosave+i)->address = addr;
- }
- printk("\b\b\b\bdone\n");
@@ -1094,7 +1198,6 @@
return -EPERM;
}
nr_copy_pages = swsusp_info.image_pages;
- pagedir_order = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages));
return error;
}
@@ -1121,6 +1224,95 @@
+/**
/**
* swsusp_read_data - Read image pages from swap.
*
@@ -1130,53 +1322,67 @@
- pr_debug("swsusp: Reading pagedir (%d Pages)\n",n);
+ printk("pmdisk: Reading pagedir (%d Pages)\n",n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE) {
- unsigned long offset = swp_offset(swsusp_info.pagedir[i]);
- if (offset)
- error = bio_read_page(offset, (void *)addr);
- else
- error = -EFAULT;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = read_one_pagedir(pgdir, i);
+ if (error) break;
+ i++;
}
+ BUG_ON(i != n);
if (error)
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
@@ -1191,7 +1397,7 @@
if ((error = read_pagedir()))
return error;
if ((error = data_read()))
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
@@ -1223,3 +1429,50 @@
pr_debug("swsusp: Error %d resuming\n", error);
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Dmitry Torokhov
Anything interesting in dmesg? And what about mouse? You may have to change
#undef DEBUG to #define DEBUG in drivers/input/serio/i8042.c and post your
full dmesg.
--
Dmitry
John Cherry
Web page with links to complete details:
http://developer.osdl.org/cherry/compile/
Kernel bzImage bzImage bzImage modules bzImage modules
(defconfig) (allno) (allyes) (allyes) (allmod) (allmod)
----------- ----------- -------- -------- -------- -------- ---------
2.6.10 13w/0e 0w/0e 778w/0e 6w/0e 15w/0e 861w/0e
2.6.9-rc3 13w/0e 0w/0e 774w/0e 6w/0e 15w/0e 857w/0e
2.6.9-rc2 14w/0e 0w/0e 1815w/11e 65w/0e 19w/0e 2157w/0e
(Compiles with gcc 3.2.2)
2.6.9-rc1 5w/0e 1w/0e 1069w/15e 6w/0e 4w/0e 1062w/1e
2.6.9 0w/0e 0w/0e 1930w/0e 41w/0e 11w/0e 1950w/0e
2.6.9-final 0w/0e 0w/0e 1930w/0e 41w/0e 11w/0e 1950w/0e
2.6.9-rc4 0w/0e 0w/0e 1930w/0e 41w/0e 11w/0e 1950w/0e
2.6.9-rc3 0w/0e 0w/0e 2752w/17e 41w/0e 11w/0e 2782w/5e
2.6.9-rc2 0w/0e 0w/0e 3036w/0e 41w/0e 11w/0e 3655w/0e
2.6.9-rc1 0w/0e 0w/0e 77w/10e 4w/0e 3w/0e 68w/0e
2.6.8.1 0w/0e 0w/0e 78w/ 0e 4w/0e 1w/0e 72w/0e
2.6.8 0w/0e 0w/0e 78w/ 0e 4w/0e 1w/0e 72w/0e
2.6.8-rc4 0w/0e 0w/0e 78w/ 0e 4w/0e 1w/0e 72w/0e
2.6.8-rc3 0w/0e 0w/0e 78w/ 0e 4w/0e 1w/0e 72w/0e
2.6.8-rc2 0w/0e 0w/0e 85w/ 0e 5w/0e 1w/0e 79w/0e
2.6.8-rc1 0w/0e 0w/0e 87w/ 0e 5w/0e 1w/0e 82w/0e
2.6.7 0w/0e 0w/0e 108w/ 0e 5w/0e 2w/0e 102w/0e
2.6.7-rc3 0w/0e 0w/0e 108w/ 0e 5w/0e 2w/0e 104w/0e
2.6.7-rc2 0w/0e 0w/0e 110w/ 0e 5w/0e 2w/0e 106w/0e
2.6.7-rc1 0w/0e 0w/0e 111w/ 0e 6w/0e 2w/0e 107w/0e
2.6.6 0w/0e 0w/0e 123w/ 0e 7w/0e 4w/0e 121w/0e
2.6.6-rc3 0w/0e 0w/0e 124w/ 0e 7w/0e 5w/0e 121w/0e
2.6.6-rc2 0w/0e 0w/0e 122w/ 0e 7w/0e 4w/0e 121w/0e
2.6.6-rc1 0w/0e 0w/0e 125w/ 0e 7w/0e 4w/0e 123w/0e
2.6.5 0w/0e 0w/0e 134w/ 0e 8w/0e 4w/0e 132w/0e
2.6.5-rc3 0w/0e 0w/0e 135w/ 0e 8w/0e 4w/0e 132w/0e
2.6.5-rc2 0w/0e 0w/0e 135w/ 0e 8w/0e 3w/0e 132w/0e
2.6.5-rc1 0w/0e 0w/0e 138w/ 0e 8w/0e 3w/0e 135w/0e
2.6.4 1w/0e 0w/0e 145w/ 0e 7w/0e 3w/0e 142w/0e
2.6.4-rc2 1w/0e 0w/0e 148w/ 0e 7w/0e 3w/0e 145w/0e
2.6.4-rc1 1w/0e 0w/0e 148w/ 0e 7w/0e 3w/0e 145w/0e
2.6.3 1w/0e 0w/0e 142w/ 0e 9w/0e 3w/0e 142w/0e
2.6.3-rc4 1w/0e 0w/0e 142w/ 0e 9w/0e 3w/0e 142w/0e
2.6.3-rc3 1w/0e 0w/0e 145w/ 7e 9w/0e 3w/0e 148w/0e
2.6.3-rc2 1w/0e 0w/0e 141w/ 0e 9w/0e 3w/0e 144w/0e
2.6.3-rc1 1w/0e 0w/0e 145w/ 0e 9w/0e 3w/0e 177w/0e
2.6.2 1w/0e 0w/0e 152w/ 0e 12w/0e 3w/0e 187w/0e
2.6.2-rc3 0w/0e 0w/0e 152w/ 0e 12w/0e 3w/0e 187w/0e
2.6.2-rc2 0w/0e 0w/0e 153w/ 8e 12w/0e 3w/0e 188w/0e
2.6.2-rc1 0w/0e 0w/0e 152w/ 0e 12w/0e 3w/0e 187w/0e
2.6.1 0w/0e 0w/0e 158w/ 0e 12w/0e 3w/0e 197w/0e
2.6.1-rc3 0w/0e 0w/0e 158w/ 0e 12w/0e 3w/0e 197w/0e
2.6.1-rc2 0w/0e 0w/0e 166w/ 0e 12w/0e 3w/0e 205w/0e
2.6.1-rc1 0w/0e 0w/0e 167w/ 0e 12w/0e 3w/0e 206w/0e
2.6.0 0w/0e 0w/0e 170w/ 0e 12w/0e 3w/0e 209w/0e
Daily compiles (ia32):
http://developer.osdl.org/cherry/compile/2.6/linus-tree/running.txt
Latest changes in Linus' bitkeeper tree:
http://linux.bkbits.net:8080/linux-2.5
John
--
John Cherry
che...@osdl.org
503-626-2455x29
Open Source Development Labs
Håkan Lindqvist
survives a suspend/resume cycle, at least on my machine.
I've seen no errors, it just doesn't work any more. (It definitely
worked with 2.6.9.)
Unloading/reloading the module doesn't appear to help either.
(This is experienced on an IBM Thinkpad X31.)
/Håkan
Greg Norris
> > My ps/2 keyboard (an relatively uninteresting Labtec 104-key model)
> > doesn't work with 2.6.10, although 2.6.9 and the BIOS seem to have no
> > issues with it. I've gone through the changelog and double-checked my
> > .config (attached), and don't see any obvious problems... any thoughts?
>
> Anything interesting in dmesg? And what about mouse? You may have to change
> #undef DEBUG to #define DEBUG in drivers/input/serio/i8042.c and post your
> full dmesg.
OK, I figured it out (I think). I normally go through a Avocent KVM
switch (USB), to share the keyboard and mouse between multiple systems.
Unfortunately the keyboard died a week or so ago, so I plugged a ps/2
model directly into the main box as a temporary measure... but didn't
think to disconnect the KVM. After doing so, 2.6.10 correctly detects
the keyboard on bootup and everything seems to be working correctly.
I haven't pursued it any farther, although I'd be happy to do so if
anyone thinks it would be beneficial. My guess is that only a single
keyboard is allowed, and 2.6.10 simply saw the USB one first. Not sure
if that was caused by an explicit change in the code, or merely due to
the order in which the drivers were linked in. Either way, I'm up and
running. ;-)
Thanx for your assistance!
Bill Davidsen
> On Sat, 2004-12-25 at 21:55, Bill Davidsen wrote:
>
>
>>Alas, It sort-of boots but is terminally slow. I see the log with
>>endless repetitions of "irq 18 nobody cared" and some trace, then
>>"disabling irq 18." Unfortunately it lies, after about 20MB of this I
>>decided it had no real intention of disabling irq 18 and tried to stop
>>it. After ten minutes I had to pull the plug and it's still cleaning
>>filesystems.
>
>
>
>
Last 2.6 kernel run was 2.6.7, which didn't have any problem with irq18.
I'm going to gather the full set of data on acpi= and pci= options, but
I'm nominally on vacation and spending time with the family instead of
computers. Also, I can't use my Christmas present until I get the FC1
kernel to set the i810/ac97 audio to 4 channels instead of the default
two, so all the people saying "I want to hear it" can't be satisfied.
Priorities this week...
Paolo Ciarrocchi
> On Gwe, 2004-12-24 at 22:39, Linus Torvalds wrote:
> > Ok, with a lot of people taking an xmas break, here's something to play
> > with over the holidays (not to mention an excuse for me to get into the
> > Glögg for real ;)
>
> Merry Yule to you too.
>
> Not wishing to be too ungrateful to Santa but
>
> - The broken AX.25 patches are not reverted so that doesn't work on some
> networks
>
> - It seems the security hole inducing exec_id change was not reverted
> and I've not yet found any other changes that fix the same problem
> (setuid_app >/proc/self/mem) in 2.6.10. It was actually quite nasty as a
> hole because you can seek the fd to the right target address before
> execing. With the other /proc changes did I miss something on this one
>
> I'll check it all over in more detail when I generate 2.6.10-ac
> (probably tomorrow), which will be nice as the patch will be a _lot_
> shorter and USB storage a lot happier than 2.6.9 based systems.
>
Having at least a -rc or maintaining a 2.6.XY.Z branch would avoid
these problems in my very humble opinion.
Best,
--
Paolo Ciarrocchi
Rafael J. Wysocki
>
> > > 2.6.10 broke resume for me: when I resume it immediately tries to
> > > suspend the machine again but gets stuck after suspending USB.
> >
> > Usually, it resumes sucessfully for me, but sometimes it fails, like this
(on
> > an AMD64):
> >
> > swsusp: Image: 43552 Pages
> > swsusp: Pagedir: 341 Pages
> > pmdisk: Reading pagedir (341 Pages)
> > Relocating
> >
pagedir ...........................................................................................................................0
> >
> > Call Trace:<ffffffff8016de7e>{__alloc_pages+766}
> > <ffffffff8016df21>{__get_free_pages+33}
> > <ffffffff8056191c>{swsusp_read+1020}
> > <ffffffff8015f711>{software_resume+33}
> > <ffffffff8010c142>{init+162} <ffffffff8010f57b>{child_rip+8}
> > <ffffffff8010c0a0>{init+0} <ffffffff8010f573>{child_rip+0}
> >
> > out of memory
>
> ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::g
> > PM: Resume from disk failed.
>
> Can you try this one? It would be nice to have reproducible way to
> trigger this before trying to fix it, through.
It looks like growing the inode and/or dentry cache before suspend does the
trick. It seems that updatedb (again) is quite good for this purpose but
it's not 100% "effective".
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
Rafael J. Wysocki
I've just had one of those on 2.6.10-mm3:
Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
or an alternative?
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
Pavel Machek
> > > > Can you try this one? It would be nice to have reproducible way to
> > > > trigger this before trying to fix it, through.
> > > >
> > > > [Patch is for 2.6.9something+my bigdiff, may need small tweaks]
> > >
> > > It's for i386, isn't it? Will it work as expected on AMD64?
> >
> > Ouch, no, it probably will not work on amd64. Some assembly tweaks
> > would be needed.
> >
> > Anyway here's that patch ported to 2.6.10+my_bigdiff (just in case
> > anyone has the same problem on i386).
>
> Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> or an alternative?
Was that hugang's patch we were talking about?
Anyway ugly workaround for this is to just try harder to free memory during
suspend... Just do free_some_memory five times with msleep(200) in between.
Pavel
--
64 bytes from 195.113.31.123: icmp_seq=28 ttl=51 time=448769.1 ms
Rafael J. Wysocki
On Thursday, 13 of January 2005 20:59, Pavel Machek wrote:
[-- snip --]
> > > Anyway here's that patch ported to 2.6.10+my_bigdiff (just in case
> > > anyone has the same problem on i386).
> >
> > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > or an alternative?
>
> Was that hugang's patch we were talking about?
Yes.
> Anyway ugly workaround for this is to just try harder to free memory during
> suspend... Just do free_some_memory five times with msleep(200) in between.
I found your patch that added this to free_some_memory(), so I decided I'd try it first.
Then, if "out of memory" problems continue, I'll try the hugang's patch.
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
hug...@soulinfo.com
> Hi,
>
>
> Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> or an alternative?
>
Ok, Here is a new patch with x86_64 support, But I have not machine, So
Need someone test it.
2.6.11-rc1-mm1
-> 2005-1-14.core.diff core patch TEST PASSED
-> 2005-1-14.x86_64.diff x86_64 patch NOT TESTED
-> 2005-1-14.i386.diff i386 patch TEST PASSED
Pavel Machek, Please comment. thanks.
32 PowerPC port coming soon.
http://soulinfo.com/~hugang/swsusp/2005-1-14/
Signed-off-by: Hu Gang <hug...@soulinfo.com>
--
Hu Gang .-.
/v\
// \\
Linux User /( )\ [204016]
GPG Key ID ^^-^^ http://soulinfo.com/~hugang/hugang.asc
core.diff
--- 2.6.11-rc1-mm1/kernel/power/swsusp.c 2005-01-14 20:19:58.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp/kernel/power/swsusp.c 2005-01-14 22:17:40.000000000 +0800
@@ -76,7 +76,6 @@
extern const void __nosave_begin, __nosave_end;
/* Variables to be preserved over suspend */
-static int pagedir_order_check;
static int nr_copy_pages_check;
extern char resume_file[];
@@ -99,7 +98,6 @@ unsigned int nr_copy_pages __nosavedata
*/
suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
static suspend_pagedir_t *pagedir_save;
-static int pagedir_order __nosavedata = 0;
#define SWSUSP_SIG "S1SUSPEND"
@@ -259,8 +257,415 @@ static int write_page(unsigned long addr
return error;
}
+static int mod_progress = 1;
+
+static void inline mod_printk_progress(int i)
+{
+ if (mod_progress == 0) mod_progress = 1;
+ if (!(i%100))
+ printk( "\b\b\b\b%3d%%", i / mod_progress );
+}
+
+#define PBE_PAGE_NUMS (PAGE_SIZE/sizeof(struct pbe))
+#define PBE_IS_PAGE_END(x) \
+ ( PAGE_SIZE - sizeof(struct pbe) == ((x) - ((~(PAGE_SIZE - 1)) & (x))) )
+
+/**
+ * pgdir_for_each - iterate over a pagedir list
+ * @pos: the &suspend_pagedir_t to use as a loop conter.
+ * @n: another &suspend_pagedir_t to use as tempory storage.
+ * @head: the head for your list.
+ */
+#define pgdir_for_each(pos, n, head) \
+ for(pos = head, n = pos ? (suspend_pagedir_t*)pos->dummy.val : NULL; \
+ pos != NULL; \
+ pos = n, n = pos ? (suspend_pagedir_t *)pos->dummy.val : NULL)
+
+/**
+ * pbe_for_each - iterate over a page backup entry list
+ * @pos: the &struct pbe to use as a loop conter.
+ * @n another &struct pbe to use as tempory storage.
+ * @index: show current index
+ * @max: max index in this list
+ * @head: the head for your list.
+ */
+#define pbe_for_each(pos, n, index, max, head) \
+ for(pos = head, index = 0,\
+ n = pos ? (struct pbe *)pos->dummy.val : NULL; \
+ (pos != NULL) && (index < max); \
+ pos = (PBE_IS_PAGE_END((unsigned long)pos)) ? n : \
+ ((struct pbe *)((unsigned long)pos + sizeof(struct pbe))), \
+ index ++, \
+ n = pos ? (struct pbe*)pos->dummy.val : NULL)
+
+/**
+ * find_pbe_by_index - find a pbe by index
+ * @head: the head for your list.
+ *
+ * @return: NULL is failed.
+ */
+static inline struct pbe *find_pbe_by_index(struct pbe *head, int index)
+{
+ unsigned long p = 0;
+ struct pbe *pbe, *next;
+
+ pgdir_for_each(pbe, next, head) {
+ if (p == index / PBE_PAGE_NUMS) {
+ pbe = (struct pbe *)((unsigned long)pbe +
+ (index % PBE_PAGE_NUMS) * sizeof(struct pbe));
+ pr_debug("find_pbe_by_index: %p, 0x%03x, %p", head, index, pbe);
+ return pbe;
+ }
+ p ++;
+ }
+ return (NULL);
+}
+
+/**
+ * pagedir_free - free the pagedir list storage
+ * @head: the head for your list.
+ */
+static inline void pagedir_free(suspend_pagedir_t *head)
+{
+ suspend_pagedir_t *next, *cur;
+ pgdir_for_each(cur, next, head)
+ free_page((unsigned long)cur);
+}
+
+static int bio_read_page(pgoff_t page_off, void * page);
+/**
+ * write_one_pbe - write a page backup entry to swap device
+ * @p: the page backup entry pointer
+ * @data: the data page pointer
+ * @cur: current index
+ *
+ * @return: 0 is ok.
+ */
+static int inline write_one_pbe(struct pbe *p, void *data, int cur)
+{
+ int error = 0;
+
+ mod_printk_progress(cur);
+
+ pr_debug("write_one_pbe: %p, o{%p} c{%p} %d ",
+ p, (void *)p->orig_address, (void *)p->address, cur);
+ error = write_page((unsigned long)data, &p->swap_address);
+ if (error) return error;
+ pr_debug("%lu\n", swp_offset(p->swap_address));
+ return 0;
+}
+static int inline read_one_pbe(struct pbe *p, void *data, int cur)
+{
+ int error = 0;
+
+ mod_printk_progress(cur);
+
+ pr_debug("read_one_pbe: %p, o{%p} c{%p} %lu\n",
+ p, (void *)p->orig_address, data,
+ swp_offset(p->swap_address));
+
+ error = bio_read_page(swp_offset(p->swap_address), data);
+ if (error) return error;
+ return 0;
+}
+
+/*
+ * Returns true if given address/order collides with any orig_address
+ */
+static int inline does_collide_order(unsigned long addr, int order)
+{
+ int i;
+
+ for (i=0; i < (1<<order); i++)
+ if(!PageNosaveFree(virt_to_page(addr + i * PAGE_SIZE)))
+ return 1;
+ return 0;
+}
+
+
+static void **eaten_memory = NULL;
+
+/**
+ * swsusp_get_safe_free_page - a get_free_pages wrapper.
+ *
+ * in resume we must make sure the page not collide with old pages, first call
+ * get_free_page, if that's collide, adding it in a easy list, then try next,
+ * until get un colliede page.
+ *
+ * @collide: if true enable collide check.
+ *
+ */
+static void *swsusp_get_safe_free_page(int collide)
+{
+ void *addr = NULL;
+ void **c = eaten_memory;
+
+ do {
+ if (addr) {
+ eaten_memory = (void**)addr;
+ *eaten_memory = c;
+ c = eaten_memory;
+ printk(".");
+ }
+ addr = (void*)__get_free_pages(GFP_ATOMIC | __GFP_COLD, 0);
+ if (!addr)
+ return NULL;
+ } while (collide && does_collide_order((unsigned long)addr, 0));
+
+ if (collide)
+ ClearPageNosaveFree(virt_to_page(addr));
+
+ return addr;
+}
/**
+ * alloc_one_pagedir - allocate a new pagedir
+ * @prev: last pagedir pointer
+ * @collide:
+ *
+ */
+static suspend_pagedir_t * alloc_one_pagedir(suspend_pagedir_t *prev,
+ int collide)
+{
+ suspend_pagedir_t *pgdir = NULL;
+ int i;
+
+ pgdir = (suspend_pagedir_t *)swsusp_get_safe_free_page(collide);
+
+ /*pr_debug("pgdir: %p, %p, %d\n",
+ pgdir, prev, sizeof(suspend_pagedir_t)); */
+ for (i = 0; i < PBE_PAGE_NUMS; i++) {
+ pgdir[i].dummy.val = 0;
+ pgdir[i].address = 0;
+ pgdir[i].orig_address = 0;
+ if (prev)
+ prev[i].dummy.val= (unsigned long)pgdir;
+ }
+
+ return (pgdir);
+}
+
+/* calc_nums - Determine the nums of allocation needed for pagedir_save. */
+static int calc_nums(int nr_copy)
+{
+ int diff = 0, ret = 0;
+ do {
+ diff = (nr_copy / PBE_PAGE_NUMS) - ret + 1;
+ if (diff) {
+ ret += diff;
+ nr_copy += diff;
+ }
+ } while (diff);
+ return nr_copy;
+}
+
+/**
+ * alloc_pagedir - Allocate the page directory.
+ * @pbe:
+ * @pbe_nums: needs how many page backup entry.
+ * @collide: true is need do collide check.
+ * @page_nums: if we knows need how many pages for pagedir set it,
+ * only using resume stage, 0 is known.
+ *
+ * @return: < 0 is failed.
+ */
+static int alloc_pagedir(struct pbe **pbe,
+ int pbe_nums, int collide, int page_nums)
+{
+ unsigned int nums = 0;
+ unsigned int after_alloc = pbe_nums;
+ suspend_pagedir_t *prev = NULL, *cur = NULL;
+
+ if (page_nums)
+ after_alloc = PBE_PAGE_NUMS * page_nums;
+ else
+ after_alloc = calc_nums(after_alloc);
+ pr_debug("alloc_pagedir: %d, %d\n", pbe_nums, after_alloc);
+ for (nums = 0 ; nums < after_alloc ; nums += PBE_PAGE_NUMS) {
+ cur = alloc_one_pagedir(prev, collide);
+ pr_debug("alloc_one_pagedir: %p\n", cur);
+ if (!cur) { /* get page failed */
+ goto no_mem;
+ }
+ if (nums == 0) { /* setup the head */
+ *pbe = cur;
+ }
+ prev = cur;
+ }
+ return after_alloc - pbe_nums;
+
+no_mem:
+ pagedir_free(*pbe);
+ *pbe = NULL;
+
+ return (-ENOMEM);
+}
+
+static int __init check_one_pbe(struct pbe *p, int cur)
+{
+ unsigned long addr = 0;
+
+ pr_debug("check_one_pbe: %p %lu o{%p} ",
+ p, p->swap_address.val, (void*)p->orig_address);
+ addr = (unsigned long)swsusp_get_safe_free_page(1);
+ if(!addr)
+ return -ENOMEM;
+ pr_debug("c{%p} done\n", (void*)addr);
+ p->address = addr;
+
+ return 0;
+}
+
+static void __init swsusp_copy_pagedir(suspend_pagedir_t *d_pgdir,
+ suspend_pagedir_t *s_pgdir)
+{
+ int i = 0;
+
+ while (s_pgdir != NULL) {
+ suspend_pagedir_t *s_next = (suspend_pagedir_t *)s_pgdir->dummy.val;
+ suspend_pagedir_t *d_next = (suspend_pagedir_t *)d_pgdir->dummy.val;
+ for (i = 0; i < PBE_PAGE_NUMS; i++) {
+ d_pgdir->address = s_pgdir->address;
+ d_pgdir->orig_address = s_pgdir->orig_address;
+ d_pgdir->swap_address = s_pgdir->swap_address;
+ s_pgdir ++; d_pgdir ++;
+ }
+ d_pgdir = d_next;
+ s_pgdir = s_next;
+ };
+}
+
+/**
+ * We check here that pagedir & pages it points to won't collide with pages
+ * where we're going to restore from the loaded pages later
+ */
+static int __init check_pagedir(void)
+{
+ void **c, *f;
+ struct pbe *next, *pos;
+ int error, index;
+ suspend_pagedir_t *addr = NULL;
+ struct zone *zone;
+ unsigned long zone_pfn;
+
+ printk("Relocating pagedir ... ");
+ /* Set page flags */
+ for_each_zone(zone) {
+ for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
+ SetPageNosaveFree(pfn_to_page(zone_pfn + zone->zone_start_pfn));
+ }
+
+ /* Clear orig address */
+ pbe_for_each(pos, next, index, nr_copy_pages, pagedir_nosave) {
+ pr_debug("clear <%p>, <%p>, %d\n",
+ pos, (void*)pos->orig_address, index);
+ ClearPageNosaveFree(virt_to_page(pos->orig_address));
+ }
+
+ error = alloc_pagedir(&addr, nr_copy_pages, 1, swsusp_info.pagedir_pages);
+ if (error < 0) {
+ return error;
+ }
+ swsusp_copy_pagedir(addr, pagedir_nosave);
+ pagedir_free(pagedir_nosave);
+
+ /* check copy address */
+ pbe_for_each(pos, next, index, nr_copy_pages, addr) {
+ error = check_one_pbe(pos, index);
+ BUG_ON(error);
+ }
+
+ /* free eaten memory */
+ c = eaten_memory;
+ while (c) {
+ printk(":");
+ f = c;
+ c = *c;
+ free_pages((unsigned long)f, 0);
+ }
+
+ printk(" done\n");
+
+ pagedir_nosave = addr;
+
+ return 0;
+}
+
+/**
+ * read_one_pagedir - read one pagedir from swap device
+ * @pgdir: the pgdir pointer
+ * @i:
+ */
+static int __init read_one_pagedir(suspend_pagedir_t *pgdir, int i)
+{
+ unsigned long offset = swp_offset(swsusp_info.pagedir[i]);
+ unsigned long next;
+ int error = 0;
+
+ next = pgdir->dummy.val;
+ pr_debug("read_one_pagedir: %p, %d, %lu, %p\n",
+ pgdir, i, offset, (void*)next);
+ if ((error = bio_read_page(offset, (void *)pgdir))) {
+ return error;
+ }
+ pgdir->dummy.val = next;
+
+ return error;
+}
+
+/**
+ * for_each_pbe_copy_back -
+ *
+ * That usefuly for help us writing the code in assemble code
+ *
+ * 1: enable CREATE_ASM_CODE
+ * 2: make kernel/power/swsusp.o
+ * 3: objdump -dx kernel/power/swsusp.o > /tmp/swsusp.s
+ * 4: vi /tmp/swsusp.s
+ *
+ */
+/*#define CREATE_ASM_CODE*/
+#ifdef CREATE_ASM_CODE
+#if 0 /* if your copy back code is running in real mode, enable it */
+#define GET_ADDRESS(x) __pa(x)
+#else
+#define GET_ADDRESS(x) (x)
+#endif
+asmlinkage void for_each_pbe_copy_back(void)
+{
+ register struct pbe *pgdir, *next;
+
+ pgdir = pagedir_nosave;
+ while (pgdir != NULL) {
+ register unsigned long i;
+ pgdir = (struct pbe *)GET_ADDRESS(pgdir);
+ next = (struct pbe*)pgdir->dummy.val;
+ /* copy a suspend pagedir */
+ for (i = 0; i < PBE_PAGE_NUMS; i++, pgdir ++) {
+ register unsigned long *orig, *copy;
+ orig = (unsigned long *)pgdir->orig_address;
+ if (orig == 0) goto end;
+ orig = (unsigned long *)GET_ADDRESS(orig);
+ copy = (unsigned long *)GET_ADDRESS(pgdir->address);
+#if 1
+ /* copy page data */
+ for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i+=4) {
+ *(orig + i) = *(copy + i);
+ *(orig + i+1) = *(copy + i+1);
+ *(orig + i+2) = *(copy + i+2);
+ *(orig + i+3) = *(copy + i+3);
+ }
+#else
+ memcpy(orig, copy, PAGE_SIZE);
+#endif
+ }
+ pgdir = next;
+ }
+end:
+ panic("just asm code");
+}
+#endif
+/**
* data_free - Free the swap entries used by the saved image.
*
* Walk the list of used swap entries and free each one.
@@ -271,14 +676,15 @@ static void data_free(void)
{
swp_entry_t entry;
int i;
+ struct pbe *next, *pos;
- for (i = 0; i < nr_copy_pages; i++) {
- entry = (pagedir_nosave + i)->swap_address;
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ entry = pos->swap_address;
if (entry.val)
swap_free(entry);
else
break;
- (pagedir_nosave + i)->swap_address = (swp_entry_t){0};
+ pos->swap_address = (swp_entry_t){0};
}
}
@@ -293,17 +699,15 @@ static int data_write(void)
{
int error = 0;
int i;
- unsigned int mod = nr_copy_pages / 100;
+ struct pbe *pos, *next;
- if (!mod)
- mod = 1;
+ mod_progress = nr_copy_pages / 100;
printk( "Writing data to swap (%d pages)... ", nr_copy_pages );
- for (i = 0; i < nr_copy_pages && !error; i++) {
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
- error = write_page((pagedir_nosave+i)->address,
- &((pagedir_nosave+i)->swap_address));
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ BUG_ON(pos->orig_address == 0);
+ error = write_one_pbe(pos, (void*)pos->address, i);
+ if (error) break;
}
printk("\b\b\b\bdone\n");
return error;
@@ -373,15 +777,19 @@ static void free_pagedir_entries(void)
static int write_pagedir(void)
{
- unsigned long addr = (unsigned long)pagedir_nosave;
int error = 0;
- int n = SUSPEND_PD_PAGES(nr_copy_pages);
- int i;
+ int n = 0;
+ suspend_pagedir_t *pgdir, *next;
- swsusp_info.pagedir_pages = n;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = write_page((unsigned long)pgdir, &swsusp_info.pagedir[n]);
+ pr_debug("write_pagedir: <%p>, %lu\n",
+ pgdir, swp_offset(swsusp_info.pagedir[n]));
+ if (error) break;
+ n ++;
+ }
printk( "Writing pagedir (%d pages)\n", n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE)
- error = write_page(addr, &swsusp_info.pagedir[i]);
+ swsusp_info.pagedir_pages = n;
return error;
}
@@ -566,9 +974,9 @@ static void copy_data_pages(void)
{
struct zone *zone;
unsigned long zone_pfn;
- struct pbe * pbe = pagedir_nosave;
+ struct pbe * pbe = NULL;
int to_copy = nr_copy_pages;
-
+
for_each_zone(zone) {
if (is_highmem(zone))
continue;
@@ -576,92 +984,31 @@ static void copy_data_pages(void)
for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn) {
if (saveable(zone, &zone_pfn)) {
struct page * page;
+ pbe = find_pbe_by_index(pagedir_nosave, nr_copy_pages-to_copy);
+ BUG_ON(pbe == NULL);
page = pfn_to_page(zone_pfn + zone->zone_start_pfn);
pbe->orig_address = (long) page_address(page);
+ BUG_ON(pbe->orig_address == 0);
+ BUG_ON(pbe->address == 0);
/* copy_page is not usable for copying task structs. */
memcpy((void *)pbe->address, (void *)pbe->orig_address, PAGE_SIZE);
- pbe++;
- to_copy--;
+ to_copy --;
}
}
}
BUG_ON(to_copy);
}
-
-/**
- * calc_order - Determine the order of allocation needed for pagedir_save.
- *
- * This looks tricky, but is just subtle. Please fix it some time.
- * Since there are %nr_copy_pages worth of pages in the snapshot, we need
- * to allocate enough contiguous space to hold
- * (%nr_copy_pages * sizeof(struct pbe)),
- * which has the saved/orig locations of the page..
- *
- * SUSPEND_PD_PAGES() tells us how many pages we need to hold those
- * structures, then we call get_bitmask_order(), which will tell us the
- * last bit set in the number, starting with 1. (If we need 30 pages, that
- * is 0x0000001e in hex. The last bit is the 5th, which is the order we
- * would use to allocate 32 contiguous pages).
- *
- * Since we also need to save those pages, we add the number of pages that
- * we need to nr_copy_pages, and in case of an overflow, do the
- * calculation again to update the number of pages needed.
- *
- * With this model, we will tend to waste a lot of memory if we just cross
- * an order boundary. Plus, the higher the order of allocation that we try
- * to do, the more likely we are to fail in a low-memory situtation
- * (though we're unlikely to get this far in such a case, since swsusp
- * requires half of memory to be free anyway).
- */
-
-
-static void calc_order(void)
-{
- int diff = 0;
- int order = 0;
-
- do {
- diff = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages)) - order;
- if (diff) {
- order += diff;
- nr_copy_pages += 1 << diff;
- }
- } while(diff);
- pagedir_order = order;
-}
-
-
-/**
- * alloc_pagedir - Allocate the page directory.
- *
- * First, determine exactly how many contiguous pages we need and
- * allocate them.
- */
-
-static int alloc_pagedir(void)
-{
- calc_order();
- pagedir_save = (suspend_pagedir_t *)__get_free_pages(GFP_ATOMIC | __GFP_COLD,
- pagedir_order);
- if (!pagedir_save)
- return -ENOMEM;
- memset(pagedir_save, 0, (1 << pagedir_order) * PAGE_SIZE);
- pagedir_nosave = pagedir_save;
- return 0;
-}
-
/**
* free_image_pages - Free pages allocated for snapshot
*/
static void free_image_pages(void)
{
- struct pbe * p;
+ struct pbe * p, * n;
int i;
- p = pagedir_save;
- for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) {
+ pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) {
if (p->address) {
ClearPageNosave(virt_to_page(p->address));
free_page(p->address);
@@ -677,10 +1024,10 @@ static void free_image_pages(void)
static int alloc_image_pages(void)
{
- struct pbe * p;
+ struct pbe * p, * n;
int i;
- for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) {
+ pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) {
p->address = get_zeroed_page(GFP_ATOMIC | __GFP_COLD);
if (!p->address)
return -ENOMEM;
@@ -694,7 +1041,7 @@ void swsusp_free(void)
BUG_ON(PageNosave(virt_to_page(pagedir_save)));
BUG_ON(PageNosaveFree(virt_to_page(pagedir_save)));
free_image_pages();
- free_pages((unsigned long) pagedir_save, pagedir_order);
+ pagedir_free(pagedir_save);
}
@@ -752,18 +1099,19 @@ static int swsusp_alloc(void)
if (!enough_swap())
return -ENOSPC;
- if ((error = alloc_pagedir())) {
+ if ((error = alloc_pagedir(&pagedir_save, nr_copy_pages, 0, 0)) < 0) {
printk(KERN_ERR "suspend: Allocating pagedir failed.\n");
return error;
}
+ pr_debug("alloc_pagedir: addon %d\n", error);
+ nr_copy_pages += error;
if ((error = alloc_image_pages())) {
printk(KERN_ERR "suspend: Allocating image pages failed.\n");
swsusp_free();
return error;
}
-
+ pagedir_nosave = pagedir_save;
nr_copy_pages_check = nr_copy_pages;
- pagedir_order_check = pagedir_order;
return 0;
}
@@ -867,7 +1215,6 @@ int swsusp_suspend(void)
asmlinkage int swsusp_restore(void)
{
BUG_ON (nr_copy_pages_check != nr_copy_pages);
- BUG_ON (pagedir_order_check != pagedir_order);
/* Even mappings of "global" things (vmalloc) need to be fixed */
__flush_tlb_global();
@@ -893,99 +1240,6 @@ int swsusp_resume(void)
return error;
}
-
-
-/* More restore stuff */
-
-#define does_collide(addr) does_collide_order(pagedir_nosave, addr, 0)
- for(i=0; i < nr_copy_pages; i++) {
- unsigned long addr;
-
- do {
- addr = get_zeroed_page(GFP_ATOMIC);
- if(!addr)
- return -ENOMEM;
- } while (does_collide(addr));
-
- (pagedir_nosave+i)->address = addr;
- }
@@ -1100,7 +1354,6 @@ static int __init check_header(void)
return -EPERM;
}
nr_copy_pages = swsusp_info.image_pages;
- pagedir_order = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages));
return error;
}
@@ -1136,23 +1389,20 @@ static int __init check_sig(void)
@@ -1163,26 +1413,24 @@ extern dev_t __init name_to_dev_t(const
static int __init read_pagedir(void)
{
- unsigned long addr;
- int i, n = swsusp_info.pagedir_pages;
- int error = 0;
+ int error = 0, i = 0, n = swsusp_info.pagedir_pages;
+ suspend_pagedir_t *pgdir, *next;
- addr = __get_free_pages(GFP_ATOMIC, pagedir_order);
- if (!addr)
- return -ENOMEM;
- pagedir_nosave = (struct pbe *)addr;
+ error = alloc_pagedir(&pagedir_nosave, nr_copy_pages, 0, n);
+ if (error < 0)
+ return error;
pr_debug("swsusp: Reading pagedir (%d Pages)\n",n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE) {
- unsigned long offset = swp_offset(swsusp_info.pagedir[i]);
- if (offset)
- error = bio_read_page(offset, (void *)addr);
- else
- error = -EFAULT;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = read_one_pagedir(pgdir, i);
+ if (error) break;
+ pgdir[PBE_PAGE_NUMS-1].dummy.val = pgdir ? pgdir ->dummy.val : 0;
+ i++;
}
+ BUG_ON(i != n);
if (error)
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
@@ -1197,7 +1445,7 @@ static int __init read_suspend_image(voi
if ((error = read_pagedir()))
return error;
if ((error = data_read()))
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
i386.diff
--- 2.6.11-rc1-mm1/arch/i386/power/swsusp.S 2004-12-30 14:56:21.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp/arch/i386/power/swsusp.S 2005-01-14 21:46:08.000000000 +0800
@@ -31,24 +31,36 @@ ENTRY(swsusp_arch_resume)
movl $swsusp_pg_dir-__PAGE_OFFSET,%ecx
movl %ecx,%cr3
- movl pagedir_nosave, %ebx
- xorl %eax, %eax
- xorl %edx, %edx
- .p2align 4,,7
+ movl pagedir_nosave, %eax
+ test %eax, %eax
+ je copy_loop_end
+ movl $1024, %edx
-copy_loop:
- movl 4(%ebx,%edx),%edi
- movl (%ebx,%edx),%esi
-
- movl $1024, %ecx
- rep
- movsl
-
- incl %eax
- addl $16, %edx
- cmpl nr_copy_pages,%eax
- jb copy_loop
.p2align 4,,7
+copy_loop_start:
+ movl 0xc(%eax), %ebp
+ xorl %ebx, %ebx
+ leal 0x0(%esi),%esi
+
+copy_one_pgdir:
+ movl 0x4(%eax),%edi
+ test %edi, %edi
+ je copy_loop_end
+
+ movl (%eax), %esi
+ movl %edx, %ecx
+ repz movsl %ds:(%esi),%es:(%edi)
+
+ incl %ebx
+ addl $0x10, %eax
+ cmpl $0xff, %ebx
+ jbe copy_one_pgdir
+ test %ebp, %ebp
+ movl %ebp, %eax
+ jne copy_loop_start
+
+ .p2align 4,,7
+copy_loop_end:
movl saved_context_esp, %esp
movl saved_context_ebp, %ebp
x86-64
--- 2.6.11-rc1-mm1/arch/x86_64/kernel/suspend_asm.S 2004-12-30 14:56:35.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp/arch/x86_64/kernel/suspend_asm.S 2005-01-14 21:47:48.000000000 +0800
@@ -49,43 +49,47 @@ ENTRY(swsusp_arch_resume)
movq %rcx, %cr3;
movq %rax, %cr4; # turn PGE back on
- movl nr_copy_pages(%rip), %eax
- xorl %ecx, %ecx
- movq $0, %r10
- testl %eax, %eax
- jz done
-.L105:
- xorl %esi, %esi
- movq $0, %r11
- jmp .L104
- .p2align 4,,7
+ movq pagedir_nosave(%rip), %rdi
+ testq %rdi, %rdi
+ je done
+
+copyback_page:
+ movq 24(%rdi), %r9
+ xorl %r8d, %r8d
+
+copy_one_pgdir:
+ movq 8(%rdi), %rsi
+ testq %rsi, %rsi
+ je done
+ movq (%rdi), %rcx
+ xorl %edx, %edx
+
copy_one_page:
- movq %r10, %rcx
-.L104:
- movq pagedir_nosave(%rip), %rdx
- movq %rcx, %rax
- salq $5, %rax
- movq 8(%rdx,%rax), %rcx
- movq (%rdx,%rax), %rax
- movzbl (%rsi,%rax), %eax
- movb %al, (%rsi,%rcx)
-
- movq %cr3, %rax; # flush TLB
- movq %rax, %cr3;
-
- movq %r11, %rax
- incq %rax
- cmpq $4095, %rax
- movq %rax, %rsi
- movq %rax, %r11
- jbe copy_one_page
- movq %r10, %rax
- incq %rax
- movq %rax, %rcx
- movq %rax, %r10
- mov nr_copy_pages(%rip), %eax
- cmpq %rax, %rcx
- jb .L105
+ movq (%rcx,%rdx,8), %rax
+ movq %rax, (%rsi,%rdx,8)
+ movq 8(%rcx,%rdx,8), %rax
+ movq %rax, 8(%rsi,%rdx,8)
+ movq 16(%rcx,%rdx,8), %rax
+ movq %rax, 16(%rsi,%rdx,8)
+ movq 24(%rcx,%rdx,8), %rax
+ movq %rax, 24(%rsi,%rdx,8)
+
+ movq %cr3, %rax; # flush TLB
+ movq %rax, %cr3;
+
+ addq $4, %rdx
+ cmpq $511, %rdx
+ jbe copy_one_page; # copy one page
+
+ incq %r8
+ addq $32, %rdi
+ cmpq $127, %r8
+ jbe copy_one_pgdir; # copy one pgdir
+
+ testq %r9, %r9
+ movq %r9, %rdi
+ jne copyback_page
+
done:
movl $24, %eax
movl %eax, %ds
Rafael J. Wysocki
> On Thu, Jan 13, 2005 at 07:09:24PM +0100, Rafael J. Wysocki wrote:
> > Hi,
> >
> >
> > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > or an alternative?
> >
>
> Ok, Here is a new patch with x86_64 support, But I have not machine, So
> Need someone test it.
OK, I will.
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
hug...@soulinfo.com
> On Friday, 14 of January 2005 15:34, you wrote:
> > On Thu, Jan 13, 2005 at 07:09:24PM +0100, Rafael J. Wysocki wrote:
> > > Hi,
> > >
> > >
> > > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > > or an alternative?
> > >
> >
> > Ok, Here is a new patch with x86_64 support, But I have not machine, So
> > Need someone test it.
> >
> > 2.6.11-rc1-mm1
> > -> 2005-1-14.core.diff core patch TEST PASSED
> > -> 2005-1-14.x86_64.diff x86_64 patch NOT TESTED
>
> but I'm not quite sure as I can't make it print any useful stuff to the serial console
> (everything is dumped to a virtual tty only). Seemingly, it prints some
> "write_pagedir: ..." debug messages and then starts to print garbage in
> an infinite loop.
Try enable debug in swsusp,
<....>
#include "power.h"
#undef pr_debug
#define pr_debug printk
<....>
Enable serial conosole,
Adding console=ttyS0 in boot command line.
Then do software suspend, And send the log to me, that will useful.
For other reference, I using qemu As X86-64 emulation, But current qemu
X86-64 not full works, the kernel hang after copy_page in suspend, I'll
enable CPU and ASM log in qemu to finger other where is the problem.
--
Hu Gang .-.
/v\
// \\
Linux User /( )\ [204016]
GPG Key ID ^^-^^ http://soulinfo.com/~hugang/hugang.asc
Rafael J. Wysocki
> On Friday, 14 of January 2005 15:34, hug...@soulinfo.com wrote:
> > On Thu, Jan 13, 2005 at 07:09:24PM +0100, Rafael J. Wysocki wrote:
> > > Hi,
> > >
> > >
> > > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > > or an alternative?
> > >
> >
> > Ok, Here is a new patch with x86_64 support, But I have not machine, So
> > Need someone test it.
>
> OK, I will.
I have tested it and it works well. For me, it speeds up the resume process significantly,
so I vote for including it into -mm (at least ;-)). I'll be testing it further to see if it really
solves my "out of memory" problems on resume.
hug...@soulinfo.com
> > > > >
> > > > > 2.6.11-rc1-mm1
> > > > > -> 2005-1-14.core.diff core patch TEST PASSED
> > > > > -> 2005-1-14.x86_64.diff x86_64 patch NOT TESTED
> > > >
> > > > Unfortunately, on x86_64 it goes south on suspend, probably somwhere in write_pagedir(),
> > > > but I'm not quite sure as I can't make it print any useful stuff to the serial console
> > > > (everything is dumped to a virtual tty only). Seemingly, it prints some
> > > > "write_pagedir: ..." debug messages and then starts to print garbage in
> > > > an infinite loop.
>
>
> The patch actually works fine on my box. What I thought was a result of an infinite loop,
> turned out to be "only" a debug output from it, which is _really_ excessive. After I had
> commented out the most of pr_debug()s in your code, it works nicely and I like it very
> much. Thanks a lot for porting it to x86_64!
>
Cool, Current I making software suspend also works in Qemu X86_64
emulation, Here is a update patch to making copyback more safed and
possible to improve copyback speed.
I change the swsusp_arch_resume to nosave section, the in memory copy
back it not touch this code. before not change that to nosave section,
I'm also geting a infinite loop in copy_one_page, From the qemu in_asm,
I sure that loop in copy_one_page, when I change it to nosave section,
that problem go away, I dont' sure tha't good idea to fixed it, but
current it works in my qemu, Can someone owner x86_64 test it.
I disable Flush TLB after copy page, It speedup the in qemu, But I can't
sure the right thing in real machine, can someone give me point.
--
Hu Gang .-.
/v\
// \\
Linux User /( )\ [204016]
GPG Key ID ^^-^^ http://soulinfo.com/~hugang/hugang.asc
2005-1-16.x86_64.diff
--- 2.6.11-rc1-mm1/arch/x86_64/kernel/suspend_asm.S 2004-12-30 14:56:35.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp-x86_64/arch/x86_64/kernel/suspend_asm.S 2005-01-16 13:38:25.000000000 +0800
@@ -35,6 +35,7 @@ ENTRY(swsusp_arch_suspend)
call swsusp_save
ret
+ .section .data.nosave
ENTRY(swsusp_arch_resume)
/* set up cr3 */
leaq init_level4_pgt(%rip),%rax
@@ -49,43 +50,47 @@ ENTRY(swsusp_arch_resume)
+#if 0 /* XXX speep up in qemu */
+ movq %cr3, %rax; # flush TLB
+ movq %rax, %cr3;
+#endif
+ addq $4, %rdx
+ cmpq $511, %rdx
+ jbe copy_one_page; # copy one page
+
+ incq %r8
+ addq $32, %rdi
+ cmpq $127, %r8
+ jbe copy_one_pgdir; # copy one pgdir
+
+ testq %r9, %r9
+ movq %r9, %rdi
+ jne copyback_page
+
done:
movl $24, %eax
movl %eax, %ds
Here is the patch for current qemu, with this it has no problem in
software suspend/resume, everything. :)
--- target-i386/helper.c~cvs 2005-01-16 14:06:22.000000000 -0500
+++ target-i386/helper.c 2005-01-16 14:07:21.000000000 -0500
@@ -1454,7 +1454,7 @@ void load_seg(int seg_reg, int selector)
selector &= 0xffff;
if ((selector & 0xfffc) == 0) {
/* null selector case */
- if (seg_reg == R_SS)
+ if (seg_reg == R_CS)
raise_exception_err(EXCP0D_GPF, 0);
cpu_x86_load_seg_cache(env, seg_reg, selector, 0, 0, 0);
} else {
Rafael J. Wysocki
Could you, please, make a patch against -rc1-mm1 with your previous patch
applied? It would be much easier to apply. :-)
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
hug...@soulinfo.com
> >
> > I disable Flush TLB after copy page, It speedup the in qemu, But I can't
> > sure the right thing in real machine, can someone give me point.
>
> Could you, please, make a patch against -rc1-mm1 with your previous patch
> applied? It would be much easier to apply. :-)
>
http://soulinfo.com/~hugang/swsusp/2005-1-16/
--
Hu Gang .-.
/v\
// \\
Linux User /( )\ [204016]
GPG Key ID ^^-^^ http://soulinfo.com/~hugang/hugang.asc
Pavel Machek
> > > > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > > > or an alternative?
> > > >
> > >
> > > Ok, Here is a new patch with x86_64 support, But I have not machine, So
> > > Need someone test it.
> >
> > OK, I will.
>
> I have tested it and it works well. For me, it speeds up the resume process significantly,
> so I vote for including it into -mm (at least ;-)). I'll be testing it further to see if it really
> solves my "out of memory" problems on resume.
Try Lukas's patch, it should provide equivalent speedups.
Pavel
--- linux-cvs/kernel/power/swsusp.c 2005-01-16 22:29:25.000000000 +0100
+++ linux/kernel/power/swsusp.c 2005-01-16 22:49:10.000000000 +0100
@@ -893,26 +893,18 @@
return error;
}
-
-
/* More restore stuff */
-#define does_collide(addr) does_collide_order(pagedir_nosave, addr, 0)
-
/*
* Returns true if given address/order collides with any orig_address
*/
-static int __init does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr,
- int order)
+static int __init does_collide_order(unsigned long addr, int order)
{
int i;
- unsigned long addre = addr + (PAGE_SIZE<<order);
- for (i=0; i < nr_copy_pages; i++)
- if ((pagedir+i)->orig_address >= addr &&
- (pagedir+i)->orig_address < addre)
+ for (i=0; i < (1<<order); i++)
+ if (!PageNosaveFree(virt_to_page(addr + i * PAGE_SIZE)))
return 1;
-
return 0;
}
@@ -931,7 +923,7 @@
addr = get_zeroed_page(GFP_ATOMIC);
if(!addr)
return -ENOMEM;
- } while (does_collide(addr));
+ } while (does_collide_order(addr, 0));
(pagedir_nosave+i)->address = addr;
}
@@ -948,16 +940,34 @@
void **eaten_memory = NULL;
void **c = eaten_memory, *m, *f;
int ret = 0;
+ struct zone *zone;
+ int i;
+ struct pbe *p;
+ unsigned long zone_pfn;
printk("Relocating pagedir ");
- if (!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) {
+ /* Set page flags */
+
+ for_each_zone(zone) {
+ for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
+ SetPageNosaveFree(pfn_to_page(zone_pfn +
+ zone->zone_start_pfn));
+ }
+
+ /* Clear orig address */
+
+ for(i = 0, p = pagedir_nosave; i < nr_copy_pages; i++, p++) {
+ ClearPageNosaveFree(virt_to_page(p->orig_address));
+ }
+
+ if (!does_collide_order((unsigned long)old_pagedir, pagedir_order)) {
printk("not necessary\n");
return check_pagedir();
}
while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) {
- if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order))
+ if (!does_collide_order((unsigned long)m, pagedir_order))
break;
eaten_memory = m;
printk( "." );
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Rafael J. Wysocki
On Sunday, 16 of January 2005 22:51, Pavel Machek wrote:
> Hi!
>
> > > > > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > > > > or an alternative?
> > > > >
> > > >
> > > > Ok, Here is a new patch with x86_64 support, But I have not machine, So
> > > > Need someone test it.
> > >
> > > OK, I will.
> >
> > I have tested it and it works well. For me, it speeds up the resume process significantly,
> > so I vote for including it into -mm (at least ;-)). I'll be testing it further to see if it really
> > solves my "out of memory" problems on resume.
>
> Try Lukas's patch, it should provide equivalent speedups.
It does. Still, I don't think it'll solve memory allocation problems on resume,
and the hugang's patch has such a potential.
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
Pavel Machek
> > > > > > Has this patch been ported to x86_64? Or is there a newer version of it anywhere,
> > > > > > or an alternative?
> > > > > >
> > > > >
> > > > > Ok, Here is a new patch with x86_64 support, But I have not machine, So
> > > > > Need someone test it.
> > > >
> > > > OK, I will.
> > >
> > > I have tested it and it works well. For me, it speeds up the resume process significantly,
> > > so I vote for including it into -mm (at least ;-)). I'll be testing it further to see if it really
> > > solves my "out of memory" problems on resume.
> >
> > Try Lukas's patch, it should provide equivalent speedups.
>
> It does. Still, I don't think it'll solve memory allocation problems on resume,
> and the hugang's patch has such a potential.
Yes, but it is also small/nonintrusive enough to be merged now.
Pavel
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Rafael J. Wysocki
> On Sun, Jan 16, 2005 at 11:07:24AM +0100, Rafael J. Wysocki wrote:
> > >
> > > I disable Flush TLB after copy page, It speedup the in qemu, But I can't
> > > sure the right thing in real machine, can someone give me point.
> >
> > Could you, please, make a patch against -rc1-mm1 with your previous patch
> > applied? It would be much easier to apply. :-)
> >
>
> http://soulinfo.com/~hugang/swsusp/2005-1-16/
Actually, there's a bug in your code: in swsusp.c:alloc_one_pagedir() you
should return NULL rather than -ENOMEM.
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
Rafael J. Wysocki
> On Sun, Jan 16, 2005 at 11:07:24AM +0100, Rafael J. Wysocki wrote:
> > >
> > > I disable Flush TLB after copy page, It speedup the in qemu, But I can't
> > > sure the right thing in real machine, can someone give me point.
> >
> > Could you, please, make a patch against -rc1-mm1 with your previous patch
> > applied? It would be much easier to apply. :-)
> >
>
> http://soulinfo.com/~hugang/swsusp/2005-1-16/
I have tested this (a couple of suspend-resume cycles) and it works.
Greets,
RJW
--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
hug...@soulinfo.com
> Hi,
> >
>
> It does. Still, I don't think it'll solve memory allocation problems on resume,
> and the hugang's patch has such a potential.
>
free_some_memory patch enought do it.
* fix a bug in alloc_one_pagedir()
2005-1-18.core.diff 18-Jan-2005 09:37 22k
fix a bug
2005-1-16.i386.diff 18-Jan-2005 09:37 1k
no change from prev version.
2005-1-16.x86_64.diff 18-Jan-2005 09:37 2k
no change from prev version.
2005-1-18.core.eatmem.diff 18-Jan-2005 09:37 1k
Pavel Machek's patch, that's useful fix memory allocation problems.
http://soulinfo.com/~hugang/swsusp/2005-1-18/
Signed-off-by: Hu Gang <hug...@soulinfo.com>
--
Hu Gang .-.
/v\
// \\
Linux User /( )\ [204016]
GPG Key ID ^^-^^ http://soulinfo.com/~hugang/hugang.asc
2005-1-18.core.diff
--- 2.6.11-rc1-mm1/kernel/power/swsusp.c 2005-01-14 20:19:58.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp/kernel/power/swsusp.c 2005-01-18 09:24:46.000000000 +0800
@@ -76,7 +76,6 @@
extern const void __nosave_begin, __nosave_end;
/* Variables to be preserved over suspend */
-static int pagedir_order_check;
static int nr_copy_pages_check;
extern char resume_file[];
@@ -99,7 +98,6 @@ unsigned int nr_copy_pages __nosavedata
*/
suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
static suspend_pagedir_t *pagedir_save;
-static int pagedir_order __nosavedata = 0;
#define SWSUSP_SIG "S1SUSPEND"
@@ -259,8 +257,420 @@ static int write_page(unsigned long addr
+ * Returns true if given address/order collides with any orig_address
+ */
+static int inline does_collide_order(unsigned long addr, int order)
+{
+ int i;
+
+ for (i=0; i < (1<<order); i++)
+ printk("out of memory\n");
+ return NULL;
+ }
+ } while (collide && does_collide_order((unsigned long)addr, 0));
+
+ if (collide)
+ ClearPageNosaveFree(virt_to_page(addr));
+
+ return addr;
+}
/**
+ * alloc_one_pagedir - allocate a new pagedir
+ * @prev: last pagedir pointer
+ * @collide:
+ *
+ */
+static suspend_pagedir_t * alloc_one_pagedir(suspend_pagedir_t *prev,
+ int collide)
+{
+ suspend_pagedir_t *pgdir = NULL;
+ int i;
+
+ pgdir = (suspend_pagedir_t *)swsusp_get_safe_free_page(collide);
+
+ if (!pgdir)
+ return NULL;
+ struct zone *zone;
+ unsigned long zone_pfn;
+
+ printk("Relocating pagedir ... ");
+ /* Set page flags */
+ for_each_zone(zone) {
+ for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
+ SetPageNosaveFree(pfn_to_page(zone_pfn + zone->zone_start_pfn));
+ }
+
+ /* Clear orig address */
@@ -271,14 +681,15 @@ static void data_free(void)
{
swp_entry_t entry;
int i;
+ struct pbe *next, *pos;
- for (i = 0; i < nr_copy_pages; i++) {
- entry = (pagedir_nosave + i)->swap_address;
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ entry = pos->swap_address;
if (entry.val)
swap_free(entry);
else
break;
- (pagedir_nosave + i)->swap_address = (swp_entry_t){0};
+ pos->swap_address = (swp_entry_t){0};
}
}
@@ -293,17 +704,15 @@ static int data_write(void)
{
int error = 0;
int i;
- unsigned int mod = nr_copy_pages / 100;
+ struct pbe *pos, *next;
- if (!mod)
- mod = 1;
+ mod_progress = nr_copy_pages / 100;
printk( "Writing data to swap (%d pages)... ", nr_copy_pages );
- for (i = 0; i < nr_copy_pages && !error; i++) {
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
- error = write_page((pagedir_nosave+i)->address,
- &((pagedir_nosave+i)->swap_address));
+ pbe_for_each(pos, next, i, nr_copy_pages, pagedir_nosave) {
+ BUG_ON(pos->orig_address == 0);
+ error = write_one_pbe(pos, (void*)pos->address, i);
+ if (error) break;
}
printk("\b\b\b\bdone\n");
return error;
@@ -373,15 +782,19 @@ static void free_pagedir_entries(void)
static int write_pagedir(void)
{
- unsigned long addr = (unsigned long)pagedir_nosave;
int error = 0;
- int n = SUSPEND_PD_PAGES(nr_copy_pages);
- int i;
+ int n = 0;
+ suspend_pagedir_t *pgdir, *next;
- swsusp_info.pagedir_pages = n;
+ pgdir_for_each(pgdir, next, pagedir_nosave) {
+ error = write_page((unsigned long)pgdir, &swsusp_info.pagedir[n]);
+ pr_debug("write_pagedir: <%p>, %lu\n",
+ pgdir, swp_offset(swsusp_info.pagedir[n]));
+ if (error) break;
+ n ++;
+ }
printk( "Writing pagedir (%d pages)\n", n);
- for (i = 0; i < n && !error; i++, addr += PAGE_SIZE)
- error = write_page(addr, &swsusp_info.pagedir[i]);
+ swsusp_info.pagedir_pages = n;
return error;
}
@@ -566,9 +979,9 @@ static void copy_data_pages(void)
{
struct zone *zone;
unsigned long zone_pfn;
- struct pbe * pbe = pagedir_nosave;
+ struct pbe * pbe = NULL;
int to_copy = nr_copy_pages;
-
+
for_each_zone(zone) {
if (is_highmem(zone))
continue;
@@ -576,92 +989,31 @@ static void copy_data_pages(void)
@@ -677,10 +1029,10 @@ static void free_image_pages(void)
static int alloc_image_pages(void)
{
- struct pbe * p;
+ struct pbe * p, * n;
int i;
- for (i = 0, p = pagedir_save; i < nr_copy_pages; i++, p++) {
+ pbe_for_each(p, n, i, nr_copy_pages, pagedir_save) {
p->address = get_zeroed_page(GFP_ATOMIC | __GFP_COLD);
if (!p->address)
return -ENOMEM;
@@ -694,7 +1046,7 @@ void swsusp_free(void)
BUG_ON(PageNosave(virt_to_page(pagedir_save)));
BUG_ON(PageNosaveFree(virt_to_page(pagedir_save)));
free_image_pages();
- free_pages((unsigned long) pagedir_save, pagedir_order);
+ pagedir_free(pagedir_save);
}
@@ -752,18 +1104,19 @@ static int swsusp_alloc(void)
if (!enough_swap())
return -ENOSPC;
- if ((error = alloc_pagedir())) {
+ if ((error = alloc_pagedir(&pagedir_save, nr_copy_pages, 0, 0)) < 0) {
printk(KERN_ERR "suspend: Allocating pagedir failed.\n");
return error;
}
+ pr_debug("alloc_pagedir: addon %d\n", error);
+ nr_copy_pages += error;
if ((error = alloc_image_pages())) {
printk(KERN_ERR "suspend: Allocating image pages failed.\n");
swsusp_free();
return error;
}
-
+ pagedir_nosave = pagedir_save;
nr_copy_pages_check = nr_copy_pages;
- pagedir_order_check = pagedir_order;
return 0;
}
@@ -867,7 +1220,6 @@ int swsusp_suspend(void)
asmlinkage int swsusp_restore(void)
{
BUG_ON (nr_copy_pages_check != nr_copy_pages);
- BUG_ON (pagedir_order_check != pagedir_order);
/* Even mappings of "global" things (vmalloc) need to be fixed */
__flush_tlb_global();
@@ -893,99 +1245,6 @@ int swsusp_resume(void)
return error;
}
-
-
-/* More restore stuff */
-
-#define does_collide(addr) does_collide_order(pagedir_nosave, addr, 0)
-
-/*
- * Returns true if given address/order collides with any orig_address
- */
-static int __init does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr,
- int order)
-{
- int i;
- unsigned long addre = addr + (PAGE_SIZE<<order);
-
- for (i=0; i < nr_copy_pages; i++)
- if ((pagedir+i)->orig_address >= addr &&
- (pagedir+i)->orig_address < addre)
- return 1;
-
- return 0;
-}
-
-/*
- * We check here that pagedir & pages it points to won't collide with pages
- * where we're going to restore from the loaded pages later
- */
-static int __init check_pagedir(void)
-{
- int i;
-
- for(i=0; i < nr_copy_pages; i++) {
- unsigned long addr;
-
- do {
- addr = get_zeroed_page(GFP_ATOMIC);
- if(!addr)
- return -ENOMEM;
- } while (does_collide(addr));
-
- (pagedir_nosave+i)->address = addr;
- }
- return 0;
-}
-
-static int __init swsusp_pagedir_relocate(void)
-{
- /*
- * We have to avoid recursion (not to overflow kernel stack),
- * and that's why code looks pretty cryptic
- */
- suspend_pagedir_t *old_pagedir = pagedir_nosave;
- void **eaten_memory = NULL;
- void **c = eaten_memory, *m, *f;
- int ret = 0;
-
- printk("Relocating pagedir ");
-
- if (!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) {
- printk("not necessary\n");
- return check_pagedir();
- }
-
- while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) {
- if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order))
@@ -1100,7 +1359,6 @@ static int __init check_header(void)
return -EPERM;
}
nr_copy_pages = swsusp_info.image_pages;
- pagedir_order = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages));
return error;
}
@@ -1136,23 +1394,20 @@ static int __init check_sig(void)
@@ -1163,26 +1418,24 @@ extern dev_t __init name_to_dev_t(const
@@ -1197,7 +1450,7 @@ static int __init read_suspend_image(voi
if ((error = read_pagedir()))
return error;
if ((error = data_read()))
- free_pages((unsigned long)pagedir_nosave, pagedir_order);
+ pagedir_free(pagedir_nosave);
return error;
}
2005-1-16.i386.diff
2005-1-16.x86_64.diff
--- 2.6.11-rc1-mm1/arch/x86_64/kernel/suspend_asm.S 2004-12-30 14:56:35.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp/arch/x86_64/kernel/suspend_asm.S 2005-01-16 14:08:16.000000000 +0800
2005-1-18.core.eatmem.diff
--- 2.6.11-rc1-mm1/kernel/power/disk.c 2005-01-14 20:19:58.000000000 +0800
+++ 2.6.11-rc1-mm1-swsusp/kernel/power/disk.c 2005-01-18 09:26:31.000000000 +0800
@@ -86,23 +86,25 @@ static int in_suspend __nosavedata = 0;
static void free_some_memory(void)
{
- unsigned int i = 0;
- unsigned int tmp;
- unsigned long pages = 0;
- char *p = "-\\|/";
-
- printk("Freeing memory... ");
- while ((tmp = shrink_all_memory(10000))) {
- pages += tmp;
- printk("\b%c", p[i]);
- i++;
- if (i > 3)
- i = 0;
+ int i;
+ for (i=0; i<5; i++) {
+ int i = 0, tmp;
+ long pages = 0;
+ char *p = "-\\|/";
+
+ printk("Freeing memory... ");
+ while ((tmp = shrink_all_memory(10000))) {
+ pages += tmp;
+ printk("\b%c", p[i]);
+ i++;
+ if (i > 3)
+ i = 0;
+ }
+ printk("\bdone (%li pages freed)\n", pages);
+ msleep_interruptible(200);
}
- printk("\bdone (%li pages freed)\n", pages);
}
-
static inline void platform_finish(void)
{
if (pm_disk_mode == PM_DISK_PLATFORM) {