s390: network patches for net-next
Subsystems (6)
cover s390: network patches for net-next
Hi Dave,
here are some s390 network patches for net-next.
We finally made it and converted the qeth layer 2 and layer 3 driver to NAPI (thanks to Jan Glauber who did the QDIO part).
shortlog:
Jan Glauber (1)
qdio: extend API to allow polling
Joe Perches (1)
qeth: Use %pI6
Mike Frysinger (1)Kconfig: have CCWGROUP depend on CLAW
Frank Blaschka (1)
qeth: NAPI support for l2 and l3 discipline
Thanks,
Frank
PATCH 1/4 qdio: extend API to allow polling
From: Jan Glauber <[email protected]>
Extend the qdio API to allow polling in the upper-layer driver. This is needed by qeth to use NAPI.
To use the new interface the upper-layer driver must specify the queue_start_poll(). This callback is used to signal the upper-layer driver that is has initiative and must process the inbound queue by calling qdio_get_next_buffers(). If the upper-layer driver wants to stop polling it calls qdio_start_irq().
Since adapter interrupts are not completely stoppable qdio implements a software bit QDIO_QUEUE_IRQS_DISABLED to safely disable interrupts for an input queue.
The old interface is preserved and will be used as is by zfcp.
---
arch/s390/include/asm/qdio.h | 13 ++- drivers/s390/cio/qdio.h | 29 ++++++++ drivers/s390/cio/qdio_debug.c | 33 +++------ drivers/s390/cio/qdio_main.c | 138 +++++++++++++++++++++++++++++++++++++++- drivers/s390/cio/qdio_setup.c | 1 drivers/s390/cio/qdio_thinint.c | 66 +++++++++++-------- drivers/s390/scsi/zfcp_qdio.c | 6 - 7 files changed, 225 insertions(+), 61 deletions(-)
arch/s390/include/asm/qdio.h +8 -5
@@ -360,6 +360,7 @@ struct qdio_initialize {unsigned int no_output_qs;qdio_handler_t *input_handler;qdio_handler_t *output_handler; +void (*queue_start_poll) (struct ccw_device *,int ,unsigned long );unsigned long int_parm;void **input_sbal_addr_array;void **output_sbal_addr_array;
@@ -377,11 +378,13 @@ struct qdio_initialize {extern int qdio_allocate (struct qdio_initialize *);extern int qdio_establish (struct qdio_initialize *);extern int qdio_activate (struct ccw_device *); - -extern int do_QDIO (struct ccw_device *cdev,unsigned int callflags, -int q_nr,unsigned int bufnr,unsigned int count); -extern int qdio_shutdown (struct ccw_device *,int ); +extern int do_QDIO (struct ccw_device *,unsigned int ,int ,unsigned int , +unsigned int ); +extern int qdio_start_irq (struct ccw_device *,int ); +extern int qdio_stop_irq (struct ccw_device *,int ); +extern int qdio_get_next_buffers (struct ccw_device *,int ,int *,int *); +extern int qdio_shutdown (struct ccw_device *,int );extern int qdio_free (struct ccw_device *); -extern int qdio_get_ssqd_desc (struct ccw_device *dev,struct qdio_ssqd_desc *); +extern int qdio_get_ssqd_desc (struct ccw_device *,struct qdio_ssqd_desc *);#endif /* __QDIO_H__ */
drivers/s390/cio/qdio_debug.c +12 -21
@@ -56,9 +56,16 @@ static int qstat_show(struct seq_file *mseq_printf (m,"DSCI: %d nr_used: %d\n" , *(u32 *)q->irq_ptr->dsci,atomic_read (&q->nr_buf_used)); -seq_printf (m,"ftc: %d last_move: %d\n" , q->first_to_check, q->last_move); -seq_printf (m,"polling: %d ack start: %d ack count: %d\n" , - q->u.in.polling, q->u.in.ack_start, q->u.in.ack_count); +seq_printf (m,"ftc: %d last_move: %d\n" , + q->first_to_check, q->last_move); +if (q->is_input_q) { +seq_printf (m,"polling: %d ack start: %d ack count: %d\n" , + q->u.in.polling, q->u.in.ack_start, + q->u.in.ack_count); +seq_printf (m,"IRQs disabled: %u\n" , +test_bit (QDIO_QUEUE_IRQS_DISABLED , + &q->u.in.queue_irq_state)); + }seq_printf (m,"SBAL states:\n" );seq_printf (m,"|0 |8 |16 |24 |32 |40 |48 |56 63|\n" );
@@ -113,22 +120,6 @@ static int qstat_show(struct seq_file *mreturn 0 ; } -static ssize_t qstat_seq_write (struct file *file,const char __user *buf, -size_t count,loff_t *off) -{ -struct seq_file *seq = file->private_data; -struct qdio_q *q = seq->private; - -if (!q) -return 0 ; -if (q->is_input_q) -xchg (q->irq_ptr->dsci,1 ); -local_bh_disable (); -tasklet_schedule (&q->tasklet); -local_bh_enable (); -return count; -} -static int qstat_seq_open (struct inode *inode,struct file *filp) { return single_open(filp, qstat_show,
@@ -139,7 +130,6 @@ static const struct file_operations debu .owner = THIS_MODULE, .open = qstat_seq_open, .read = seq_read, - .write = qstat_seq_write, .llseek = seq_lseek, .release = single_release, };
@@ -166,7 +156,8 @@ static char *qperf_names[] = {"QEBSM eqbs" ,"QEBSM eqbs partial" ,"QEBSM sqbs" , - "QEBSM sqbs partial" +"QEBSM sqbs partial" , + "Discarded interrupts" };static int qperf_show (struct seq_file *m,void *v)
drivers/s390/cio/qdio.h +29 -0
@@ -208,6 +208,7 @@ struct qdio_dev_perf_stat {unsigned int eqbs_partial;unsigned int sqbs;unsigned int sqbs_partial; +unsigned int int_discarded; }____cacheline_aligned ;struct qdio_queue_perf_stat {
@@ -222,6 +223,10 @@ struct qdio_queue_perf_stat {unsigned int nr_sbal_total; }; +enum qdio_queue_irq_states { +QDIO_QUEUE_IRQS_DISABLED , +}; +struct qdio_input_q {/* input buffer acknowledgement flag */ int polling;
@@ -231,6 +236,10 @@ struct qdio_input_q {int ack_count;/* last time of noticing incoming data */ u64 timestamp; +/* upper-layer polling flag */ +unsigned long queue_irq_state; +/* callback to start upper-layer polling */ +void (*queue_start_poll) (struct ccw_device *,int ,unsigned long ); };struct qdio_output_q {
@@ -399,6 +408,26 @@ static inline int multicast_outbound(str#define sub_buf (bufnr, dec) \ ((bufnr - dec) & QDIO_MAX_BUFFERS_MASK) +#define queue_irqs_enabled (q) \ + (test_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state) == 0) +#define queue_irqs_disabled (q) \ + (test_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state) != 0) + +#define TIQDIO_SHARED_IND 63 + +/* device state change indicators */ +struct indicator_t { +u32 ind;/* u32 because of compare-and-swap performance */ +atomic_t count;/* use count, 0 or 1 for non-shared indicators */ +}; + +extern struct indicator_t *q_indicators; + +static inline int shared_ind (struct qdio_irq *irq_ptr) +{ +return irq_ptr->dsci == &q_indicators[TIQDIO_SHARED_IND ].ind; +} +/* prototypes for thin interrupt */ void qdio_setup_thinint (struct qdio_irq *irq_ptr);int qdio_establish_thinint (struct qdio_irq *irq_ptr);
drivers/s390/cio/qdio_main.c +136 -2
150 lines not on this page · raw message
drivers/s390/cio/qdio_setup.c +1 -0
@@ -161,6 +161,7 @@ static void setup_queues(struct qdio_irqsetup_queues_misc (q, irq_ptr, qdio_init->input_handler, i); q->is_input_q =1 ; + q->u.in.queue_start_poll = qdio_init->queue_start_poll;setup_storage_lists (q, irq_ptr, input_sbal_array, i); input_sbal_array +=QDIO_MAX_BUFFERS_PER_Q ;
drivers/s390/cio/qdio_thinint.c +38 -28
121 lines not on this page · raw message
drivers/s390/scsi/zfcp_qdio.c +1 -5
@@ -277,16 +277,12 @@ int zfcp_qdio_send(struct zfcp_qdio *qdistatic void zfcp_qdio_setup_init_data (struct qdio_initialize *id,struct zfcp_qdio *qdio) { - +memset (id,0 ,sizeof (*id)); id->cdev = qdio->adapter->ccw_device; id->q_format =QDIO_ZFCP_QFMT ;memcpy (id->adapter_name,dev_name (&id->cdev->dev),8 );ASCEBC (id->adapter_name,8 ); id->qib_rflags =QIB_RFLAGS_ENABLE_DATA_DIV ; - id->qib_param_field_format =0 ; - id->qib_param_field =NULL ; - id->input_slib_elements =NULL ; - id->output_slib_elements =NULL ; id->no_input_qs =1 ; id->no_output_qs =1 ; id->input_handler = zfcp_qdio_int_resp;
PATCH 2/4 qeth: Use %pI6
In reply to [email protected]From: Joe Perches <[email protected]>
Format an ipv6 address using vsprintf extensions.
---
drivers/s390/net/qeth_l3_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/s390/net/qeth_l3_main.c +1 -6
@@ -103,12 +103,7 @@ int qeth_l3_string_to_ipaddr4(const charvoid qeth_l3_ipaddr6_to_string (const __u8 *addr,char *buf) { -sprintf (buf,"%02x%02x:%02x%02x:%02x%02x:%02x%02x" -":%02x%02x:%02x%02x:%02x%02x:%02x%02x" , - addr[0 ], addr[1 ], addr[2 ], addr[3 ], - addr[4 ], addr[5 ], addr[6 ], addr[7 ], - addr[8 ], addr[9 ], addr[10 ], addr[11 ], - addr[12 ], addr[13 ], addr[14 ], addr[15 ]); +sprintf (buf,"%pI6" , addr); }int qeth_l3_string_to_ipaddr6 (const char *buf,__u8 *addr)
PATCH 3/4 Kconfig: have CCWGROUP depend on CLAW
In reply to [email protected]From: Mike Frysinger <[email protected]>
Since the claw code calls ccwgroup_remove_ccwdev(), we need to make sure CCWGROUP is enabled when CLAW is enabled. Otherwise we hit fun undefined references at build time:
ERROR: "ccwgroup_remove_ccwdev" [drivers/s390/net/claw.ko] undefined!
ERROR: "ccwgroup_probe_ccwdev" [drivers/s390/net/claw.ko] undefined!
ERROR: "ccwgroup_driver_register" [drivers/s390/net/claw.ko] undefined!
ERROR: "ccwgroup_driver_unregister" [drivers/s390/net/claw.ko] undefined!
ERROR: "ccwgroup_create_from_string" [drivers/s390/net/claw.ko] undefined!
---
drivers/s390/net/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/Kconfig +1 -1
@@ -100,6 +100,6 @@ config QETH_IPV6 config CCWGROUP tristate - default (LCS || CTCM || QETH) + default (LCS || CTCM || QETH || CLAW) endmenu
PATCH 4/4 qeth: NAPI support for l2 and l3 discipline
In reply to [email protected]From: Frank Blaschka <[email protected]>
This patch adds NAPI support to the qeth layer 2 and layer 3 discipline. It is important to understand that we can not enable/disable IRQs as usual, we have to use the corresponding new QDIO interface. Also to not overdraw the budget we have to stop and restart buffer processing at any point during processing a bulk of QDIO buffers. Having the driver NAPI enabled it is possible to turn on GRO for the layer 3 discipline.
---
drivers/s390/net/qeth_core.h | 17 +++ drivers/s390/net/qeth_core_main.c | 26 +++++ drivers/s390/net/qeth_l2_main.c | 173 ++++++++++++++++++++++-------------- drivers/s390/net/qeth_l3_main.c | 182 +++++++++++++++++++++++--------------- 4 files changed, 260 insertions(+), 138 deletions(-)
drivers/s390/net/qeth_core.h +17 -0
@@ -676,6 +676,7 @@ enum qeth_discipline_id { };struct qeth_discipline { +void (*start_poll)(struct ccw_device *,int ,unsigned long );qdio_handler_t *input_handler;qdio_handler_t *output_handler;int (*recover)(void *ptr);
@@ -702,6 +703,16 @@ struct qeth_skb_data {#define QETH_SKB_MAGIC 0x71657468#define QETH_SIGA_CC2_RETRIES 3 +struct qeth_rx { +int b_count; +int b_index; +struct qdio_buffer_element *b_element; +int e_offset; +int qdio_err; +}; + +#define QETH_NAPI_WEIGHT 128 +struct qeth_card {struct list_head list;enum qeth_card_states state;
@@ -749,6 +760,8 @@ struct qeth_card {debug_info_t *debug;struct mutex conf_mutex;struct mutex discipline_mutex; +struct napi_struct napi; +struct qeth_rx rx; };struct qeth_card_list_struct {
@@ -831,6 +844,10 @@ struct sk_buff *qeth_core_get_next_skb(s struct qdio_buffer *, struct qdio_buffer_element **, int *, struct qeth_hdr **);void qeth_schedule_recovery (struct qeth_card *); +void qeth_qdio_start_poll (struct ccw_device *,int ,unsigned long ); +void qeth_qdio_input_handler (struct ccw_device *, +unsigned int ,unsigned int ,int , +int ,unsigned long );void qeth_qdio_output_handler (struct ccw_device *,unsigned int ,int ,int ,int ,unsigned long );void qeth_clear_ipacmd_list (struct qeth_card *);
drivers/s390/net/qeth_core_main.c +24 -2
@@ -2911,6 +2911,27 @@ static void qeth_check_outbound_queue(st } } +void qeth_qdio_start_poll (struct ccw_device *ccwdev,int queue, +unsigned long card_ptr) +{ +struct qeth_card *card = (struct qeth_card *)card_ptr; + +if (card->dev) +napi_schedule (&card->napi); +} +EXPORT_SYMBOL_GPL (qeth_qdio_start_poll); + +void qeth_qdio_input_handler (struct ccw_device *ccwdev,unsigned int qdio_err, +unsigned int queue,int first_element,int count, +unsigned long card_ptr) +{ +struct qeth_card *card = (struct qeth_card *)card_ptr; + +if (qdio_err) +qeth_schedule_recovery (card); +} +EXPORT_SYMBOL_GPL (qeth_qdio_input_handler); +void qeth_qdio_output_handler (struct ccw_device *ccwdev,unsigned int qdio_error,int __queue,int first_element,int count,unsigned long card_ptr)
@@ -3843,6 +3864,7 @@ static int qeth_qdio_establish(struct qe init_data.no_output_qs = card->qdio.no_out_queues; init_data.input_handler = card->discipline.input_handler; init_data.output_handler = card->discipline.output_handler; + init_data.queue_start_poll = card->discipline.start_poll; init_data.int_parm = (unsigned long ) card; init_data.input_sbal_addr_array = (void **) in_sbal_ptrs; init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;
@@ -4513,8 +4535,8 @@ static struct { /* 20 */{"queue 1 buffer usage"}, {"queue 2 buffer usage"}, {"queue 3 buffer usage"}, - {"rx handler time"}, - {"rx handler count"}, + {"rx poll time"}, + {"rx poll count"}, {"rx do_QDIO time"}, {"rx do_QDIO count"}, {"tx handler time"},
drivers/s390/net/qeth_l2_main.c +108 -65
255 lines not on this page · raw message
drivers/s390/net/qeth_l3_main.c +111 -71
271 lines not on this page · raw message
David Miller
maintainerFrom: [email protected]
Date: Wed, 08 Sep 2010 09:14:38 +0200
Quoted 3 lines
here are some s390 network patches for net-next.
We finally made it and converted the qeth layer 2 and layer 3 driver to NAPI (thanks to Jan Glauber who did the QDIO part).
Nice work, all applied to net-next-2.6, thanks!