Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <5db8b856-27fe-41df-82df-774a3ec312a7@intel.com>
Date:   Mon, 4 Dec 2023 11:15:47 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH V2 net 1/2] net: hns: fix wrong head when modify the tx
 feature when sending packets
To:     Jijie Shao <shaojijie@huawei.com>, <yisen.zhuang@huawei.com>,
        <salil.mehta@huawei.com>, <davem@davemloft.net>,
        <edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>
CC:     <shenjian15@huawei.com>, <wangjie125@huawei.com>,
        <liuyonglong@huawei.com>, <netdev@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
References: <20231204011051.4055031-1-shaojijie@huawei.com>
 <20231204011051.4055031-2-shaojijie@huawei.com>
Content-Language: en-US
From:   Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <20231204011051.4055031-2-shaojijie@huawei.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cHpzTW5Kb3VpUUlqV2tBeTJTcEdIcGtqWmRFT2JkQ0FhbGtvTDdVQXhBQmhX?=
 =?utf-8?B?Wi9waEo3RURvN2NiUFpGOFJDN3ZqNTNRa2hVSTNxbHJ5SktLMzM5VkU1c0pW?=
 =?utf-8?B?MFQ2bWJxcStRTlQ4UTl0SkhvMHNpQ2xiaUd2UTRic0hPdE5KSkhnbkZDMUsr?=
 =?utf-8?B?aHdvU2dOUHVYVWxQMU1PTGx1SjVkWjQ5RXJkenovb2ZvS21HRUVvUCtYM210?=
 =?utf-8?B?NGRDUlUraVVocjVOeTVPa3djRDZyZmRDUThJc1dXM250ZEMvUTFIODhWd1gr?=
 =?utf-8?B?cStNQ2RDb3k3NGIvbXVvMENYQXFOMUxaMk0xUVZVMGR1eGswOFVtUGxxUkE1?=
 =?utf-8?B?bFJNOUlab0Y2SnJVL2kyRUFDNzlIb09tKzJSRzc1VUNiOUdqZ3VNK3NmM3dp?=
 =?utf-8?B?TzMzeWt0dTZWU3JERHZqbldSb0sya3hjM01BVmpRM2NnWTBmeGJOeXp1eUpL?=
 =?utf-8?B?MmVDNnE1MklVVUVJZVltVGFUM1pDUmVPY2RqeEtQVnBEb0dJQk42djRtSWpo?=
 =?utf-8?B?c1dwM1hOQWJTVUpSbUFTUkRxWEl6YVZqbzB0clRHSWJsamF1OFpQYXJYcHB6?=
 =?utf-8?B?bHVTazdKeU9oV2JFMm1wc2hpZXpvL3dMbURzbnNkOTVQS1NSUXEyRUlXam1p?=
 =?utf-8?B?YkdOTGxyTnJpZHRUSEM5T3cwVngxWDN6ZU9BVGdKZmY4NDUyNldlZU9pcy93?=
 =?utf-8?B?ZXZTd1JpdXJoeUFIM2JIZXVGa29LUnZqR2ZkSmN1V2lEMklWbjBiQVVsRW8w?=
 =?utf-8?B?MkpJNzNrWlRnN2hlL1BUekNIVnlpMjdnVllLTmwyTFZHSEZTd0UzN0t4L1hn?=
 =?utf-8?B?bDNOTUNoRFNKZEVGR2l3Q2o0V0ZZUER5SHB5blZkSElZV2VwLzlUSmw3U1VB?=
 =?utf-8?B?bXFZN2lhRGRNWWMrcnl6eDZoQ25jZnRZTHJjS3kxWUI2YTRwb2lKSEl1ODFz?=
 =?utf-8?B?SDBhcXJ0U1o4U0I1MnVNWHNtaS9jS3J3dHdJRUtjTGl3T2JuZzJ1N3g2QXVi?=
 =?utf-8?B?d2hRRU9IZFNrS21tSWhTMlZaWFd2WHhqdDEyNFNLWWtLMEJtV1kyaEQwY1R3?=
 =?utf-8?B?RWV4YlFpcmVUNXlhbG50R3NVZEJWVTNFQkJjR2I4TXpIekVMTzRoNFQxZ29M?=
 =?utf-8?B?NFdhdFA0bUhpa3IzdjlucGF2TTdJcnMvNFBabHJmdHdHMldhanRSakRkWi9V?=
 =?utf-8?B?TGdUK3V5UHJkL0hsTnNBa0p6SFBVZDR6VkozY1FBenA1Rm5yYU1YZUZranBL?=
 =?utf-8?B?N3M5TnErQVU5NThwcHhCRUhGNmd6TzV1UjZYQ3p0QWFBVm1YMkh3T1ByRjZT?=
 =?utf-8?B?UnJPam8xQ2J4QjY2QlBJWlEvd01iWHY3S1VvMFAvRlZ3WkVMSFl4Qmd4dGZ0?=
 =?utf-8?B?aFlaNXB2cEpGanVmd05KbjNuZ0NITXA1cFBYUkhxNm1HNFdmR0NyUXV5Z1dm?=
 =?utf-8?B?QnczcERybGJ4S0JHOHFWUzBobklkazh6eExjZXRpR2hYaTl5T1hzcmptYnlK?=
 =?utf-8?B?THRWZlFIc3JKU1dFM0g4QWhha3FYcXg5K1h6ckc0RkVhL0hDZGZSYTQ1UTg2?=
 =?utf-8?B?azdydEtibjVkTldtUzkxRERwWlhvYWRHc3laWmFqY0FKZTVIRW8xaGdRUjFZ?=
 =?utf-8?B?WWVyNGtzZXZicVNISXpmbm9HVXpXaFZBS3RCa0EzdzF2UGgzYTZHODFEd3R3?=
 =?utf-8?B?Mm84Rm4xMmRsU3JvL0NxaEdhc0FKRGF5UjNWMGk3cko0amJRK0V4b2NmdVd6?=
 =?utf-8?B?azQxWVFsV0wrM1FNNHo1dDd4UXZuVW0zeVJaekFOWE1kNGE2bjY0TWVLWXFJ?=
 =?utf-8?B?NWZiN3U5OFVVYS94MmJnY2lzYlhpOTdob3duQXVSUi9UL0lKMWFpTVBKRWV2?=
 =?utf-8?B?UnRWOVBKKzFPU3lLRUNVL05CbkJRZVpLckZlQlAvMEkyRElrajdPbDMzYm16?=
 =?utf-8?B?Yk4zS0NyUUxIdE1PMnRhK1dvRkc0WElsV2ZGR3QrbHQxbkJqSVJLT09xbTIx?=
 =?utf-8?B?enNsR0FHc0w4U21HQkk5SzRPL05KS05kUDBES2lKTGkySEhOREcxeXVWL0lm?=
 =?utf-8?B?WFZ2bnR1Y2VtRmYyRkM0SUYxV3dRM0lEK1pYa2RpVkZSZi9kNUpIcjhpWEQz?=
 =?utf-8?B?SzhNRDZaOWtXOVdWYWFReklsUmZTbHMzOFRSVm1zZWd3dEJtVUI5VGxvS0dU?=
 =?utf-8?B?Vnc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 85f4af16-6326-4dda-13b9-08dbf4b1ff61
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 10:15:53.6646
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qL1zBZXhGOnGe8W9s+363k4/ygQrUXGqoiEjKfguChE6PelIdf4kFXsy9JjpB/xezSdYW4mHxwSSycckzhON6j9hrHEwTeZ+GYIIIsbhOCQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB6222
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 04 Dec 2023 02:16:22 -0800 (PST)


On 04.12.2023 02:10, Jijie Shao wrote:
> From: Yonglong Liu <liuyonglong@huawei.com>
> 
> When modify the tx feature, the hns driver will modify the

Upon changing the...

> maybe_stop_tx() and fill_desc() functions, if the modify happens
> during packet sending, will cause the hardware and software
> pointers do not match, and the port can not work anymore.
> 
> This patch deletes the maybe_stop_tx() and fill_desc() functions
> modification when setting tx feature, and use the skb_is_gro()
> to determine use tso functions or non-tso functions when packets
> sending.

and use the skb_is_gro() to determine which functions to use in the tx path.
> 
> Fixes: 38f616da1c28 ("net:hns: Add support of ethtool TSO set option for Hip06 in HNS")
> Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
> Signed-off-by: Jijie Shao <shaojijie@huawei.com>
> ---

Some commit msg suggestions, other than that:
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>

>  drivers/net/ethernet/hisilicon/hns/hns_enet.c | 53 +++++++++++--------
>  drivers/net/ethernet/hisilicon/hns/hns_enet.h |  3 +-
>  2 files changed, 33 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> index 0900abf5c508..8a713eed4465 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> @@ -142,7 +142,8 @@ MODULE_DEVICE_TABLE(acpi, hns_enet_acpi_match);
>  
>  static void fill_desc(struct hnae_ring *ring, void *priv,
>  		      int size, dma_addr_t dma, int frag_end,
> -		      int buf_num, enum hns_desc_type type, int mtu)
> +		      int buf_num, enum hns_desc_type type, int mtu,
> +		      bool is_gso)
>  {
>  	struct hnae_desc *desc = &ring->desc[ring->next_to_use];
>  	struct hnae_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];
> @@ -275,6 +276,15 @@ static int hns_nic_maybe_stop_tso(
>  	return 0;
>  }
>  
> +static int hns_nic_maybe_stop_tx_v2(struct sk_buff **out_skb, int *bnum,
> +				    struct hnae_ring *ring)
> +{
> +	if (skb_is_gso(*out_skb))
> +		return hns_nic_maybe_stop_tso(out_skb, bnum, ring);
> +	else
> +		return hns_nic_maybe_stop_tx(out_skb, bnum, ring);
> +}
> +
>  static void fill_tso_desc(struct hnae_ring *ring, void *priv,
>  			  int size, dma_addr_t dma, int frag_end,
>  			  int buf_num, enum hns_desc_type type, int mtu)
> @@ -300,6 +310,19 @@ static void fill_tso_desc(struct hnae_ring *ring, void *priv,
>  				mtu);
>  }
>  
> +static void fill_desc_v2(struct hnae_ring *ring, void *priv,
> +			 int size, dma_addr_t dma, int frag_end,
> +			 int buf_num, enum hns_desc_type type, int mtu,
> +			 bool is_gso)
> +{
> +	if (is_gso)
> +		fill_tso_desc(ring, priv, size, dma, frag_end, buf_num, type,
> +			      mtu);
> +	else
> +		fill_v2_desc(ring, priv, size, dma, frag_end, buf_num, type,
> +			     mtu);
> +}
> +
>  netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,
>  				struct sk_buff *skb,
>  				struct hns_nic_ring_data *ring_data)
> @@ -313,6 +336,7 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,
>  	int seg_num;
>  	dma_addr_t dma;
>  	int size, next_to_use;
> +	bool is_gso;
>  	int i;
>  
>  	switch (priv->ops.maybe_stop_tx(&skb, &buf_num, ring)) {
> @@ -339,8 +363,9 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,
>  		ring->stats.sw_err_cnt++;
>  		goto out_err_tx_ok;
>  	}
> +	is_gso = skb_is_gso(skb);
>  	priv->ops.fill_desc(ring, skb, size, dma, seg_num == 1 ? 1 : 0,
> -			    buf_num, DESC_TYPE_SKB, ndev->mtu);
> +			    buf_num, DESC_TYPE_SKB, ndev->mtu, is_gso);
>  
>  	/* fill the fragments */
>  	for (i = 1; i < seg_num; i++) {
> @@ -354,7 +379,7 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,
>  		}
>  		priv->ops.fill_desc(ring, skb_frag_page(frag), size, dma,
>  				    seg_num - 1 == i ? 1 : 0, buf_num,
> -				    DESC_TYPE_PAGE, ndev->mtu);
> +				    DESC_TYPE_PAGE, ndev->mtu, is_gso);
>  	}
>  
>  	/*complete translate all packets*/
> @@ -1776,15 +1801,6 @@ static int hns_nic_set_features(struct net_device *netdev,
>  			netdev_info(netdev, "enet v1 do not support tso!\n");
>  		break;
>  	default:
> -		if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {
> -			priv->ops.fill_desc = fill_tso_desc;
> -			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tso;
> -			/* The chip only support 7*4096 */
> -			netif_set_tso_max_size(netdev, 7 * 4096);
> -		} else {
> -			priv->ops.fill_desc = fill_v2_desc;
> -			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx;
> -		}
>  		break;
>  	}
>  	netdev->features = features;
> @@ -2159,16 +2175,9 @@ static void hns_nic_set_priv_ops(struct net_device *netdev)
>  		priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx;
>  	} else {
>  		priv->ops.get_rxd_bnum = get_v2rx_desc_bnum;
> -		if ((netdev->features & NETIF_F_TSO) ||
> -		    (netdev->features & NETIF_F_TSO6)) {
> -			priv->ops.fill_desc = fill_tso_desc;
> -			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tso;
> -			/* This chip only support 7*4096 */
> -			netif_set_tso_max_size(netdev, 7 * 4096);
> -		} else {
> -			priv->ops.fill_desc = fill_v2_desc;
> -			priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx;
> -		}
> +		priv->ops.fill_desc = fill_desc_v2;
> +		priv->ops.maybe_stop_tx = hns_nic_maybe_stop_tx_v2;
> +		netif_set_tso_max_size(netdev, 7 * 4096);
>  		/* enable tso when init
>  		 * control tso on/off through TSE bit in bd
>  		 */
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> index ffa9d6573f54..3f3ee032f631 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> @@ -44,7 +44,8 @@ struct hns_nic_ring_data {
>  struct hns_nic_ops {
>  	void (*fill_desc)(struct hnae_ring *ring, void *priv,
>  			  int size, dma_addr_t dma, int frag_end,
> -			  int buf_num, enum hns_desc_type type, int mtu);
> +			  int buf_num, enum hns_desc_type type, int mtu,
> +			  bool is_gso);
>  	int (*maybe_stop_tx)(struct sk_buff **out_skb,
>  			     int *bnum, struct hnae_ring *ring);
>  	void (*get_rxd_bnum)(u32 bnum_flag, int *out_bnum);