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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED 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 80A04C43381 for ; Fri, 15 Mar 2019 21:36:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33A76218A1 for ; Fri, 15 Mar 2019 21:36:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f+YzS5BB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726337AbfCOVgi (ORCPT ); Fri, 15 Mar 2019 17:36:38 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42338 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725959AbfCOVgh (ORCPT ); Fri, 15 Mar 2019 17:36:37 -0400 Received: by mail-pg1-f195.google.com with SMTP id b2so7290615pgl.9 for ; Fri, 15 Mar 2019 14:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SC4MLWScoZOwkf/6wl0Esu/G+kjLJPDPdw1lfMDMsJU=; b=f+YzS5BB/wPzVnzlXH2tpuh2kcAR3aQ08yXd0VmaFKnoJ7W3YfJZhi5MViNow9ctQr GHYCt267IjvdAsj9yzqpR/sFtvULxPDZgvlUMbsd1uPhcCRfJoZ4NFw4uUWBZzGLL0JF NpJwC4ci6WyJ2D5joSKwtLrMgHWf2be7DhpfbAtu0p90SsjI3QRg9K0v2bU1INje2aCA 3cEJDtizH4iAT4Nm1Ef8Bn0PihGwN8b2W758bX/Qr+13a2++aOX+LzKUsg1OoRC5T99V Zdqv3zPU/OVB2Q5YSPHhAjGW2T25TiN5FKXwdole8bR2Q4pVgUUm2PRbsaKXCP5hF9mx 3j9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=SC4MLWScoZOwkf/6wl0Esu/G+kjLJPDPdw1lfMDMsJU=; b=EIpv+WdrB142Mnlg6rwEN7AhzeFmHzDDpp/Anm8xHFQW628mOZiYVMKbCNziAzdGg1 QFmA/U260O9Qmp+q25QPMeUouigGP3ciWySD3lS7j5tg8afeaiC029WVY4HtOsY2nQEr /+EHsN5pv+naUXTns3Z+m2j+eCLJnTLrrxfQ9p6zAATICO3NtqxY5+lruINzeqRF2nfW uFRl0v9WXCnXM6drD2o6+LSemX77c/oHzBBTvTEDrRsNNQqWcobheGpSwSyzTKgh1MXR YHU610jtspgBRfdL8UEbnzmo8K7KLT2fROeOCC5c3WbE/vUZJxGM7M7O/VI61+0WcsM2 t5pQ== X-Gm-Message-State: APjAAAXlQszODMTqoWxVJa+5Se+hUvo4pOj7CCOKHW7IphiWhhPLXpky fj6tKLA8GYZVGpubKyfmfI4= X-Google-Smtp-Source: APXvYqyGYRkxuxHWtMfvb04W5nCtzvmkRHoDXGum5a6ibBqKajRSz6b7sp2JAdINkCSzlKQAZ9SUbw== X-Received: by 2002:aa7:930b:: with SMTP id 11mr6240111pfj.49.1552685796425; Fri, 15 Mar 2019 14:36:36 -0700 (PDT) Received: from [10.67.50.0] ([192.19.223.250]) by smtp.googlemail.com with ESMTPSA id s4sm4050471pfe.16.2019.03.15.14.36.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 14:36:35 -0700 (PDT) Subject: Re: [PATCH net V3 1/2] net/sched: taprio: fix picos_per_byte miscalculation To: Leandro Dorileo , netdev@vger.kernel.org Cc: Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S . Miller" , Vinicius Costa Gomes References: <20190315211626.300-1-leandro.maciel.dorileo@intel.com> <20190315211626.300-2-leandro.maciel.dorileo@intel.com> From: Florian Fainelli Openpgp: preference=signencrypt Autocrypt: addr=f.fainelli@gmail.com; prefer-encrypt=mutual; keydata= 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 M5kY0ACeNhCZJvZ5g4C2Lc9fcTHu8jxmEkI= Message-ID: Date: Fri, 15 Mar 2019 14:36:33 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190315211626.300-2-leandro.maciel.dorileo@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 3/15/19 2:16 PM, Leandro Dorileo wrote: > The Time Aware Priority Scheduler is heavily dependent to link speed, > it relies on it to calculate transmission bytes per cycle, we can't > properly calculate the so called budget if the device has failed > to report the link speed. > > In that case we can't dequeue packets assuming a wrong budget. > This patch makes sure we fail to dequeue case: > > 1) __ethtool_get_link_ksettings() reports error or 2) the ethernet > driver failed to set the ksettings' speed value (setting link speed > to SPEED_UNKNOWN). > > Additionally we re calculate the budget whenever the link speed is > changed. > > Fixes: 5a781ccbd19e4 ("tc: Add support for configuring the taprio scheduler") > Signed-off-by: Leandro Dorileo > --- > net/sched/sch_taprio.c | 90 ++++++++++++++++++++++++++++++++++-------- > 1 file changed, 74 insertions(+), 16 deletions(-) > > diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c > index 206e4dbed12f..fa237908ba09 100644 > --- a/net/sched/sch_taprio.c > +++ b/net/sched/sch_taprio.c > @@ -20,6 +20,9 @@ > #include > #include > > +static LIST_HEAD(taprio_list); > +static DEFINE_SPINLOCK(taprio_list_lock); > + > #define TAPRIO_ALL_GATES_OPEN -1 > > struct sched_entry { > @@ -42,9 +45,9 @@ struct taprio_sched { > struct Qdisc *root; > s64 base_time; > int clockid; > - int picos_per_byte; /* Using picoseconds because for 10Gbps+ > - * speeds it's sub-nanoseconds per byte > - */ > + atomic64_t picos_per_byte; /* Using picoseconds because for 10Gbps+ > + * speeds it's sub-nanoseconds per byte > + */ > size_t num_entries; > > /* Protects the update side of the RCU protected current_entry */ > @@ -53,6 +56,7 @@ struct taprio_sched { > struct list_head entries; > ktime_t (*get_time)(void); > struct hrtimer advance_timer; > + struct list_head taprio_list; > }; > > static int taprio_enqueue(struct sk_buff *skb, struct Qdisc *sch, > @@ -117,7 +121,7 @@ static struct sk_buff *taprio_peek(struct Qdisc *sch) > > static inline int length_to_duration(struct taprio_sched *q, int len) > { > - return (len * q->picos_per_byte) / 1000; > + return (len * atomic64_read(&q->picos_per_byte)) / 1000; > } > > static struct sk_buff *taprio_dequeue(struct Qdisc *sch) > @@ -129,6 +133,11 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch) > u32 gate_mask; > int i; > > + if (atomic64_read(&q->picos_per_byte) == -1) { > + WARN_ONCE(1, "taprio: dequeue() called with unknown picos per byte."); > + return NULL; > + } > + > rcu_read_lock(); > entry = rcu_dereference(q->current_entry); > /* if there's no entry, it means that the schedule didn't > @@ -233,7 +242,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer) > > next->close_time = close_time; > atomic_set(&next->budget, > - (next->interval * 1000) / q->picos_per_byte); > + (next->interval * 1000) / atomic64_read(&q->picos_per_byte)); > > first_run: > rcu_assign_pointer(q->current_entry, next); > @@ -567,7 +576,8 @@ static void taprio_start_sched(struct Qdisc *sch, ktime_t start) > > first->close_time = ktime_add_ns(start, first->interval); > atomic_set(&first->budget, > - (first->interval * 1000) / q->picos_per_byte); > + (first->interval * 1000) / > + atomic64_read(&q->picos_per_byte)); > rcu_assign_pointer(q->current_entry, NULL); > > spin_unlock_irqrestore(&q->current_entry_lock, flags); > @@ -575,6 +585,45 @@ static void taprio_start_sched(struct Qdisc *sch, ktime_t start) > hrtimer_start(&q->advance_timer, start, HRTIMER_MODE_ABS); > } > > +static void taprio_set_picos_per_byte(struct net_device *dev, > + struct taprio_sched *q) > +{ > + struct ethtool_link_ksettings ecmd; > + int picos_per_byte = -1; > + > + if (!__ethtool_get_link_ksettings(dev, &ecmd) && > + ecmd.base.speed != SPEED_UNKNOWN) > + picos_per_byte = div64_s64(NSEC_PER_SEC * 1000LL * 8, > + ecmd.base.speed * 1000 * 1000); > + > + atomic64_set(&q->picos_per_byte, picos_per_byte); > + pr_info("taprio: set %s's picos_per_byte to: %lld, linkspeed: %d\n", > + dev->name, atomic64_read(&q->picos_per_byte), ecmd.base.speed); It does not seem appropriate to use pr_info() here whenever the link speed changes and the taprio scheduler is reconfigured to match the network device's link speed. netdev_dbg() might be more appropriate, or no message at all to avoid spamming the kernel log. Same thing for your second patch. -- Florian