Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2A5EC4332F for ; Wed, 8 Dec 2021 11:25:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232438AbhLHL31 (ORCPT ); Wed, 8 Dec 2021 06:29:27 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:57784 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229716AbhLHL30 (ORCPT ); Wed, 8 Dec 2021 06:29:26 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1B8BHWRg022535; Wed, 8 Dec 2021 11:25:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=bp6Sg2MiBOSsxGHhbJ8B9AzoIfzbqK5iRNxdhJmIuuI=; b=bPHA26oSF67z1y6Xm3j1+WgIMrl5p3CaBnZMHUqpc+pq69DRIcyMYM1koMQxvZMHARWI hz7iQIeX6Z34nt5tlf+YaZANKN5VKKtLYcmlM8uB/nfXMHMqaBda+O0gLJPbgbDTrmaI MlWFPIEl0dm5tu7sosXNLNEJF1fbjSUvQ3OzXRf4bMUbOLx2uZHxmI6X8AePbznpfs9D xd3FQe/b3NBCOP+w7cv9VdPar04LI4Uy36qup4R2GY1CWD74SVlE3hlTRGqC4UirxBzE HElxd3AgDiNiu5IJGtUe4WoUjqURjSETPHdWkmfge9K1djO8TBk+QRv+KVCXUEoggr01 hA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ctuq184f4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Dec 2021 11:25:53 +0000 Received: from m0098414.ppops.net (m0098414.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 1B8BIXJs025553; Wed, 8 Dec 2021 11:25:53 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 3ctuq184er-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Dec 2021 11:25:53 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 1B8BDG7s008978; Wed, 8 Dec 2021 11:25:51 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma04ams.nl.ibm.com with ESMTP id 3cqyyaxw0w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Dec 2021 11:25:51 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 1B8BPllN27853172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 8 Dec 2021 11:25:47 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7313B11C058; Wed, 8 Dec 2021 11:25:47 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6A8AC11C054; Wed, 8 Dec 2021 11:25:46 +0000 (GMT) Received: from [9.171.54.177] (unknown [9.171.54.177]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 8 Dec 2021 11:25:46 +0000 (GMT) Message-ID: Date: Wed, 8 Dec 2021 12:25:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH 05/32] s390/airq: pass more TPI info to airq handlers Content-Language: en-US To: Matthew Rosato , linux-s390@vger.kernel.org Cc: alex.williamson@redhat.com, cohuck@redhat.com, schnelle@linux.ibm.com, farman@linux.ibm.com, pmorel@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, frankja@linux.ibm.com, david@redhat.com, imbrenda@linux.ibm.com, vneethv@linux.ibm.com, oberpar@linux.ibm.com, freude@linux.ibm.com, thuth@redhat.com, pasic@linux.ibm.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20211207205743.150299-1-mjrosato@linux.ibm.com> <20211207205743.150299-6-mjrosato@linux.ibm.com> From: Christian Borntraeger In-Reply-To: <20211207205743.150299-6-mjrosato@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: oe2gWRbSympb6qmb5OzNBbNG_qmRCAMu X-Proofpoint-ORIG-GUID: fMEKx99H8sr_nk_NRRNxtzbsvapnn76J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-08_04,2021-12-08_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 bulkscore=0 phishscore=0 mlxscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112080071 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 07.12.21 um 21:57 schrieb Matthew Rosato: > A subsequent patch will introduce an airq handler that requires additional > TPI information beyond directed vs floating, so pass the entire tpi_info > structure via the handler. Only pci actually uses this information today, > for the other airq handlers this is effectively a no-op. > > Reviewed-by: Eric Farman > Signed-off-by: Matthew Rosato Looks sane. Acked-by: Christian Borntraeger > --- > arch/s390/include/asm/airq.h | 3 ++- > arch/s390/kvm/interrupt.c | 4 +++- > arch/s390/pci/pci_irq.c | 9 +++++++-- > drivers/s390/cio/airq.c | 2 +- > drivers/s390/cio/qdio_thinint.c | 6 ++++-- > drivers/s390/crypto/ap_bus.c | 9 ++++++--- > drivers/s390/virtio/virtio_ccw.c | 4 +++- > 7 files changed, 26 insertions(+), 11 deletions(-) > > diff --git a/arch/s390/include/asm/airq.h b/arch/s390/include/asm/airq.h > index 01936fdfaddb..7918a7d09028 100644 > --- a/arch/s390/include/asm/airq.h > +++ b/arch/s390/include/asm/airq.h > @@ -12,10 +12,11 @@ > > #include > #include > +#include > > struct airq_struct { > struct hlist_node list; /* Handler queueing. */ > - void (*handler)(struct airq_struct *airq, bool floating); > + void (*handler)(struct airq_struct *airq, struct tpi_info *tpi_info); > u8 *lsi_ptr; /* Local-Summary-Indicator pointer */ > u8 lsi_mask; /* Local-Summary-Indicator mask */ > u8 isc; /* Interrupt-subclass */ > diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c > index c3bd993fdd0c..f9b872e358c6 100644 > --- a/arch/s390/kvm/interrupt.c > +++ b/arch/s390/kvm/interrupt.c > @@ -28,6 +28,7 @@ > #include > #include > #include > +#include > #include "kvm-s390.h" > #include "gaccess.h" > #include "trace-s390.h" > @@ -3261,7 +3262,8 @@ int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc) > } > EXPORT_SYMBOL_GPL(kvm_s390_gisc_unregister); > > -static void gib_alert_irq_handler(struct airq_struct *airq, bool floating) > +static void gib_alert_irq_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info) > { > inc_irq_stat(IRQIO_GAL); > process_gib_alert_list(); > diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c > index 954bb7a83124..880bcd73f11a 100644 > --- a/arch/s390/pci/pci_irq.c > +++ b/arch/s390/pci/pci_irq.c > @@ -11,6 +11,7 @@ > > #include > #include > +#include > > static enum {FLOATING, DIRECTED} irq_delivery; > > @@ -216,8 +217,11 @@ static void zpci_handle_fallback_irq(void) > } > } > > -static void zpci_directed_irq_handler(struct airq_struct *airq, bool floating) > +static void zpci_directed_irq_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info) > { > + bool floating = !tpi_info->directed_irq; > + > if (floating) { > inc_irq_stat(IRQIO_PCF); > zpci_handle_fallback_irq(); > @@ -227,7 +231,8 @@ static void zpci_directed_irq_handler(struct airq_struct *airq, bool floating) > } > } > > -static void zpci_floating_irq_handler(struct airq_struct *airq, bool floating) > +static void zpci_floating_irq_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info) > { > unsigned long si, ai; > struct airq_iv *aibv; > diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c > index e56535c99888..2f2226786319 100644 > --- a/drivers/s390/cio/airq.c > +++ b/drivers/s390/cio/airq.c > @@ -99,7 +99,7 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy) > rcu_read_lock(); > hlist_for_each_entry_rcu(airq, head, list) > if ((*airq->lsi_ptr & airq->lsi_mask) != 0) > - airq->handler(airq, !tpi_info->directed_irq); > + airq->handler(airq, tpi_info); > rcu_read_unlock(); > > return IRQ_HANDLED; > diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c > index 8e09bf3a2fcd..9b9335dd06db 100644 > --- a/drivers/s390/cio/qdio_thinint.c > +++ b/drivers/s390/cio/qdio_thinint.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > > #include "cio.h" > #include "ioasm.h" > @@ -93,9 +94,10 @@ static inline u32 clear_shared_ind(void) > /** > * tiqdio_thinint_handler - thin interrupt handler for qdio > * @airq: pointer to adapter interrupt descriptor > - * @floating: flag to recognize floating vs. directed interrupts (unused) > + * @tpi_info: interrupt information (e.g. floating vs directed -- unused) > */ > -static void tiqdio_thinint_handler(struct airq_struct *airq, bool floating) > +static void tiqdio_thinint_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info) > { > u64 irq_time = S390_lowcore.int_clock; > u32 si_used = clear_shared_ind(); > diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c > index 1986243f9cd3..df1a038442db 100644 > --- a/drivers/s390/crypto/ap_bus.c > +++ b/drivers/s390/crypto/ap_bus.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -129,7 +130,8 @@ static int ap_max_adapter_id = 63; > static struct bus_type ap_bus_type; > > /* Adapter interrupt definitions */ > -static void ap_interrupt_handler(struct airq_struct *airq, bool floating); > +static void ap_interrupt_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info); > > static bool ap_irq_flag; > > @@ -442,9 +444,10 @@ static enum hrtimer_restart ap_poll_timeout(struct hrtimer *unused) > /** > * ap_interrupt_handler() - Schedule ap_tasklet on interrupt > * @airq: pointer to adapter interrupt descriptor > - * @floating: ignored > + * @tpi_info: ignored > */ > -static void ap_interrupt_handler(struct airq_struct *airq, bool floating) > +static void ap_interrupt_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info) > { > inc_irq_stat(IRQIO_APB); > tasklet_schedule(&ap_tasklet); > diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c > index d35e7a3f7067..52c376d15978 100644 > --- a/drivers/s390/virtio/virtio_ccw.c > +++ b/drivers/s390/virtio/virtio_ccw.c > @@ -33,6 +33,7 @@ > #include > #include > #include > +#include > > /* > * virtio related functions > @@ -203,7 +204,8 @@ static void drop_airq_indicator(struct virtqueue *vq, struct airq_info *info) > write_unlock_irqrestore(&info->lock, flags); > } > > -static void virtio_airq_handler(struct airq_struct *airq, bool floating) > +static void virtio_airq_handler(struct airq_struct *airq, > + struct tpi_info *tpi_info) > { > struct airq_info *info = container_of(airq, struct airq_info, airq); > unsigned long ai; >