Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40ac6b20 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Linus Torvalds
Browse files

[PATCH] s390: fix slab debugging 



With CONFIG_SLAB_DEBUG=y networking over qeth doesn't work.  The problem is
that the qib structure embedded in the qeth_irq structure needs an alignment
of 256 but kmalloc only guarantees an alignment of 8.  When using SLAB
debugging the alignment of qeth_irq is not sufficient for the embedded qib
structure which causes all users of qdio (qeth and zfcp) to stop working.
Allocate qeth_irq structure with __get_free_page.  That wastes a small amount
of memory (~2500 bytes) per online adapter.

Signed-off-by: default avatarChristian Borntraeger <cborntra@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 39ccf95e

drivers/s390/cio/qdio.c

+3 −3
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ next: 


	}

	kfree(irq_ptr->qdr);

	kfree(irq_ptr);

	free_page((unsigned long) irq_ptr);

}



static void
@@ -2983,7 +2983,7 @@ qdio_allocate(struct qdio_initialize *init_data) 
	qdio_allocate_do_dbf(init_data);



	/* create irq */

	irq_ptr = kzalloc(sizeof(struct qdio_irq), GFP_KERNEL | GFP_DMA);

	irq_ptr = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);



	QDIO_DBF_TEXT0(0,setup,"irq_ptr:");

	QDIO_DBF_HEX0(0,setup,&irq_ptr,sizeof(void*));
@@ -2998,7 +2998,7 @@ qdio_allocate(struct qdio_initialize *init_data) 
	/* QDR must be in DMA area since CCW data address is only 32 bit */

	irq_ptr->qdr=kmalloc(sizeof(struct qdr), GFP_KERNEL | GFP_DMA);

  	if (!(irq_ptr->qdr)) {

   		kfree(irq_ptr);

   		free_page((unsigned long) irq_ptr);

    		QDIO_PRINT_ERR("kmalloc of irq_ptr->qdr failed!\n");

		return -ENOMEM;

       	}