From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22E3AC43218 for ; Thu, 25 Apr 2019 17:18:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A67CC20717 for ; Thu, 25 Apr 2019 17:18:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbfDYRSm (ORCPT ); Thu, 25 Apr 2019 13:18:42 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:55700 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726514AbfDYRSl (ORCPT ); Thu, 25 Apr 2019 13:18:41 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x3PHCt69079449 for ; Thu, 25 Apr 2019 13:18:40 -0400 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0a-001b2d01.pphosted.com with ESMTP id 2s3eyseef2-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Apr 2019 13:18:40 -0400 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 25 Apr 2019 18:18:39 +0100 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e13.ny.us.ibm.com (146.89.104.200) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 25 Apr 2019 18:18:36 +0100 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x3PHIZa415204486 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Apr 2019 17:18:35 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 76F8B2805E; Thu, 25 Apr 2019 17:18:35 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F2D2128065; Thu, 25 Apr 2019 17:18:34 +0000 (GMT) Received: from oc7186267434.ibm.com (unknown [9.85.199.73]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 25 Apr 2019 17:18:34 +0000 (GMT) Subject: Re: [PATCH net-next] ibmvnic: Add device identification to requested IRQs To: Murilo Fossa Vicentini , netdev@vger.kernel.org Cc: maurosr@linux.vnet.ibm.com References: <20190425140233.99658-1-muvic@linux.ibm.com> From: Thomas Falcon Date: Thu, 25 Apr 2019 12:18:34 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190425140233.99658-1-muvic@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 x-cbid: 19042517-0064-0000-0000-000003D204FF X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010994; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000285; SDB=6.01194261; UDB=6.00626126; IPR=6.00975089; MB=3.00026594; MTD=3.00000008; XFM=3.00000015; UTC=2019-04-25 17:18:38 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19042517-0065-0000-0000-00003D3597FF Message-Id: <7b33fdf5-ef53-06ca-c311-2fec927ebea6@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-04-25_14:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904250105 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 4/25/19 9:02 AM, Murilo Fossa Vicentini wrote: > The ibmvnic driver currently uses the same fixed name when using > request_irq, this makes it hard to parse when multiple VNIC devices are > available at the same time. This patch adds the unit_address as the device > identification along with an id for each queue. > > The original idea was to use the interface name as an identifier, but it > is not feasible given these requests happen at adapter probe, and at this > point netdev is not yet registered so it doesn't have the proper name > assigned to it. > > Signed-off-by: Murilo Fossa Vicentini > --- Reviewed-by: Thomas Falcon Thanks, Murilo! > drivers/net/ethernet/ibm/ibmvnic.c | 13 +++++++++---- > drivers/net/ethernet/ibm/ibmvnic.h | 2 ++ > 2 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c > index 5e3cdb0b46d5..b398d6c94dbd 100644 > --- a/drivers/net/ethernet/ibm/ibmvnic.c > +++ b/drivers/net/ethernet/ibm/ibmvnic.c > @@ -2919,8 +2919,10 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter) > goto req_tx_irq_failed; > } > > + snprintf(scrq->name, sizeof(scrq->name), "ibmvnic-%x-tx%d", > + adapter->vdev->unit_address, i); > rc = request_irq(scrq->irq, ibmvnic_interrupt_tx, > - 0, "ibmvnic_tx", scrq); > + 0, scrq->name, scrq); > > if (rc) { > dev_err(dev, "Couldn't register tx irq 0x%x. rc=%d\n", > @@ -2940,8 +2942,10 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter) > dev_err(dev, "Error mapping irq\n"); > goto req_rx_irq_failed; > } > + snprintf(scrq->name, sizeof(scrq->name), "ibmvnic-%x-rx%d", > + adapter->vdev->unit_address, i); > rc = request_irq(scrq->irq, ibmvnic_interrupt_rx, > - 0, "ibmvnic_rx", scrq); > + 0, scrq->name, scrq); > if (rc) { > dev_err(dev, "Couldn't register rx irq 0x%x. rc=%d\n", > scrq->irq, rc); > @@ -4667,8 +4671,9 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter) > (unsigned long)adapter); > > netdev_dbg(adapter->netdev, "registering irq 0x%x\n", vdev->irq); > - rc = request_irq(vdev->irq, ibmvnic_interrupt, 0, IBMVNIC_NAME, > - adapter); > + snprintf(crq->name, sizeof(crq->name), "ibmvnic-%x", > + adapter->vdev->unit_address); > + rc = request_irq(vdev->irq, ibmvnic_interrupt, 0, crq->name, adapter); > if (rc) { > dev_err(dev, "Couldn't register irq 0x%x. rc=%d\n", > vdev->irq, rc); > diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h > index d5260a206708..cffdac372a33 100644 > --- a/drivers/net/ethernet/ibm/ibmvnic.h > +++ b/drivers/net/ethernet/ibm/ibmvnic.h > @@ -855,6 +855,7 @@ struct ibmvnic_crq_queue { > dma_addr_t msg_token; > spinlock_t lock; > bool active; > + char name[32]; > }; > > union sub_crq { > @@ -881,6 +882,7 @@ struct ibmvnic_sub_crq_queue { > struct sk_buff *rx_skb_top; > struct ibmvnic_adapter *adapter; > atomic_t used; > + char name[32]; > }; > > struct ibmvnic_long_term_buff {