From: Doug Berger <opendmb@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Doug Berger <opendmb@gmail.com>
Subject: [PATCH net-next v2 7/8] net: bcmgenet: Be drop monitor friendly while re-allocating headroom
Date: Tue, 17 Dec 2019 16:51:14 -0800 [thread overview]
Message-ID: <1576630275-17591-8-git-send-email-opendmb@gmail.com> (raw)
In-Reply-To: <1576630275-17591-1-git-send-email-opendmb@gmail.com>
During bcmgenet_put_tx_csum() make sure we differentiate a SKB
headroom re-allocation failure from the normal swap and replace
path.
Signed-off-by: Doug Berger <opendmb@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 13e9154db253..e2bca19bf10b 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1499,11 +1499,12 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
* enough headroom for us to insert 64B status block.
*/
new_skb = skb_realloc_headroom(skb, sizeof(*status));
- dev_kfree_skb(skb);
if (!new_skb) {
+ dev_kfree_skb_any(skb);
dev->stats.tx_dropped++;
return NULL;
}
+ dev_consume_skb_any(skb);
skb = new_skb;
}
--
2.7.4
next prev parent reply other threads:[~2019-12-18 0:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 0:51 [PATCH net-next v2 0/8] net: bcmgenet: Turn on offloads by default Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 1/8] net: bcmgenet: enable NETIF_F_HIGHDMA flag Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 2/8] net: bcmgenet: enable NETIF_F_HW_CSUM feature Doug Berger
2019-12-18 1:06 ` Florian Fainelli
2019-12-18 0:51 ` [PATCH net-next v2 3/8] net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM Doug Berger
2019-12-18 1:03 ` Florian Fainelli
2019-12-18 0:51 ` [PATCH net-next v2 4/8] net: bcmgenet: Refactor bcmgenet_set_features() Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 5/8] net: bcmgenet: Utilize bcmgenet_set_features() during resume/open Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 6/8] net: bcmgenet: Turn on offloads by default Doug Berger
2019-12-18 0:51 ` Doug Berger [this message]
2019-12-18 0:51 ` [PATCH net-next v2 8/8] net: bcmgenet: Add software counters to track reallocations Doug Berger
2019-12-20 2:13 ` [PATCH net-next v2 0/8] net: bcmgenet: Turn on offloads by default 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=1576630275-17591-8-git-send-email-opendmb@gmail.com \
--to=opendmb@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).