Re: [PATCH] 2.5.21 IDE 91

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

> At some point in the past, akpm wrote:
>>> Does this patch get the throughput back?

>> That makes all the difference to dbench.  

> How does it do against the prior 2.5 kernels?

dbench ext2 128    Average 
2.5.1-dj13           8.04 mb/sec 
2.5.2-dj6            8.59  
2.5.4-dj2            8.45  
2.5.16              11.06  
2.5.18-akpm         18.11  
2.5.18-wli          18.54  
2.5.19              18.60  
2.5.19-wli          18.54  
2.5.19-wli3         20.93  
2.5.20              12.89  
2.5.20-dj4          10.58  
2.5.21              12.67  
2.5.21-akpm         19.65

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

>> Is it reproducible?   

> tiobench had a similar livelock in 2.5.19, 2.5.19 + 2 versions of
> wli's lazy-buddy allocator, 2.5.20, 2.5.21

2.5.22 completes all the tests, including tiobench.  :)

-- 
Randy Hron
http://home.earthlink.net/~rwhron/

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

>> tiobench.pl --size 2048 --numruns 3 --threads 128  # 384 MB ram in machine

> From your trace it would seem that writeout completion has not
> occurred against one or more pages.  Could be that the device
> driver lost an interrupt, or it failed to deliver completion
> for one or more BIO segments, or something screwed up at the
> VFS level.

> I am (of course ;)) disinclined to believe the latter, mainly
> because of the amount of testing I do here.  Eight-hour Cerberus
> runs on quad CPU, five IDE disks and six SCSI disks all chugging
> along, no probs.

> Is it reproducible?   Are you able to try it on a different machine?
> On other disks in the same machine?

tiobench had a similar livelock in 2.5.19, 2.5.19 + 2 versions of
wli's lazy-buddy allocator, 2.5.20, 2.5.21, and 2.5.21 with the
request queue size change we talked about.  However, when I tried
it just now on a different disk and filesystem type (reiser instead
of ext2) it didn't happen.  The non-reproduced livelock didn't
have any of the previous stress testing run against the machine
though.

Since the tiobench livelock appeared in 2.5.19, the following
kernels have completed all tests.

2.4.19-pre10
2.5.20-dj3
2.4.19-pre10-ac2
2.4.19-pre10-aa1
2.5.20-dj4
2.4.19-pre10-jam2
2.4.19-pre10-jam2-O2
2.4.19-pre10-jam2-O3
2.4.18-cmpr-cache
2.4.19-pre10-mjc1

2.5.22 is out now and I'm trying that.  If it has a problem, I'm
inclined to rebuild the ext2 that tiobench, osdb, and dbench run 
on.  (may not help, but it won't hurt :)

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

There is a stack trace with function names from the livelock 
during tiotest on 2.5.21 at:

http://home.earthlink.net/~rwhron/kernel/2.5.21.tasktrace

The task trace was create with:
http://home.earthlink.net/~rwhron/kernel/tasktrace

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

This oops occured after rebooting into 2.5.21, compiling a kernel,
then init 6.

flushing ide devices: hda <1>Unable to handle kernel NULL pointer dereference at virtual address 00000004
c0199a8b
*pde = 00000000
Oops: 0002
CPU:    0
EIP:    0010:[<c0199a8b>]    Not tainted
Using defaults from ksymoops -t elf32-i386 -a i386
EFLAGS: 00010286
eax: c02c1944   ebx: c02c192c   ecx: 00000000   edx: 00000000
esi: c025cc60   edi: 00000001   ebp: 00000001   esp: d01fde58
ds: 0018   es: 0018   ss: 0018
Stack: c02c192c c02c17d4 c0199d0e c02c192c c02c17d0 c01c6b1c c02c192c c02c17d0
       c01c072b c02c17d0 c025c77c 00000000 00000001 bffffd54 c011910e c025c77c
       00000001 00000000 d01fc000 080498c0 fee1dead c01193ee c02a1b48 00000001
Call Trace: [<c0199d0e>] [<c01c6b1c>] [<c01c072b>] [<c011910e>] [<c01193ee>]
   [<c01dbaa3>] [<c01d7ab5>] [<c01ffaac>] [<c01ffdb9>] [<c01d0e57>] [<c013c264>]
   [<c013ccfc>] [<c013b016>] [<c012c654>] [<c012b6f5>] [<c012b745>] [<c01069f7>]
Code: 89 4a 04 89 11 89 43 18 89 40 04 83 7e 38 00 74 09 53 8b 46


>>EIP; c0199a8b <device_detach+23/4c>   <=====

>>eax; c02c1944 <ide_hwifs+2a4/3d90>
>>ebx; c02c192c <ide_hwifs+28c/3d90>
>>esi; c025cc60 <idedisk_devdrv+0/60>
>>esp; d01fde58 <END_OF_CODE+ff35f3c/????>

Trace; c0199d0e <put_device+4a/7c>
Trace; c01c6b1c <idedisk_cleanup+1c/60>
Trace; c01c072b <ata_sys_notify+9f/d4>
Trace; c011910e <notifier_call_chain+1e/38>
Trace; c01193ee <sys_reboot+c2/1d0>
Trace; c01dbaa3 <rtmsg_ifinfo+6f/74>
Trace; c01d7ab5 <dev_change_flags+f1/fc>
Trace; c01ffaac <devinet_ioctl+348/6b4>
Trace; c01ffdb9 <devinet_ioctl+655/6b4>
Trace; c01d0e57 <sock_destroy_inode+13/18>
Trace; c013c264 <destroy_inode+2c/4c>
Trace; c013ccfc <generic_forget_inode+c4/cc>
Trace; c013b016 <dput+126/144>
Trace; c012c654 <fput+bc/e0>
Trace; c012b6f5 <filp_close+59/64>
Trace; c012b745 <sys_close+45/58>
Trace; c01069f7 <syscall_call+7/b>

Code;  c0199a8b <device_detach+23/4c>
00000000 <_EIP>:
Code;  c0199a8b <device_detach+23/4c>   <=====
   0:   89 4a 04                  mov    %ecx,0x4(%edx)   <=====
Code;  c0199a8e <device_detach+26/4c>
   3:   89 11                     mov    %edx,(%ecx)
Code;  c0199a90 <device_detach+28/4c>
   5:   89 43 18                  mov    %eax,0x18(%ebx)
Code;  c0199a93 <device_detach+2b/4c>
   8:   89 40 04                  mov    %eax,0x4(%eax)
Code;  c0199a96 <device_detach+2e/4c>
   b:   83 7e 38 00               cmpl   $0x0,0x38(%esi)
Code;  c0199a9a <device_detach+32/4c>
   f:   74 09                     je     1a <_EIP+0x1a> c0199aa5 <device_detach+3d/4c>
Code;  c0199a9c <device_detach+34/4c>
  11:   53                        push   %ebx
Code;  c0199a9d <device_detach+35/4c>
  12:   8b 46 00                  mov    0x0(%esi),%eax


-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

> That's interesting. What exactly was failing ? It'd be in everyones
> interests to get those bits pushed to Linus sooner.

This time it was tiobench with 32 threads.  The <sysrq Tasks>
and a few other details on the livelock are at:

http://home.earthlink.net/~rwhron/kernel/2.5.21-sysrq.txt

If the System.map file is useful, it is at:
http://home.earthlink.net/~rwhron/kernel/System.map-2.5.21.bz2

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

> Does this patch get the throughput back?

That makes all the difference to dbench.  Throughput
for dbench 128 up over 40% compared to vanilla 2.5.21.
-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[William Lee Irwin III]

At some point in the past, akpm wrote:
>> Does this patch get the throughput back?

On Sat, Jun 15, 2002 at 05:00:09PM -0400, rwhron@earthlink.net wrote:
> That makes all the difference to dbench.  Throughput
> for dbench 128 up over 40% compared to vanilla 2.5.21.

How does it do against the prior 2.5 kernels?


Cheers,
Bill

Re: [PATCH] 2.5.21 IDE 91

[Andrew Morton]

rwhron@earthlink.net wrote:
> 
> > Does this patch get the throughput back?
> 
> That makes all the difference to dbench.  Throughput
> for dbench 128 up over 40% compared to vanilla 2.5.21.

ho hum.  Now we need to work out why a larger request queue
whacks dbench, whether it penalises workloads which we actually
care about and if so, what the appropriate size really should be.
If indeed that algorithms are optimal.  urgh.

Thanks again, Randy.

-

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

>> Recently, 2.5.20-dj[34] completed all my tests, whereas
>> 2.5.{19,20,21} haven't.   I realize breakage in the development series
>> is expected and sometimes good.  Nonetheless, "two thumbs up" for -dj.

> That's interesting. What exactly was failing ? It'd be in everyones
> interests to get those bits pushed to Linus sooner.

tiobench.pl --size 2048 --numruns 3 --threads 128  # 384 MB ram in machine

The ssh session running vmstat no longer updates.  Console won't
give a new "login" prompt with <Enter>.  <sysrq T> prints a 
trace (which I haven't captured - it's really long with > 128 processes).

Does <sysrq T> need any post processing to convert addresses to
something more useful?  I'll save it on 2.5.22 if it happens.

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[Andrew Morton]

rwhron@earthlink.net wrote:
> 
> >> Recently, 2.5.20-dj[34] completed all my tests, whereas
> >> 2.5.{19,20,21} haven't.   I realize breakage in the development series
> >> is expected and sometimes good.  Nonetheless, "two thumbs up" for -dj.
> 
> > That's interesting. What exactly was failing ? It'd be in everyones
> > interests to get those bits pushed to Linus sooner.
> 
> tiobench.pl --size 2048 --numruns 3 --threads 128  # 384 MB ram in machine
> 
> The ssh session running vmstat no longer updates.  Console won't
> give a new "login" prompt with <Enter>.  <sysrq T> prints a
> trace (which I haven't captured - it's really long with > 128 processes).
> 
> Does <sysrq T> need any post processing to convert addresses to
> something more useful?  I'll save it on 2.5.22 if it happens.

Well I dunno, Randy.  Works fine here, on aic7xxx SCSI and hpt366 IDE.

>From your trace it would seem that writeout completion has not
occurred against one or more pages.  Could be that the device
driver lost an interrupt, or it failed to deliver completion
for one or more BIO segments, or something screwed up at the
VFS level.

I am (of course ;)) disinclined to believe the latter, mainly
because of the amount of testing I do here.  Eight-hour Cerberus
runs on quad CPU, five IDE disks and six SCSI disks all chugging
along, no probs.

Is it reproducible?   Are you able to try it on a different machine?
On other disks in the same machine? 

-

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

> When the IDE carnage first started back circa 2.5.3, I had contemplated
> not merging *any* of the IDE patches, just so that people who want to
> work on other areas could have something solid to build upon.
> I regret not following through on that instinct.

I give the -dj series a vote of "good taste".   In my testing they have
been reliable.  Recently, 2.5.20-dj[34] completed all my tests, whereas
2.5.{19,20,21} haven't.   I realize breakage in the development series
is expected and sometimes good.  Nonetheless, "two thumbs up" for -dj.

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[Dave Jones]

On Sat, Jun 15, 2002 at 07:41:06AM -0400, rwhron@earthlink.net wrote:
 > > When the IDE carnage first started back circa 2.5.3, I had contemplated
 > > not merging *any* of the IDE patches, just so that people who want to
 > > work on other areas could have something solid to build upon.
 > > I regret not following through on that instinct.
 > 
 > I give the -dj series a vote of "good taste".   In my testing they have
 > been reliable.  Recently, 2.5.20-dj[34] completed all my tests, whereas
 > 2.5.{19,20,21} haven't.   I realize breakage in the development series
 > is expected and sometimes good.  Nonetheless, "two thumbs up" for -dj.

That's interesting. What exactly was failing ? It'd be in everyones
interests to get those bits pushed to Linus sooner.

        Dave.

-- 
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs

Re: [PATCH] 2.5.21 IDE 91

[rwhron]

>> > test the crap out of a kernel :).

>> Linux Test Project's runalltests.sh has occasionally triggered a bug.

> Is this still happening?  What was the bug?

That's just a general suggestion with regard to kernel testing.
Recent 2.5.x hasn't had a problem completing LTP runalltests.sh.  
I've used LTP to narrow down a couple early 2.4.x reiserfs bugs to
a specific test case.  LTP has occasionally triggered oops and
livelocks too.  It's a useful regression test. 

>> 2.5 took a drop in dbench throughput recently.
>>
>> dbench ext2 128 processes       Average         High            Low(MB/sec)

> Is this still with 384 megs of memory?

Yes. 

> 2.5.19                           18.60           21.69           14.58
> 2.5.20                           12.89           13.15           12.79

> One possibile culprit here is the doubling of the request queue size
> in 2.5.20.  A long time ago it was 1024 slots.  Then it went to
> 128.  That's where it is in Marcelo kernels.  Then -ac kernels
> went up to 1024 because they have read-latency2.  Somehow 2.5 found
> itself at 256 slots.  In 2.5.20 it slealthily snuck up to 512
> slots.  I didn't squeak about this because I was interested to see what
> effect it would have.

Interesting.  I've seen read-latency2 drop dbench throughput in -aa
kernels (but I use it anyway).  I'd like to capture the request
queue size.  Is there a command or file in /proc that displays 
it, or should I just grep drivers/block/ll_rw_blk.c?

> Does this patch get the throughput back?

I will try that next.

-- 
Randy Hron

Re: [PATCH] 2.5.21 IDE 91

[Jens Axboe]

On Sat, Jun 15 2002, rwhron@earthlink.net wrote:
> > One possibile culprit here is the doubling of the request queue size
> > in 2.5.20.  A long time ago it was 1024 slots.  Then it went to
> > 128.  That's where it is in Marcelo kernels.  Then -ac kernels
> > went up to 1024 because they have read-latency2.  Somehow 2.5 found
> > itself at 256 slots.  In 2.5.20 it slealthily snuck up to 512
> > slots.  I didn't squeak about this because I was interested to see what
> > effect it would have.
> 
> Interesting.  I've seen read-latency2 drop dbench throughput in -aa
> kernels (but I use it anyway).  I'd like to capture the request
> queue size.  Is there a command or file in /proc that displays 
> it, or should I just grep drivers/block/ll_rw_blk.c?

There is currently no way you can capture the queue request state. In
the past I've done sysrq hacks to display it, but that's about it.

-- 
Jens Axboe

Re: [PATCH] 2.5.21 IDE 91

[Andries.Brouwer]

>>>Frankly, _I'm_ too scared to run 2.5 IDE currently.

>> Backups, that is what you need. Or a scratch machine.

> Just curious: Becouse dir entires beeing affected
> looks like the effect of the recent changes to the VFS.

I am not ready to blame any part of the kernel.
Don't read an implicit complaint about IDE into my note.
No, just a warning: this is what vanilla 2.5.21 can do.

Andries

Re: [PATCH] 2.5.21 IDE 91

[Andries.Brouwer]

> Frankly, _I'm_ too scared to run 2.5 IDE currently.

Backups, that is what you need. Or a scratch machine.

This is what vanilla 2.5.21 can do to your filesystem
(after a reboot and a e2fsck -a):

% ls /lost+found
#10416
#104719
#104724
#10537
#10540
#10547
#10548
#10549
#10550
#10551
#106768
#108545
#108550
#108576
...
(thousands and thousands of files - not lost, only their
names suffered a bit...)

But, to be fair, only a small part of the damage is due
to the kernel. Afterwards, e2fsck made things much worse.

Andries


(Vanilla 2.5.21 does not compile, you say?
OK, 2.5.21 together with the addition of the #include lines
that make it compile.)

Re: [PATCH] 2.5.21 IDE 91

[Martin Dalecki]

Użytkownik Andries.Brouwer@cwi.nl napisał:
>>Frankly, _I'm_ too scared to run 2.5 IDE currently.
> 
> 
> Backups, that is what you need. Or a scratch machine.
> 
> This is what vanilla 2.5.21 can do to your filesystem
> (after a reboot and a e2fsck -a):
> 
> % ls /lost+found
> #10416
> #104719

> ...
> (thousands and thousands of files - not lost, only their
> names suffered a bit...)
> 
> But, to be fair, only a small part of the damage is due
> to the kernel. Afterwards, e2fsck made things much worse.

Just curious: Becouse dir entires beeing
affected looks like the effect of the recent changes to
the VFS.

Re: [PATCH] 2.5.21 IDE 91

[Hron, Randall]

> (lord knows i'm trying to get up to speed), but, in the meantime, I can
> test the crap out of a kernel :).

tiobench is having trouble completing in kernels >= 2.5.19 on my K6-2
384 mb ram, IDE test system.  The parameters I'm using are:

tiobench.pl --size 2048 --numruns 3 --threads 1 --threads 32 --threads 64
--threads 128

--size depends on ram and disk space.

Early in 2.5, dbench 192 would exercise a bug or two.
(requires about 5GB of disk space)

Linux Test Project's runalltests.sh has occasionally triggered a bug.

2.5 took a drop in dbench throughput recently.

dbench ext2 128 processes       Average         High            Low(MB/sec)
2.5.19                           18.60           21.69           14.58
2.5.20                           12.89           13.15           12.79
2.5.21                           12.67           12.94           12.51

If you want to benchmark some stuff while you're stress testing,
http://home.earthlink.net/~rwhron/kernel/index.html might be a
starting point for ideas.

Re: [PATCH] 2.5.21 IDE 91

[Andrew Morton]

"Hron, Randall" wrote:
> 
> > (lord knows i'm trying to get up to speed), but, in the meantime, I can
> > test the crap out of a kernel :).
> 
> tiobench is having trouble completing in kernels >= 2.5.19 on my K6-2
> 384 mb ram, IDE test system.  The parameters I'm using are:
> 
> tiobench.pl --size 2048 --numruns 3 --threads 1 --threads 32 --threads 64
> --threads 128
> 
> --size depends on ram and disk space.
> 
> Early in 2.5, dbench 192 would exercise a bug or two.
> (requires about 5GB of disk space)
> 
> Linux Test Project's runalltests.sh has occasionally triggered a bug.

Is this still happening?  What was the bug?
 
> 2.5 took a drop in dbench throughput recently.
> 
> dbench ext2 128 processes       Average         High            Low(MB/sec)

Is this still with 384 megs of memory?

> 2.5.19                           18.60           21.69           14.58
> 2.5.20                           12.89           13.15           12.79
> 2.5.21                           12.67           12.94           12.51
> 

One possibile culprit here is the doubling of the request queue size
in 2.5.20.  A long time ago it was 1024 slots.  Then it went to
128.  That's where it is in Marcelo kernels.  Then -ac kernels
went up to 1024 because they have read-latency2.  Somehow 2.5 found
itself at 256 slots.  In 2.5.20 it slealthily snuck up to 512
slots.  I didn't squeak about this because I was interested to see what
effect it would have.

Does this patch get the throughput back?


Index: drivers/block/ll_rw_blk.c
===================================================================
RCS file: /opt/cvs/lk/drivers/block/ll_rw_blk.c,v
retrieving revision 1.66
diff -u -r1.66 ll_rw_blk.c
--- drivers/block/ll_rw_blk.c	9 Jun 2002 07:13:15 -0000	1.66
+++ drivers/block/ll_rw_blk.c	14 Jun 2002 23:35:54 -0000
@@ -1974,6 +1974,8 @@
 	if (queue_nr_requests > 512)
 		queue_nr_requests = 512;
 
+	queue_nr_requests = 256;
+
 	/*
 	 * Batch frees according to queue length
 	 */


-

Linux 2.5.21

[Linus Torvalds]

The bulk of the changes are the s390 merge bits, but there are small 
details like fixing some races in the new unplugging code etc, more 
driverfs, USB, framebuffer updates etc.

The most noticeable changes (and that people will probably find some 
nagging missing things with) are the header file cleanups - expect some 
missing headers here and there - and the kernel build changes. Different 
dependency stuff etc.

		Linus

-----

Summary of changes from v2.5.20 to v2.5.21
============================================

<alex@ssi.bg>:
  o ipchains_core netlink fix
  o ipchains_core GFP_KERNEL fix

<ch@murgatroid.com>:
  o USB SA-1111 patch against usb-2.5 bitkeeper

<da-x@gmx.net>:
  o fix NULL dereferencing in dcache.c

<dank@kegel.com>:
  o must be __KERNEL__ for byteorder/generic.h

<devik@cdi.cz>:
  o USB pwc webcam patch

<johan.adolfsson@axis.com>:
  o Missing include in mm/bootmem.c

<kaz@earth.email.ne.jp>:
  o fix for /proc operation

<mark@alpha.dyndns.org>:
  o 2.5.20 ov511.c compile fixes

<martin.schwidefsky@debitel.net>:
  o s/390 patches for 2.5.20 (1..4)

<willy@debian.org>:
  o fs/locks.c: Only yield once for flocks
  o fs/locks.c: remove MSNFS define
  o fs/locks.c: more cleanup

<wli@holomorphy.com>:
  o correct zone_table comment
  o duplicate decl in sched_init()
  o make memclass() an inline
  o remove antiquated comment
  o remove macros from page_alloc.c
  o static list init page_alloc.c

<zwane@linux.realnet.co.sz>:
  o bluesmoke merge

Adrian Bunk <bunk@fs.tum.de>:
  o UHCI bix for build error under unstable debian

Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>:
  o net/sched fixes
  o ipv6 raw fixes

Anton Altaparmakov <aia21@cantab.net>:
  o NTFS: Remove unused source file
  o NTFS: The beginning of 2.0.8. - Major updates for handling of case
    sensitivity
  o NTFS: Fix really dumb logic bug in boot sector recovery
  o NTFS: Fix potential 1 byte overflow in
    fs/ntfs/unistr.c::ntfs_ucstonls()
  o NTFS: 2.0.8 release. Major updates for dcache aliasing issues wrt
    short/long file names

Anton Blanchard <anton@samba.org>:
  o Fix for recent swap changes on 64 bit archs

Arnaldo Carvalho de Melo <acme@conectiva.com.br>:
  o net/ipv4/af_inet.c
  o net/ipv4/devinet.c
  o net/ipv4/icmp.c
  o net/core/dev.c
  o net/ipv4/tcp_ipv4.c
  o arch/* drivers/cdrom/* drivers/char/*

Brad Hards <bhards@bigpond.net.au>:
  o "General options" - begone

Brian Gerst <bgerst@didntduck.org>:
  o fs/inode.c list_del_init
  o missing GET_CPU_IDX in i386 entry.S

Christoph Hellwig <hch@sb.bsdonline.org>:
  o kbuild: remove CLEAN_DIRS from Makfile
  o kbuild: small toplevel makefile tidyup

Dave Jones <davej@suse.de>:
  o large x86 setup cleanup

Dave Kleikamp <shaggy@kleikamp.austin.ibm.com>:
  o JFS: Fix structure alignment problem on 64-bit machines
  o JFS: Add hch's copyright
  o JFS: remove obsolete declaration

David Brownell <david-b@pacbell.net>:
  o ohci-hcd, fix urb unlink races
  o synchronous control/bulk messaging
  o uhci-hcd misc
  o relocate error checks

David S. Miller <davem@nuts.ninka.net>:
  o net/core/dev.c: Do not cast pointers to int, use long
  o sk->num no longer exists in 2.5, use inet_sk(sk)->num
  o net/core/dev.c: Make handle_diverter return 0
  o Bonding driver: Merge 2.4.x driver updates into 2.5
  o asm-generic.h: Add forward siginfo decl for the sake of
    HAVE_ARCH_SIGINFO_T platforms.
  o init/main.c: Revert recent GCC requirement change
  o Fix generic device layer init sequence
  o SunRPC: Fix size_t vs. unsigned int arg descrepancy
  o register_netdevice: Fix return value handling on success
  o sparc64/kernel/Makefile: Remove bogus binfmt_elf32.o dependency
    target
  o Sparc64: Propagate exec MM handling changes to sparc32 emulation
    layer
  o Sparc64: Propagate forget_pte changes to sparc64 ioremap
  o Sparc: Adjust to new {clear,copy}_user_page calling convention
  o IDE: Print I/O ports more portably
  o IDE: Add missing printf format specifier when printing Sparc IRQ.
  o IDE: Print 64-bit types more portably

David Woodhouse <dwmw2@infradead.org>:
  o Shared zlib include fix for 2.5 and 2.4-ac

Ghozlane Toumi <ghoz@sympatico.ca>:
  o update to pci_quirks.c

Greg Kroah-Hartman <greg@kroah.com>:
  o USB: emi26.c small fix to enable the driver to build properly
  o USB: formatting cleanups for some USB drivers from the 2.5.20-dj3
    tree
  o Added usb-midi driver from NAGANO Daisuke with some porting from me
  o USB: split some pci specific pieces out of hcd.c into a separate
    file
  o USB: usb-midi driver: fixed memory flag, as pointed out by Oliver
    Neukum
  o USB: hcd cleanups and documentation
  o IBM PCI Hotplug driver:  polling thread locking cleanup
  o PCI Hotplug core: added #include <linux/namei.h> to fix compile
    time warning
  o IBM PCI Hotplug driver: added __init and __exit to functions that
    needed it

James Simmons <jsimmons@heisenberg.transvirtual.com>:
  o Reversed a mistake in cyber200fb.c Finshed porting the 3Dfx driver
    over to the new api
  o Ported over NeoMagic over to new api
  o Fixed a nasty bug in the 3Dfx driver and added the ahrdware
    routines for the NeoMagic chipset
  o Bug fixes for NeoMagic and 3Dfx driver
  o More bug fixes. When will it end?
  o Ported over the apollo framebuffer device. Updated the Permedia 2
    fbdev driver to the latest code. Small bug fix for the NeoMagic
    driver.
  o Ported the Maxine framebuffer driver to the new api
  o A few small fixes from porting it over to the new api. ALso a few
    more drivers from the MIPS platform ported over
  o Ported over the TX3912 framebuffer to the new api. Fixed a NODEV
    error for the Permedia framebuffer driver and patched fbcmap.c to
    prevent another Oops
  o Bug fixes for the fbdev layer

Jens Axboe <axboe@suse.de>:
  o unplugging fix

Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de>:
  o kbuild: Split Makefile into needs / needs not .config
  o kbuild: Fix make -s (silent) and add a quiet mode
  o kbuild: Fix 'make some/dir/foo.lst'
  o kbuild: Fix calling of scripts
  o kbuild: Make dependencies at compile time
  o kbuild: Use deep directory structure for include/linux/modules
  o kbuild: Clean up descending into subdirs
  o kbuild: Really stick with verbose output by default
  o kbuild: modversions improvements
  o kbuild: Build modules by default
  o kbuild: Use a standard "update-if-changed"
  o kbuild: -DMODULE for assembler source
  o kbuild: Additional config targets for testing
  o kbuild: Remove 2048 symbol limit from make xconfig
  o kbuild
  o kbuild: Fix tolower() usage in scripts/fixdep.c
  o kbuild: Use -nostdinc with kernel sources
  o kbuild: Enforce UTS limit, use LANG=C for date/time
  o kbuild: Add rules for compiling programs on the host
  o kbuild: Fix extracting of CONFIG_ references
  o kbuild: dependency generation fixes
  o ISDN: Add missing #include <linux/init.h>
  o ISDN: Fix a typo in drivers/isdn/hisax/elsa.c
  o ISDN/CAPI: Remove some left-over from the capi_driver removal
  o ISDN: Add PPP statistics in bytes
  o ISDN: Export all hisax symbols from drivers/isdn/hisax/config.o
  o ISDN: hisax/hfc_pci.c: sync with 2.4
  o ISDN: Add support for USR PCI TA
  o ISDN: Cisco HDLC update
  o ISDN: Add support for Eicon Diva 2.02
  o ISDN: Add DoV (Data over Voice) support
  o ISDN: Add support for Formula-n enter:now, a.k.a. Gerdes Power ISDN
  o ISDN: Add in-kernel ISAPnP support to HiSax driven cards
  o ISDN: MPPP crash fix
  o ISDN: LED support for netjet driver
  o ISDN/CAPI: Don't use special slab caches for CAPI objects

Linus Torvalds <torvalds@transmeta.com>:
  o Split up "iput()" and make it more readable
  o Fix extra parenthesis in the constant-address rwlock case
  o ACPI sleep depends on software suspend (at least for now)
  o Fall-out from header file cleanups
  o "make clean": get rid of temporary directories too
  o Kernel version 2.5.21
  o Clean up and fix Makefile from x86 CPU split
  o Fix x86 CPU merge dangling ends
  o Fix sound compile error exposed by header file cleanups

Martin Dalecki <dalecki@evision-ventures.com>:
  o 2.5.20 airo wireless -  "I can't get no, compilation..."
  o 2.5.20 IDE 83..85

Nicolas Pitre <nico@cam.org>:
  o [ARM PATCH] 1166/1: further cleanup of SA1110 suspend/resume code
    (2.5) Same thing as patch #1165/1 but for 2.5.x

Patrick Mochel <mochel@osdl.org>:
  o device model udpate
  o Do manual traversing of drivers' devices list when unbinding the
    driver
  o PCI driver mgmt
  o Change unused_initcall to postcore_initcall for things that must be
    initialized early, but not too early (after the core is done)
  o s/subsys_initcall/postcore_initcall/ for sys_bys and pci, so they
    get initialized early enough for arch and subsys initcalls to use
    them
  o device model update s/{driver,device}_bind/{driver,device}_attach/
    and s/{driver,device}_unbind/{driver,device}_detach/ call bus's
    match callback instead of bind callback
  o Attempt to better locking in device model core
  o Don't reference driver after you set pointer to NULL in
    device_detach
  o device detach locking, one more time: get driver and reset it in
    struct device before calling remove()

Pavel Machek <pavel@suse.cz>:
  o Re: Fix suspend-to-RAM in 2.5.20

Pavel Machek <pavel@ucw.cz>:
  o Fix suspend-to-RAM in 2.5.20
  o Cleanup swsusp in 2.5.20
  o 2.5.20 swsusp: stop abusing headers with non-inlined functions

Peter Chubb <peter@chubb.wattle.id.au>:
  o bogus casts in ide-cd.c

Petr Vandrovec <vandrove@vc.cvut.cz>:
  o matroxfb dies when you try to use secondary head in 2.5.x

Randy Hron <rwhron@earthlink.net>:
  o remove space in cache names

Rob Radez <rob@osinvestor.com>:
  o Sparc32 code cleanups from 2.4.x

Robert Love <rml@tech9.net>:
  o remove wq_lock_t cruft
  o capability.c cleanup
  o trivial misc. scheduler cleanups
  o maintainers update
  o make smp.c preempt-safe
  o sys_sysinfo cleanup
  o remove suser()
  o remove fsuser()
  o capability.c thinko
  o set_cpus_allowed fix

Russell King <rmk@arm.linux.org.uk>:
  o fix 2.5.20 ramdisk
  o Allow mpage.c to build

Russell King <rmk@flint.arm.linux.org.uk>:
  o [ARM] Makefile and page.h ARM updates for 2.5.20
  o [ARM] Clean up map_desc structure
  o [ARM] Cast thread_saved_{pc,fp} to unsigned long

Rusty Russell <rusty@rustcorp.com.au>:
  o Spelling
  o TAGS creation should go into arch dirs
  o Futex update I: Trivial comment removal
  o Futex II: Copy-from-user can fail
  o Futex update III: don't use put_page
  o Futex update IV: use a waitqueue

Simon Evans <spse@secret.org.uk>:
  o fix urb->next removal in konicawc driver
  o fix urb->next removal in usbvideo

Stephen Rothwell <sfr@canb.auug.org.au>:
  o fs/locks.c use list_del_init
  o fcntl_[sg]etlk() only need the file *
  o fs/locks.c: add and use IS_{POSIX, FLOCK, LEASE} macros

Tom Rini <trini@kernel.crashing.org>:
  o Cleanup i386 <linux/init.h> abuses
  o Have core/drivers.c include <linux/gfp.h>
  o Move vmalloc wrappers out of include/linux/vmalloc.h
  o Remove <linux/mm.h> from <linux/vmalloc.h>
  o More work on removing <linux/mm.h> from <linux/vmalloc.h>

Trond Myklebust <trond.myklebust@fys.uio.no>:
  o Fix Oops due to use of incorrect km_type in RPC socket code
  o Reduce number of LOOKUP calls in nfs_lookup_revalidate()
  o Catch a few more cases where we need to renew inode->d_time

[PATCH] 2.5.21 IDE 91

[Martin Dalecki]

[-- Attachment #1: Type: text/plain, Size: 915 bytes --]

Thu Jun 13 22:59:54 CEST 2002 ide-clean-91

- Realize that the only place where ata_do_taskfile gets used is ide-disk.c
   move it and its "friends' over there.

- Unify the do_request method for disk devices. This saves quite a lot of code.

- Make task_muin_intr and task_in_intr use the same busy status checks on
   entry.

- Unfold get_command at the single only place where it's used.

- Add missing __ata_end_request on kill_rq path.

- Rename udma_tcq_taskfile() to udma_tcq_init to make the code look like to
   normal udma_init. Revert the logics of udma_init and it's
   implementations to mirror that of udma_tcq_init().

- Fix a tinny bug in pmac_udma_init() where it was reporting the wrong value up
   on failure.

- Revert the logics of udma_start(). It's called from udma_init context.
   Realize that it is always returning ide_started. Make it self and the
   implementations of it return void.


[-- Attachment #2: ide-clean-91.diff --]
[-- Type: text/plain, Size: 38509 bytes --]

diff -urN linux-2.5.21/drivers/ide/alim15x3.c linux/drivers/ide/alim15x3.c
--- linux-2.5.21/drivers/ide/alim15x3.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/alim15x3.c	2002-06-14 14:23:39.000000000 +0200
@@ -259,7 +259,7 @@
 static int ali15x3_udma_init(struct ata_device *drive, struct request *rq)
 {
 	if ((m5229_revision < 0xC2) && (drive->type != ATA_DISK))
-		return 1;	/* try PIO instead of DMA */
+		return ide_stopped;	/* try PIO instead of DMA */
 
 	return udma_pci_init(drive, rq);
 }
diff -urN linux-2.5.21/drivers/ide/hpt34x.c linux/drivers/ide/hpt34x.c
--- linux-2.5.21/drivers/ide/hpt34x.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/hpt34x.c	2002-06-14 14:20:16.000000000 +0200
@@ -175,7 +175,7 @@
 	u8 cmd;
 
 	if (!(count = udma_new_table(drive, rq)))
-		return 1;	/* try PIO instead of DMA */
+		return ide_stopped;	/* try PIO instead of DMA */
 
 	if (rq_data_dir(rq) == READ)
 		cmd = 0x09;
@@ -192,7 +192,7 @@
 		OUT_BYTE((cmd == 0x09) ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG);
 	}
 
-	return 0;
+	return ide_started;
 }
 #endif
 
diff -urN linux-2.5.21/drivers/ide/hpt366.c linux/drivers/ide/hpt366.c
--- linux-2.5.21/drivers/ide/hpt366.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/hpt366.c	2002-06-14 15:11:39.000000000 +0200
@@ -858,7 +858,7 @@
 	udelay(10);
 }
 
-static int hpt370_udma_start(struct ata_device *drive, struct request *__rq)
+static void hpt370_udma_start(struct ata_device *drive, struct request *__rq)
 {
 	struct ata_channel *ch = drive->channel;
 
@@ -870,8 +870,6 @@
 	 */
 
 	outb(inb(ch->dma_base) | 1, ch->dma_base);	/* start DMA */
-
-	return 0;
 }
 
 static void do_timeout_irq(struct ata_device *drive)
diff -urN linux-2.5.21/drivers/ide/icside.c linux/drivers/ide/icside.c
--- linux-2.5.21/drivers/ide/icside.c	2002-06-14 12:45:00.000000000 +0200
+++ linux/drivers/ide/icside.c	2002-06-14 15:11:08.000000000 +0200
@@ -447,18 +447,13 @@
 	return get_dma_residue(ch->hw.dma) != 0;
 }
 
-static int icside_dma_start(struct ata_device *drive, struct request *rq)
+static void icside_dma_start(struct ata_device *drive, struct request *rq)
 {
 	struct ata_channel *ch = drive->channel;
 
-	/*
-	 * We can not enable DMA on both channels.
-	 */
+	/* We can not enable DMA on both channels simultaneously. */
 	BUG_ON(dma_channel_active(ch->hw.dma));
-
 	enable_dma(ch->hw.dma);
-
-	return 0;
 }
 
 /*
@@ -524,10 +519,10 @@
 	u8 int cmd;
 
 	if (icside_dma_common(drive, rq, DMA_MODE_WRITE))
-		return 1;
+		return ide_stopped;
 
 	if (drive->type != ATA_DISK)
-		return 0;
+		return ide_started;
 
 	ata_set_handler(drive, icside_dmaintr, WAIT_CMD, NULL);
 
@@ -543,7 +538,7 @@
 
 	enable_dma(ch->hw.dma);
 
-	return 0;
+	return ide_started;
 }
 
 static int icside_irq_status(struct ata_device *drive)
diff -urN linux-2.5.21/drivers/ide/ide.c linux/drivers/ide/ide.c
--- linux-2.5.21/drivers/ide/ide.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/ide.c	2002-06-14 13:18:44.000000000 +0200
@@ -702,7 +702,8 @@
 			spin_unlock_irq(ch->lock);
 			ata_ops(drive)->end_request(drive, rq, 0);
 			spin_lock_irq(ch->lock);
-		}
+		} else
+			__ata_end_request(drive, rq, 0, 0);
 	} else
 		__ata_end_request(drive, rq, 0, 0);
 
diff -urN linux-2.5.21/drivers/ide/ide-cd.c linux/drivers/ide/ide-cd.c
--- linux-2.5.21/drivers/ide/ide-cd.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/ide-cd.c	2002-06-14 14:23:18.000000000 +0200
@@ -741,7 +741,7 @@
 	else {
 		if (info->dma) {
 			if (info->cmd == READ || info->cmd == WRITE)
-				info->dma = !udma_init(drive, rq);
+				info->dma = udma_init(drive, rq);
 			else
 				printk("ide-cd: DMA set, but not allowed\n");
 		}
diff -urN linux-2.5.21/drivers/ide/ide-disk.c linux/drivers/ide/ide-disk.c
--- linux-2.5.21/drivers/ide/ide-disk.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/ide-disk.c	2002-06-14 14:18:25.000000000 +0200
@@ -102,40 +102,44 @@
 	spin_lock_irqsave(ch->lock, flags);
 
 	if (!ata_status(drive, DATA_READY, BAD_R_STAT)) {
-		if (drive->status & (ERR_STAT|DRQ_STAT)) {
+		if (drive->status & (ERR_STAT | DRQ_STAT)) {
 			spin_unlock_irqrestore(ch->lock, flags);
 
 			return ata_error(drive, rq, __FUNCTION__);
 		}
 
-		if (!(drive->status & BUSY_STAT)) {
-//			printk("task_in_intr to Soon wait for next interrupt\n");
-			ata_set_handler(drive, task_in_intr, WAIT_CMD, NULL);
-			spin_unlock_irqrestore(ch->lock, flags);
+		/* no data yet, so wait for another interrupt */
+		ata_set_handler(drive, task_in_intr, WAIT_CMD, NULL);
 
-			return ide_started;
+		ret = ide_started;
+	} else {
+
+		//	printk("Read: %p, rq->current_nr_sectors: %d\n", buf, (int) rq->current_nr_sectors);
+		{
+			unsigned long flags;
+			char *buf;
+
+			buf = ide_map_rq(rq, &flags);
+			ata_read(drive, buf, SECTOR_WORDS);
+			ide_unmap_rq(rq, buf, &flags);
 		}
-	}
 
-//	printk("Read: %p, rq->current_nr_sectors: %d\n", buf, (int) rq->current_nr_sectors);
-	{
-		unsigned long flags;
-		char *buf;
-
-		buf = ide_map_rq(rq, &flags);
-		ata_read(drive, buf, SECTOR_WORDS);
-		ide_unmap_rq(rq, buf, &flags);
-	}
+		/* First segment of the request is complete. note that this does not
+		 * necessarily mean that the entire request is done!! this is only true
+		 * if ata_end_request() returns 0.
+		 */
+		rq->errors = 0;
+		--rq->current_nr_sectors;
 
-	/* First segment of the request is complete. note that this does not
-	 * necessarily mean that the entire request is done!! this is only true
-	 * if ata_end_request() returns 0.
-	 */
+		if (rq->current_nr_sectors <= 0) {
+			if (!__ata_end_request(drive, rq, 1, 0)) {
+			//		printk("Request Ended stat: %02x\n", drive->status);
+				spin_unlock_irqrestore(ch->lock, flags);
+
+				return ide_stopped;
+			}
+		}
 
-	if (--rq->current_nr_sectors <= 0 && !__ata_end_request(drive, rq, 1, 0)) {
-//		printk("Request Ended stat: %02x\n", drive->status);
-		ret = ide_stopped;
-	} else {
 		/* still data left to transfer */
 		ata_set_handler(drive, task_in_intr,  WAIT_CMD, NULL);
 
@@ -197,7 +201,7 @@
 
 	spin_lock_irqsave(ch->lock, flags);
 	if (!ata_status(drive, DATA_READY, BAD_R_STAT)) {
-		if (drive->status & (ERR_STAT|DRQ_STAT)) {
+		if (drive->status & (ERR_STAT | DRQ_STAT)) {
 			spin_unlock_irqrestore(ch->lock, flags);
 
 			return ata_error(drive, rq, __FUNCTION__);
@@ -235,16 +239,16 @@
 
 			rq->errors = 0;
 			rq->current_nr_sectors -= nsect;
-			msect -= nsect;
 
 			/* FIXME: this seems buggy */
-			if (!rq->current_nr_sectors) {
+			if (rq->current_nr_sectors <= 0) {
 				if (!__ata_end_request(drive, rq, 1, 0)) {
 					spin_unlock_irqrestore(ch->lock, flags);
 
 					return ide_stopped;
 				}
 			}
+			msect -= nsect;
 		} while (msect);
 
 		/* more data left */
@@ -343,212 +347,138 @@
 }
 
 /*
- * Decode with physical ATA command to use and setup associated data.
+ * Channel lock should be held on entry.
  */
-static u8 get_command(struct ata_device *drive, struct ata_taskfile *ar, int cmd)
+static ide_startstop_t __do_request(struct ata_device *drive,
+		struct ata_taskfile *ar, struct request *rq)
 {
-	int lba48bit = (drive->id->cfs_enable_2 & 0x0400) ? 1 : 0;
-
-#if 1
-	lba48bit = drive->addressing;
-#endif
-
-	if (lba48bit) {
-		if (cmd == READ) {
-			ar->command_type = IDE_DRIVE_TASK_IN;
-			if (drive->using_tcq) {
-				return WIN_READDMA_QUEUED_EXT;
-			} else if (drive->using_dma) {
-				return WIN_READDMA_EXT;
-			} else if (drive->mult_count) {
-				ar->handler = task_mulin_intr;
-				return WIN_MULTREAD_EXT;
-			} else {
-				ar->handler = task_in_intr;
-				return WIN_READ_EXT;
-			}
-		} else if (cmd == WRITE) {
-			ar->command_type = IDE_DRIVE_TASK_RAW_WRITE;
-			if (drive->using_tcq) {
-				return WIN_WRITEDMA_QUEUED_EXT;
-			} else if (drive->using_dma) {
-				return WIN_WRITEDMA_EXT;
-			} else if (drive->mult_count) {
-				ar->handler = task_mulout_intr;
-				return WIN_MULTWRITE_EXT;
-			} else {
-				ar->handler = task_out_intr;
-				return WIN_WRITE_EXT;
-			}
-		}
-	} else {
-		if (cmd == READ) {
-			ar->command_type = IDE_DRIVE_TASK_IN;
-			if (drive->using_tcq) {
-				return WIN_READDMA_QUEUED;
-			} else if (drive->using_dma) {
-				return WIN_READDMA;
-			} else if (drive->mult_count) {
-				ar->handler = task_in_intr;
-				return WIN_MULTREAD;
-			} else {
-				ar->handler = task_in_intr;
-				return WIN_READ;
-			}
-		} else if (cmd == WRITE) {
-			ar->command_type = IDE_DRIVE_TASK_RAW_WRITE;
-			if (drive->using_tcq) {
-				return WIN_WRITEDMA_QUEUED;
-			} else if (drive->using_dma) {
-				return WIN_WRITEDMA;
-			} else if (drive->mult_count) {
-				ar->handler = task_mulout_intr;
-				return WIN_MULTWRITE;
-			} else {
-				ar->handler = task_out_intr;
-				return WIN_WRITE;
-			}
-		}
-	}
-
-	/* not reached! */
-	return WIN_NOP;
-}
-
-static ide_startstop_t chs_do_request(struct ata_device *drive, struct request *rq, sector_t block)
-{
-	struct ata_taskfile args;
-	int sectors;
-
-	unsigned int track	= (block / drive->sect);
-	unsigned int sect	= (block % drive->sect) + 1;
-	unsigned int head	= (track % drive->head);
-	unsigned int cyl	= (track / drive->head);
-
-	sectors = rq->nr_sectors;
-	if (sectors == 256)
-		sectors = 0;
-
-	memset(&args, 0, sizeof(args));
-
-	if (blk_rq_tagged(rq)) {
-		args.taskfile.feature = sectors;
-		args.taskfile.sector_count = rq->tag << 3;
-	} else
-		args.taskfile.sector_count = sectors;
-
-	args.taskfile.sector_number = sect;
-	args.taskfile.low_cylinder = cyl;
-	args.taskfile.high_cylinder = (cyl>>8);
-
-	args.taskfile.device_head = head;
-	args.taskfile.device_head |= drive->select.all;
-	args.cmd = get_command(drive, &args, rq_data_dir(rq));
-
-#ifdef DEBUG
-	printk("%s: %sing: ", drive->name,
-		(rq_data_dir(rq)==READ) ? "read" : "writ");
-	if (lba)	printk("LBAsect=%lld, ", block);
-	else		printk("CHS=%d/%d/%d, ", cyl, head, sect);
-	printk("sectors=%ld, ", rq->nr_sectors);
-	printk("buffer=%p\n", rq->buffer);
-#endif
-
-	rq->special = &args;
-
-	return ata_do_taskfile(drive, &args, rq);
-}
-
-static ide_startstop_t lba28_do_request(struct ata_device *drive, struct request *rq, sector_t block)
-{
-	struct ata_taskfile args;
-	int sectors;
-
-	sectors = rq->nr_sectors;
-	if (sectors == 256)
-		sectors = 0;
-
-	memset(&args, 0, sizeof(args));
-
-	if (blk_rq_tagged(rq)) {
-		args.taskfile.feature = sectors;
-		args.taskfile.sector_count = rq->tag << 3;
-	} else
-		args.taskfile.sector_count = sectors;
-
-	args.taskfile.sector_number = block;
-	args.taskfile.low_cylinder = (block >>= 8);
-
-	args.taskfile.high_cylinder = (block >>= 8);
+	struct hd_driveid *id = drive->id;
 
-	args.taskfile.device_head = ((block >> 8) & 0x0f);
-	args.taskfile.device_head |= drive->select.all;
-	args.cmd = get_command(drive, &args, rq_data_dir(rq));
+	/* (ks/hs): Moved to start, do not use for multiple out commands.
+	 * FIXME: why not?! */
+	if (!(ar->cmd == CFA_WRITE_MULTI_WO_ERASE ||
+	      ar->cmd == WIN_MULTWRITE ||
+	      ar->cmd == WIN_MULTWRITE_EXT)) {
+		ata_irq_enable(drive, 1);
+		ata_mask(drive);
+	}
+
+	if ((id->command_set_2 & 0x0400) && (id->cfs_enable_2 & 0x0400) &&
+	    (drive->addressing == 1))
+		ata_out_regfile(drive, &ar->hobfile);
+
+	ata_out_regfile(drive, &ar->taskfile);
+
+	OUT_BYTE((ar->taskfile.device_head & (drive->addressing ? 0xE0 : 0xEF)) | drive->select.all,
+			IDE_SELECT_REG);
+
+	if (ar->XXX_handler) {
+		struct ata_channel *ch = drive->channel;
+
+		ata_set_handler(drive, ar->XXX_handler, WAIT_CMD, NULL);
+		OUT_BYTE(ar->cmd, IDE_COMMAND_REG);
+
+		/* FIXME: Warning check for race between handler and prehandler
+		 * for writing first block of data.  however since we are well
+		 * inside the boundaries of the seek, we should be okay.
+		 *
+		 * FIXME: Replace the switch by using a proper command_type.
+		 */
 
-#ifdef DEBUG
-	printk("%s: %sing: ", drive->name,
-		(rq_data_dir(rq)==READ) ? "read" : "writ");
-	if (lba)	printk("LBAsect=%lld, ", block);
-	else		printk("CHS=%d/%d/%d, ", cyl, head, sect);
-	printk("sectors=%ld, ", rq->nr_sectors);
-	printk("buffer=%p\n", rq->buffer);
-#endif
+		if (ar->cmd == CFA_WRITE_SECT_WO_ERASE ||
+		    ar->cmd == WIN_WRITE ||
+		    ar->cmd == WIN_WRITE_EXT ||
+		    ar->cmd == WIN_WRITE_VERIFY ||
+		    ar->cmd == WIN_WRITE_BUFFER ||
+		    ar->cmd == WIN_DOWNLOAD_MICROCODE ||
+		    ar->cmd == CFA_WRITE_MULTI_WO_ERASE ||
+		    ar->cmd == WIN_MULTWRITE ||
+		    ar->cmd == WIN_MULTWRITE_EXT) {
+			ide_startstop_t startstop;
+
+			if (ata_status_poll(drive, DATA_READY, drive->bad_wstat,
+						WAIT_DRQ, rq, &startstop)) {
+				printk(KERN_ERR "%s: no DRQ after issuing %s\n",
+						drive->name, drive->mult_count ? "MULTWRITE" : "WRITE");
 
-	rq->special = &args;
+				return startstop;
+			}
 
-	return ata_do_taskfile(drive, &args, rq);
-}
+			/* FIXME: This doesn't make the slightest sense.
+			 * (ks/hs): Fixed Multi Write
+			 */
+			if (!(ar->cmd == CFA_WRITE_MULTI_WO_ERASE ||
+			      ar->cmd == WIN_MULTWRITE ||
+			      ar->cmd == WIN_MULTWRITE_EXT)) {
+				unsigned long flags;
+				char *buf = ide_map_rq(rq, &flags);
 
-/*
- * 268435455  == 137439 MB or 28bit limit
- * 320173056  == 163929 MB or 48bit addressing
- * 1073741822 == 549756 MB or 48bit addressing fake drive
- */
+				/* For Write_sectors we need to stuff the first sector */
+				ata_write(drive, buf, SECTOR_WORDS);
 
-static ide_startstop_t lba48_do_request(struct ata_device *drive, struct request *rq, sector_t block)
-{
-	struct ata_taskfile args;
-	int sectors;
+				rq->current_nr_sectors--;
+				ide_unmap_rq(rq, buf, &flags);
 
-	sectors = rq->nr_sectors;
-	if (sectors == 65536)
-		sectors = 0;
+				return ide_started;
+			} else {
+				int i;
+				int ret;
 
-	memset(&args, 0, sizeof(args));
+				/* Polling wait until the drive is ready.
+				 *
+				 * Stuff the first sector(s) by calling the
+				 * handler driectly therafter.
+				 *
+				 * FIXME: Replace hard-coded 100, what about
+				 * error handling?
+				 */
+
+				for (i = 0; i < 100; ++i) {
+					if (drive_is_ready(drive))
+						break;
+				}
+				if (!drive_is_ready(drive)) {
+					printk(KERN_ERR "DISASTER WAITING TO HAPPEN!\n");
+				}
+				/* FIXME: make this unlocking go away*/
+				spin_unlock_irq(ch->lock);
+				ret =  ar->XXX_handler(drive, rq);
+				spin_lock_irq(ch->lock);
 
-	if (blk_rq_tagged(rq)) {
-		args.taskfile.feature = sectors;
-		args.hobfile.feature = sectors >> 8;
-		args.taskfile.sector_count = rq->tag << 3;
+				return ret;
+			}
+		}
 	} else {
-		args.taskfile.sector_count = sectors;
-		args.hobfile.sector_count = sectors >> 8;
-	}
-
-	args.taskfile.sector_number = block;		/* low lba */
-	args.taskfile.low_cylinder = (block >>= 8);	/* mid lba */
-	args.taskfile.high_cylinder = (block >>= 8);	/* hi  lba */
-	args.taskfile.device_head = drive->select.all;
-
-	args.hobfile.sector_number = (block >>= 8);	/* low lba */
-	args.hobfile.low_cylinder = (block >>= 8);	/* mid lba */
-	args.hobfile.high_cylinder = (block >>= 8);	/* hi  lba */
-	args.hobfile.device_head = drive->select.all;
+		/*
+		 * FIXME: This is a gross hack, need to unify tcq dma proc and
+		 * regular dma proc. It should now be easier.
+		 *
+		 * FIXME: Handle the alternateives by a command type.
+		 */
 
-	args.cmd = get_command(drive, &args, rq_data_dir(rq));
+		if (!drive->using_dma)
+			return ide_started;
 
-#ifdef DEBUG
-	printk("%s: %sing: ", drive->name,
-		(rq_data_dir(rq)==READ) ? "read" : "writ");
-	if (lba)	printk("LBAsect=%lld, ", block);
-	else		printk("CHS=%d/%d/%d, ", cyl, head, sect);
-	printk("sectors=%ld, ", rq->nr_sectors);
-	printk("buffer=%p\n",rq->buffer);
+		/* for dma commands we don't set the handler */
+		if (ar->cmd == WIN_WRITEDMA ||
+		    ar->cmd == WIN_WRITEDMA_EXT ||
+		    ar->cmd == WIN_READDMA ||
+		    ar->cmd == WIN_READDMA_EXT)
+			return udma_init(drive, rq);
+#ifdef CONFIG_BLK_DEV_IDE_TCQ
+		else if (ar->cmd == WIN_WRITEDMA_QUEUED ||
+			 ar->cmd == WIN_WRITEDMA_QUEUED_EXT ||
+			 ar->cmd == WIN_READDMA_QUEUED ||
+			 ar->cmd == WIN_READDMA_QUEUED_EXT)
+			return udma_tcq_init(drive, rq);
 #endif
+		else {
+			printk(KERN_ERR "%s: unknown command %x\n", __FUNCTION__, ar->cmd);
+			return ide_stopped;
+		}
+	}
 
-	rq->special = &args;
-
-	return ata_do_taskfile(drive, &args, rq);
+	return ide_started;
 }
 
 /*
@@ -560,10 +490,13 @@
  */
 static ide_startstop_t idedisk_do_request(struct ata_device *drive, struct request *rq, sector_t block)
 {
+	struct ata_taskfile args;
+	unsigned int sectors;
+
 	/* This issues a special drive command.
 	 */
 	if (rq->flags & REQ_SPECIAL)
-		return ata_do_taskfile(drive, rq->special, rq);
+		return __do_request(drive, rq->special, rq);
 
 	/* FIXME: this check doesn't make sense */
 	if (!(rq->flags & REQ_CMD)) {
@@ -597,15 +530,150 @@
 		}
 	}
 
-	if ((drive->id->cfs_enable_2 & 0x0400) && (drive->addressing))
-		return lba48_do_request(drive, rq, block);
-	else if (drive->select.b.lba)
-		return lba28_do_request(drive, rq, block);
-	else
-		return chs_do_request(drive, rq, block);
+	memset(&args, 0, sizeof(args));
+	sectors = rq->nr_sectors;
+	/* Dispatch depending up on the drive access method. */
+	if ((drive->id->cfs_enable_2 & 0x0400) && (drive->addressing)) {
+		/* LBA 48 bit */
+		/*
+		 * 268435455  == 137439 MB or 28bit limit
+		 * 320173056  == 163929 MB or 48bit addressing
+		 * 1073741822 == 549756 MB or 48bit addressing fake drive
+		 */
+		if (sectors == 65536)
+			sectors = 0;
+
+		if (blk_rq_tagged(rq)) {
+			args.taskfile.feature = sectors;
+			args.hobfile.feature = sectors >> 8;
+			args.taskfile.sector_count = rq->tag << 3;
+		} else {
+			args.taskfile.sector_count = sectors;
+			args.hobfile.sector_count = sectors >> 8;
+		}
+
+		args.taskfile.sector_number = block;		/* low lba */
+		args.taskfile.low_cylinder = (block >>= 8);	/* mid lba */
+		args.taskfile.high_cylinder = (block >>= 8);	/* hi  lba */
+		args.taskfile.device_head = drive->select.all;
+
+		args.hobfile.sector_number = (block >>= 8);	/* low lba */
+		args.hobfile.low_cylinder = (block >>= 8);	/* mid lba */
+		args.hobfile.high_cylinder = (block >>= 8);	/* hi  lba */
+	} else if (drive->select.b.lba) {
+		/* LBA 28 bit  */
+		if (sectors == 256)
+			sectors = 0;
+
+		if (blk_rq_tagged(rq)) {
+			args.taskfile.feature = sectors;
+			args.taskfile.sector_count = rq->tag << 3;
+		} else
+			args.taskfile.sector_count = sectors;
+
+		args.taskfile.sector_number = block;
+		args.taskfile.low_cylinder = (block >>= 8);
+		args.taskfile.high_cylinder = (block >>= 8);
+		args.taskfile.device_head = ((block >> 8) & 0x0f);
+	} else {
+		/* CHS */
+		unsigned int track	= (block / drive->sect);
+		unsigned int sect	= (block % drive->sect) + 1;
+		unsigned int head	= (track % drive->head);
+		unsigned int cyl	= (track / drive->head);
+
+		if (sectors == 256)
+			sectors = 0;
+
+		if (blk_rq_tagged(rq)) {
+			args.taskfile.feature = sectors;
+			args.taskfile.sector_count = rq->tag << 3;
+		} else
+			args.taskfile.sector_count = sectors;
+
+		args.taskfile.sector_number = sect;
+		args.taskfile.low_cylinder = cyl;
+		args.taskfile.high_cylinder = (cyl>>8);
+		args.taskfile.device_head = head;
+	}
+	args.taskfile.device_head |= drive->select.all;
+
+	/*
+	 * Decode with physical ATA command to use and setup associated data.
+	 */
+
+	if (rq_data_dir(rq) == READ) {
+		args.command_type = IDE_DRIVE_TASK_IN;
+		if (drive->addressing) {
+			if (drive->using_tcq) {
+				args.cmd = WIN_READDMA_QUEUED_EXT;
+			} else if (drive->using_dma) {
+				args.cmd = WIN_READDMA_EXT;
+			} else if (drive->mult_count) {
+				args.XXX_handler = task_mulin_intr;
+				args.cmd = WIN_MULTREAD_EXT;
+			} else {
+				args.XXX_handler = task_in_intr;
+				args.cmd = WIN_READ_EXT;
+			}
+		} else {
+			if (drive->using_tcq) {
+				args.cmd = WIN_READDMA_QUEUED;
+			} else if (drive->using_dma) {
+				args.cmd = WIN_READDMA;
+			} else if (drive->mult_count) {
+				/* FIXME : Shouldn't this be task_mulin_intr?! */
+				args.XXX_handler = task_in_intr;
+				args.cmd = WIN_MULTREAD;
+			} else {
+				args.XXX_handler = task_in_intr;
+				args.cmd = WIN_READ;
+			}
+		}
+	} else {
+		args.command_type = IDE_DRIVE_TASK_RAW_WRITE;
+		if (drive->addressing) {
+			if (drive->using_tcq) {
+				args.cmd = WIN_WRITEDMA_QUEUED_EXT;
+			} else if (drive->using_dma) {
+				args.cmd = WIN_WRITEDMA_EXT;
+			} else if (drive->mult_count) {
+				args.XXX_handler = task_mulout_intr;
+				args.cmd = WIN_MULTWRITE_EXT;
+			} else {
+				args.XXX_handler = task_out_intr;
+				args.cmd = WIN_WRITE_EXT;
+			}
+		} else {
+			if (drive->using_tcq) {
+				args.cmd = WIN_WRITEDMA_QUEUED;
+			} else if (drive->using_dma) {
+				args.cmd = WIN_WRITEDMA;
+			} else if (drive->mult_count) {
+				args.XXX_handler = task_mulout_intr;
+				args.cmd = WIN_MULTWRITE;
+			} else {
+				args.XXX_handler = task_out_intr;
+				args.cmd = WIN_WRITE;
+			}
+		}
+	}
+
+
+#ifdef DEBUG
+	printk("%s: %sing: ", drive->name,
+			(rq_data_dir(rq)==READ) ? "read" : "writ");
+	if (lba)	printk("LBAsect=%lld, ", block);
+	else		printk("CHS=%d/%d/%d, ", cyl, head, sect);
+	printk("sectors=%ld, ", rq->nr_sectors);
+	printk("buffer=%p\n", rq->buffer);
+#endif
+	rq->special = &args;
+
+	return __do_request(drive, &args, rq);
 }
 
-static int idedisk_open(struct inode *inode, struct file *filp, struct ata_device *drive)
+static int idedisk_open(struct inode *inode, struct file *__fp, struct ata_device *drive)
 {
 	MOD_INC_USE_COUNT;
 	if (drive->removable && drive->usage == 1) {
diff -urN linux-2.5.21/drivers/ide/ide-floppy.c linux/drivers/ide/ide-floppy.c
--- linux-2.5.21/drivers/ide/ide-floppy.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/ide-floppy.c	2002-06-14 14:21:59.000000000 +0200
@@ -1102,7 +1102,7 @@
 		udma_enable(drive, 0, 1);
 
 	if (test_bit (PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma)
-		dma_ok = !udma_init(drive, rq);
+		dma_ok = udma_init(drive, rq);
 #endif
 
 	ata_irq_enable(drive, 1);
diff -urN linux-2.5.21/drivers/ide/ide-pmac.c linux/drivers/ide/ide-pmac.c
--- linux-2.5.21/drivers/ide/ide-pmac.c	2002-06-14 12:45:00.000000000 +0200
+++ linux/drivers/ide/ide-pmac.c	2002-06-14 15:03:31.000000000 +0200
@@ -1365,7 +1365,8 @@
 	 */
 	ix = pmac_ide_find(drive);
 	if (ix < 0)
-		return 0;
+		return ide_started;
+
 	dma = pmac_ide[ix].dma_regs;
 	ata4 = (pmac_ide[ix].kind == controller_kl_ata4 ||
 		pmac_ide[ix].kind == controller_kl_ata4_80);
@@ -1373,7 +1374,8 @@
 	out_le32(&dma->control, (RUN << 16) | RUN);
 	/* Make sure it gets to the controller right now */
 	(void)in_le32(&dma->control);
-	return 0;
+
+	return ide_started;
 }
 
 static int pmac_udma_stop(struct ata_device *drive)
@@ -1411,7 +1413,7 @@
 	 */
 	ix = pmac_ide_find(drive);
 	if (ix < 0)
-		return 0;
+		return ide_stopped;
 
 	if (rq_data_dir(rq) == READ)
 		reading = 1;
@@ -1423,7 +1425,7 @@
 		pmac_ide[ix].kind == controller_kl_ata4_80);
 
 	if (!pmac_ide_build_dmatable(drive, rq, ix, !reading))
-		return 1;
+		return ide_stopped;
 	/* Apple adds 60ns to wrDataSetup on reads */
 	if (ata4 && (pmac_ide[ix].timings[unit] & TR_66_UDMA_EN)) {
 		out_le32((unsigned *)(IDE_DATA_REG + IDE_TIMING_CONFIG + _IO_BASE),
@@ -1433,7 +1435,7 @@
 	}
 	drive->waiting_for_dma = 1;
 	if (drive->type != ATA_DISK)
-		return 0;
+		return ide_started;
 
 	ata_set_handler(drive, ide_dma_intr, WAIT_CMD, NULL);
 	if ((rq->flags & REQ_SPECIAL) &&
@@ -1447,7 +1449,9 @@
 		OUT_BYTE(reading ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG);
 	}
 
-	return udma_start(drive, rq);
+	udma_start(drive, rq);
+
+	return ide_started;
 }
 
 /*
diff -urN linux-2.5.21/drivers/ide/ide-tape.c linux/drivers/ide/ide-tape.c
--- linux-2.5.21/drivers/ide/ide-tape.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/ide-tape.c	2002-06-14 14:20:30.000000000 +0200
@@ -2290,7 +2290,7 @@
 		udma_enable(drive, 0, 1);
 	}
 	if (test_bit (PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma)
-		dma_ok = !udma_init(drive, rq);
+		dma_ok = udma_init(drive, rq);
 #endif
 
 	ata_irq_enable(drive, 1);
diff -urN linux-2.5.21/drivers/ide/ide-taskfile.c linux/drivers/ide/ide-taskfile.c
--- linux-2.5.21/drivers/ide/ide-taskfile.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/ide-taskfile.c	2002-06-14 02:04:27.000000000 +0200
@@ -177,145 +177,6 @@
 }
 
 /*
- * Channel lock should be held on entry.
- */
-ide_startstop_t ata_do_taskfile(struct ata_device *drive,
-		struct ata_taskfile *ar, struct request *rq)
-{
-	struct hd_driveid *id = drive->id;
-
-	/* (ks/hs): Moved to start, do not use for multiple out commands.
-	 * FIXME: why not?! */
-	if (!(ar->cmd == CFA_WRITE_MULTI_WO_ERASE ||
-	      ar->cmd == WIN_MULTWRITE ||
-	      ar->cmd == WIN_MULTWRITE_EXT)) {
-		ata_irq_enable(drive, 1);
-		ata_mask(drive);
-	}
-
-	if ((id->command_set_2 & 0x0400) && (id->cfs_enable_2 & 0x0400) &&
-	    (drive->addressing == 1))
-		ata_out_regfile(drive, &ar->hobfile);
-
-	ata_out_regfile(drive, &ar->taskfile);
-
-	OUT_BYTE((ar->taskfile.device_head & (drive->addressing ? 0xE0 : 0xEF)) | drive->select.all,
-			IDE_SELECT_REG);
-
-	if (ar->handler) {
-		struct ata_channel *ch = drive->channel;
-
-		/* This is apparently supposed to reset the wait timeout for
-		 * the interrupt to accur.
-		 */
-
-		ata_set_handler(drive, ar->handler, WAIT_CMD, NULL);
-		OUT_BYTE(ar->cmd, IDE_COMMAND_REG);
-
-		/* FIXME: Warning check for race between handler and prehandler
-		 * for writing first block of data.  however since we are well
-		 * inside the boundaries of the seek, we should be okay.
-		 *
-		 * FIXME: Replace the switch by using a proper command_type.
-		 */
-
-		if (ar->cmd == CFA_WRITE_SECT_WO_ERASE ||
-		    ar->cmd == WIN_WRITE ||
-		    ar->cmd == WIN_WRITE_EXT ||
-		    ar->cmd == WIN_WRITE_VERIFY ||
-		    ar->cmd == WIN_WRITE_BUFFER ||
-		    ar->cmd == WIN_DOWNLOAD_MICROCODE ||
-		    ar->cmd == CFA_WRITE_MULTI_WO_ERASE ||
-		    ar->cmd == WIN_MULTWRITE ||
-		    ar->cmd == WIN_MULTWRITE_EXT) {
-			ide_startstop_t startstop;
-
-			if (ata_status_poll(drive, DATA_READY, drive->bad_wstat,
-						WAIT_DRQ, rq, &startstop)) {
-				printk(KERN_ERR "%s: no DRQ after issuing %s\n",
-						drive->name, drive->mult_count ? "MULTWRITE" : "WRITE");
-
-				return startstop;
-			}
-
-			/* FIXME: This doesn't make the slightest sense.
-			 * (ks/hs): Fixed Multi Write
-			 */
-			if (!(ar->cmd == CFA_WRITE_MULTI_WO_ERASE ||
-			      ar->cmd == WIN_MULTWRITE ||
-			      ar->cmd == WIN_MULTWRITE_EXT)) {
-				unsigned long flags;
-				char *buf = ide_map_rq(rq, &flags);
-
-				/* For Write_sectors we need to stuff the first sector */
-				ata_write(drive, buf, SECTOR_WORDS);
-
-				rq->current_nr_sectors--;
-				ide_unmap_rq(rq, buf, &flags);
-
-				return ide_started;
-			} else {
-				int i;
-				int ret;
-
-				/* Polling wait until the drive is ready.
-				 *
-				 * Stuff the first sector(s) by calling the
-				 * handler driectly therafter.
-				 *
-				 * FIXME: Replace hard-coded 100, what about
-				 * error handling?
-				 */
-
-				for (i = 0; i < 100; ++i) {
-					if (drive_is_ready(drive))
-						break;
-				}
-				if (!drive_is_ready(drive)) {
-					printk(KERN_ERR "DISASTER WAITING TO HAPPEN!\n");
-				}
-				/* FIXME: make this unlocking go away*/
-				spin_unlock_irq(ch->lock);
-				ret =  ar->handler(drive, rq);
-				spin_lock_irq(ch->lock);
-
-				return ret;
-			}
-		}
-	} else {
-		/*
-		 * FIXME: This is a gross hack, need to unify tcq dma proc and
-		 * regular dma proc. It should now be easier.
-		 *
-		 * FIXME: Handle the alternateives by a command type.
-		 */
-
-		if (!drive->using_dma)
-			return ide_started;
-
-		/* for dma commands we don't set the handler */
-		if (ar->cmd == WIN_WRITEDMA ||
-		    ar->cmd == WIN_WRITEDMA_EXT ||
-		    ar->cmd == WIN_READDMA ||
-		    ar->cmd == WIN_READDMA_EXT)
-			return !udma_init(drive, rq);
-#ifdef CONFIG_BLK_DEV_IDE_TCQ
-		else if (ar->cmd == WIN_WRITEDMA_QUEUED ||
-			 ar->cmd == WIN_WRITEDMA_QUEUED_EXT ||
-			 ar->cmd == WIN_READDMA_QUEUED ||
-			 ar->cmd == WIN_READDMA_QUEUED_EXT)
-			return udma_tcq_taskfile(drive, rq);
-#endif
-		else {
-			printk(KERN_ERR "%s: unknown command %x\n", __FUNCTION__, ar->cmd);
-			return ide_stopped;
-		}
-	}
-
-	return ide_started;
-}
-
-/*
  * This function issues a special IDE device request onto the request queue.
  *
  * If action is ide_wait, then the rq is queued at the end of the request
@@ -436,7 +297,7 @@
 	struct request req;
 
 	ar->command_type = IDE_DRIVE_TASK_NO_DATA;
-	ar->handler = ata_special_intr;
+	ar->XXX_handler = ata_special_intr;
 
 	memset(&req, 0, sizeof(req));
 	req.flags = REQ_SPECIAL;
@@ -449,6 +310,5 @@
 EXPORT_SYMBOL(ide_do_drive_cmd);
 EXPORT_SYMBOL(ata_read);
 EXPORT_SYMBOL(ata_write);
-EXPORT_SYMBOL(ata_do_taskfile);
 EXPORT_SYMBOL(ata_special_intr);
 EXPORT_SYMBOL(ide_raw_taskfile);
diff -urN linux-2.5.21/drivers/ide/ioctl.c linux/drivers/ide/ioctl.c
--- linux-2.5.21/drivers/ide/ioctl.c	2002-06-14 12:45:00.000000000 +0200
+++ linux/drivers/ide/ioctl.c	2002-06-14 02:08:02.000000000 +0200
@@ -54,9 +54,6 @@
 	if (copy_from_user(vals, (void *)arg, 4))
 		return -EFAULT;
 
-	memset(&req, 0, sizeof(req));
-	req.flags = REQ_SPECIAL;
-
 	memset(&args, 0, sizeof(args));
 
 	args.taskfile.feature = vals[2];
@@ -83,10 +80,14 @@
 
 	/* Issue ATA command and wait for completion.
 	 */
-	args.handler = ata_special_intr;
+	args.command_type = IDE_DRIVE_TASK_NO_DATA;
+	args.XXX_handler = ata_special_intr;
 
-	req.buffer = argbuf + 4;
+	memset(&req, 0, sizeof(req));
+	req.flags = REQ_SPECIAL;
 	req.special = &args;
+
+	req.buffer = argbuf + 4;
 	err = ide_do_drive_cmd(drive, &req, ide_wait);
 
 	argbuf[0] = drive->status;
diff -urN linux-2.5.21/drivers/ide/ns87415.c linux/drivers/ide/ns87415.c
--- linux-2.5.21/drivers/ide/ns87415.c	2002-06-09 07:28:49.000000000 +0200
+++ linux/drivers/ide/ns87415.c	2002-06-14 14:27:42.000000000 +0200
@@ -105,12 +105,12 @@
 {
 	ns87415_prepare_drive(drive, 1);	/* select DMA xfer */
 
-	if (!udma_pci_init(drive, rq))		/* use standard DMA stuff */
-		return 0;
+	if (udma_pci_init(drive, rq))		/* use standard DMA stuff */
+		return ide_started;
 
 	ns87415_prepare_drive(drive, 0);	/* DMA failed: select PIO xfer */
 
-	return 1;
+	return ide_stopped;
 }
 
 static int ns87415_udma_setup(struct ata_device *drive)
diff -urN linux-2.5.21/drivers/ide/pcidma.c linux/drivers/ide/pcidma.c
--- linux-2.5.21/drivers/ide/pcidma.c	2002-06-14 12:45:03.000000000 +0200
+++ linux/drivers/ide/pcidma.c	2002-06-14 15:12:30.000000000 +0200
@@ -420,13 +420,11 @@
 	struct ata_channel *ch = drive->channel;
 	unsigned long dma_base = ch->dma_base;
 
-	/* Note that this is done *after* the cmd has
-	 * been issued to the drive, as per the BM-IDE spec.
-	 * The Promise Ultra33 doesn't work correctly when
-	 * we do this part before issuing the drive cmd.
+	/* Note that this is done *after* the cmd has been issued to the drive,
+	 * as per the BM-IDE spec.  The Promise Ultra33 doesn't work correctly
+	 * when we do this part before issuing the drive cmd.
 	 */
-	outb(inb(dma_base)|1, dma_base);		/* start DMA */
-	return 0;
+	outb(inb(dma_base) | 1, dma_base);	/* start DMA */
 }
 
 /*
@@ -545,11 +543,11 @@
 	u8 cmd;
 
 	if (ata_start_dma(drive, rq))
-		return 1;
+		return ide_stopped;
 
 	/* No DMA transfers on ATAPI devices. */
 	if (drive->type != ATA_DISK)
-		return 0;
+		return ide_started;
 
 	if (rq_data_dir(rq) == READ)
 		cmd = 0x08;
@@ -562,7 +560,9 @@
 	else
 		outb(cmd ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG);
 
-	return udma_start(drive, rq);
+	udma_start(drive, rq);
+
+	return ide_started;
 }
 
 EXPORT_SYMBOL(ide_dma_intr);
diff -urN linux-2.5.21/drivers/ide/pdc202xx.c linux/drivers/ide/pdc202xx.c
--- linux-2.5.21/drivers/ide/pdc202xx.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/pdc202xx.c	2002-06-14 15:13:37.000000000 +0200
@@ -573,8 +573,6 @@
 	 */
 
 	outb(inb(ch->dma_base) | 1, ch->dma_base); /* start DMA */
-
-	return 0;
 }
 
 int pdc202xx_udma_stop(struct ata_device *drive)
diff -urN linux-2.5.21/drivers/ide/pdc4030.c linux/drivers/ide/pdc4030.c
--- linux-2.5.21/drivers/ide/pdc4030.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/ide/pdc4030.c	2002-06-14 02:09:46.000000000 +0200
@@ -784,7 +784,7 @@
 	args.taskfile.high_cylinder	= (block>>=8);
 	args.taskfile.device_head	= ((block>>8)&0x0f)|drive->select.all;
 	args.cmd = (rq_data_dir(rq) == READ) ? PROMISE_READ : PROMISE_WRITE;
-	args.handler	= NULL;
+	args.XXX_handler	= NULL;
 	rq->special	= &args;
 
 	return do_pdc4030_io(drive, &args, rq);
diff -urN linux-2.5.21/drivers/ide/sl82c105.c linux/drivers/ide/sl82c105.c
--- linux-2.5.21/drivers/ide/sl82c105.c	2002-06-09 07:28:39.000000000 +0200
+++ linux/drivers/ide/sl82c105.c	2002-06-14 14:22:23.000000000 +0200
@@ -209,6 +209,7 @@
 static int sl82c105_dma_init(struct ata_device *drive, struct request *rq)
 {
 	sl82c105_reset_host(drive->channel->pci_dev);
+
 	return udma_pci_init(drive, rq);
 }
 
diff -urN linux-2.5.21/drivers/ide/tcq.c linux/drivers/ide/tcq.c
--- linux-2.5.21/drivers/ide/tcq.c	2002-06-14 12:45:03.000000000 +0200
+++ linux/drivers/ide/tcq.c	2002-06-14 15:04:59.000000000 +0200
@@ -84,7 +84,7 @@
 {
 	struct ata_channel *ch = drive->channel;
 	request_queue_t *q = &drive->queue;
-	struct ata_taskfile *args;
+	struct ata_taskfile *ar;
 	struct request *rq;
 	unsigned long flags;
 
@@ -110,8 +110,8 @@
 	 * executed before any new commands are started. issue a NOP
 	 * to clear internal queue on drive.
 	 */
-	args = kmalloc(sizeof(*args), GFP_ATOMIC);
-	if (!args) {
+	ar = kmalloc(sizeof(*ar), GFP_ATOMIC);
+	if (!ar) {
 		printk(KERN_ERR "ATA: %s: failed to issue NOP\n", drive->name);
 		goto out;
 	}
@@ -126,10 +126,10 @@
 	 */
 	BUG_ON(!rq);
 
-	rq->special = args;
-	args->cmd = WIN_NOP;
-	args->handler = tcq_nop_handler;
-	args->command_type = IDE_DRIVE_TASK_NO_DATA;
+	rq->special = ar;
+	ar->cmd = WIN_NOP;
+	ar->XXX_handler = tcq_nop_handler;
+	ar->command_type = IDE_DRIVE_TASK_NO_DATA;
 
 	rq->rq_dev = mk_kdev(drive->channel->major, (drive->select.b.unit)<<PARTN_BITS);
 	_elv_add_request(q, rq, 0, 0);
@@ -539,10 +539,9 @@
 		return ide_stopped;
 
 	set_irq(drive, ide_dmaq_intr);
-	if (!udma_start(drive, rq))
-		return ide_started;
+	udma_start(drive, rq);
 
-	return ide_stopped;
+	return ide_started;
 }
 
 /*
@@ -550,7 +549,7 @@
  *
  * Channel lock should be held.
  */
-ide_startstop_t udma_tcq_taskfile(struct ata_device *drive, struct request *rq)
+ide_startstop_t udma_tcq_init(struct ata_device *drive, struct request *rq)
 {
 	u8 stat;
 	u8 feat;
diff -urN linux-2.5.21/drivers/ide/trm290.c linux/drivers/ide/trm290.c
--- linux-2.5.21/drivers/ide/trm290.c	2002-06-14 12:45:00.000000000 +0200
+++ linux/drivers/ide/trm290.c	2002-06-14 15:12:48.000000000 +0200
@@ -179,7 +179,6 @@
 static int trm290_udma_start(struct ata_device *drive, struct request *__rq)
 {
 	/* Nothing to be done here. */
-	return 0;
 }
 
 static int trm290_udma_stop(struct ata_device *drive)
@@ -210,7 +209,7 @@
 #ifdef TRM290_NO_DMA_WRITES
 		trm290_prepare_drive(drive, 0);	/* select PIO xfer */
 
-		return 1;
+		return ide_stopped;
 #endif
 	} else {
 		reading = 2;
@@ -219,7 +218,7 @@
 
 	if (!(count = udma_new_table(drive, rq))) {
 		trm290_prepare_drive(drive, 0);	/* select PIO xfer */
-		return 1;	/* try PIO instead of DMA */
+		return ide_stopped;	/* try PIO instead of DMA */
 	}
 
 	trm290_prepare_drive(drive, 1);	/* select DMA xfer */
@@ -233,7 +232,7 @@
 		outb(reading ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG);
 	}
 
-	return 0;
+	return ide_started;
 }
 
 static int trm290_udma_irq_status(struct ata_device *drive)
diff -urN linux-2.5.21/drivers/scsi/ide-scsi.c linux/drivers/scsi/ide-scsi.c
--- linux-2.5.21/drivers/scsi/ide-scsi.c	2002-06-14 12:45:13.000000000 +0200
+++ linux/drivers/scsi/ide-scsi.c	2002-06-14 14:18:13.000000000 +0200
@@ -444,7 +444,7 @@
 	bcount = min(pc->request_transfer, 63 * 1024);		/* Request to transfer the entire buffer at once */
 
 	if (drive->using_dma && rq->bio)
-		dma_ok = !udma_init(drive, rq);
+		dma_ok = udma_init(drive, rq);
 
 	ata_select(drive, 10);
 	ata_irq_enable(drive, 1);
diff -urN linux-2.5.21/include/linux/ide.h linux/include/linux/ide.h
--- linux-2.5.21/include/linux/ide.h	2002-06-14 12:45:13.000000000 +0200
+++ linux/include/linux/ide.h	2002-06-14 15:14:20.000000000 +0200
@@ -459,9 +459,9 @@
 	int (*udma_setup)(struct ata_device *);
 
 	void (*udma_enable)(struct ata_device *, int, int);
-	int (*udma_start) (struct ata_device *, struct request *rq);
+	void (*udma_start) (struct ata_device *, struct request *);
 	int (*udma_stop) (struct ata_device *);
-	int (*udma_init) (struct ata_device *, struct request *rq);
+	int (*udma_init) (struct ata_device *, struct request *);
 	int (*udma_irq_status) (struct ata_device *);
 	void (*udma_timeout) (struct ata_device *);
 	void (*udma_irq_lost) (struct ata_device *);
@@ -651,15 +651,12 @@
 	struct hd_drive_task_hdr  hobfile;
 	u8 cmd;					/* actual ATA command */
 	int command_type;
-	ide_startstop_t (*handler)(struct ata_device *, struct request *);
+	ide_startstop_t (*XXX_handler)(struct ata_device *, struct request *);
 };
 
 extern void ata_read(struct ata_device *, void *, unsigned int);
 extern void ata_write(struct ata_device *, void *, unsigned int);
 
-extern ide_startstop_t ata_do_taskfile(struct ata_device *,
-	struct ata_taskfile *, struct request *);
-
 /*
  * Special Flagged Register Validation Caller
  */
@@ -751,9 +748,9 @@
 	drive->channel->udma_enable(drive, on, verbose);
 }
 
-static inline int udma_start(struct ata_device *drive, struct request *rq)
+static inline void udma_start(struct ata_device *drive, struct request *rq)
 {
-	return drive->channel->udma_start(drive, rq);
+	drive->channel->udma_start(drive, rq);
 }
 
 static inline int udma_stop(struct ata_device *drive)
@@ -764,7 +761,7 @@
 /*
  * Initiate actual DMA data transfer. The direction is encoded in the request.
  */
-static inline int udma_init(struct ata_device *drive, struct request *rq)
+static inline ide_startstop_t udma_init(struct ata_device *drive, struct request *rq)
 {
 	return drive->channel->udma_init(drive, rq);
 }
@@ -802,7 +799,7 @@
 extern int udma_black_list(struct ata_device *);
 extern int udma_white_list(struct ata_device *);
 
-extern ide_startstop_t udma_tcq_taskfile(struct ata_device *, struct request *);
+extern ide_startstop_t udma_tcq_init(struct ata_device *, struct request *);
 extern int udma_tcq_enable(struct ata_device *, int);
 
 extern ide_startstop_t ide_dma_intr(struct ata_device *, struct request *);

Re: [PATCH] 2.5.21 IDE 91

[Jens Axboe]

On Fri, Jun 14 2002, Martin Dalecki wrote:
> Thu Jun 13 22:59:54 CEST 2002 ide-clean-91
> 
> - Realize that the only place where ata_do_taskfile gets used is ide-disk.c
>   move it and its "friends' over there.

Ehm, isn't that a bit odd? The typical "I'm not looking at the
interface, if only one person is currently using it then heck lets move
it" Martin approach (refer to prep_rq_fn cdb builder as well)

The above is just a minor thing, the reason I'm mailing is really:

- current 2.5 bk deadlocks reading partition info off disk. Again a
  locking problem I suppose, to be honest I just got very tired when
  seeing it happen and didn't want to spend tim looking into it.

I thought IDE locking couldn't get worse than 2.4, but I think you are
well into doing just that. What exactly are you plans with the channel
locks? Right now, to me, it seems you are extending the use of them to
the point where they would be used to serialize the entire request
operation start? Heck, ide-cd is even holding the channel lock when
outputting the cdb now.

- ata_end_request(). why didn't you just remove the last argument to
  __ata_end_request() instead just changing the comment saying why we
  pass nr_secs == 0 in from some sites?

- what's the reasoning behind moving the active request into the
  ata_device?! we are serializing requests for ata_device's on the
  ata_channel anyways, which is why it made sense to have the active
  request there.

And finally a small plea for more testing. Do you even test before
blindly sending patches off to Linus?! Sometimes just watching how
quickly these big patches appears makes it impossible that they have
gotten any kind of testing other than the 'hey it compiles', which I
think it just way too little for something that could possible screw
peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
currently. The success ratio of posted over working patches is too big.

-- 
Jens Axboe

Re: [PATCH] 2.5.21 IDE 91

[John Weber]

  > And finally a small plea for more testing. Do you even test before
> blindly sending patches off to Linus?! Sometimes just watching how
> quickly these big patches appears makes it impossible that they have
> gotten any kind of testing other than the 'hey it compiles', which I
> think it just way too little for something that could possible screw
> peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
> currently. The success ratio of posted over working patches is too big.

I run all all of Martin's patches on my machine, and I haven't run into
any catastrophic problems (by this I mean problems that cause data loss 
though I realize that this may not be much of a standard).

I rather like the fact that Martin releases early and often... it 
usually means that I get a fix right away. I like the "release early and 
often" approach in a development kernel branch since I do not believe 
that releasing less often has any correlation to the stability of the 
product released (look at Windows :).

Martin or Jens, are there any test suites that you would like me to run?

I am currently too stupid to be able to aid in the development directly 
(lord knows i'm trying to get up to speed), but, in the meantime, I can 
test the crap out of a kernel :).

  -o)  J o h n   W e b e r
  /\\ john.weber@linuxhq.com
_\/v http://www.linuxhq.com/people/weber/

Re: [PATCH] 2.5.21 IDE 91

[Dave Jones]

On Fri, Jun 14, 2002 at 05:17:03PM +0200, Jens Axboe wrote:

 > And finally a small plea for more testing. Do you even test before
 > blindly sending patches off to Linus?! Sometimes just watching how
 > quickly these big patches appears makes it impossible that they have
 > gotten any kind of testing other than the 'hey it compiles', which I
 > think it just way too little for something that could possible screw
 > peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
 > currently. The success ratio of posted over working patches is too big.

Ditto. As we rapidly approach the 100th incarnation of Martin's IDE
patches, there are still cases where we die within seconds of booting
on some old PIO-only boxes for eg.  There seems to be far too much
"lets rip this out as it doesn't do much anyway" rather than fixing
known problems.

When the IDE carnage first started back circa 2.5.3, I had contemplated
not merging *any* of the IDE patches, just so that people who want to
work on other areas could have something solid to build upon.
I regret not following through on that instinct.

        Dave.

-- 
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs

Re: [PATCH] 2.5.21 IDE 91

[Bartlomiej Zolnierkiewicz]

Just my 0.02 plns...

On Fri, 14 Jun 2002, Dave Jones wrote:

> On Fri, Jun 14, 2002 at 05:17:03PM +0200, Jens Axboe wrote:
>
>  > And finally a small plea for more testing. Do you even test before
>  > blindly sending patches off to Linus?! Sometimes just watching how
>  > quickly these big patches appears makes it impossible that they have
>  > gotten any kind of testing other than the 'hey it compiles', which I
>  > think it just way too little for something that could possible screw
>  > peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
>  > currently. The success ratio of posted over working patches is too big.
>

I review every single patch from Martin and they are usually ok,
but it is generally good habbit to wait for next patch before running
previous one (just to see if there was any bugs in previous one)...

> Ditto. As we rapidly approach the 100th incarnation of Martin's IDE
> patches, there are still cases where we die within seconds of booting
> on some old PIO-only boxes for eg.  There seems to be far too much
> "lets rip this out as it doesn't do much anyway" rather than fixing
> known problems.

I will try to fix them one by one soon...

>
> When the IDE carnage first started back circa 2.5.3, I had contemplated
> not merging *any* of the IDE patches, just so that people who want to
> work on other areas could have something solid to build upon.
> I regret not following through on that instinct.
>

Your mistake, Dave ;)

>         Dave.
>
> --
> | Dave Jones.        http://www.codemonkey.org.uk
> | SuSE Labs
> -

--
Bartlomiej

Re: [PATCH] 2.5.21 IDE 91

[Martin Dalecki]

Użytkownik Bartlomiej Zolnierkiewicz napisał:
> Just my 0.02 plns...
> 
> On Fri, 14 Jun 2002, Dave Jones wrote:
> 
> 
>>On Fri, Jun 14, 2002 at 05:17:03PM +0200, Jens Axboe wrote:
>>
>> > And finally a small plea for more testing. Do you even test before
>> > blindly sending patches off to Linus?! Sometimes just watching how
>> > quickly these big patches appears makes it impossible that they have
>> > gotten any kind of testing other than the 'hey it compiles', which I
>> > think it just way too little for something that could possible screw
>> > peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
>> > currently. The success ratio of posted over working patches is too big.
> 
> I review every single patch from Martin and they are usually ok,
> but it is generally good habbit to wait for next patch before running
> previous one (just to see if there was any bugs in previous one)...

And I'm gald you do. You know that I admit if I screw
things up even in my change logs. Finally I'm sometimes just
the shield for screwups done by others. (No problem I can
take the heat :-).

>>Ditto. As we rapidly approach the 100th incarnation of Martin's IDE
>>patches, there are still cases where we die within seconds of booting
>>on some old PIO-only boxes for eg.  There seems to be far too much
>>"lets rip this out as it doesn't do much anyway" rather than fixing
>>known problems.
> 
> 
> I will try to fix them one by one soon...

Many people just do not realize that I don't hunt for the
easy fruits. I tend to solve fundamental things first before
getting down. (See for example the TCQ in and out
discussion I had with Jens - it turned out to be much
better to do the infrastructure thing at same time instead of
hacking up on the existing thing.)

Down to the point - there was *no way in hell* to
solve the PIO problems util:

1. The basic datastructures we have now where there.

2. The locking issues get resolved and take place on a sane
level.

3. The number of possible code flows got sanitized.

Heck, contrary to the habbits of many others I'm constantly
trying to explain even the reasoning behing the changes I do.
Not just what gets changes.

But fortunately right now we are indeed "getting just there" as
the fact shows that the last series of the IDE patches is moving
more and more down to the actual transport layer. And since
the overall structure starts to become more and more
clean even more and more people start to work together with
me on not just some very well separated areas like for
example host chip timing but the overall infrastructure as well.
(Adam, Bartek - I'm glad you are around :-).

Everybody out there proclaiming that this could have
all been solved far earlier by some kind of "easy" fix had just
enough of time to prove me worng on this issue.

Unless I get complains from people who work with me together
on the code itself I indeed tend to follow my own agenda
of prio.

It's that simple.

Re: [PATCH] 2.5.21 IDE 91

[Linus Torvalds]

On Fri, 14 Jun 2002, Dave Jones wrote:
> On Fri, Jun 14, 2002 at 05:17:03PM +0200, Jens Axboe wrote:
>
>  > And finally a small plea for more testing. Do you even test before
>  > blindly sending patches off to Linus?! Sometimes just watching how
>  > quickly these big patches appears makes it impossible that they have
>  > gotten any kind of testing other than the 'hey it compiles', which I
>  > think it just way too little for something that could possible screw
>  > peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
>  > currently. The success ratio of posted over working patches is too big.
>
> Ditto. As we rapidly approach the 100th incarnation of Martin's IDE
> patches, there are still cases where we die within seconds of booting
> on some old PIO-only boxes for eg.  There seems to be far too much
> "lets rip this out as it doesn't do much anyway" rather than fixing
> known problems.

Are we perhaps forgetting the _point_ of open source?

We're not supposed to be writing code and then releasing it when it is
done. We _want_ incremental changes, and open breakage.

Do bugs happen? Should we expect locking problems if the author is working
on changing the locking (which everybody who has ever looked at the code
admits was totally broken)?

YES.

Am I personally disturbed over the fact that PIO is still totally broken?
Yes. I don't like that part at all, but I do know that Martin is aware of
it, and I keep pushing on him all the time. Martin claims to be on top of
it, and getting close to be able to fix it. I haven't seen any real reason
to doubt him on that so far. We'll get there.

		Linus

Re: [PATCH] 2.5.21 IDE 91

[Benjamin LaHaise]

On Fri, Jun 14, 2002 at 05:17:03PM +0200, Jens Axboe wrote:
> And finally a small plea for more testing. Do you even test before
> blindly sending patches off to Linus?! Sometimes just watching how
> quickly these big patches appears makes it impossible that they have
> gotten any kind of testing other than the 'hey it compiles', which I
> think it just way too little for something that could possible screw
> peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
> currently. The success ratio of posted over working patches is too big.

Add my voice to these concerns.  At the very least the code should have 
been moved into a second tree to allow people to work with the old stable 
driver as needed.

		-ben
-- 
"You will be reincarnated as a toad; and you will be much happier."

Re: [PATCH] 2.5.21 IDE 91

[Dave Jones]

On Fri, Jun 14, 2002 at 11:56:34AM -0400, Benjamin LaHaise wrote:

 > Add my voice to these concerns.  At the very least the code should have 
 > been moved into a second tree to allow people to work with the old stable 
 > driver as needed.

*nod*, with periodic known-good _tested_ bits getting merged to
mainline, to avoid the need for an IDE merge flag day as has been
the norm in the past.

        Dave
-- 
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs

Re: [PATCH] 2.5.21 IDE 91

[Martin Dalecki]

Użytkownik Dave Jones napisał:
> On Fri, Jun 14, 2002 at 11:56:34AM -0400, Benjamin LaHaise wrote:
> 
>  > Add my voice to these concerns.  At the very least the code should have 
>  > been moved into a second tree to allow people to work with the old stable 
>  > driver as needed.
> 
> *nod*, with periodic known-good _tested_ bits getting merged to
> mainline, to avoid the need for an IDE merge flag day as has been
> the norm in the past.

And they where the best way to basically halt the whole thing.
Right now the only thing you would achieve would be to kick out
the other people with wich I work *together*.
Oh perhaps noone of them would have got involved...
I simply don't like to idea of lonely developement on a separate
small iland called a "dedicated mailing list". And I don't see any
need for it - the traffic on LKML isn't that high if one
learn how to use mozillas filtering facilities.

Re: [PATCH] 2.5.21 IDE 91

[Bartlomiej Zolnierkiewicz]

You can just copy old drives/ide/ + include/linux/[ide.h, hdreg.h]
+ asm/ide.h and it should compile/work?...

On Fri, 14 Jun 2002, Benjamin LaHaise wrote:

> On Fri, Jun 14, 2002 at 05:17:03PM +0200, Jens Axboe wrote:
> > And finally a small plea for more testing. Do you even test before
> > blindly sending patches off to Linus?! Sometimes just watching how
> > quickly these big patches appears makes it impossible that they have
> > gotten any kind of testing other than the 'hey it compiles', which I
> > think it just way too little for something that could possible screw
> > peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
> > currently. The success ratio of posted over working patches is too big.
>
> Add my voice to these concerns.  At the very least the code should have
> been moved into a second tree to allow people to work with the old stable
> driver as needed.
>
> 		-ben
> --
> "You will be reincarnated as a toad; and you will be much happier."
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

Re: [PATCH] 2.5.21 IDE 91

[Martin Dalecki]

Użytkownik Jens Axboe napisał:
> On Fri, Jun 14 2002, Martin Dalecki wrote:
> 
>>Thu Jun 13 22:59:54 CEST 2002 ide-clean-91
>>
>>- Realize that the only place where ata_do_taskfile gets used is ide-disk.c
>>  move it and its "friends' over there.
> 
> 
> Ehm, isn't that a bit odd? The typical "I'm not looking at the
> interface, if only one person is currently using it then heck lets move
> it" Martin approach (refer to prep_rq_fn cdb builder as well)

Yes this is the usual Marcin aproach. The fscking best road to bloat
is providing interfaces "on the heap" and "just in case", which
then nobody sane uses. Wen one discovers later that they are inadequate,
we try to support them until the end of days becouse
some silly python based incompetently written setup application
turns out to love to having you know what with.

And since application level programming expierence shows me that in 99%
of the cases where interfaces are designed in front of beeing used
they turn out to be inadequate I don't do it.

Won't to see some silly things like the situation described above?
Please just count the number of ioctl for the /dev/random.
90% of them qualify as "debuggin during developement" or are
working against the purpose of the thing. Just one example.
Once another even more striking is the whole /proc/ mess.

> The above is just a minor thing, the reason I'm mailing is really:
> 
> - current 2.5 bk deadlocks reading partition info off disk. Again a
>   locking problem I suppose, to be honest I just got very tired when
>   seeing it happen and didn't want to spend tim looking into it.

2.5.21 + the patches I did doesn't. Likely it's the driverfs?

> I thought IDE locking couldn't get worse than 2.4, but I think you are
> well into doing just that. What exactly are you plans with the channel
> locks? Right now, to me, it seems you are extending the use of them to
> the point where they would be used to serialize the entire request
> operation start? Heck, ide-cd is even holding the channel lock when
> outputting the cdb now.

After extracting out 80% of the host controller register file
access one has to realize that in reality we where releasing the lock
just to regain it immediately. Or alternatively accessing them
without any lock protection at all. (Same goes for BIO ummer layer
memmbers.) This is why they are pushed up. It's just avoiding the
"windows" between unlock and immediate relock and making the real
behaviour more "obvious". You have just realized this.

2.4 prevents the locking problems basically by georgeously
disabling IRQs. Too fine grained locking is a futile exercise.
Unless I see the time spent in system state during concurrent disk
access going really up (it doesn't right now), I don't see any thing
bad in making the locking more coarse. Locks don't came for free and
having fine grained locking isn't justifying itself.

Another "usual Marcin approach" - don't optimze for the sake of it.
See futile unlikely() tagging and inlining in tcq.c for example.
I don't do somethig like that. I have just written too much
numerical code which was really time constrained to do something
like this before looking at benchmarks.
Really constrained means having a program running 7 or "just"
5 *days*. This can make a difference, a difference in hard real
money on the range of multiple kEUR!

Finally - unless there appears some aother way to block access to
busy devices on the generic block layer I do it the only way
we have right now - spinlocks. (... looking forward to working
queue pugging and the work done by Adam richter).
Unless there is a sane way to signal partial completion - we will
be doing it at once. Unless we have a sane async io infrastructure
most of the above will be likely not solved anyway.

> - ata_end_request(). why didn't you just remove the last argument to
>   __ata_end_request() instead just changing the comment saying why we
>   pass nr_secs == 0 in from some sites?

One step after another. Watch for hard_xxx members from struch request
to see why I hesitated please.

> - what's the reasoning behind moving the active request into the
>   ata_device?! we are serializing requests for ata_device's on the
>   ata_channel anyways, which is why it made sense to have the active
>   request there.

Becouse it is going to go away altogether. We need it there
just only for the purpose of the default ide_timer_expiry function, which
is subject to go away since a long time. And finally becouse
it doesn't hurt.

Further on I refer you to the discussion we had (or was it Linus?)
once about the fact that attaching physical properties of the
device to the request queue and replicating those parameters in
every single request struct, is well ... "unpleasant" on behalf of the
upper layers. Loop devices expose the same problem.
Once again just grepping for hard_ memebers of the struct
request makes it obvious.

Somce people say that using the gratest common denominator in
the case of the loop devices is the  solution,
but I think that it's rather a work around.

> And finally a small plea for more testing. Do you even test before
> blindly sending patches off to Linus?! Sometimes just watching how
> quickly these big patches appears makes it impossible that they have
> gotten any kind of testing other than the 'hey it compiles', which I
> think it just way too little for something that could possible screw
> peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
> currently. The success ratio of posted over working patches is too big.

Fact is: many of the patches are just big becouse they contain
host chip handling cleanups done by others, and becouse
we have just too many different drivers for the same purpose:
ATAPI packet command devices. Which I'm more and more tempted
to scarp... in favour of just ide-scsi.c. But that's another
story. (Adam J. Richter is givng me constant preassure to do just that and I 
start really tending to admitt that he is just right.)

As of testing. Well at least I can assure you that I'm eating my dogfood,
since I run constantly on the patches. (Heck even the time I write this.)
But I don't use kernels from the BK repository at all.
In fact I just don't use BK at all and I don't intend too.

Re: [PATCH] 2.5.21 IDE 91

[Jens Axboe]

On Fri, Jun 14 2002, Martin Dalecki wrote:
> >- current 2.5 bk deadlocks reading partition info off disk. Again a
> >  locking problem I suppose, to be honest I just got very tired when
> >  seeing it happen and didn't want to spend tim looking into it.
> 
> 2.5.21 + the patches I did doesn't. Likely it's the driverfs?

This particular problem I don't know, I'm simply just out lining it.

> >I thought IDE locking couldn't get worse than 2.4, but I think you are
> >well into doing just that. What exactly are you plans with the channel
> >locks? Right now, to me, it seems you are extending the use of them to
> >the point where they would be used to serialize the entire request
> >operation start? Heck, ide-cd is even holding the channel lock when
> >outputting the cdb now.
> 
> After extracting out 80% of the host controller register file
> access one has to realize that in reality we where releasing the lock
> just to regain it immediately. Or alternatively accessing them
> without any lock protection at all. (Same goes for BIO ummer layer
> memmbers.) This is why they are pushed up. It's just avoiding the
> "windows" between unlock and immediate relock and making the real
> behaviour more "obvious". You have just realized this.

I know the locking needs to be reworked, it just very much looks like
that you are just extending the scope of the channel lock to basically
be held the entire way through. I'm hoping this is just a transition?

> 2.4 prevents the locking problems basically by georgeously
> disabling IRQs. Too fine grained locking is a futile exercise.

Yep

> Unless I see the time spent in system state during concurrent disk
> access going really up (it doesn't right now), I don't see any thing
> bad in making the locking more coarse. Locks don't came for free and
> having fine grained locking isn't justifying itself.

That's silly. Most of the "locking" required is just serializing access
to the channel (or interface). Just making the locking coarse and
grabbing it to do just that is pretty dumb.

> Another "usual Marcin approach" - don't optimze for the sake of it.
> See futile unlikely() tagging and inlining in tcq.c for example.
> I don't do somethig like that. I have just written too much
> numerical code which was really time constrained to do something
> like this before looking at benchmarks.
> Really constrained means having a program running 7 or "just"
> 5 *days*. This can make a difference, a difference in hard real
> money on the range of multiple kEUR!

Listing to complaints about unlikely() as micro-optimization from
someone who doesn't think that using a spin lock to serialize looong
operations is a problem doesn't carry a lot of weight, sorry. I don't
know why you bring this up again, I've already stated my case in the
last mail and I see no reason to repeat it.

> Finally - unless there appears some aother way to block access to
> busy devices on the generic block layer I do it the only way
> we have right now - spinlocks. (... looking forward to working
> queue pugging and the work done by Adam richter).

First of all, queue plugging works now. Second, this is no excuse for
using a spin lock to serialize request starts?! Please tell me you don't
really mean this. At worst you could have spurious request_fn runs
before, but that's hardly a big problem. I know the start/stop queue is
a nicer interface (that's why it's there now), but there's nothing wrong
with simply recalling your queueing function once a request completes.
That's how it was done before too. In short, this is not an argument, it
has little relevance to this case. And the big-bio stuff, how is that
relevant?

> Unless there is a sane way to signal partial completion - we will
> be doing it at once. Unless we have a sane async io infrastructure
> most of the above will be likely not solved anyway.

??

> >  ata_device?! we are serializing requests for ata_device's on the
> >  ata_channel anyways, which is why it made sense to have the active
> >  request there.
> 
> Becouse it is going to go away altogether. We need it there
> just only for the purpose of the default ide_timer_expiry function, which
> is subject to go away since a long time. And finally becouse
> it doesn't hurt.

Because it doesn't hurt? From the same book of code writing an
optimization? Again, the serialization point is the channel, why move
the active request to the drive?! To me, this is loosing information
and making the whole thing more confusing.

> Further on I refer you to the discussion we had (or was it Linus?)
> once about the fact that attaching physical properties of the
> device to the request queue and replicating those parameters in
> every single request struct, is well ... "unpleasant" on behalf of the

The drive <-> queue relationship has no bearing on the active request
serialization.

> upper layers. Loop devices expose the same problem.

Please explain the loop case?

> Once again just grepping for hard_ memebers of the struct
> request makes it obvious.

Do you understand why we have the hard_ members? It seems you don't,
because I don't see how that is remotely related to this. The hard_
members are just there so that low level drivers can screw with the
nr_sectors and current_nr_sectors as much as they want, and the block
layer can still maintain a consistent request state regardless of what
happens.

> Somce people say that using the gratest common denominator in
> the case of the loop devices is the  solution,
> but I think that it's rather a work around.

This sounds like nonsense.

> >And finally a small plea for more testing. Do you even test before
> >blindly sending patches off to Linus?! Sometimes just watching how
> >quickly these big patches appears makes it impossible that they have
> >gotten any kind of testing other than the 'hey it compiles', which I
> >think it just way too little for something that could possible screw
> >peoples data up very badly. Frankly, _I'm_ too scared to run 2.5 IDE
> >currently. The success ratio of posted over working patches is too big.
> 
> Fact is: many of the patches are just big becouse they contain
> host chip handling cleanups done by others, and becouse
> we have just too many different drivers for the same purpose:
> ATAPI packet command devices. Which I'm more and more tempted
> to scarp... in favour of just ide-scsi.c. But that's another
> story. (Adam J. Richter is givng me constant preassure to do just that and 
> I start really tending to admitt that he is just right.)

Yeah I know that they are mostly big because of cleanups, and I'm not
worried about that at all. But even when just maybe 10% of the patch is
changing stuff radically, problems can sneak in. Plus, there appears to
be no clear goal in what you are doing. Things change in one direction
one day, back in another the next day. I have a hard time seeing how
this will lead to a cleaner and more maintainable code base.

> As of testing. Well at least I can assure you that I'm eating my dogfood,
> since I run constantly on the patches. (Heck even the time I write this.)

That's good for you, but a single person testing is usually not enough.
Especially not with stuff like IDE where there are sooo many different
pieces of hardware and setups out there. I'm not saying that you should
do complete validation of the code every single time, but maybe having a
bleding edge tree and a linus tree would go along way. Then you could
ship cleanups as much as you want, but do the more radical changes a bit
slower. I think that would also solve your direction problem, letting
the more radical changes mature a bit before shipping it.

> But I don't use kernels from the BK repository at all.
> In fact I just don't use BK at all and I don't intend too.

Doesn't matter. Fact is, you don't know when Linus will tag the BK tree
as the next release. Or how many of your ide-xx patches are in at that
point.

-- 
Jens Axboe

Re: [PATCH] 2.5.21 IDE 91

[Linus Torvalds]

On Fri, 14 Jun 2002, Jens Axboe wrote:
>
> - current 2.5 bk deadlocks reading partition info off disk. Again a
>   locking problem I suppose, to be honest I just got very tired when
>   seeing it happen and didn't want to spend tim looking into it.

Hmm. There's a bug in "balance_irq()" if you are trying to run a SMP
kernel on an UP machine right now, and it _might_ be that the lockup has
nothing to do with the IDE layer, but simple with the first PCI interrupt
(as opposed to local timer interrupt) coming in.

One-liner from Zwane Mwaikambo (cut-and-paste, so space is wrong, please
apply by hand).

--- linux-2.5.19/arch/i386/kernel/io_apic.c.orig        Fri Jun 14 17:43:20 2002
+++ linux-2.5.19/arch/i386/kernel/io_apic.c     Fri Jun 14 17:42:23 2002
@@ -251,7 +251,7 @@
        irq_balance_t *entry = irq_balance + irq;
        unsigned long now = jiffies;

-       if (unlikely(entry->timestamp != now)) {
+       if ((entry->timestamp != now) && (smp_num_cpus > 1)) {
                unsigned long allowed_mask;
                int random_number;

I don't know. Might be the IDE code too, of course.

		Linus

Re: [PATCH] 2.5.21 IDE 91

[Martin Dalecki]

Użytkownik Linus Torvalds napisał:
> 
> On Fri, 14 Jun 2002, Jens Axboe wrote:
> 
>>- current 2.5 bk deadlocks reading partition info off disk. Again a
>>  locking problem I suppose, to be honest I just got very tired when
>>  seeing it happen and didn't want to spend tim looking into it.
> 
> 
> Hmm. There's a bug in "balance_irq()" if you are trying to run a SMP
> kernel on an UP machine right now, and it _might_ be that the lockup has
> nothing to do with the IDE layer, but simple with the first PCI interrupt
> (as opposed to local timer interrupt) coming in.

...

> I don't know. Might be the IDE code too, of course.

Just to complete the picture: I'm running SMP kernels on
UP for the sake of spinlock debugging and compilatoin coverage too.
But as I have already stated - I run my own patches on
top of the last offical release instead of BK contents.

Re: [PATCH] 2.5.21 IDE 91

[Jens Axboe]

On Fri, Jun 14 2002, Linus Torvalds wrote:
> 
> 
> On Fri, 14 Jun 2002, Jens Axboe wrote:
> >
> > - current 2.5 bk deadlocks reading partition info off disk. Again a
> >   locking problem I suppose, to be honest I just got very tired when
> >   seeing it happen and didn't want to spend tim looking into it.
> 
> Hmm. There's a bug in "balance_irq()" if you are trying to run a SMP
> kernel on an UP machine right now, and it _might_ be that the lockup has
> nothing to do with the IDE layer, but simple with the first PCI interrupt
> (as opposed to local timer interrupt) coming in.
> 
> One-liner from Zwane Mwaikambo (cut-and-paste, so space is wrong, please
> apply by hand).
> 
> --- linux-2.5.19/arch/i386/kernel/io_apic.c.orig        Fri Jun 14 17:43:20 2002
> +++ linux-2.5.19/arch/i386/kernel/io_apic.c     Fri Jun 14 17:42:23 2002
> @@ -251,7 +251,7 @@
>         irq_balance_t *entry = irq_balance + irq;
>         unsigned long now = jiffies;
> 
> -       if (unlikely(entry->timestamp != now)) {
> +       if ((entry->timestamp != now) && (smp_num_cpus > 1)) {
>                 unsigned long allowed_mask;
>                 int random_number;
> 
> I don't know. Might be the IDE code too, of course.

If it's just a SMP kernel on UP, then that's not the problem here. This
was SMP kernel on SMP machine.

-- 
Jens Axboe