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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 753CCC3DA4A for ; Mon, 19 Aug 2024 11:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MO3Bgs9Dy2a9RAD8UjB1CU4gKYO/Woxp4kWSfJ4CEcc=; b=FDm2dGdMZEWfKsnYmAkMW1ruoD zrASs9PUmh0JAx4hsKTjK4ovbfNYWwJgfSWkIfcJTcMcfexUDUtB4vF/wq53MEVz/aC+yabVtmeDi eyFyzz9QNlDMqIYo7bnln2xRStzY+JtZEL6uuWsu+xlHrVHDmdlRtm4oMRIiblhJ5xaM1ap8JCyOP 2tYfL5ZgsHaorDSofFGiw/mOiRJgczW9+Pv0n7t0C5RG/38HcHwi6eHAKQZy7L2HpPROcvn5K6cAR vOoSCR0G7FdGlN+uCoXCXIYxZjCQb9hwaIa6s2tKcZLNQaAHEYKdadkvU7cfcs0SiJZiA0B6zaYH5 c+xtEF3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg0nK-00000001GFf-2TwC; Mon, 19 Aug 2024 11:43:30 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg0md-00000001G5x-2jqU for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 11:42:49 +0000 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-371893dd249so2237797f8f.2 for ; Mon, 19 Aug 2024 04:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724067766; x=1724672566; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MO3Bgs9Dy2a9RAD8UjB1CU4gKYO/Woxp4kWSfJ4CEcc=; b=QNlF8C+XTmqD/VhZ4X+MPAX7aMozw/l18xgEaJ1+qC0Uqun2RmEyVfOSGHXlbwrSW2 oxqpv6EtSF5VNAd1qhDzv2ZZYKvtD/RjIBf9UPWIi9GxeCzluO2s2Gsmkg7vru9GO/It JF/wJn+W9m1pNa+PtP+2SWeP44QKO0DMZeT0MnKl1wemIbBmA9brVDWS8ko3QtqsYv9m Gs7lI65895nokF7fNR9HxUF9ozO5BY8wFMqWk3gWR697TfF4Ezm8y2u28gbPKb1KjDvN xBRb64xOBoA09ZtnrwElCbTgVa5DLQXs7v2N6zqTPjcFpzKzLzwJdCJP3VJYiXTIwtgI GSqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724067766; x=1724672566; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MO3Bgs9Dy2a9RAD8UjB1CU4gKYO/Woxp4kWSfJ4CEcc=; b=Jdb8qsPfRrnH9Abutm/C4GhGAeWJPZ1ZAXANn5ZT1QZQPZFoddUI06ppTM9Lq4EgnM agf1icNimIfTn+fpTvji1nEJSHoNW0+96X9mc9vqBc/sHvJdy0RUccAyjlDI9rbG149M Si4u2nqc2d8yU2CCtzIkvRpEjAQt9lke2ybm+qZfT7/BVWtixJalZdwt+2Sbj8OsS+UX qUSpAvVJlM0jHoFWpgU3C8E95nLEnr4HHxOOm0nG8954eeJNiIXMrOcUH5gTf9nE1tik rmbIDuHDW2IrYqHhgugGEx7j2m4DumqsjIvfDkSjE2+RuPKo9aU4ibfhY1jdOYqgwjMK QaHw== X-Forwarded-Encrypted: i=1; AJvYcCXvzs7CcCCZA9QSbSjMsS0dNDDTi6jImV3cUQ+jSK8YS3MfEwnlD0VkUoELytbYXTPvq7FmepqxDKfX4N+OvIQbDGrkglWHiaYonbPc4HNMMqwG9sM= X-Gm-Message-State: AOJu0Yy73sWpcEfU4QRJcy0kZVdmmW53fpUfRSjmlaTRDd9Bfbj0nwUf x0LsGXiHH+pYMyoFm9j3Z/OvRDuNYGkBaIcIK2VfqA5VuBsDijwE X-Google-Smtp-Source: AGHT+IEL53gDLjuRZcqGEa/kN5yhO0fwxMEnDdHkMbcEE+bMHmvUJLjzmajFixcoI15UC2irOx6iCg== X-Received: by 2002:adf:e88e:0:b0:36b:d21e:bf85 with SMTP id ffacd0b85a97d-371a7477a4bmr4403906f8f.51.1724067765493; Mon, 19 Aug 2024 04:42:45 -0700 (PDT) Received: from skbuf ([188.25.134.29]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37195650163sm8280650f8f.98.2024.08.19.04.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 04:42:44 -0700 (PDT) Date: Mon, 19 Aug 2024 14:42:42 +0300 From: Vladimir Oltean To: Furong Xu <0x1207@gmail.com> Cc: Serge Semin , Andrew Lunn , "David S. Miller" , Alexandre Torgue , Jose Abreu , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Joao Pinto , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xfr@outlook.com Subject: Re: [PATCH net-next v3 6/7] net: stmmac: support fp parameter of tc-taprio Message-ID: <20240819114242.2m6okk7bq64e437c@skbuf> References: <28f3b68dd0e0744e851a0b9d90fdee69792fbc0f.1724051326.git.0x1207@gmail.com> <28f3b68dd0e0744e851a0b9d90fdee69792fbc0f.1724051326.git.0x1207@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <28f3b68dd0e0744e851a0b9d90fdee69792fbc0f.1724051326.git.0x1207@gmail.com> <28f3b68dd0e0744e851a0b9d90fdee69792fbc0f.1724051326.git.0x1207@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_044247_719886_2F84DAF7 X-CRM114-Status: GOOD ( 20.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Aug 19, 2024 at 03:25:19PM +0800, Furong Xu wrote: > tc-taprio can select whether traffic classes are express or preemptible. > > 0) tc qdisc add dev eth1 parent root handle 100 taprio \ > num_tc 4 \ > map 0 1 2 3 2 2 2 2 2 2 2 2 2 2 2 3 \ > queues 1@0 1@1 1@2 1@3 \ > base-time 1000000000 \ > sched-entry S 03 10000000 \ > sched-entry S 0e 10000000 \ > flags 0x2 fp P E E E > > 1) After some traffic tests, MAC merge layer statistics are all good. > > Local device: > [ { > "ifname": "eth1", > "pmac-enabled": true, > "tx-enabled": true, > "tx-active": true, > "tx-min-frag-size": 60, > "rx-min-frag-size": 60, > "verify-enabled": true, > "verify-time": 100, > "max-verify-time": 128, > "verify-status": "SUCCEEDED", > "statistics": { > "MACMergeFrameAssErrorCount": 0, > "MACMergeFrameSmdErrorCount": 0, > "MACMergeFrameAssOkCount": 0, > "MACMergeFragCountRx": 0, > "MACMergeFragCountTx": 17837, > "MACMergeHoldCount": 18639 > } > } ] > > Remote device: > [ { > "ifname": "end1", > "pmac-enabled": true, > "tx-enabled": true, > "tx-active": true, > "tx-min-frag-size": 60, > "rx-min-frag-size": 60, > "verify-enabled": true, > "verify-time": 100, > "max-verify-time": 128, > "verify-status": "SUCCEEDED", > "statistics": { > "MACMergeFrameAssErrorCount": 0, > "MACMergeFrameSmdErrorCount": 0, > "MACMergeFrameAssOkCount": 17189, > "MACMergeFragCountRx": 17837, > "MACMergeFragCountTx": 0, > "MACMergeHoldCount": 0 > } > } ] > > Tested on DWMAC CORE 5.10a > > Signed-off-by: Furong Xu <0x1207@gmail.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c > index a967c6f01e4e..05b870b35947 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c > @@ -933,7 +933,6 @@ static int tc_taprio_configure(struct stmmac_priv *priv, > u32 size, wid = priv->dma_cap.estwid, dep = priv->dma_cap.estdep; > struct timespec64 time, current_time, qopt_time; > ktime_t current_time_ns; > - bool fpe = false; > int i, ret = 0; > u64 ctr; > > @@ -1018,16 +1017,12 @@ static int tc_taprio_configure(struct stmmac_priv *priv, > > switch (qopt->entries[i].command) { > case TC_TAPRIO_CMD_SET_GATES: > - if (fpe) > - return -EINVAL; > break; > case TC_TAPRIO_CMD_SET_AND_HOLD: > gates |= BIT(0); > - fpe = true; > break; > case TC_TAPRIO_CMD_SET_AND_RELEASE: > gates &= ~BIT(0); > - fpe = true; > break; > default: > return -EOPNOTSUPP; > @@ -1058,7 +1053,7 @@ static int tc_taprio_configure(struct stmmac_priv *priv, > > tc_taprio_map_maxsdu_txq(priv, qopt); > > - if (fpe && !priv->dma_cap.fpesel) { > + if (qopt->mqprio.preemptible_tcs && !priv->dma_cap.fpesel) { > mutex_unlock(&priv->est_lock); > return -EOPNOTSUPP; > } This condition is dealt with by the core, now. if (have_preemption && !ethtool_dev_mm_supported(dev)) { NL_SET_ERR_MSG(extack, "Device does not support preemption"); return -EOPNOTSUPP; } where ethtool_dev_mm_supported() is implemented by issuing a get_mm() command and seeing what it returns. There's a check for priv->dma_cap.fpesel there already. > @@ -1071,6 +1066,9 @@ static int tc_taprio_configure(struct stmmac_priv *priv, > goto disable; > } > > + stmmac_fpe_set_preemptible_tcs(priv, priv->dev, qopt->mqprio.extack, > + qopt->mqprio.preemptible_tcs); > + > netdev_info(priv->dev, "configured EST\n"); > > return 0; > @@ -1089,11 +1087,8 @@ static int tc_taprio_configure(struct stmmac_priv *priv, > mutex_unlock(&priv->est_lock); > } > > - stmmac_fpe_configure(priv, priv->ioaddr, > - &priv->fpe_cfg, > - priv->plat->tx_queues_to_use, > - priv->plat->rx_queues_to_use, > - false, false); > + stmmac_fpe_set_preemptible_tcs(priv, priv->dev, qopt->mqprio.extack, 0); > + > netdev_info(priv->dev, "disabled FPE\n"); > > return ret; > -- > 2.34.1 >