| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 17 Jan 2016 19:34:54 +0900
From: Yoshihiro Kaneko <ykaneko0929@...il.com>
To: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Cc: netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
Simon Horman <horms@...ge.net.au>,
Magnus Damm <magnus.damm@...il.com>,
Linux-sh list <linux-sh@...r.kernel.org>
Subject: Re: [PATCH/RFC v2 net-next] ravb: Add dma queue interrupt support
Hi Sergei,
2015-12-27 8:09 GMT+09:00 Sergei Shtylyov <sergei.shtylyov@...entembedded.com>:
> Hello.
>
> On 12/26/2015 02:26 PM, Yoshihiro Kaneko wrote:
>
>>>> From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@...esas.com>
>>>>
>>>> This patch supports the following interrupts.
>>>>
>>>> - One interrupt for multiple (descriptor, error, management)
>>>> - One interrupt for emac
>>>> - Four interrupts for dma queue (best effort rx/tx, network control
>>>> rx/tx)
>>>
>>>
>>> You still don't say why it's better than the current scheme...
>>
>>
>> I missed the comment for some reason.
>> I will think about updating the changelog.
>
>
> TIA.
>
>>>> Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@...esas.com>
>>>> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@...il.com>
>
> [...]
>>>>
>>>> b/drivers/net/ethernet/renesas/ravb.h
>>>> index 9fbe92a..71badd6d 100644
>>>> --- a/drivers/net/ethernet/renesas/ravb.h
>>>> +++ b/drivers/net/ethernet/renesas/ravb.h
>
> [...]
>>>>
>>>> @@ -1223,23 +1343,68 @@ static const struct ethtool_ops ravb_ethtool_ops
>>>> =
>>>> {
>>>> static int ravb_open(struct net_device *ndev)
>>>> {
>>>> struct ravb_private *priv = netdev_priv(ndev);
>>>> - int error;
>>>> + struct platform_device *pdev = priv->pdev;
>>>> + struct device *dev = &pdev->dev;
>>>> + int error, i;
>>>> + char *name;
>>>>
>>>> napi_enable(&priv->napi[RAVB_BE]);
>>>> napi_enable(&priv->napi[RAVB_NC]);
>>>>
>>>> - error = request_irq(ndev->irq, ravb_interrupt, IRQF_SHARED,
>>>> ndev->name,
>>>> - ndev);
>>>> - if (error) {
>>>> - netdev_err(ndev, "cannot request IRQ\n");
>>>> - goto out_napi_off;
>>>> - }
>>>> -
>>>> - if (priv->chip_id == RCAR_GEN3) {
>>>> - error = request_irq(priv->emac_irq, ravb_interrupt,
>>>> - IRQF_SHARED, ndev->name, ndev);
>>>> + if (priv->chip_id == RCAR_GEN2) {
>>>> + error = request_irq(ndev->irq, ravb_interrupt,
>>>> IRQF_SHARED,
>>>> + ndev->name, ndev);
>>>> if (error) {
>>>> netdev_err(ndev, "cannot request IRQ\n");
>>>> + goto out_napi_off;
>>>> + }
>>>> + } else {
>>>> + name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch22:multi",
>>>> + ndev->name);
>>>> + error = request_irq(ndev->irq, ravb_multi_interrupt,
>>>> + IRQF_SHARED, name, ndev);
>>>> + if (error) {
>>>> + netdev_err(ndev, "cannot request IRQ %s\n",
>>>> name);
>>>> + goto out_napi_off;
>>>> + }
>>>> + name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch24:emac",
>>>> + ndev->name);
>>>> + error = request_irq(priv->emac_irq, ravb_emac_interrupt,
>>>> + IRQF_SHARED, name, ndev);
>>>> + if (error) {
>>>> + netdev_err(ndev, "cannot request IRQ %s\n",
>>>> name);
>>>> + goto out_free_irq;
>>>> + }
>>>> + name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch0:rx_be",
>>>> + ndev->name);
>>>> + error = request_irq(priv->rx_irqs[RAVB_BE],
>>>> ravb_be_interrupt,
>>>> + IRQF_SHARED, name, ndev);
>>>> + if (error) {
>>>> + netdev_err(ndev, "cannot request IRQ %s\n",
>>>> name);
>>>> + goto out_free_irq;
>>>> + }
>>>> + name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch18:tx_be",
>>>> + ndev->name);
>>>> + error = request_irq(priv->tx_irqs[RAVB_BE],
>>>> ravb_be_interrupt,
>>>> + IRQF_SHARED, name, ndev);
>>>> + if (error) {
>>>> + netdev_err(ndev, "cannot request IRQ %s\n",
>>>> name);
>>>> + goto out_free_irq;
>>>> + }
>>>> + name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch1:rx_nc",
>>>> + ndev->name);
>>>> + error = request_irq(priv->rx_irqs[RAVB_NC],
>>>> ravb_nc_interrupt,
>>>> + IRQF_SHARED, name, ndev);
>>>> + if (error) {
>>>> + netdev_err(ndev, "cannot request IRQ %s\n",
>>>> name);
>>>> + goto out_free_irq;
>>>> + }
>>>> + name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch19:tx_nc",
>>>> + ndev->name);
>>>> + error = request_irq(priv->tx_irqs[RAVB_NC],
>>>> ravb_nc_interrupt,
>>>> + IRQF_SHARED, name, ndev);
>>>> + if (error) {
>>>> + netdev_err(ndev, "cannot request IRQ %s\n",
>>>> name);
>>>> goto out_free_irq;
>>>> }
>>>
>>>
>>>
>>> This error case is repetitive, couldn't you consolidate it somehow?
>>
>>
>> It seems to be impossible to be solved by the simple change of the code.
>> Do you intend to add macro or a small helper function?
>
>
> What I meant should look like this:
>
> } else {
> name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch22:multi",
> ndev->name);
> error = request_irq(ndev->irq, ravb_multi_interrupt,
> IRQF_SHARED, name, ndev);
> if (error)
> goto out;
> [...]
> name = devm_kasprintf(dev, GFP_KERNEL, "%s:ch19:tx_nc",
> ndev->name);
> error = request_irq(priv->tx_irqs[RAVB_NC],
> ravb_nc_interrupt,
> IRQF_SHARED, name, ndev);
> if (error)
> goto out;
> }
>
> out:
> if (error) {
> netdev_err(ndev, "cannot request IRQ %s\n", name);
> goto out_free_irq;
> }
>
> Did it make things clearer?
Thanks for the clarification.
> But indeed, a helper function would probably be even better...
I will add a helper function to avoid the use of nested goto statement.
>
> [...]
>>>>
>>>> @@ -1798,6 +1973,22 @@ static int ravb_probe(struct platform_device
>>>> *pdev)
>>>> goto out_release;
>>>> }
>>>> priv->emac_irq = irq;
>>>> + for (i = 0; i < NUM_RX_QUEUE; i++) {
>>>> + irq = platform_get_irq_byname(pdev,
>>>> ravb_rx_irqs[i]);
>>>> + if (irq < 0) {
>>>> + error = irq;
>>>> + goto out_release;
>>>> + }
>>>> + priv->rx_irqs[i] = irq;
>>>> + }
>>>> + for (i = 0; i < NUM_TX_QUEUE; i++) {
>>>> + irq = platform_get_irq_byname(pdev,
>>>> ravb_tx_irqs[i]);
>>>> + if (irq < 0) {
>>>> + error = irq;
>>>> + goto out_release;
>>>> + }
>>>> + priv->tx_irqs[i] = irq;
>>>> + }
>>>
>>>
>>>
>>> Perhaps it would better to use sprintf() here, in both loops...
>>
>>
>> Could you give me some more details?
>
>
> I think it would be better to use sprintf() to generate the IRQ names
> passed to platfrom_get_irq_byname() instead of string literals grouped into
> arrays. I may be wrong though...
At this moment, I don't think that it is necessary.
I would do it in other patch when the need became clear.
>
>
> [...]
>
>> Thanks,
>> kaneko
>
>
> MBR, Sergei
>
Thanks,
kaneko
Powered by blists - more mailing lists