Commit a18c28f0 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: move qdio's QAOB cache into qeth 



qdio.ko no longer needs to care about how the QAOBs are allocated,
from its perspective they are merely another parameter to do_QDIO().

So for a start, shift the cache into the only qdio driver that uses
QAOBs (ie. qeth). Here there's further opportunity to optimize its
usage in the future - eg. make it per-{device, TX queue}, or only
compile it when the driver is built with CQ/QAOB support.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2decb0b7

arch/s390/include/asm/qdio.h

+0 −2
Original line number Diff line number Diff line
@@ -349,8 +349,6 @@ extern int qdio_allocate(struct ccw_device *cdev, unsigned int no_input_qs, 
extern int qdio_establish(struct ccw_device *cdev,

			  struct qdio_initialize *init_data);

extern int qdio_activate(struct ccw_device *);

extern struct qaob *qdio_allocate_aob(void);

extern void qdio_release_aob(struct qaob *);

extern int do_QDIO(struct ccw_device *cdev, unsigned int callflags, int q_nr,

		   unsigned int bufnr, unsigned int count, struct qaob *aob);

extern int qdio_start_irq(struct ccw_device *cdev);

drivers/s390/cio/qdio_setup.c

+2 −32
Original line number Diff line number Diff line
@@ -24,19 +24,6 @@ 
#define QBUFF_PER_PAGE (PAGE_SIZE / sizeof(struct qdio_buffer))



static struct kmem_cache *qdio_q_cache;

static struct kmem_cache *qdio_aob_cache;



struct qaob *qdio_allocate_aob(void)

{

	return kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);

}

EXPORT_SYMBOL_GPL(qdio_allocate_aob);



void qdio_release_aob(struct qaob *aob)

{

	kmem_cache_free(qdio_aob_cache, aob);

}

EXPORT_SYMBOL_GPL(qdio_release_aob);



/**

 * qdio_free_buffers() - free qdio buffers
@@ -447,39 +434,22 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr) 


int __init qdio_setup_init(void)

{

	int rc;



	qdio_q_cache = kmem_cache_create("qdio_q", sizeof(struct qdio_q),

					 256, 0, NULL);

	if (!qdio_q_cache)

		return -ENOMEM;



	qdio_aob_cache = kmem_cache_create("qdio_aob",

					sizeof(struct qaob),

					sizeof(struct qaob),

					0,

					NULL);

	if (!qdio_aob_cache) {

		rc = -ENOMEM;

		goto free_qdio_q_cache;

	}



	/* Check for OSA/FCP thin interrupts (bit 67). */

	DBF_EVENT("thinint:%1d",

		  (css_general_characteristics.aif_osa) ? 1 : 0);



	/* Check for QEBSM support in general (bit 58). */

	DBF_EVENT("cssQEBSM:%1d", css_general_characteristics.qebsm);

	rc = 0;

out:

	return rc;

free_qdio_q_cache:

	kmem_cache_destroy(qdio_q_cache);

	goto out;



	return 0;

}



void qdio_setup_exit(void)

{

	kmem_cache_destroy(qdio_aob_cache);

	kmem_cache_destroy(qdio_q_cache);

}

drivers/s390/net/qeth_core_main.c

+17 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ EXPORT_SYMBOL_GPL(qeth_dbf); 


static struct kmem_cache *qeth_core_header_cache;

static struct kmem_cache *qeth_qdio_outbuf_cache;

static struct kmem_cache *qeth_qaob_cache;



static struct device *qeth_core_root_dev;

static struct dentry *qeth_debugfs_root;
@@ -1338,7 +1339,7 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue, 
static void qeth_free_out_buf(struct qeth_qdio_out_buffer *buf)

{

	if (buf->aob)

		qdio_release_aob(buf->aob);

		kmem_cache_free(qeth_qaob_cache, buf->aob);

	kmem_cache_free(qeth_qdio_outbuf_cache, buf);

}
@@ -3554,7 +3555,8 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index, 
		    !qeth_iqd_is_mcast_queue(card, queue) &&

		    count == 1) {

			if (!buf->aob)

				buf->aob = qdio_allocate_aob();

				buf->aob = kmem_cache_zalloc(qeth_qaob_cache,

							     GFP_ATOMIC);

			if (buf->aob) {

				struct qeth_qaob_priv1 *priv;
@@ -7174,6 +7176,16 @@ static int __init qeth_core_init(void) 
		rc = -ENOMEM;

		goto cqslab_err;

	}



	qeth_qaob_cache = kmem_cache_create("qeth_qaob",

					    sizeof(struct qaob),

					    sizeof(struct qaob),

					    0, NULL);

	if (!qeth_qaob_cache) {

		rc = -ENOMEM;

		goto qaob_err;

	}



	rc = ccw_driver_register(&qeth_ccw_driver);

	if (rc)

		goto ccw_err;
@@ -7186,6 +7198,8 @@ static int __init qeth_core_init(void) 
ccwgroup_err:

	ccw_driver_unregister(&qeth_ccw_driver);

ccw_err:

	kmem_cache_destroy(qeth_qaob_cache);

qaob_err:

	kmem_cache_destroy(qeth_qdio_outbuf_cache);

cqslab_err:

	kmem_cache_destroy(qeth_core_header_cache);
@@ -7204,6 +7218,7 @@ static void __exit qeth_core_exit(void) 
	qeth_clear_dbf_list();

	ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);

	ccw_driver_unregister(&qeth_ccw_driver);

	kmem_cache_destroy(qeth_qaob_cache);

	kmem_cache_destroy(qeth_qdio_outbuf_cache);

	kmem_cache_destroy(qeth_core_header_cache);

	root_device_unregister(qeth_core_root_dev);