From: Jiri Pirko <jiri@resnulli.us>
To: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Cc: Ido Schimmel <idosch@mellanox.com>,
netdev@vger.kernel.org, davem@davemloft.net,
stephen@networkplumber.org, jiri@mellanox.com,
yotamg@mellanox.com, mlxsw@mellanox.com,
bridge@lists.linux-foundation.org
Subject: Re: [PATCH net] bridge: switchdev: Clear forward mark when transmitting packet
Date: Fri, 1 Sep 2017 14:01:20 +0200 [thread overview]
Message-ID: <20170901120120.GA1962@nanopsycho> (raw)
In-Reply-To: <0384baf6-0786-2d07-8919-fdd1ca5d88eb@cumulusnetworks.com>
Fri, Sep 01, 2017 at 01:45:15PM CEST, nikolay@cumulusnetworks.com wrote:
>On 01/09/17 12:22, Ido Schimmel wrote:
>> Commit 6bc506b4fb06 ("bridge: switchdev: Add forward mark support for
>> stacked devices") added the 'offload_fwd_mark' bit to the skb in order
>> to allow drivers to indicate to the bridge driver that they already
>> forwarded the packet in L2.
>>
>> In case the bit is set, before transmitting the packet from each port,
>> the port's mark is compared with the mark stored in the skb's control
>> block. If both marks are equal, we know the packet arrived from a switch
>> device that already forwarded the packet and it's not re-transmitted.
>>
>> However, if the packet is transmitted from the bridge device itself
>> (e.g., br0), we should clear the 'offload_fwd_mark' bit as the mark
>> stored in the skb's control block isn't valid.
>>
>> This scenario can happen in rare cases where a packet was trapped during
>> L3 forwarding and forwarded by the kernel to a bridge device.
>>
>> Fixes: 6bc506b4fb06 ("bridge: switchdev: Add forward mark support for stacked devices")
>> Signed-off-by: Ido Schimmel <idosch@mellanox.com>
>> Reported-by: Yotam Gigi <yotamg@mellanox.com>
>> Tested-by: Yotam Gigi <yotamg@mellanox.com>
>> Reviewed-by: Jiri Pirko <jiri@mellanox.com>
>> ---
>> net/bridge/br_device.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
>> index 861ae2a165f4..5a7be3bddfa9 100644
>> --- a/net/bridge/br_device.c
>> +++ b/net/bridge/br_device.c
>> @@ -53,6 +53,9 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
>> brstats->tx_bytes += skb->len;
>> u64_stats_update_end(&brstats->syncp);
>>
>> +#ifdef CONFIG_NET_SWITCHDEV
>> + skb->offload_fwd_mark = 0;
>> +#endif
>> BR_INPUT_SKB_CB(skb)->brdev = dev;
>>
>> skb_reset_mac_header(skb);
>>
>
>Good catch, just one minor nit since there is already an ifdef
>switchdev/else in br_private.h, why not make this a helper and avoid the
>ifdef/endif in here ? Currently there is no ifdef switchdev anywhere else.
I think it would be better to convert this to a helper in -net-next and
take the patch as it is for -net
next prev parent reply other threads:[~2017-09-01 12:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 9:22 [Bridge] [PATCH net] bridge: switchdev: Clear forward mark when transmitting packet Ido Schimmel
2017-09-01 9:22 ` Ido Schimmel
2017-09-01 11:45 ` [Bridge] " Nikolay Aleksandrov
2017-09-01 11:45 ` Nikolay Aleksandrov
2017-09-01 12:01 ` Jiri Pirko [this message]
2017-09-01 12:03 ` [Bridge] " Nikolay Aleksandrov
2017-09-01 12:03 ` Nikolay Aleksandrov
2017-09-01 17:12 ` [Bridge] " David Miller
2017-09-01 17:12 ` David Miller
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=20170901120120.GA1962@nanopsycho \
--to=jiri@resnulli.us \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=idosch@mellanox.com \
--cc=jiri@mellanox.com \
--cc=mlxsw@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=stephen@networkplumber.org \
--cc=yotamg@mellanox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.