From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keller, Jacob E Date: Tue, 16 Jun 2015 21:38:55 +0000 Subject: [Intel-wired-lan] [PATCH] fm10k: Don't assume page fragments are page size In-Reply-To: <20150616184712.1966.44790.stgit@ahduyck-vm-fedora22> References: <20150616184712.1966.44790.stgit@ahduyck-vm-fedora22> Message-ID: <1434490735.12272.5.camel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: Acked-by: Jacob Keller Regards, Jake On Tue, 2015-06-16 at 11:47 -0700, Alexander Duyck wrote: > This change pulls out the optimization that assumed that all > fragments > would be limited to page size. That hasn't been the case for some > time now > and to assume this is incorrect as the TCP allocator can provide up > to a > 32K page fragment. > > Signed-off-by: Alexander Duyck > --- > drivers/net/ethernet/intel/fm10k/fm10k_main.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c > b/drivers/net/ethernet/intel/fm10k/fm10k_main.c > index 982fdcdc795b..620ff5e9dc59 100644 > --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c > @@ -1079,9 +1079,7 @@ netdev_tx_t fm10k_xmit_frame_ring(struct > sk_buff *skb, > struct fm10k_tx_buffer *first; > int tso; > u32 tx_flags = 0; > -#if PAGE_SIZE > FM10K_MAX_DATA_PER_TXD > unsigned short f; > -#endif > u16 count = TXD_USE_COUNT(skb_headlen(skb)); > > /* need: 1 descriptor per page * > PAGE_SIZE/FM10K_MAX_DATA_PER_TXD, > @@ -1089,12 +1087,9 @@ netdev_tx_t fm10k_xmit_frame_ring(struct > sk_buff *skb, > * + 2 desc gap to keep tail from touching head > * otherwise try next time > */ > -#if PAGE_SIZE > FM10K_MAX_DATA_PER_TXD > for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) > count += TXD_USE_COUNT(skb_shinfo(skb) > ->frags[f].size); > -#else > - count += skb_shinfo(skb)->nr_frags; > -#endif > + > if (fm10k_maybe_stop_tx(tx_ring, count + 3)) { > tx_ring->tx_stats.tx_busy++; > return NETDEV_TX_BUSY; > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan at lists.osuosl.org > http://lists.osuosl.org/mailman/listinfo/intel-wired-lan From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Keller, Jacob E" Subject: Re: [Intel-wired-lan] [PATCH] fm10k: Don't assume page fragments are page size Date: Tue, 16 Jun 2015 21:38:55 +0000 Message-ID: <1434490735.12272.5.camel@intel.com> References: <20150616184712.1966.44790.stgit@ahduyck-vm-fedora22> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: "netdev@vger.kernel.org" , "Kirsher, Jeffrey T" , "intel-wired-lan@lists.osuosl.org" To: "alexander.h.duyck@redhat.com" Return-path: Received: from mga09.intel.com ([134.134.136.24]:61144 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754783AbbFPVi5 (ORCPT ); Tue, 16 Jun 2015 17:38:57 -0400 In-Reply-To: <20150616184712.1966.44790.stgit@ahduyck-vm-fedora22> Content-Language: en-US Content-ID: <542074CE788C254598C817B44EBD778B@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: QWNrZWQtYnk6IEphY29iIEtlbGxlciA8amFjb2IuZS5rZWxsZXJAaW50ZWwuY29tPg0KDQpSZWdh cmRzLA0KSmFrZQ0KDQpPbiBUdWUsIDIwMTUtMDYtMTYgYXQgMTE6NDcgLTA3MDAsIEFsZXhhbmRl ciBEdXljayB3cm90ZToNCj4gVGhpcyBjaGFuZ2UgcHVsbHMgb3V0IHRoZSBvcHRpbWl6YXRpb24g dGhhdCBhc3N1bWVkIHRoYXQgYWxsIA0KPiBmcmFnbWVudHMNCj4gd291bGQgYmUgbGltaXRlZCB0 byBwYWdlIHNpemUuICBUaGF0IGhhc24ndCBiZWVuIHRoZSBjYXNlIGZvciBzb21lIA0KPiB0aW1l IG5vdw0KPiBhbmQgdG8gYXNzdW1lIHRoaXMgaXMgaW5jb3JyZWN0IGFzIHRoZSBUQ1AgYWxsb2Nh dG9yIGNhbiBwcm92aWRlIHVwIA0KPiB0byBhDQo+IDMySyBwYWdlIGZyYWdtZW50Lg0KPiANCj4g U2lnbmVkLW9mZi1ieTogQWxleGFuZGVyIER1eWNrIDxhbGV4YW5kZXIuaC5kdXlja0ByZWRoYXQu Y29tPg0KPiAtLS0NCj4gIGRyaXZlcnMvbmV0L2V0aGVybmV0L2ludGVsL2ZtMTBrL2ZtMTBrX21h aW4uYyB8ICAgIDcgKy0tLS0tLQ0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA2 IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L2lu dGVsL2ZtMTBrL2ZtMTBrX21haW4uYyANCj4gYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9m bTEway9mbTEwa19tYWluLmMNCj4gaW5kZXggOTgyZmRjZGM3OTViLi42MjBmZjVlOWRjNTkgMTAw NjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L2ludGVsL2ZtMTBrL2ZtMTBrX21haW4u Yw0KPiArKysgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9mbTEway9mbTEwa19tYWluLmMN Cj4gQEAgLTEwNzksOSArMTA3OSw3IEBAIG5ldGRldl90eF90IGZtMTBrX3htaXRfZnJhbWVfcmlu ZyhzdHJ1Y3QgDQo+IHNrX2J1ZmYgKnNrYiwNCj4gICAgICAgc3RydWN0IGZtMTBrX3R4X2J1ZmZl ciAqZmlyc3Q7DQo+ICAgICAgIGludCB0c287DQo+ICAgICAgIHUzMiB0eF9mbGFncyA9IDA7DQo+ IC0jaWYgUEFHRV9TSVpFID4gRk0xMEtfTUFYX0RBVEFfUEVSX1RYRA0KPiAgICAgICB1bnNpZ25l ZCBzaG9ydCBmOw0KPiAtI2VuZGlmDQo+ICAgICAgIHUxNiBjb3VudCA9IFRYRF9VU0VfQ09VTlQo c2tiX2hlYWRsZW4oc2tiKSk7DQo+ICANCj4gICAgICAgLyogbmVlZDogMSBkZXNjcmlwdG9yIHBl ciBwYWdlICogDQo+IFBBR0VfU0laRS9GTTEwS19NQVhfREFUQV9QRVJfVFhELA0KPiBAQCAtMTA4 OSwxMiArMTA4Nyw5IEBAIG5ldGRldl90eF90IGZtMTBrX3htaXRfZnJhbWVfcmluZyhzdHJ1Y3Qg DQo+IHNrX2J1ZmYgKnNrYiwNCj4gICAgICAgICogICAgICAgKyAyIGRlc2MgZ2FwIHRvIGtlZXAg dGFpbCBmcm9tIHRvdWNoaW5nIGhlYWQNCj4gICAgICAgICogb3RoZXJ3aXNlIHRyeSBuZXh0IHRp bWUNCj4gICAgICAgICovDQo+IC0jaWYgUEFHRV9TSVpFID4gRk0xMEtfTUFYX0RBVEFfUEVSX1RY RA0KPiAgICAgICBmb3IgKGYgPSAwOyBmIDwgc2tiX3NoaW5mbyhza2IpLT5ucl9mcmFnczsgZisr KQ0KPiAgICAgICAgICAgICAgIGNvdW50ICs9IFRYRF9VU0VfQ09VTlQoc2tiX3NoaW5mbyhza2Ip DQo+IC0+ZnJhZ3NbZl0uc2l6ZSk7DQo+IC0jZWxzZQ0KPiAtICAgICBjb3VudCArPSBza2Jfc2hp bmZvKHNrYiktPm5yX2ZyYWdzOw0KPiAtI2VuZGlmDQo+ICsNCj4gICAgICAgaWYgKGZtMTBrX21h eWJlX3N0b3BfdHgodHhfcmluZywgY291bnQgKyAzKSkgew0KPiAgICAgICAgICAgICAgIHR4X3Jp bmctPnR4X3N0YXRzLnR4X2J1c3krKzsNCj4gICAgICAgICAgICAgICByZXR1cm4gTkVUREVWX1RY X0JVU1k7DQo+IA0KPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXw0KPiBJbnRlbC13aXJlZC1sYW4gbWFpbGluZyBsaXN0DQo+IEludGVsLXdpcmVkLWxhbkBs aXN0cy5vc3Vvc2wub3JnDQo+IGh0dHA6Ly9saXN0cy5vc3Vvc2wub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtd2lyZWQtbGFu