From patchwork Wed Jul 29 09:45:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bogdan Hamciuc X-Patchwork-Id: 501633 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BD2FE140316 for ; Wed, 29 Jul 2015 19:47:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751130AbbG2JrA (ORCPT ); Wed, 29 Jul 2015 05:47:00 -0400 Received: from mail-bl2on0112.outbound.protection.outlook.com ([65.55.169.112]:42201 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750854AbbG2Jq7 (ORCPT ); Wed, 29 Jul 2015 05:46:59 -0400 Received: from CO2PR03CA0012.namprd03.prod.outlook.com (10.141.194.139) by BL2PR03MB498.namprd03.prod.outlook.com (10.141.93.146) with Microsoft SMTP Server (TLS) id 15.1.219.17; Wed, 29 Jul 2015 09:46:56 +0000 Received: from BN1AFFO11FD054.protection.gbl (2a01:111:f400:7c10::169) by CO2PR03CA0012.outlook.office365.com (2a01:111:e400:1414::11) with Microsoft SMTP Server (TLS) id 15.1.219.17 via Frontend Transport; Wed, 29 Jul 2015 09:46:54 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD054.mail.protection.outlook.com (10.58.53.69) with Microsoft SMTP Server (TLS) id 15.1.231.11 via Frontend Transport; Wed, 29 Jul 2015 09:46:53 +0000 Received: from fsr-fed1764-002.ea.freescale.net (fsr-fed1764-002.ea.freescale.net [10.171.73.191]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t6T9ko17026066; Wed, 29 Jul 2015 02:46:51 -0700 From: Bogdan Hamciuc To: , CC: Bogdan Hamciuc Subject: [PATCH] net: pktgen: Observe needed_headroom of the device Date: Wed, 29 Jul 2015 12:45:58 +0300 Message-ID: <1438163158-12554-1-git-send-email-bogdan.hamciuc@freescale.com> X-Mailer: git-send-email 1.8.3.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD054; 1:ZaDH+dbyqyH2G4nGz2dQctIpljcrs/yK06baF+3dGpBY0FDgk8m9/zLHfsVHrkd8XSLTNttRBW47KxksGaprfTX7EGplRO9FOXdynBcWzvjPIRHRUdzftS7SdJcERGvaeaJgYK/YVbnceNvm2kf7vKoZH4rZGL2ATV1VeD9ruAq+xb6j98QsyGdUasevxfUxoSO9MMg4Jw8wBb3loqfAEoBBjT+ClC5fzpSOzheuqOuxL63kiNEyVfFgIGWQ1wo9Im1hOBs0yYtdwY882uCDKE1jrlL2kWb0gYRNfgkvHaNET7Zd/hBa5i44mkJYFPmGva13JhPIOl3uNu95g7rKQQ== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(105606002)(106466001)(107886002)(77156002)(62966003)(5001960100002)(6806004)(19580405001)(19580395003)(87936001)(33646002)(104016003)(50986999)(85426001)(47776003)(229853001)(48376002)(77096005)(92566002)(46102003)(36756003)(189998001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB498; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB498; 2:OUNRQN0RwpflXWy/98HMZ8Qp+v2qf+tIkzvhvuuOK9a0oD57NJl8d9js4P7hot05; 3:d6BjTA/7/7f3jdncI70RbEg/mQJNrfzbxfLmZ2jZLnpj+hz/+My6tdHAUlXg13YQTpqTVakraPrq69eh+G3H6gINeoCGnrKVYNooEzALRuYTm9SQh5nKjh9XmhwLV+zff6jWOiZuujztBreTngxuQwXoDkqzFOA9/ZzgNTVZ3ObekJebCY6ehizZiVRv2uP5Y4QFCFnGOccfGIWKlZXe31GWJIRFZjMNA+Jyl9goiXA=; 25:pDP6gmVKlRGZcEDyZAFq2cSAqGu6tcsD4P6eLpwzvguwOxlK4ANmhKyvKrQqTiALuKibb92oLf5ux7CLtZrUrVGbicC/OTrDVOwgpKss6QkqYcS48MdV0tT1bFmWzsnAQb8HfLxdmuxZOBW9wgEC5BvK9bS1jcxCDCrCTIQ9Pi6Ee/AkceJO6hwMAD+SdA82+ko0fzN7zwZv+DunhPi+oLOkvQx+7/UDQ80cNz3ZLDPgbbSWLur1FxQ0vUMJ+8lIovNLvQ5DkSqnjpbAlwaJHQ==; 20:yYc4Ya4yeJusTAm/+O/mPArQg65hJ6dCmLT3ryc8UflvHUZV6IHB2dXwnM2x9aqzpIcV+0jQdZkvfQDKJoa91DtkhMFkWtOYAs3tR2n3JV5wpdidRJxfZCYrFChCrfTnGXqd8yJPAg4R1Zif/uEBIKe9ft8H/2VzJiI+WUAihhMRD8HGp/0msNF7vz+YNB7hO+c3k0UldniF+ZuCfaEqeoSOi2vuVG4YkwXgpA8GhvUYuUiHM9AHQzpRPmx2W1emOzovO3tikMgHAadYsp9GWvZ0sjEkcmYZViJpxgs28xotwMijxMILvHILBvmhgxy/Kuf+1egY16DhbiS0ODki0+aKNZHeeeLTQ8JzDQ3KQis= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB498; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BL2PR03MB498; BCL:0; PCL:0; RULEID:; SRVR:BL2PR03MB498; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB498; 4:DJg2MQyMM8g9dIdx90kyfSFEjv36D1lwLh9mFXfBli/1ya5SrUrS+vFWfhsNXYFLdC+M+PhHYyyBZ7MpR7zjLQRNWf5WI6bWh5YxhBNr6EsdH7nNiuIZVeYPPwDtaKQIybdufQQK4yWha7gQrjSHv6eus27bNuEwxjR9lFemLaodDD6U3TO7mdRYp6h8fmWAWWmbyB4DUJ3pn48JUhLvPfmTu6dyTElAjBQI5avLOlYJ7BMq06Pmdwrfbr9R8JXa+oq4JQNh84Zme4aUJgui/oYXNjLPlYj9fOtAvOY1Iz0= X-Forefront-PRVS: 0652EA5565 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB498; 23:RSk6Ksx/ki1Pk72KrYW5mZYmb1us8sEIpZxeFVuy/fpzVk2raDWtao0FgYHsUxS6OW1nyKDAF56KH/SDxQfYXO8Idn+Y70pnRN8c9UZVAAfZnUq9t96voFG7VVc7wkM5uZD8evhC3/weA2kkBvDOxcoUPag0CeF268Sa8zvNZ8sgn0s0ChUkwaCkLM9o+R252/Hn0YyFY8gzciluSfnucLQDdZHOYYLQu8VEbPOLA5/qzfHPkyY5xd9u1qK9yJH2ag7fVQ91aMCf8+/3yB8wvCad553bBIOrOopqv3WtycnoPFggvByUO7PSa8Q6IzcF7qjc5XgCtkTDTI92NoLSrThHs9HQAgLCdhSPdhGxosb2P5kIYwqIut51wbakOYckmtMZIof9473VeK1eZ4ReMUHYFTv1MYS8hTc/U4+ATyyYAZNYTnQreZ8QwVAjvceIxhvcUnCpavlgMmVeeyTa/JTjFsS3EoN6kMNm8Ll1RxCJHpza2RaEG1Gl0nruyAEBFs1HUCHQ8U0CSVkGoybQHHo9Q9EDtPYYZGtQHT/+keUMu+A5VirSHySmPcKZxjciP2t+VO6Re2MIg19yi9qhv2PjQ+orskG6ZOSQL3YUluvdEjV5k/0XsZC2ALGFGlFS73j40n251phZS7oc7HfxcN+gWST+5Jl+5dNNS8wQT9VeC+UylqlMCO+Ly8AiIfgYxdJ57ao744HT0ceSHU9HotzCBdKXrUL6X/gNwb5tZeKu57u7mxnPhqRBaNJ0OaevWwV9aHnNU65udcXkywoZPA==; 5:0yR5puXz1rvI96BhxEf0RUzk/NNrqmbGwUrEehw2cN3b2gIE4VnxKD7xwiHs2MvN/mq9eq9D42y+bE76H+U1cv066SSrgDE/94Q7jNtmffBq9v0ivJ0jZyTU7mzKmWv2b00IE4ZMKfmZQzOkwE3ctQ== X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB498; 24:L/yNPdPB9Q3S7dqGUiazwl+oZMR4QQ2k6+deKAn7+KBp14EC7uqklgSw72fhyPFgvwl+2ZK16aZ5+qA3Qyj7xwN3lYxrz358bSmdgD8gq1o=; 20:XdDSm8UAiU4JKeupL7IUncaLKhZzY6NUXZ+DAWGIo3MiM+KCWmzDsqZ0niHp3WvTBkgsi4is94BYuv2hkA1zZQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2015 09:46:53.5249 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB498 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allocate enough space so as not to force the outgoing net device to do skb_realloc_headroom(). Signed-off-by: Bogdan Hamciuc --- net/core/pktgen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 1ebdf1c..5961da6 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2279,7 +2279,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev) { - pkt_dev->pkt_overhead = 0; + pkt_dev->pkt_overhead = LL_RESERVED_SPACE(pkt_dev->odev); pkt_dev->pkt_overhead += pkt_dev->nr_labels*sizeof(u32); pkt_dev->pkt_overhead += VLAN_TAG_SIZE(pkt_dev); pkt_dev->pkt_overhead += SVLAN_TAG_SIZE(pkt_dev); @@ -2788,6 +2788,7 @@ static struct sk_buff *pktgen_alloc_skb(struct net_device *dev, } else { skb = __netdev_alloc_skb(dev, size, GFP_NOWAIT); } + skb_reserve(skb, LL_RESERVED_SPACE(dev)); return skb; }