* [PATCH] via crypto beginnings
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
@ 2004-02-05 9:52 ` Jeff Garzik
2004-02-05 10:11 ` Andrew Morton
2004-02-05 9:55 ` 2.6.2-mm1 aka "Geriatric Wombat" Nikita Danilov
` (8 subsequent siblings)
9 siblings, 1 reply; 30+ messages in thread
From: Jeff Garzik @ 2004-02-05 9:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-mm1/
>
>
> - Merged some page reclaim fixes from Nick and Nikita. These yield some
> performance improvements in low memory and heavy paging situations.
>
> - Various random fixes.
>
>
>
> Changes since 2.6.2-rc3-mm1:
Did you see this one? I could have sworn I sent via crypto stuff, but
I've been scatterbrained recently.
Jeff
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 3300 bytes --]
diff -Nru a/arch/i386/kernel/cpu/centaur.c b/arch/i386/kernel/cpu/centaur.c
--- a/arch/i386/kernel/cpu/centaur.c Thu Feb 5 04:51:15 2004
+++ b/arch/i386/kernel/cpu/centaur.c Thu Feb 5 04:51:15 2004
@@ -246,7 +246,15 @@
lo&=~0x1C0; /* blank bits 8-6 */
wrmsr(MSR_IDT_MCR_CTRL, lo, hi);
}
-#endif
+#endif /* CONFIG_X86_OOSTORE */
+
+#define ACE_PRESENT (1 << 6)
+#define ACE_ENABLED (1 << 7)
+#define ACE_FCR (1 << 28) /* MSR_VIA_FCR */
+
+#define RNG_PRESENT (1 << 2)
+#define RNG_ENABLED (1 << 3)
+#define RNG_ENABLE (1 << 6) /* MSR_VIA_RNG */
static void __init init_c3(struct cpuinfo_x86 *c)
{
@@ -254,6 +262,24 @@
/* Test for Centaur Extended Feature Flags presence */
if (cpuid_eax(0xC0000000) >= 0xC0000001) {
+ u32 tmp = cpuid_edx(0xC0000001);
+
+ /* enable ACE unit, if present and disabled */
+ if ((tmp & (ACE_PRESENT | ACE_ENABLED)) == ACE_PRESENT) {
+ rdmsr (MSR_VIA_FCR, lo, hi);
+ lo |= ACE_FCR; /* enable ACE unit */
+ wrmsr (MSR_VIA_FCR, lo, hi);
+ printk(KERN_INFO "CPU: Enabled ACE h/w crypto\n");
+ }
+
+ /* enable RNG unit, if present and disabled */
+ if ((tmp & (RNG_PRESENT | RNG_ENABLED)) == RNG_PRESENT) {
+ rdmsr (MSR_VIA_RNG, lo, hi);
+ lo |= RNG_ENABLE; /* enable RNG unit */
+ wrmsr (MSR_VIA_RNG, lo, hi);
+ printk(KERN_INFO "CPU: Enabled h/w RNG\n");
+ }
+
/* store Centaur Extended Feature Flags as
* word 5 of the CPU capability bit array
*/
diff -Nru a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/cpu/proc.c Thu Feb 5 04:51:15 2004
+++ b/arch/i386/kernel/cpu/proc.c Thu Feb 5 04:51:15 2004
@@ -50,7 +50,7 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
- NULL, NULL, "xstore", NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
diff -Nru a/drivers/char/hw_random.c b/drivers/char/hw_random.c
--- a/drivers/char/hw_random.c Thu Feb 5 04:51:15 2004
+++ b/drivers/char/hw_random.c Thu Feb 5 04:51:15 2004
@@ -454,11 +454,7 @@
static void via_cleanup(void)
{
- u32 lo, hi;
-
- rdmsr(MSR_VIA_RNG, lo, hi);
- lo &= ~VIA_RNG_ENABLE;
- wrmsr(MSR_VIA_RNG, lo, hi);
+ /* do nothing */
}
diff -Nru a/include/asm-i386/cpufeature.h b/include/asm-i386/cpufeature.h
--- a/include/asm-i386/cpufeature.h Thu Feb 5 04:51:15 2004
+++ b/include/asm-i386/cpufeature.h Thu Feb 5 04:51:15 2004
@@ -76,6 +76,9 @@
/* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
#define X86_FEATURE_XSTORE (5*32+ 2) /* on-CPU RNG present (xstore insn) */
+#define X86_FEATURE_XSTORE_EN (5*32+ 3) /* on-CPU RNG enabled */
+#define X86_FEATURE_XCRYPT (5*32+ 6) /* on-CPU crypto (xcrypt insn) */
+#define X86_FEATURE_XCRYPT_EN (5*32+ 7) /* on-CPU crypto enabled */
#define cpu_has(c, bit) test_bit(bit, (c)->x86_capability)
@@ -101,6 +104,7 @@
#define cpu_has_cyrix_arr boot_cpu_has(X86_FEATURE_CYRIX_ARR)
#define cpu_has_centaur_mcr boot_cpu_has(X86_FEATURE_CENTAUR_MCR)
#define cpu_has_xstore boot_cpu_has(X86_FEATURE_XSTORE)
+#define cpu_has_xcrypt boot_cpu_has(X86_FEATURE_XCRYPT)
#endif /* __ASM_I386_CPUFEATURE_H */
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
2004-02-05 9:52 ` [PATCH] via crypto beginnings Jeff Garzik
@ 2004-02-05 9:55 ` Nikita Danilov
2004-02-05 10:00 ` Russell King
` (7 subsequent siblings)
9 siblings, 0 replies; 30+ messages in thread
From: Nikita Danilov @ 2004-02-05 9:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm
Andrew Morton writes:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-mm1/
>
>
> - Merged some page reclaim fixes from Nick and Nikita. These yield some
> performance improvements in low memory and heavy paging situations.
----------------------------------------------------------------------
>From Jargon File (4.3.0, 30 APR 2001) [jargon]:
WOMBAT /wom'bat/ adj. [acronym: Waste Of Money, Brains, And Time]
Applied to problems which are both profoundly {uninteresting} in
themselves and unlikely to benefit anyone interesting even if solved.
----------------------------------------------------------------------
A reference to the "VM replacement research was finished in 60s", I
presume.
>
> - Various random fixes.
Nikita.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
2004-02-05 9:52 ` [PATCH] via crypto beginnings Jeff Garzik
2004-02-05 9:55 ` 2.6.2-mm1 aka "Geriatric Wombat" Nikita Danilov
@ 2004-02-05 10:00 ` Russell King
2004-02-05 10:37 ` Jeff Garzik
2004-02-05 11:47 ` Nick Piggin
` (6 subsequent siblings)
9 siblings, 1 reply; 30+ messages in thread
From: Russell King @ 2004-02-05 10:00 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm
On Thu, Feb 05, 2004 at 01:44:05AM -0800, Andrew Morton wrote:
> bk-netdev.patch
Does this include the changes to all those PCMCIA net drivers which
Jeff has had for a while from me?
I'd like to get those patches into mainline so I can close bugme bug
1711, but I think Jeff's waiting for responses from the individual
net driver maintainers first. ;(
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 10:00 ` Russell King
@ 2004-02-05 10:37 ` Jeff Garzik
2004-02-05 10:50 ` Russell King
0 siblings, 1 reply; 30+ messages in thread
From: Jeff Garzik @ 2004-02-05 10:37 UTC (permalink / raw)
To: Russell King; +Cc: Andrew Morton, linux-kernel, linux-mm
Russell King wrote:
> On Thu, Feb 05, 2004 at 01:44:05AM -0800, Andrew Morton wrote:
>
>> bk-netdev.patch
>
>
> Does this include the changes to all those PCMCIA net drivers which
> Jeff has had for a while from me?
Yes
> I'd like to get those patches into mainline so I can close bugme bug
> 1711, but I think Jeff's waiting for responses from the individual
> net driver maintainers first. ;(
Nope, was just waiting for 2.6.2 to be released. The first post-262
batch has been merged, am now sending the second batch. Yours is in the
third batch :)
Jeff
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 10:37 ` Jeff Garzik
@ 2004-02-05 10:50 ` Russell King
0 siblings, 0 replies; 30+ messages in thread
From: Russell King @ 2004-02-05 10:50 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Andrew Morton, linux-kernel, linux-mm
On Thu, Feb 05, 2004 at 05:37:14AM -0500, Jeff Garzik wrote:
> > I'd like to get those patches into mainline so I can close bugme bug
> > 1711, but I think Jeff's waiting for responses from the individual
> > net driver maintainers first. ;(
>
> Nope, was just waiting for 2.6.2 to be released. The first post-262
> batch has been merged, am now sending the second batch. Yours is in the
> third batch :)
Ah, ok - that's excellent. Thanks.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (2 preceding siblings ...)
2004-02-05 10:00 ` Russell King
@ 2004-02-05 11:47 ` Nick Piggin
2004-02-05 16:11 ` Martin J. Bligh
2004-02-05 13:57 ` Alistair John Strachan
` (5 subsequent siblings)
9 siblings, 1 reply; 30+ messages in thread
From: Nick Piggin @ 2004-02-05 11:47 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm
Andrew Morton wrote:
>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-mm1/
>
>
>- Merged some page reclaim fixes from Nick and Nikita. These yield some
> performance improvements in low memory and heavy paging situations.
>
>
Nikita's vm-dont-rotate-active-list.patch still has this:
+/* dummy pages used to scan active lists */
+static struct page scan_pages[MAX_NUMNODES][MAX_NR_ZONES];
+
Which probably needs its nodes and cachelines untangled.
Maybe it doesn't - I really don't know.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 11:47 ` Nick Piggin
@ 2004-02-05 16:11 ` Martin J. Bligh
2004-02-05 16:16 ` Nick Piggin
2004-02-05 16:20 ` Nikita Danilov
0 siblings, 2 replies; 30+ messages in thread
From: Martin J. Bligh @ 2004-02-05 16:11 UTC (permalink / raw)
To: Nick Piggin, Andrew Morton; +Cc: linux-kernel, linux-mm
--Nick Piggin <piggin@cyberone.com.au> wrote (on Thursday, February 05, 2004 22:47:23 +1100):
>
> Andrew Morton wrote:
>
>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-mm1/
>>
>>
>> - Merged some page reclaim fixes from Nick and Nikita. These yield some
>> performance improvements in low memory and heavy paging situations.
>>
>>
>
> Nikita's vm-dont-rotate-active-list.patch still has this:
>
> +/* dummy pages used to scan active lists */
> +static struct page scan_pages[MAX_NUMNODES][MAX_NR_ZONES];
> +
>
> Which probably needs its nodes and cachelines untangled.
> Maybe it doesn't - I really don't know.
The idle toad's way is to shove it in the pgdat.
Maybe even the zone structure?
M.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 16:11 ` Martin J. Bligh
@ 2004-02-05 16:16 ` Nick Piggin
2004-02-05 16:20 ` Nikita Danilov
1 sibling, 0 replies; 30+ messages in thread
From: Nick Piggin @ 2004-02-05 16:16 UTC (permalink / raw)
To: Martin J. Bligh; +Cc: Andrew Morton, linux-kernel, linux-mm
Martin J. Bligh wrote:
>--Nick Piggin <piggin@cyberone.com.au> wrote (on Thursday, February 05, 2004 22:47:23 +1100):
>
>
>>Andrew Morton wrote:
>>
>>
>>>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-mm1/
>>>
>>>
>>>- Merged some page reclaim fixes from Nick and Nikita. These yield some
>>> performance improvements in low memory and heavy paging situations.
>>>
>>>
>>>
>>Nikita's vm-dont-rotate-active-list.patch still has this:
>>
>>+/* dummy pages used to scan active lists */
>>+static struct page scan_pages[MAX_NUMNODES][MAX_NR_ZONES];
>>+
>>
>>Which probably needs its nodes and cachelines untangled.
>>Maybe it doesn't - I really don't know.
>>
>
>The idle toad's way is to shove it in the pgdat.
>Maybe even the zone structure?
>
>
It logically belongs in the zone structure, but apparently
dependancies will not allow that right now.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 16:11 ` Martin J. Bligh
2004-02-05 16:16 ` Nick Piggin
@ 2004-02-05 16:20 ` Nikita Danilov
1 sibling, 0 replies; 30+ messages in thread
From: Nikita Danilov @ 2004-02-05 16:20 UTC (permalink / raw)
To: Martin J. Bligh; +Cc: Nick Piggin, Andrew Morton, linux-kernel, linux-mm
Martin J. Bligh writes:
>
> The idle toad's way is to shove it in the pgdat.
> Maybe even the zone structure?
Include hell lies that way.
>
> M.
Nikita.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (3 preceding siblings ...)
2004-02-05 11:47 ` Nick Piggin
@ 2004-02-05 13:57 ` Alistair John Strachan
2004-02-05 14:16 ` Lenar Lõhmus
2004-02-05 14:16 ` Matthias Urlichs
` (4 subsequent siblings)
9 siblings, 1 reply; 30+ messages in thread
From: Alistair John Strachan @ 2004-02-05 13:57 UTC (permalink / raw)
To: linux-kernel
On Thursday 05 February 2004 09:44, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-m
>m1/
>
>
> - Merged some page reclaim fixes from Nick and Nikita. These yield some
> performance improvements in low memory and heavy paging situations.
>
> - Various random fixes.
>
>
Still doesn't boot on my nForce 2 system, hangs while probing PDC RAID card.
Confirmed from 2.6.2-rc3-mm1 that it was likely related to ACPI changes, but
reverting bk-acpi.patch makes no difference.
I'd like to test mainline, but I'm using gcc 3.4 snapshot, so I'll try later
today with 2.6.2 + linus.patch.
--
Cheers,
Alistair.
personal: alistair()devzero!co!uk
university: s0348365()sms!ed!ac!uk
student: CS/AI Undergraduate
contact: 7/10 Darroch Court,
University of Edinburgh.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 13:57 ` Alistair John Strachan
@ 2004-02-05 14:16 ` Lenar Lõhmus
2004-02-05 19:57 ` 2.6.2-mm1 [are these mine?] Maciej Soltysiak
2004-02-05 21:30 ` 2.6.2-mm1 aka "Geriatric Wombat" Alistair John Strachan
0 siblings, 2 replies; 30+ messages in thread
From: Lenar Lõhmus @ 2004-02-05 14:16 UTC (permalink / raw)
To: linux-kernel
Alistair John Strachan wrote:
>On Thursday 05 February 2004 09:44, Andrew Morton wrote:
>
>
>Still doesn't boot on my nForce 2 system, hangs while probing PDC RAID card.
>Confirmed from 2.6.2-rc3-mm1 that it was likely related to ACPI changes, but
>reverting bk-acpi.patch makes no difference.
>
>I'd like to test mainline, but I'm using gcc 3.4 snapshot, so I'll try later
>today with 2.6.2 + linus.patch.
>
>
>
Same here, hangs probing hpt366 ide controller. After some time says:
hde: lost interrupt
boots ok with pci=noacpi
Lenar
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 [are these mine?]
2004-02-05 14:16 ` Lenar Lõhmus
@ 2004-02-05 19:57 ` Maciej Soltysiak
2004-02-05 20:11 ` Randy.Dunlap
2004-02-05 21:30 ` 2.6.2-mm1 aka "Geriatric Wombat" Alistair John Strachan
1 sibling, 1 reply; 30+ messages in thread
From: Maciej Soltysiak @ 2004-02-05 19:57 UTC (permalink / raw)
To: linux-kernel
Hi,
2.6.2-mm1 contains:
sound/oss/dmasound/tas3001c.c 1 +
1 - 0 !
sound/oss/dmasound/tas3001c_tables.c 166 +
166 - 0 !
sound/oss/dmasound/tas3004_tables.c 120 +
120 - 0 !
sound/oss/dmasound/trans_16.c 22 +
22 - 0 !
sound/oss/sb_card.h 50 +
50 - 0 !
I would like to ask if these are from the batch I proposed a while ago
during 2.6.0 available at:
http://soltysiak.com/patches/2.6/2.6.0/c99/patch-2.6.0-c99.diff
split:
http://soltysiak.com/patches/2.6/2.6.0/c99/split/
It would add to my other C99 contributed patches list :-)
Regards,
Maciej
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 14:16 ` Lenar Lõhmus
2004-02-05 19:57 ` 2.6.2-mm1 [are these mine?] Maciej Soltysiak
@ 2004-02-05 21:30 ` Alistair John Strachan
2004-02-06 8:39 ` Lenar Lõhmus
1 sibling, 1 reply; 30+ messages in thread
From: Alistair John Strachan @ 2004-02-05 21:30 UTC (permalink / raw)
To: Lenar Lõhmus, Arjen Verweij, Andrew Morton
Cc: Luis Miguel García, linux-kernel, acpi-devel
On Thursday 05 February 2004 14:16, you wrote:
> Alistair John Strachan wrote:
> >On Thursday 05 February 2004 09:44, Andrew Morton wrote:
> >
> >
> >Still doesn't boot on my nForce 2 system, hangs while probing PDC RAID
> > card. Confirmed from 2.6.2-rc3-mm1 that it was likely related to ACPI
> > changes, but reverting bk-acpi.patch makes no difference.
> >
> >I'd like to test mainline, but I'm using gcc 3.4 snapshot, so I'll try
> > later today with 2.6.2 + linus.patch.
>
> Same here, hangs probing hpt366 ide controller. After some time says:
>
> hde: lost interrupt
>
> boots ok with pci=noacpi
>
> Lenar
This fix doesn't work for me because I get problems if I disable ACPI IRQ
routing and still have apic enabled. Normally these problems would be
gracefully solved, but my USB HCD complains about not having been assigned an
IRQ.
This ACPI problem is definitely present in mainline, so this is a regression
at least on my nForce 2.
If this is helpful, in 2.6.2-rc1-mm1 I would see:
..MPBIOS bug: 8254 timer not connected to IO-APIC.
This error seemed to be harmless and made no difference to the kernel while
booting. It's been like that since latter 2.5 kernels, so that's quite a long
time. The board is an EPoX 8RDA+ in case this is a vendor bug.
Now, instead, I see (in 2.6.2 and 2.6.2-mm1):
IOAPIC[0]: Invalid reference to IRQ 0
Later my kernel hangs when detecting hde, as described in another thread.
pci=noacpi allows me to get to init, but it breaks my USB HCD.
--
Cheers,
Alistair.
personal: alistair()devzero!co!uk
university: s0348365()sms!ed!ac!uk
student: CS/AI Undergraduate
contact: 7/10 Darroch Court,
University of Edinburgh.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 21:30 ` 2.6.2-mm1 aka "Geriatric Wombat" Alistair John Strachan
@ 2004-02-06 8:39 ` Lenar Lõhmus
0 siblings, 0 replies; 30+ messages in thread
From: Lenar Lõhmus @ 2004-02-06 8:39 UTC (permalink / raw)
To: s0348365
Cc: Arjen Verweij, Andrew Morton, Luis Miguel García,
linux-kernel, acpi-devel
Alistair John Strachan wrote:
>This fix doesn't work for me because I get problems if I disable ACPI IRQ
>routing and still have apic enabled. Normally these problems would be
>gracefully solved, but my USB HCD complains about not having been assigned an
>IRQ.
>
>
Actually it's exactly the same here I'm just not bothered by my USB HCD
not having an IRQ since
my USB mouse still works.
It says this when booting:
PCI: No IRQ known for interrupt pin A of device 0000:00:02.0. Please try
using pci=biosirq.
drivers/usb/core/hcd-pci.c: Found HC with no IRQ. Check BIOS/PCI
0000:00:02.0 setup!
All I can say is that in 2.6.1-rc1-mm1 it worked and I could have all my
interrupts off the XT-PIC.
Lenar
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (4 preceding siblings ...)
2004-02-05 13:57 ` Alistair John Strachan
@ 2004-02-05 14:16 ` Matthias Urlichs
2004-02-05 17:58 ` John Cherry
` (3 subsequent siblings)
9 siblings, 0 replies; 30+ messages in thread
From: Matthias Urlichs @ 2004-02-05 14:16 UTC (permalink / raw)
To: linux-kernel
Hi, Andrew Morton wrote:
> - Various random fixes.
Ohboy. ;-)
Just for general elucidation: this tree now touches 1854 files, or
slightly more than ten percent of the kernel source, with roughly 3500
changes, packaged in 1500 Bitkeeper changes and/or individual patches.
Feel free to draw unwarranted conclusions from these numbers....
--
Matthias Urlichs
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (5 preceding siblings ...)
2004-02-05 14:16 ` Matthias Urlichs
@ 2004-02-05 17:58 ` John Cherry
2004-02-05 23:12 ` [patch] 2.6.2-mm1: fix warning introduced by input-2wheel-mouse-fix Adrian Bunk
2004-02-05 19:23 ` 2.6.2-mm1 aka "Geriatric Wombat" Deepak Saxena
` (2 subsequent siblings)
9 siblings, 1 reply; 30+ messages in thread
From: John Cherry @ 2004-02-05 17:58 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel@vger.kernel.org, linux-mm
Nice. This patch contains some AIO/DIO race fixes.
The nit warnings that sprung up in the defconfig builds are...
drivers/scsi/libata-core.c:2141: warning: `ata_qc_push' defined but not
used
drivers/usb/input/hid-input.c: In function `hidinput_hid_event':
drivers/usb/input/hid-input.c:436: warning: suggest parentheses around
&& within ||
-----------------------------------------------------------------------
Linux 2.6 (mm tree) Compile Statistics (gcc 3.2.2)
Warnings/Errors Summary
Kernel bzImage bzImage bzImage modules bzImage modules
(defconfig) (allno) (allyes) (allyes) (allmod) (allmod)
--------------- ---------- -------- -------- -------- -------- --------
2.6.2-mm1 2w/0e 0w/264e 147w/ 5e 7w/0e 3w/0e 173w/0e
2.6.2-rc3-mm1 2w/0e 0w/265e 146w/ 5e 7w/0e 3w/0e 172w/0e
2.6.2-rc2-mm2 0w/0e 0w/264e 145w/ 5e 7w/0e 3w/0e 171w/0e
2.6.2-rc2-mm1 0w/0e 0w/264e 146w/ 5e 7w/0e 3w/0e 172w/0e
2.6.2-rc1-mm3 0w/0e 0w/265e 144w/ 8e 7w/0e 3w/0e 169w/0e
2.6.2-rc1-mm2 0w/0e 0w/264e 144w/ 5e 10w/0e 3w/0e 171w/0e
2.6.2-rc1-mm1 0w/0e 0w/264e 144w/ 5e 10w/0e 3w/0e 171w/0e
2.6.1-mm5 2w/5e 0w/264e 153w/11e 10w/0e 3w/0e 180w/0e
2.6.1-mm4 0w/821e 0w/264e 154w/ 5e 8w/1e 5w/0e 179w/0e
2.6.1-mm3 0w/0e 0w/0e 151w/ 5e 10w/0e 3w/0e 177w/0e
2.6.1-mm2 0w/0e 0w/0e 143w/ 5e 12w/0e 3w/0e 171w/0e
2.6.1-mm1 0w/0e 0w/0e 146w/ 9e 12w/0e 6w/0e 171w/0e
2.6.1-rc2-mm1 0w/0e 0w/0e 149w/ 0e 12w/0e 6w/0e 171w/4e
2.6.1-rc1-mm2 0w/0e 0w/0e 157w/15e 12w/0e 3w/0e 185w/4e
2.6.1-rc1-mm1 0w/0e 0w/0e 156w/10e 12w/0e 3w/0e 184w/2e
2.6.0-mm2 0w/0e 0w/0e 161w/ 0e 12w/0e 3w/0e 189w/0e
2.6.0-mm1 0w/0e 0w/0e 173w/ 0e 12w/0e 3w/0e 212w/0e
Web page with links to complete details:
http://developer.osdl.org/cherry/compile/
Error Summary (individual module builds):
drivers/net: 0 warnings, 1 errors
Warning Summary (individual module builds):
drivers/block: 1 warnings, 0 errors
drivers/cdrom: 3 warnings, 0 errors
drivers/char: 4 warnings, 0 errors
drivers/ide: 29 warnings, 0 errors
drivers/message: 1 warnings, 0 errors
drivers/mtd: 23 warnings, 0 errors
drivers/net: 7 warnings, 0 errors
drivers/pcmcia: 3 warnings, 0 errors
drivers/scsi/pcmcia: 1 warnings, 0 errors
drivers/scsi: 34 warnings, 0 errors
drivers/serial: 1 warnings, 0 errors
drivers/telephony: 5 warnings, 0 errors
drivers/usb: 3 warnings, 0 errors
drivers/video/aty: 3 warnings, 0 errors
drivers/video/console: 2 warnings, 0 errors
drivers/video/matrox: 5 warnings, 0 errors
drivers/video: 8 warnings, 0 errors
net: 1 warnings, 0 errors
sound/isa: 6 warnings, 0 errors
sound/oss: 33 warnings, 0 errors
sound/pci: 2 warnings, 0 errors
John
^ permalink raw reply [flat|nested] 30+ messages in thread* [patch] 2.6.2-mm1: fix warning introduced by input-2wheel-mouse-fix
2004-02-05 17:58 ` John Cherry
@ 2004-02-05 23:12 ` Adrian Bunk
2004-02-06 0:22 ` Zephaniah E. Hull
0 siblings, 1 reply; 30+ messages in thread
From: Adrian Bunk @ 2004-02-05 23:12 UTC (permalink / raw)
To: John Cherry, Zephaniah E. Hull
Cc: Andrew Morton, linux-kernel@vger.kernel.org, vojtech, gregkh
On Thu, Feb 05, 2004 at 09:58:18AM -0800, John Cherry wrote:
>...
> The nit warnings that sprung up in the defconfig builds are...
>...
> drivers/usb/input/hid-input.c: In function `hidinput_hid_event':
> drivers/usb/input/hid-input.c:436: warning: suggest parentheses around
> && within ||
>...
This one's easy to fix:
--- linux-2.6.2-mm1/drivers/usb/input/hid-input.c.old 2004-02-06 00:05:19.000000000 +0100
+++ linux-2.6.2-mm1/drivers/usb/input/hid-input.c 2004-02-06 00:05:50.000000000 +0100
@@ -433,7 +433,7 @@
input_regs(input, regs);
if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA) && (usage->code == BTN_EXTRA))
- || (hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK)) {
+ || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK))) {
if (value)
hid->quirks |= HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
else
Please apply
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [patch] 2.6.2-mm1: fix warning introduced by input-2wheel-mouse-fix
2004-02-05 23:12 ` [patch] 2.6.2-mm1: fix warning introduced by input-2wheel-mouse-fix Adrian Bunk
@ 2004-02-06 0:22 ` Zephaniah E. Hull
0 siblings, 0 replies; 30+ messages in thread
From: Zephaniah E. Hull @ 2004-02-06 0:22 UTC (permalink / raw)
To: Adrian Bunk
Cc: John Cherry, Andrew Morton, linux-kernel@vger.kernel.org, vojtech,
gregkh
[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]
On Fri, Feb 06, 2004 at 12:12:27AM +0100, Adrian Bunk wrote:
> On Thu, Feb 05, 2004 at 09:58:18AM -0800, John Cherry wrote:
> >...
> > The nit warnings that sprung up in the defconfig builds are...
> >...
> > drivers/usb/input/hid-input.c: In function `hidinput_hid_event':
> > drivers/usb/input/hid-input.c:436: warning: suggest parentheses around
> > && within ||
> >...
>
> This one's easy to fix:
>
> --- linux-2.6.2-mm1/drivers/usb/input/hid-input.c.old 2004-02-06 00:05:19.000000000 +0100
> +++ linux-2.6.2-mm1/drivers/usb/input/hid-input.c 2004-02-06 00:05:50.000000000 +0100
> @@ -433,7 +433,7 @@
> input_regs(input, regs);
>
> if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA) && (usage->code == BTN_EXTRA))
> - || (hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK)) {
> + || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK))) {
> if (value)
> hid->quirks |= HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
> else
>
>
> Please apply
Ah hell, yes, please do apply.
*looks around for a brown paper bag*
--
1024D/E65A7801 Zephaniah E. Hull <warp@babylon.d2dc.net>
92ED 94E4 B1E6 3624 226D 5727 4453 008B E65A 7801
CCs of replies from mailing lists are requested.
On Sat, 13 Jul 2002, Alexander Viro wrote:
>
> So I'd just do
>
> vi fs/dcache.c -c '/|= DCACHE_R/d|/nr_un/pu|<|x'
>
> and be done with that. Linus?
Done.
For future reference - don't anybody else try to send patches as vi
scripts, please. Yes, it's manly, but let's face it, so is bungee-jumping
with the cord tied to your testicles.
Linus
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (6 preceding siblings ...)
2004-02-05 17:58 ` John Cherry
@ 2004-02-05 19:23 ` Deepak Saxena
2004-02-05 20:05 ` Greg KH
2004-02-05 23:31 ` 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails Daniel McNeil
2004-02-06 18:02 ` 2.6.2-mm1 aka "Geriatric Wombat" Thomas Davis
9 siblings, 1 reply; 30+ messages in thread
From: Deepak Saxena @ 2004-02-05 19:23 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm, greg
On Feb 05 2004, at 01:44, Andrew Morton was caught saying:
>
> +dmapool-needs-pci.patch
>
> The dmapool code doesn't build with CONFIG_PCI=n. But it should. Needs
> work.
Hmm..that defeats the purpose of making it generic. :(
I was able to build w/o PCI for an SA1100 platform, so I'm assuming
this is an x86 issue. I'll dig into it when I get some free time.
I only have x86 and arm toolchains, so can folks on other non-PCI
architectures remove the dmapool-needs-pci.patch and try building
w/o PCI.
~Deepak
--
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 19:23 ` 2.6.2-mm1 aka "Geriatric Wombat" Deepak Saxena
@ 2004-02-05 20:05 ` Greg KH
0 siblings, 0 replies; 30+ messages in thread
From: Greg KH @ 2004-02-05 20:05 UTC (permalink / raw)
To: Deepak Saxena, mingo; +Cc: Andrew Morton, linux-kernel, linux-mm
On Thu, Feb 05, 2004 at 12:23:28PM -0700, Deepak Saxena wrote:
> On Feb 05 2004, at 01:44, Andrew Morton was caught saying:
> >
> > +dmapool-needs-pci.patch
> >
> > The dmapool code doesn't build with CONFIG_PCI=n. But it should. Needs
> > work.
>
> Hmm..that defeats the purpose of making it generic. :(
I agree. I think the comment was that UML didn't build properly, but I
really don't see what the error would be.
Could the original submitter of this patch please send us the error
messages that this patch is supposed to fix?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (7 preceding siblings ...)
2004-02-05 19:23 ` 2.6.2-mm1 aka "Geriatric Wombat" Deepak Saxena
@ 2004-02-05 23:31 ` Daniel McNeil
2004-02-05 23:58 ` Badari Pulavarty
2004-02-06 0:07 ` Andrew Morton
2004-02-06 18:02 ` 2.6.2-mm1 aka "Geriatric Wombat" Thomas Davis
9 siblings, 2 replies; 30+ messages in thread
From: Daniel McNeil @ 2004-02-05 23:31 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-mm, linux-aio@kvack.org
Andrew,
I tested 2.6.2-mm1 on an 8-proc running 6 copies of the read_under
test and all 6 read_under tests saw uninitialized data in less than 5
minutes. :(
Daniel
On Thu, 2004-02-05 at 01:44, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2/2.6.2-mm1/
>
> O_DIRECT-ll_rw_block-vs-block_write_full_page-fix.patch
> Fix race between ll_rw_block() and block_write_full_page()
>
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails
2004-02-05 23:31 ` 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails Daniel McNeil
@ 2004-02-05 23:58 ` Badari Pulavarty
2004-02-06 22:37 ` Daniel McNeil
2004-02-06 0:07 ` Andrew Morton
1 sibling, 1 reply; 30+ messages in thread
From: Badari Pulavarty @ 2004-02-05 23:58 UTC (permalink / raw)
To: Daniel McNeil, Andrew Morton
Cc: Linux Kernel Mailing List, linux-mm, linux-aio@kvack.org
On Thursday 05 February 2004 03:31 pm, Daniel McNeil wrote:
> Andrew,
>
> I tested 2.6.2-mm1 on an 8-proc running 6 copies of the read_under
> test and all 6 read_under tests saw uninitialized data in less than 5
> minutes. :(
>
> Daniel
Daniel,
Same here... Just FYI, I am running with your original patch and
not failed so far (2 hours..) Normally, I see the problem in 15 min or so.
Thanks,
Badari
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails
2004-02-05 23:58 ` Badari Pulavarty
@ 2004-02-06 22:37 ` Daniel McNeil
0 siblings, 0 replies; 30+ messages in thread
From: Daniel McNeil @ 2004-02-06 22:37 UTC (permalink / raw)
To: Badari Pulavarty
Cc: Andrew Morton, Linux Kernel Mailing List, linux-mm,
linux-aio@kvack.org
I patched 2.6.2-mm1 with the wait_on_buffer(bh) in
__block_write_full_page() and my tests ran overnight and
though today without any errors.
I'm looking to see if there is any way to move the end_page_writeback()
for this locked bh case to the end_buffer_write_sync(). Kind of
tricky...
Daniel
On Thu, 2004-02-05 at 15:58, Badari Pulavarty wrote:
> On Thursday 05 February 2004 03:31 pm, Daniel McNeil wrote:
> > Andrew,
> >
> > I tested 2.6.2-mm1 on an 8-proc running 6 copies of the read_under
> > test and all 6 read_under tests saw uninitialized data in less than 5
> > minutes. :(
> >
> > Daniel
>
> Daniel,
>
> Same here... Just FYI, I am running with your original patch and
> not failed so far (2 hours..) Normally, I see the problem in 15 min or so.
>
> Thanks,
> Badari
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails
2004-02-05 23:31 ` 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails Daniel McNeil
2004-02-05 23:58 ` Badari Pulavarty
@ 2004-02-06 0:07 ` Andrew Morton
2004-02-06 0:32 ` Daniel McNeil
1 sibling, 1 reply; 30+ messages in thread
From: Andrew Morton @ 2004-02-06 0:07 UTC (permalink / raw)
To: Daniel McNeil; +Cc: linux-kernel, linux-mm, linux-aio
Daniel McNeil <daniel@osdl.org> wrote:
>
> Andrew,
>
> I tested 2.6.2-mm1 on an 8-proc running 6 copies of the read_under
> test and all 6 read_under tests saw uninitialized data in less than 5
> minutes. :(
The performance implications of synchronising behind kjournald writes for
normal non-blocking writeback are bad. Can you detail what you now think
is the failure mechanism?
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails
2004-02-06 0:07 ` Andrew Morton
@ 2004-02-06 0:32 ` Daniel McNeil
0 siblings, 0 replies; 30+ messages in thread
From: Daniel McNeil @ 2004-02-06 0:32 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Kernel Mailing List, linux-mm, linux-aio@kvack.org
On Thu, 2004-02-05 at 16:07, Andrew Morton wrote:
> Daniel McNeil <daniel@osdl.org> wrote:
> >
> > Andrew,
> >
> > I tested 2.6.2-mm1 on an 8-proc running 6 copies of the read_under
> > test and all 6 read_under tests saw uninitialized data in less than 5
> > minutes. :(
>
> The performance implications of synchronising behind kjournald writes for
> normal non-blocking writeback are bad. Can you detail what you now think
> is the failure mechanism?
>
I think the problem is that any block_write_full_page(WB_SYNC_NONE)
that hits a page that has a buffer in process of being written will
get PageWriteback cleared even though the i/o has not completed.
(The buffer will be locked, but buffer_dirty() is cleared, so
__block_write_full_page() will SetPageWriteback(); unlock_page();
see no buffer were submitted and call end_page_writeback())
Any subsequent filemap_write_and_wait() or filemap_fdatawrite() /
filemap_fdatawait will never wait for that i/o. So this could
potentially be a problem for more than just DIO.
BTW: 2.4 __block_write_full_page() always did a lock_buffer(), so
it waits for i/o in flight.
I agree though, it would be best if non-sync __block_write_full_page()
would not block on buffers in flight. Somehow we need to move the
clearing of PageWriteback() until after the buffer has been written
even for the case where ll_rw_block() is called.
Thoughts?
Daniel
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: 2.6.2-mm1 aka "Geriatric Wombat"
2004-02-05 9:44 2.6.2-mm1 aka "Geriatric Wombat" Andrew Morton
` (8 preceding siblings ...)
2004-02-05 23:31 ` 2.6.2-mm1 aka "Geriatric Wombat" DIO read race still fails Daniel McNeil
@ 2004-02-06 18:02 ` Thomas Davis
9 siblings, 0 replies; 30+ messages in thread
From: Thomas Davis @ 2004-02-06 18:02 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-mm
I'm getting these:
irq 9: nobody cared!
Call Trace:
[<c010c9e3>] __report_bad_irq+0x23/0x90
[<c010cac8>] note_interrupt+0x58/0x90
[<c010ce0b>] do_IRQ+0x16b/0x1a0
[<c02cb138>] common_interrupt+0x18/0x20
[<c026b30c>] sock_poll+0xc/0x20
[<c0173a91>] do_pollfd+0x91/0xa0
[<c0173aff>] do_poll+0x5f/0xc0
[<c0173cf4>] sys_poll+0x194/0x2b0
[<c0173080>] __pollwait+0x0/0xb0
[<c015fc9a>] sys_write+0x4a/0x50
[<c02ca1ba>] sysenter_past_esp+0x43/0x69
handlers:
[<c01cf136>] (acpi_irq+0x0/0x1a)
Disabling IRQ #9
[tdavis@lanshark tdavis]$ uname -a
Linux lanshark 2.6.2-mm1 #1 SMP Thu Feb 5 15:50:03 PST 2004 i686 athlon i386 GNU/Linux
[tdavis@lanshark tdavis]$ more /proc/interrupts
CPU0 CPU1
0: 27932291 27954246 IO-APIC-edge timer
1: 638 497 IO-APIC-edge i8042
2: 0 0 XT-PIC cascade
8: 0 1 IO-APIC-edge rtc
9: 53744 46258 IO-APIC-edge acpi
12: 7867 7708 IO-APIC-edge i8042
14: 60366 50315 IO-APIC-edge ide0
15: 9026 7688 IO-APIC-edge ide1
18: 160500 1 IO-APIC-level eth0
19: 839 790 IO-APIC-level ICE1712
NMI: 0 0
LOC: 55890040 55890045
ERR: 0
MIS: 0
^ permalink raw reply [flat|nested] 30+ messages in thread