From: Florian Fainelli <f.fainelli@gmail.com>
To: Vladimir Oltean <olteanv@gmail.com>,
Lino Sanfilippo <LinoSanfilippo@gmx.de>
Cc: woojung.huh@microchip.com, UNGLinuxDriver@microchip.com,
andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net,
kuba@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/2] net: dsa: ensure linearized SKBs in case of tail taggers
Date: Wed, 21 Jul 2021 20:56:56 -0700 [thread overview]
Message-ID: <8460fa10-6db7-273c-a2c2-9b54cc660d9a@gmail.com> (raw)
In-Reply-To: <20210721233549.mhqlrt3l2bbyaawr@skbuf>
On 7/21/2021 4:35 PM, Vladimir Oltean wrote:
> On Wed, Jul 21, 2021 at 11:56:41PM +0200, Lino Sanfilippo wrote:
>> The function skb_put() that is used by tail taggers to make room for the
>> DSA tag must only be called for linearized SKBS. However in case that the
>> slave device inherited features like NETIF_F_HW_SG or NETIF_F_FRAGLIST the
>> SKB passed to the slaves transmit function may not be linearized.
>> Avoid those SKBs by clearing the NETIF_F_HW_SG and NETIF_F_FRAGLIST flags
>> for tail taggers.
>> Furthermore since the tagging protocol can be changed at runtime move the
>> code for setting up the slaves features into dsa_slave_setup_tagger().
>>
>> Suggested-by: Vladimir Oltean <olteanv@gmail.com>
>> Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
>> ---
>> net/dsa/slave.c | 14 +++++++++-----
>> 1 file changed, 9 insertions(+), 5 deletions(-)
>>
>> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
>> index 22ce11cd770e..ae2a648ed9be 100644
>> --- a/net/dsa/slave.c
>> +++ b/net/dsa/slave.c
>> @@ -1808,6 +1808,7 @@ void dsa_slave_setup_tagger(struct net_device *slave)
>> struct dsa_slave_priv *p = netdev_priv(slave);
>> const struct dsa_port *cpu_dp = dp->cpu_dp;
>> struct net_device *master = cpu_dp->master;
>> + const struct dsa_switch *ds = dp->ds;
>>
>> slave->needed_headroom = cpu_dp->tag_ops->needed_headroom;
>> slave->needed_tailroom = cpu_dp->tag_ops->needed_tailroom;
>> @@ -1819,6 +1820,14 @@ void dsa_slave_setup_tagger(struct net_device *slave)
>> slave->needed_tailroom += master->needed_tailroom;
>>
>> p->xmit = cpu_dp->tag_ops->xmit;
>> +
>> + slave->features = master->vlan_features | NETIF_F_HW_TC;
>> + if (ds->ops->port_vlan_add && ds->ops->port_vlan_del)
>> + slave->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
>> + slave->hw_features |= NETIF_F_HW_TC;
>> + slave->features |= NETIF_F_LLTX;
>> + if (slave->needed_tailroom)
>> + slave->features &= ~(NETIF_F_SG | NETIF_F_FRAGLIST);
>> }
>>
>> static struct lock_class_key dsa_slave_netdev_xmit_lock_key;
>> @@ -1881,11 +1890,6 @@ int dsa_slave_create(struct dsa_port *port)
>> if (slave_dev == NULL)
>> return -ENOMEM;
>>
>> - slave_dev->features = master->vlan_features | NETIF_F_HW_TC;
>> - if (ds->ops->port_vlan_add && ds->ops->port_vlan_del)
>> - slave_dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
>> - slave_dev->hw_features |= NETIF_F_HW_TC;
>> - slave_dev->features |= NETIF_F_LLTX;
>> slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;
>> if (!is_zero_ether_addr(port->mac))
>> ether_addr_copy(slave_dev->dev_addr, port->mac);
>> --
>> 2.32.0
>>
>
> I would have probably changed the code in dsa_slave_create just like
> this:
>
> - slave->features = master->vlan_features | NETIF_F_HW_TC;
> + slave->features = NETIF_F_HW_TC;
> ...
> - slave_dev->vlan_features = master->vlan_features;
>
> and in dsa_slave_setup_tagger:
>
> + vlan_features = master->vlan_features;
> + slave->features &= ~vlan_features;
> + if (slave->needed_tailroom)
> + vlan_features &= ~(NETIF_F_SG | NETIF_F_FRAGLIST);
> + slave->features |= vlan_features;
> + slave->vlan_features = vlan_features;
>
> no need to move around NETIF_F_HW_TC and NETIF_F_LLTX. Makes sense?
>
> And I would probably add:
>
> Fixes: 91da11f870f0 ("net: Distributed Switch Architecture protocol support")
Agreed, with those fixed:
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
next prev parent reply other threads:[~2021-07-22 3:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 21:56 [PATCH v2 0/2] Fixes for KSZ DSA switch Lino Sanfilippo
2021-07-21 21:56 ` [PATCH v2 1/2] net: dsa: ensure linearized SKBs in case of tail taggers Lino Sanfilippo
2021-07-21 23:35 ` Vladimir Oltean
2021-07-22 3:56 ` Florian Fainelli [this message]
2021-07-22 14:14 ` Andrew Lunn
2021-07-22 16:05 ` Florian Fainelli
2021-07-23 7:47 ` Lino Sanfilippo
2021-07-23 12:22 ` Vladimir Oltean
2021-07-23 13:41 ` Lino Sanfilippo
2021-07-21 21:56 ` [PATCH v2 2/2] net: dsa: tag_ksz: dont let the hardware process the layer 4 checksum Lino Sanfilippo
2021-07-21 23:37 ` Vladimir Oltean
2021-07-22 3:55 ` Florian Fainelli
2021-07-22 6:20 ` [PATCH v2 0/2] Fixes for KSZ DSA switch patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8460fa10-6db7-273c-a2c2-9b54cc660d9a@gmail.com \
--to=f.fainelli@gmail.com \
--cc=LinoSanfilippo@gmx.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.com \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).