Received: by 10.223.164.202 with SMTP id h10csp632265wrb; Thu, 9 Nov 2017 00:28:25 -0800 (PST) X-Google-Smtp-Source: ABhQp+RlGMVcP884tKmFWb/2IUXjZ8x4m7JGQlunK+23kg8YO4t/7/girQj8JrwGCr/8gJ7tU0WS X-Received: by 10.84.238.136 with SMTP id v8mr3047836plk.116.1510216105521; Thu, 09 Nov 2017 00:28:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510216105; cv=none; d=google.com; s=arc-20160816; b=aotPTqnewQtewsLoFnnaz1Oostfhatb+liKxrj6tqmNEeTl0MW06D6873s5WavzJAB ajOdQi0YkxoDhbIWnlKFnK2hdKPKlOMpa4QpQA2Oph91LOenKNXZqqmIy/l4WB2ys+VK Q3jGB8D4nwnSBfFj22sAzd01it5FyGHtYVmI7d/ZSshdKPtPFGE22MnshgaImmq31CZ3 +vQwB10pDhR67bOGBkaWFBcu1Mv9UnphUg6qMUCtOcLaj/YfVHBiYUFvUvW4dhkQClbX C7O6ce+Jv3D9dKbcEWrjmlKnQ1gnVWwjYs6Odo0UjDaKXKcM/JrL+iynYT2pMXzADTva 6f6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:arc-authentication-results; bh=LTcChqaOXPLmCRzu+sjU8UiufqLugyN2yOSSnWBnPCo=; b=pWhwmJOd26KHkC/mLhJfQsclxQ30Lb1u3wniXlrA6I90wGnto0Ks24kiLGkAJOwBFP CJWXvdfGnFsdu3Pxs3m5cDelKG1FLSE+yU0/mGLQeLdr/QcnPhsafJmrqqjf6/zTneu6 WgoJ5Vl3fblLGWbbNu+w0exlvUZ4VRthORNrqG5Wy0/ptKDL/IQRNhR+Be2IJumiYwB5 mG2LPRigAlpc5One2YPy/+6wtJj5fVKg6F8jc3TIzLvGEhp5hIYX+ybrpdG7+4RC5krJ ND1MMN7lJle9wtOcjJQH1CUaiycS7+VI1alOfqK3btnuZPE/vvSxRxEMdhskMLuHAI7s CR7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si5889857pld.101.2017.11.09.00.28.13; Thu, 09 Nov 2017 00:28:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753420AbdKII1j (ORCPT + 82 others); Thu, 9 Nov 2017 03:27:39 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:44379 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdKII1h (ORCPT ); Thu, 9 Nov 2017 03:27:37 -0500 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id vA98RNqh032508 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Nov 2017 08:27:23 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id vA98RMfF015793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Nov 2017 08:27:22 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vA98RLAT024681; Thu, 9 Nov 2017 08:27:21 GMT Received: from yuvallap (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 09 Nov 2017 00:27:20 -0800 Date: Thu, 9 Nov 2017 10:27:14 +0200 From: Yuval Shaia To: Salil Mehta Cc: davem@davemloft.net, hch@lst.de, yisen.zhuang@huawei.com, lipeng321@huawei.com, mehta.salil.lnk@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linuxarm@huawei.com Subject: Re: [PATCH net] net: hns3: Updates MSI/MSI-X alloc/free APIs(depricated) to new APIs Message-ID: <20171109082713.GB4963@yuvallap> References: <20171108115606.8012-1-salil.mehta@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171108115606.8012-1-salil.mehta@huawei.com> User-Agent: Mutt/1.9.1 (2017-09-22) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 08, 2017 at 11:56:06AM +0000, Salil Mehta wrote: > This patch migrates the HNS3 driver code from use of depricated PCI > MSI/MSI-X interrupt vector allocation/free APIs to new common APIs. > > Signed-off-by: Salil Mehta > Suggested-by: Christoph Hellwig > --- > .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 108 +++++++-------------- > .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 15 ++- > 2 files changed, 42 insertions(+), 81 deletions(-) > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > index c1cdbfd..09fa068 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > @@ -885,14 +885,14 @@ static int hclge_query_pf_resource(struct hclge_dev *hdev) > hdev->pkt_buf_size = __le16_to_cpu(req->buf_size) << HCLGE_BUF_UNIT_S; > > if (hnae3_dev_roce_supported(hdev)) { > - hdev->num_roce_msix = > + hdev->num_roce_msi = > hnae_get_field(__le16_to_cpu(req->pf_intr_vector_number), > HCLGE_PF_VEC_NUM_M, HCLGE_PF_VEC_NUM_S); > > /* PF should have NIC vectors and Roce vectors, > * NIC vectors are queued before Roce vectors. > */ > - hdev->num_msi = hdev->num_roce_msix + HCLGE_ROCE_VECTOR_OFFSET; > + hdev->num_msi = hdev->num_roce_msi + HCLGE_ROCE_VECTOR_OFFSET; > } else { > hdev->num_msi = > hnae_get_field(__le16_to_cpu(req->pf_intr_vector_number), > @@ -1835,7 +1835,7 @@ static int hclge_init_roce_base_info(struct hclge_vport *vport) > struct hnae3_handle *roce = &vport->roce; > struct hnae3_handle *nic = &vport->nic; > > - roce->rinfo.num_vectors = vport->back->num_roce_msix; > + roce->rinfo.num_vectors = vport->back->num_roce_msi; > > if (vport->back->num_msi_left < vport->roce.rinfo.num_vectors || > vport->back->num_msi_left == 0) > @@ -1853,67 +1853,46 @@ static int hclge_init_roce_base_info(struct hclge_vport *vport) > return 0; > } > > -static int hclge_init_msix(struct hclge_dev *hdev) > +static int hclge_init_msi(struct hclge_dev *hdev) > { > struct pci_dev *pdev = hdev->pdev; > - int ret, i; > - > - hdev->msix_entries = devm_kcalloc(&pdev->dev, hdev->num_msi, > - sizeof(struct msix_entry), > - GFP_KERNEL); > - if (!hdev->msix_entries) > - return -ENOMEM; > - > - hdev->vector_status = devm_kcalloc(&pdev->dev, hdev->num_msi, > - sizeof(u16), GFP_KERNEL); > - if (!hdev->vector_status) > - return -ENOMEM; > + int vectors; > + int i; > > - for (i = 0; i < hdev->num_msi; i++) { > - hdev->msix_entries[i].entry = i; > - hdev->vector_status[i] = HCLGE_INVALID_VPORT; > + vectors = pci_alloc_irq_vectors(pdev, 1, hdev->num_msi, > + PCI_IRQ_MSI | PCI_IRQ_MSIX); > + if (vectors < 0) { > + dev_err(&pdev->dev, "failed to allocate MSI/MSI-X vectors %d\n", Suggesting: dev_err(&pdev->dev, "failed to allocate MSI/MSI-X %d vecrors, error=%d", hdev->num_msi, vectors); > + vectors); > + return vectors; > } > + if (vectors < hdev->num_msi) > + dev_warn(&hdev->pdev->dev, > + "could not alloc(=%d) all requested(=%d) MSI/MSI-X\n", Suggesting something like: "Requested %d, allocated %d" > + hdev->num_msi, vectors); > > - hdev->num_msi_left = hdev->num_msi; > - hdev->base_msi_vector = hdev->pdev->irq; > + hdev->num_msi = vectors; > + hdev->num_msi_left = vectors; > + hdev->base_msi_vector = pdev->irq; > hdev->roce_base_vector = hdev->base_msi_vector + > - HCLGE_ROCE_VECTOR_OFFSET; > - > - ret = pci_enable_msix_range(hdev->pdev, hdev->msix_entries, > - hdev->num_msi, hdev->num_msi); > - if (ret < 0) { > - dev_info(&hdev->pdev->dev, > - "MSI-X vector alloc failed: %d\n", ret); > - return ret; > - } > - > - return 0; > -} > - > -static int hclge_init_msi(struct hclge_dev *hdev) > -{ > - struct pci_dev *pdev = hdev->pdev; > - int vectors; > - int i; > + HCLGE_ROCE_VECTOR_OFFSET; Any reason for this ^^^^^^^^^^^^^^^^^^^^^^^^ > > hdev->vector_status = devm_kcalloc(&pdev->dev, hdev->num_msi, > sizeof(u16), GFP_KERNEL); > - if (!hdev->vector_status) > + if (!hdev->vector_status) { > + pci_free_irq_vectors(pdev); > return -ENOMEM; > + } > > for (i = 0; i < hdev->num_msi; i++) > hdev->vector_status[i] = HCLGE_INVALID_VPORT; > > - vectors = pci_alloc_irq_vectors(pdev, 1, hdev->num_msi, PCI_IRQ_MSI); > - if (vectors < 0) { > - dev_err(&pdev->dev, "MSI vectors enable failed %d\n", vectors); > - return -EINVAL; > + hdev->vector_irq = devm_kcalloc(&pdev->dev, hdev->num_msi, > + sizeof(int), GFP_KERNEL); > + if (!hdev->vector_irq) { > + pci_free_irq_vectors(pdev); > + return -ENOMEM; > } > - hdev->num_msi = vectors; > - hdev->num_msi_left = vectors; > - hdev->base_msi_vector = pdev->irq; > - hdev->roce_base_vector = hdev->base_msi_vector + > - HCLGE_ROCE_VECTOR_OFFSET; > > return 0; > } > @@ -2341,6 +2320,7 @@ static int hclge_get_vector(struct hnae3_handle *handle, u16 vector_num, > vport->vport_id * > HCLGE_VECTOR_VF_OFFSET; > hdev->vector_status[i] = vport->vport_id; > + hdev->vector_irq[i] = vector->vector; > > vector++; > alloc++; > @@ -2359,15 +2339,10 @@ static int hclge_get_vector_index(struct hclge_dev *hdev, int vector) > { > int i; > > - for (i = 0; i < hdev->num_msi; i++) { > - if (hdev->msix_entries) { > - if (vector == hdev->msix_entries[i].vector) > - return i; > - } else { > - if (vector == (hdev->base_msi_vector + i)) > - return i; > - } > - } > + for (i = 0; i < hdev->num_msi; i++) > + if (vector == hdev->vector_irq[i]) > + return i; > + > return -EINVAL; > } > > @@ -4072,14 +4047,7 @@ static void hclge_pci_uninit(struct hclge_dev *hdev) > { > struct pci_dev *pdev = hdev->pdev; > > - if (hdev->flag & HCLGE_FLAG_USE_MSIX) { > - pci_disable_msix(pdev); > - devm_kfree(&pdev->dev, hdev->msix_entries); > - hdev->msix_entries = NULL; > - } else { > - pci_disable_msi(pdev); > - } > - > + pci_free_irq_vectors(pdev); > pci_clear_master(pdev); > pci_release_mem_regions(pdev); > pci_disable_device(pdev); > @@ -4097,7 +4065,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) > goto err_hclge_dev; > } > > - hdev->flag |= HCLGE_FLAG_USE_MSIX; > hdev->pdev = pdev; > hdev->ae_dev = ae_dev; > ae_dev->priv = hdev; > @@ -4126,12 +4093,9 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) > return ret; > } > > - if (hdev->flag & HCLGE_FLAG_USE_MSIX) > - ret = hclge_init_msix(hdev); > - else > - ret = hclge_init_msi(hdev); > + ret = hclge_init_msi(hdev); > if (ret) { > - dev_err(&pdev->dev, "Init msix/msi error, ret = %d.\n", ret); > + dev_err(&pdev->dev, "Init MSI/MSI-X error, ret = %d.\n", ret); > return ret; > } > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h > index 9fcfd93..ab87843 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h > @@ -400,9 +400,6 @@ struct hclge_dev { > u16 num_tqps; /* Num task queue pairs of this PF */ > u16 num_req_vfs; /* Num VFs requested for this PF */ > > - u16 num_roce_msix; /* Num of roce vectors for this PF */ > - int roce_base_vector; > - > /* Base task tqp physical id of this PF */ > u16 base_tqp_pid; > u16 alloc_rss_size; /* Allocated RSS task queue */ > @@ -429,8 +426,10 @@ struct hclge_dev { > u16 num_msi_left; > u16 num_msi_used; > u32 base_msi_vector; > - struct msix_entry *msix_entries; > u16 *vector_status; > + int *vector_irq; > + u16 num_roce_msi; /* Num of roce vectors for this PF */ > + int roce_base_vector; > > u16 pending_udp_bitmap; > > @@ -454,11 +453,9 @@ struct hclge_dev { > struct hnae3_client *nic_client; > struct hnae3_client *roce_client; > > -#define HCLGE_FLAG_USE_MSI 0x00000001 > -#define HCLGE_FLAG_USE_MSIX 0x00000002 > -#define HCLGE_FLAG_MAIN 0x00000004 > -#define HCLGE_FLAG_DCB_CAPABLE 0x00000008 > -#define HCLGE_FLAG_DCB_ENABLE 0x00000010 > +#define HCLGE_FLAG_MAIN BIT(0) > +#define HCLGE_FLAG_DCB_CAPABLE BIT(1) > +#define HCLGE_FLAG_DCB_ENABLE BIT(2) > u32 flag; > > u32 pkt_buf_size; /* Total pf buf size for tx/rx */ > -- > 2.7.4 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html From 1583498936056662774@xxx Wed Nov 08 11:57:45 +0000 2017 X-GM-THRID: 1583498936056662774 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread