From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.2 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADD5CC282DA for ; Wed, 17 Apr 2019 20:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 766DD2183E for ; Wed, 17 Apr 2019 20:52:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="fuKr2DdM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733100AbfDQUwS (ORCPT ); Wed, 17 Apr 2019 16:52:18 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:37585 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732543AbfDQUwQ (ORCPT ); Wed, 17 Apr 2019 16:52:16 -0400 Received: by mail-qt1-f194.google.com with SMTP id z16so29033862qtn.4 for ; Wed, 17 Apr 2019 13:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xY+easmjaXWSroRBaWQlwrCUhL1NGVPuukfD4j/7bCU=; b=fuKr2DdMEHGK+3CqKBcfFC3toLKXvJqdKnKZBC/RkN1M3YyI3UlBBqlxMeGYTyEdtZ LOKMHVTIMj+j3dVsVi2UlbmC7BoI44SJ5t2soYnobnri6jDZWHcxJQtEpABlytZn/uo3 kbSztNoSUXrAcemOHV2BGyen7K+P6X8uJnKWU6mDlMmj9Txy3Ih/AyN2VgcHYZ7Pm5lE 66eCaFmQ2la+QSUhaacX4b0VmPiS86fTcd2hb6uKhkQCvtjajKOdX5e8zlO/ujDQr6kl j21GlyKRh1B6maQvH1g/luZ3fByZVHvTHc6vxCCA0hsiWpdShUsq+N8ZuJ4npAbSqyMJ f2oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xY+easmjaXWSroRBaWQlwrCUhL1NGVPuukfD4j/7bCU=; b=tnnJnm7HR8qgoCYyhIgqalPYCUa/2v2WtMbCmhGq5Cz8KFB2me36nYZVpet0+qNLPN AlNOmvf5hnjNgV88RCWACRQWLC44bIm+3i+k6lfU7/61XxNTHlTkNiYKPoapLbK+g2ui 5F1RU7O35vyIFp0UkubLERS/aWHo9qdw9AvF7yjht+t0lXex1J/A9Bq0GMAvhUVZRYPX LUAZRivWwcCfdFAHJ5eUv/zQmugrYoPMsY7Ma133RMyYpKV7hsmIgZ2OwLrh6+u9Anoh wT1Fkd+mhJByevOYni1pQoOEi3vXqg70t+zvRZdpRlM/Xa1tER9mJ095PeIP11MihsWQ sCRA== X-Gm-Message-State: APjAAAWl9OvGeszSZ84+t9jLei71ExpgJkEQQRiS63eKh8N6q5tU3G7r KsieNcgFVpZ2wIpR8t+2T1uPww== X-Google-Smtp-Source: APXvYqy0mH2c3FPXBk64WQ7538BlE8TbTXuYuB7yd6muih9iF5Qmnw09ueek/PVuPDTFHPF4tOcUpQ== X-Received: by 2002:aed:35b0:: with SMTP id c45mr72380495qte.144.1555534335321; Wed, 17 Apr 2019 13:52:15 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id d34sm60247qta.18.2019.04.17.13.52.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 13:52:14 -0700 (PDT) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski , Dirk van der Merwe , Leandro Dorileo , Vinicius Costa Gomes Subject: [PATCH net-next 3/5] net/sched: taprio: fix build without 64bit div Date: Wed, 17 Apr 2019 13:51:57 -0700 Message-Id: <20190417205159.30938-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190417205159.30938-1-jakub.kicinski@netronome.com> References: <20190417205159.30938-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Recent changes to taprio did not use the correct div64 helpers, leading to: net/sched/sch_taprio.o: In function `taprio_dequeue': sch_taprio.c:(.text+0x34a): undefined reference to `__divdi3' net/sched/sch_taprio.o: In function `advance_sched': sch_taprio.c:(.text+0xa0b): undefined reference to `__divdi3' net/sched/sch_taprio.o: In function `taprio_init': sch_taprio.c:(.text+0x1450): undefined reference to `__divdi3' /home/jkicinski/devel/linux/Makefile:1032: recipe for target 'vmlinux' failed Use math64 helpers. Fixes: 7b9eba7ba0c1 ("net/sched: taprio: fix picos_per_byte miscalculation") Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe --- CC: Leandro Dorileo CC: Vinicius Costa Gomes net/sched/sch_taprio.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index 1b0fb80162e6..001182aa3959 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -121,7 +122,14 @@ static struct sk_buff *taprio_peek(struct Qdisc *sch) static inline int length_to_duration(struct taprio_sched *q, int len) { - return (len * atomic64_read(&q->picos_per_byte)) / 1000; + return div_u64(len * atomic64_read(&q->picos_per_byte), 1000); +} + +static void taprio_set_budget(struct taprio_sched *q, struct sched_entry *entry) +{ + atomic_set(&entry->budget, + div64_u64((u64)entry->interval * 1000, + atomic64_read(&q->picos_per_byte))); } static struct sk_buff *taprio_dequeue(struct Qdisc *sch) @@ -241,8 +249,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer) close_time = ktime_add_ns(entry->close_time, next->interval); next->close_time = close_time; - atomic_set(&next->budget, - (next->interval * 1000) / atomic64_read(&q->picos_per_byte)); + taprio_set_budget(q, next); first_run: rcu_assign_pointer(q->current_entry, next); @@ -575,9 +582,7 @@ static void taprio_start_sched(struct Qdisc *sch, ktime_t start) list); first->close_time = ktime_add_ns(start, first->interval); - atomic_set(&first->budget, - (first->interval * 1000) / - atomic64_read(&q->picos_per_byte)); + taprio_set_budget(q, first); rcu_assign_pointer(q->current_entry, NULL); spin_unlock_irqrestore(&q->current_entry_lock, flags); -- 2.21.0