Linux 2.4.32-pre2

Linux 2.4.32-pre2

[Marcelo Tosatti]

Hi,

Here goes another -pre, after a long period.

A couple of USB corrections, a socket hashing bugfix and ipvs race
condition, avoidance of rare inode cache SMP race. 

And a zlib security update (erratic changelog for that one, my fault), 
whose CAN number is: CAN-2005-1849

Summary of changes from v2.4.32-pre1 to v2.4.32-pre2
============================================

Alan Stern:
  file_storage and UHCI bugfixes

David S. Miller:
  [NETLINK]: Fix two socket hashing bugs.

Jakub Bogusz:
  [SPARC64]: fix sys32_utimes(somefile, NULL)

Larry Woodman:
  workaround inode cache (prune_icache/__refile_inode) SMP races

Marcelo Tosatti:
  Change VERSION to 2.4.32-pre2
  Merge with rsync://rsync.kernel.org/.../davem/net-2.4.git
  Revert [NETLINK]: Fix two socket hashing bugs.

Neil Horman:
  [IPVS]: Close race conditions on ip_vs_conn_tab list modification

Pete Zaitcev:
  usb: printer double up()

Tim Yamin:
  Merge with rsync://rsync.kernel.org/.../davem/sparc-2.4.git/
  The gzip description is as good as the ChangeLog says it is -: "Set n to

Re: Linux 2.4.32-pre2

[Grant Coady]

On Wed, 27 Jul 2005 05:05:12 -0300, Marcelo Tosatti <marcelo.tosatti@cyclades.com> wrote:
>
>Here goes another -pre, after a long period.

Breaks Toshiba laptop: hard lockup --> what is on screen is same as 
working dmesg up to point: "host/uhci.c: detected 2 port"

Same .config as for 2.4.31-hf3 or 2.4.32-pre1
http://scatter.mine.nu/test/linux-2.4/tosh/

Grant.

Re: Linux 2.4.32-pre2

[Marcelo Tosatti]

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

On Thu, Jul 28, 2005 at 07:02:30PM +1000, Grant Coady wrote:
> On Wed, 27 Jul 2005 05:05:12 -0300, Marcelo Tosatti <marcelo.tosatti@cyclades.com> wrote:
> >
> >Here goes another -pre, after a long period.
> 
> Breaks Toshiba laptop: hard lockup --> what is on screen is same as 
> working dmesg up to point: "host/uhci.c: detected 2 port"
> 
> Same .config as for 2.4.31-hf3 or 2.4.32-pre1
> http://scatter.mine.nu/test/linux-2.4/tosh/

Please try to revert the attached? 

[-- Attachment #2: 2.4.32-pre2-usbuhci.diff --]
[-- Type: text/plain, Size: 1290 bytes --]


    [PATCH] file_storage and UHCI bugfixes

    The patch below (as547) corrects two minor errors, one in the
    file_storage gadget driver (need to send a length-zero packet if a
    control response is short) and one in the alternate UHCI driver (need
    to set the QH bit in the frame list). Both of these are back-ports of
    things that have been in 2.6 for several releases.

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -1454,6 +1454,7 @@ static int fsg_setup(struct usb_gadget *
 	/* Respond with data/status or defer until later? */
 	if (rc >= 0 && rc != DELAYED_STATUS) {
 		fsg->ep0req->length = rc;
+		fsg->ep0req->zero = (rc < ctrl->wLength);
 		fsg->ep0req_name = (ctrl->bRequestType & USB_DIR_IN ?
 				"ep0-in" : "ep0-out");
 		rc = ep0_queue(fsg);
diff --git a/drivers/usb/host/uhci.c b/drivers/usb/host/uhci.c
--- a/drivers/usb/host/uhci.c
+++ b/drivers/usb/host/uhci.c
@@ -2924,7 +2924,7 @@ static int alloc_uhci(struct pci_dev *de
 		}
 
 		/* Only place we don't use the frame list routines */
-		uhci->fl->frame[i] =  uhci->skeltd[irq]->dma_handle;
+		uhci->fl->frame[i] = uhci->skeltd[irq]->dma_handle | UHCI_PTR_QH;
 	}
 
 	start_hc(uhci);

Re: Linux 2.4.32-pre2

[Grant Coady]

On Thu, 28 Jul 2005 07:22:25 -0300, Marcelo Tosatti <marcelo.tosatti@cyclades.com> wrote:
>> 
>> Breaks Toshiba laptop: hard lockup --> what is on screen is same as 
>> working dmesg up to point: "host/uhci.c: detected 2 port"
>> 
>> Same .config as for 2.4.31-hf3 or 2.4.32-pre1
>> http://scatter.mine.nu/test/linux-2.4/tosh/
>
>Please try to revert the attached? 

Yes, that fixed it :o) a USB mouse works.

dmesg:
...
host/uhci.c: detected 2 ports         <<== previous lockup after this
usb.c: kmalloc IF c12f36e0, numif 1
usb.c: new device strings: Mfr=0, Product=2, SerialNumber=1
usb.c: USB device number 1 default language ID 0x0
Product: USB UHCI-alt Root Hub
SerialNumber: ff80
...

And the other USB driver (usb-uhci) didn't lockup.

Thanks,
Grant.

Re: Linux 2.4.32-pre2

[Johannes Erdfelt]

On Thu, Jul 28, 2005, Marcelo Tosatti <marcelo.tosatti@cyclades.com> wrote:
> diff --git a/drivers/usb/host/uhci.c b/drivers/usb/host/uhci.c
> --- a/drivers/usb/host/uhci.c
> +++ b/drivers/usb/host/uhci.c
> @@ -2924,7 +2924,7 @@ static int alloc_uhci(struct pci_dev *de
>  		}
>  
>  		/* Only place we don't use the frame list routines */
> -		uhci->fl->frame[i] =  uhci->skeltd[irq]->dma_handle;
> +		uhci->fl->frame[i] = uhci->skeltd[irq]->dma_handle | UHCI_PTR_QH;
>  	}
>  
>  	start_hc(uhci);

Am I missing something here? We're certainly adding TDs to the schedule, so
why is this patch setting the QH bit?

JE