From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934Ab3LLO3l (ORCPT ); Thu, 12 Dec 2013 09:29:41 -0500 Received: from multi.imgtec.com ([194.200.65.239]:8477 "EHLO multi.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751395Ab3LLO3i (ORCPT ); Thu, 12 Dec 2013 09:29:38 -0500 From: Qais Yousef To: Eric Dumazet CC: Yang Yingliang , Eric Dumazet , Jamal Hadi Salim , "David S. Miller" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" Subject: RE: [PATCH] net/sched/sch_tbf.c: fix linking error Thread-Topic: [PATCH] net/sched/sch_tbf.c: fix linking error Thread-Index: AQHO9zck2dE04dBQo0atJfoWgkVHfZpQm5SAgAAC88A= Date: Thu, 12 Dec 2013 14:29:35 +0000 Message-ID: <392C4BDEFF12D14FA57A3F30B283D7D13C8A24@LEMAIL01.le.imgtec.org> References: <1386851936-1582-1-git-send-email-qais.yousef@imgtec.com> <1386857899.19078.49.camel@edumazet-glaptop2.roam.corp.google.com> In-Reply-To: <1386857899.19078.49.camel@edumazet-glaptop2.roam.corp.google.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.154.35] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01192__2013_12_12_14_29_37 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id rBCETl9S001354 > -----Original Message----- > From: Eric Dumazet [mailto:eric.dumazet@gmail.com] > Sent: 12 December 2013 14:18 > To: Qais Yousef > Cc: Yang Yingliang; Eric Dumazet; Jamal Hadi Salim; David S. Miller; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org; linux- > next@vger.kernel.org > Subject: Re: [PATCH] net/sched/sch_tbf.c: fix linking error > > On Thu, 2013-12-12 at 12:38 +0000, Qais Yousef wrote: > > ERROR: "__udivdi3" [net/sched/sch_tbf.ko] undefined! > > > > introduced by: cc106e441a63 (net: sched: tbf: fix the calculation of > > max_size) > > > > which adds a 64 by 32 bit division without using do_div(). > > Fix it by using do_div(len/ 53) instead of len/53. > > > > Signed-off-by: Qais Yousef > > Cc: Eric Dumazet > > Cc: Jamal Hadi Salim > > Cc: "David S. Miller" > > Cc: netdev@vger.kernel.org > > Cc: linux-kernel@vger.kernel.org > > Cc: linux-next@vger.kernel.org > > --- > > We caught this error on linux-next today. This is my quick attemp of a fix. > > If it's not appropriate or doesn't make sense my apologies and feel > > free to resend a better fix :) > > > > net/sched/sch_tbf.c | 6 ++++-- > > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index > > a44928c..771cbec 100644 > > --- a/net/sched/sch_tbf.c > > +++ b/net/sched/sch_tbf.c > > @@ -131,8 +131,10 @@ static u64 psched_ns_t2l(const struct > > psched_ratecfg *r, > > > > do_div(len, NSEC_PER_SEC); > > > > - if (unlikely(r->linklayer == TC_LINKLAYER_ATM)) > > - len = (len / 53) * 48; > > + if (unlikely(r->linklayer == TC_LINKLAYER_ATM)) { > > + do_div(len, 53); > > + len *= 48; > > + } > > > > if (len > r->overhead) > > len -= r->overhead; > > This looks like this was already fixed yesterday in David net tree : > > http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=d55d282e6 > af88120ad90e93a88f70e3116dc0e3d > Ah, ok. Thanks for checking this and sorry about the noise. Qais {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I From mboxrd@z Thu Jan 1 00:00:00 1970 From: Qais Yousef Subject: RE: [PATCH] net/sched/sch_tbf.c: fix linking error Date: Thu, 12 Dec 2013 14:29:35 +0000 Message-ID: <392C4BDEFF12D14FA57A3F30B283D7D13C8A24@LEMAIL01.le.imgtec.org> References: <1386851936-1582-1-git-send-email-qais.yousef@imgtec.com> <1386857899.19078.49.camel@edumazet-glaptop2.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Yang Yingliang , Eric Dumazet , Jamal Hadi Salim , "David S. Miller" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" To: Eric Dumazet Return-path: In-Reply-To: <1386857899.19078.49.camel@edumazet-glaptop2.roam.corp.google.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBFcmljIER1bWF6ZXQgW21haWx0 bzplcmljLmR1bWF6ZXRAZ21haWwuY29tXQ0KPiBTZW50OiAxMiBEZWNlbWJlciAyMDEzIDE0OjE4 DQo+IFRvOiBRYWlzIFlvdXNlZg0KPiBDYzogWWFuZyBZaW5nbGlhbmc7IEVyaWMgRHVtYXpldDsg SmFtYWwgSGFkaSBTYWxpbTsgRGF2aWQgUy4gTWlsbGVyOw0KPiBuZXRkZXZAdmdlci5rZXJuZWwu b3JnOyBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnOyBsaW51eC0NCj4gbmV4dEB2Z2VyLmtl cm5lbC5vcmcNCj4gU3ViamVjdDogUmU6IFtQQVRDSF0gbmV0L3NjaGVkL3NjaF90YmYuYzogZml4 IGxpbmtpbmcgZXJyb3INCj4gDQo+IE9uIFRodSwgMjAxMy0xMi0xMiBhdCAxMjozOCArMDAwMCwg UWFpcyBZb3VzZWYgd3JvdGU6DQo+ID4gRVJST1I6ICJfX3VkaXZkaTMiIFtuZXQvc2NoZWQvc2No X3RiZi5rb10gdW5kZWZpbmVkIQ0KPiA+DQo+ID4gaW50cm9kdWNlZCBieTogY2MxMDZlNDQxYTYz IChuZXQ6IHNjaGVkOiB0YmY6IGZpeCB0aGUgY2FsY3VsYXRpb24gb2YNCj4gPiBtYXhfc2l6ZSkN Cj4gPg0KPiA+IHdoaWNoIGFkZHMgYSA2NCBieSAzMiBiaXQgZGl2aXNpb24gd2l0aG91dCB1c2lu ZyBkb19kaXYoKS4NCj4gPiBGaXggaXQgYnkgdXNpbmcgZG9fZGl2KGxlbi8gNTMpIGluc3RlYWQg b2YgbGVuLzUzLg0KPiA+DQo+ID4gU2lnbmVkLW9mZi1ieTogUWFpcyBZb3VzZWYgPHFhaXMueW91 c2VmQGltZ3RlYy5jb20+DQo+ID4gQ2M6IEVyaWMgRHVtYXpldCA8ZWR1bWF6ZXRAZ29vZ2xlLmNv bT4NCj4gPiBDYzogSmFtYWwgSGFkaSBTYWxpbSA8amhzQG1vamF0YXR1LmNvbT4NCj4gPiBDYzog IkRhdmlkIFMuIE1pbGxlciIgPGRhdmVtQGRhdmVtbG9mdC5uZXQ+DQo+ID4gQ2M6IG5ldGRldkB2 Z2VyLmtlcm5lbC5vcmcNCj4gPiBDYzogbGludXgta2VybmVsQHZnZXIua2VybmVsLm9yZw0KPiA+ IENjOiBsaW51eC1uZXh0QHZnZXIua2VybmVsLm9yZw0KPiA+IC0tLQ0KPiA+IFdlIGNhdWdodCB0 aGlzIGVycm9yIG9uIGxpbnV4LW5leHQgdG9kYXkuIFRoaXMgaXMgbXkgcXVpY2sgYXR0ZW1wIG9m IGEgZml4Lg0KPiA+IElmIGl0J3Mgbm90IGFwcHJvcHJpYXRlIG9yIGRvZXNuJ3QgbWFrZSBzZW5z ZSBteSBhcG9sb2dpZXMgYW5kIGZlZWwNCj4gPiBmcmVlIHRvIHJlc2VuZCBhIGJldHRlciBmaXgg OikNCj4gPg0KPiA+ICBuZXQvc2NoZWQvc2NoX3RiZi5jIHwgICAgNiArKysrLS0NCj4gPiAgMSBm aWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pDQo+ID4NCj4gPiBk aWZmIC0tZ2l0IGEvbmV0L3NjaGVkL3NjaF90YmYuYyBiL25ldC9zY2hlZC9zY2hfdGJmLmMgaW5k ZXgNCj4gPiBhNDQ5MjhjLi43NzFjYmVjIDEwMDY0NA0KPiA+IC0tLSBhL25ldC9zY2hlZC9zY2hf dGJmLmMNCj4gPiArKysgYi9uZXQvc2NoZWQvc2NoX3RiZi5jDQo+ID4gQEAgLTEzMSw4ICsxMzEs MTAgQEAgc3RhdGljIHU2NCBwc2NoZWRfbnNfdDJsKGNvbnN0IHN0cnVjdA0KPiA+IHBzY2hlZF9y YXRlY2ZnICpyLA0KPiA+DQo+ID4gIAlkb19kaXYobGVuLCBOU0VDX1BFUl9TRUMpOw0KPiA+DQo+ ID4gLQlpZiAodW5saWtlbHkoci0+bGlua2xheWVyID09IFRDX0xJTktMQVlFUl9BVE0pKQ0KPiA+ IC0JCWxlbiA9IChsZW4gLyA1MykgKiA0ODsNCj4gPiArCWlmICh1bmxpa2VseShyLT5saW5rbGF5 ZXIgPT0gVENfTElOS0xBWUVSX0FUTSkpIHsNCj4gPiArCQlkb19kaXYobGVuLCA1Myk7DQo+ID4g KwkJbGVuICo9IDQ4Ow0KPiA+ICsJfQ0KPiA+DQo+ID4gIAlpZiAobGVuID4gci0+b3ZlcmhlYWQp DQo+ID4gIAkJbGVuIC09IHItPm92ZXJoZWFkOw0KPiANCj4gVGhpcyBsb29rcyBsaWtlIHRoaXMg d2FzIGFscmVhZHkgZml4ZWQgeWVzdGVyZGF5IGluIERhdmlkIG5ldCB0cmVlIDoNCj4gDQo+IGh0 dHA6Ly9naXQua2VybmVsLm9yZy9jZ2l0L2xpbnV4L2tlcm5lbC9naXQvZGF2ZW0vbmV0LmdpdC9j b21taXQvP2lkPWQ1NWQyODJlNg0KPiBhZjg4MTIwYWQ5MGU5M2E4OGY3MGUzMTE2ZGMwZTNkDQo+ IA0KDQpBaCwgb2suIFRoYW5rcyBmb3IgY2hlY2tpbmcgdGhpcyBhbmQgc29ycnkgYWJvdXQgdGhl IG5vaXNlLg0KDQpRYWlzDQoNCg==