April 2021 - Linuxarm - mailweb.openeuler.org

[PATCH v2] iommu/iova: put free_iova_mem() outside of spinlock iova_rbtree_lock
by chenxiang 15 Apr '21

15 Apr '21

From: Xiang Chen <chenxiang66(a)hisilicon.com> It is not necessary to put free_iova_mem() inside of spinlock/unlock iova_rbtree_lock which only leads to more completion for the spinlock. It has a small promote on the performance after the change. And also rename private_free_iova() as remove_iova() because the function will not free iova after that change. Signed-off-by: Xiang Chen <chenxiang66(a)hisilicon.com> --- drivers/iommu/iova.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index b7ecd5b..c10af23 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -412,12 +412,11 @@ private_find_iova(struct iova_domain *iovad, unsigned long pfn) return NULL; } -static void private_free_iova(struct iova_domain *iovad, struct iova *iova) +static void remove_iova(struct iova_domain *iovad, struct iova *iova) { assert_spin_locked(&iovad->iova_rbtree_lock); __cached_rbnode_delete_update(iovad, iova); rb_erase(&iova->node, &iovad->rbroot); - free_iova_mem(iova); } /** @@ -452,8 +451,9 @@ __free_iova(struct iova_domain *iovad, struct iova *iova) unsigned long flags; spin_lock_irqsave(&iovad->iova_rbtree_lock, flags); - private_free_iova(iovad, iova); + remove_iova(iovad, iova); spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); + free_iova_mem(iova); } EXPORT_SYMBOL_GPL(__free_iova); @@ -473,9 +473,9 @@ free_iova(struct iova_domain *iovad, unsigned long pfn) spin_lock_irqsave(&iovad->iova_rbtree_lock, flags); iova = private_find_iova(iovad, pfn); if (iova) - private_free_iova(iovad, iova); + remove_iova(iovad, iova); spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); - + free_iova_mem(iova); } EXPORT_SYMBOL_GPL(free_iova); @@ -825,7 +825,8 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad) if (WARN_ON(!iova)) continue; - private_free_iova(iovad, iova); + remove_iova(iovad, iova); + free_iova_mem(iova); } spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); -- 2.8.1

2 1

FW: Patch "ice: Re-organizes reqstd/avail {R,T}XQ check/code for efficiency+readability" has been added to net-queue tree
by Salil Mehta 15 Apr '21

15 Apr '21

FYI. > From: anthony.l.nguyen(a)intel.com [mailto:anthony.l.nguyen@intel.com] > Sent: Wednesday, April 14, 2021 10:28 PM > To: Salil Mehta <salil.mehta(a)huawei.com> > Subject: Patch "ice: Re-organizes reqstd/avail {R,T}XQ check/code for > efficiency+readability" has been added to net-queue tree > > This is a note to let you know that I applied the following patch to > the dev-queue branch on the net-queue tree. > > http://patchwork.ozlabs.org/patch/1465962/ > > From 2c58268dac5bd0dbfe46614febd22b757e29582c Mon Sep 17 00:00:00 2001 > From: Salil Mehta <salil.mehta(a)huawei.com> > Date: Wed, 14 Apr 2021 12:01:49 -0700 > Subject: [PATCH] ice: Re-organizes reqstd/avail {R,T}XQ check/code for > efficiency+readability > > If user has explicitly requested the number of {R,T}XQs, then it is > unnecessary to get the count of already available {R,T}XQs from the > PF avail_{r,t}xqs bitmap. This value will get overridden by user specified > value in any case. > > This patch does minor re-organization of the code for improving the flow > and readabiltiy. This scope of improvement was found during the review of > the ICE driver code. > > FYI, I could not test this change due to unavailability of the hardware. > It would be helpful if somebody can test this patch and provide Tested-by > Tag. Many thanks! > > Fixes: 87324e747fde ("ice: Implement ethtool ops for channels") > Cc: intel-wired-lan(a)lists.osuosl.org > Cc: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com> > Signed-off-by: Salil Mehta <salil.mehta(a)huawei.com> > --- > > checkpatch.pl reports: > > total: 0 errors, 0 warnings, 0 checks, 32 lines checked > > .apply/V2-net-ice-Re-organizes-reqstd-avail-R-T-XQ-check-code-for-efficienc > y-readability.patch has no obvious style problems and is ready for submission.

1 0

[PATCH net-next 0/2] net: hns3: updates for -next
by Huazhong Tan 15 Apr '21

15 Apr '21

This series adds support for pushing link status to VFs for the HNS3 ethernet driver. Guangbin Huang (2): net: hns3: PF add support for pushing link status to VFs net: hns3: VF not request link status when PF support push link status feature drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 3 ++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 35 +++++++++++++++++++++- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 12 ++++---- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 8 +++-- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 6 ++++ 7 files changed, 55 insertions(+), 11 deletions(-) -- 2.7.4

2 8

linuxarm@openeuler.org You have [9] qurantined messages in your quarantine portal
by openeuler.org 15 Apr '21

15 Apr '21

1 0

Re: [PATCH] iommu/iova: put free_iova_mem() outside of spinlock iova_rbtree_lock
by Robin Murphy 14 Apr '21

14 Apr '21

On 2021-04-14 07:38, chenxiang wrote: > From: Xiang Chen <chenxiang66(a)hisilicon.com> > > It is not necessary to put free_iova_mem() inside of spinlock/unlock > iova_rbtree_lock which only leads to more completion for the spinlock. > It has a small promote on the performance after the change. This seems not entirely unreasonable, but private_free_iova() really needs to be renamed (maybe something like remove_iova()?) if it's no longer actually freeing anything - otherwise it's just unnecessarily misleading. Robin. > Signed-off-by: Xiang Chen <chenxiang66(a)hisilicon.com> > --- > drivers/iommu/iova.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c > index c669526f..292ed4a 100644 > --- a/drivers/iommu/iova.c > +++ b/drivers/iommu/iova.c > @@ -339,7 +339,6 @@ static void private_free_iova(struct iova_domain *iovad, struct iova *iova) > assert_spin_locked(&iovad->iova_rbtree_lock); > __cached_rbnode_delete_update(iovad, iova); > rb_erase(&iova->node, &iovad->rbroot); > - free_iova_mem(iova); > } > > /** > @@ -376,6 +375,7 @@ __free_iova(struct iova_domain *iovad, struct iova *iova) > spin_lock_irqsave(&iovad->iova_rbtree_lock, flags); > private_free_iova(iovad, iova); > spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); > + free_iova_mem(iova); > } > EXPORT_SYMBOL_GPL(__free_iova); > > @@ -397,7 +397,7 @@ free_iova(struct iova_domain *iovad, unsigned long pfn) > if (iova) > private_free_iova(iovad, iova); > spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); > - > + free_iova_mem(iova); > } > EXPORT_SYMBOL_GPL(free_iova); > > @@ -746,6 +746,7 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad) > continue; > > private_free_iova(iovad, iova); > + free_iova_mem(iova); > } > > spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags); >

1 0

[PATCH] ethdev: add queue state when retrieve queue information
by Lijun Ou 14 Apr '21

14 Apr '21

Currently, upper-layer application could get queue state only through pointers such as dev->data->tx_queue_state[queue_id], this is not the recommended way to access it. So this patch add get queue state when call rte_eth_rx_queue_info_get and rte_eth_tx_queue_info_get API. Note: The hairpin queue is not supported with above rte_eth_*x_queue_info_get, so the queue state could be RTE_ETH_QUEUE_STATE_STARTED or RTE_ETH_QUEUE_STATE_STOPPED. Note: After add queue_state field, the 'struct rte_eth_rxq_info' size remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so it could be ABI compatible. Signed-off-by: Chengwen Feng <fengchengwen(a)huawei.com> Signed-off-by: Lijun Ou <oulijun(a)huawei.com> --- doc/guides/rel_notes/release_21_05.rst | 6 ++++++ lib/librte_ethdev/rte_ethdev.c | 3 +++ lib/librte_ethdev/rte_ethdev.h | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst index 43063e3..165b5f7 100644 --- a/doc/guides/rel_notes/release_21_05.rst +++ b/doc/guides/rel_notes/release_21_05.rst @@ -156,6 +156,12 @@ ABI Changes * No ABI change that would break compatibility with 20.11. +* Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure + to provide indicated rxq queue state. + +* Added new field ``queue_state`` to ``rte_eth_txq_info`` structure + to provide indicated txq queue state. + Known Issues ------------ diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 3059aa5..fbd10b2 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -5042,6 +5042,8 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, memset(qinfo, 0, sizeof(*qinfo)); dev->dev_ops->rxq_info_get(dev, queue_id, qinfo); + qinfo->queue_state = dev->data->rx_queue_state[queue_id]; + return 0; } @@ -5082,6 +5084,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, memset(qinfo, 0, sizeof(*qinfo)); dev->dev_ops->txq_info_get(dev, queue_id, qinfo); + qinfo->queue_state = dev->data->tx_queue_state[queue_id]; return 0; } diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index efda313..3b83c5a 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1591,6 +1591,8 @@ struct rte_eth_rxq_info { uint8_t scattered_rx; /**< scattered packets RX supported. */ uint16_t nb_desc; /**< configured number of RXDs. */ uint16_t rx_buf_size; /**< hardware receive buffer size. */ + /**< Queues state: STARTED(1) / STOPPED(0). */ + uint8_t queue_state; } __rte_cache_min_aligned; /** @@ -1600,6 +1602,8 @@ struct rte_eth_rxq_info { struct rte_eth_txq_info { struct rte_eth_txconf conf; /**< queue config parameters. */ uint16_t nb_desc; /**< configured number of TXDs. */ + /**< Queues state: STARTED(1) / STOPPED(0). */ + uint8_t queue_state; } __rte_cache_min_aligned; /* Generic Burst mode flag definition, values can be ORed. */ -- 2.7.4

6 18

Re: [PATCH RFC net] net: hns3: fixes+refactors the broken set channel fallback logic
by Salil Mehta 14 Apr '21

14 Apr '21

> From: lipeng (Y) > Sent: Wednesday, April 14, 2021 2:59 AM > > > 在 2021/4/13 21:55, Salil Mehta 写道: > >> From: lipeng (Y) > >> Sent: Tuesday, April 13, 2021 1:38 PM > >> > >> > >> 在 2021/4/13 19:17, Salil Mehta 写道: > >>>> From: lipeng (Y) > >>>> Sent: Tuesday, April 13, 2021 10:30 AM > >>>> To: Salil Mehta <salil.mehta(a)huawei.com>; Linuxarm <linuxarm(a)huawei.com>; > >>>> linuxarm(a)openeuler.org > >>>> Cc: Zhuangyuzeng (Yisen) <yisen.zhuang(a)huawei.com>; huangdaode > >>>> <huangdaode(a)huawei.com>; linyunsheng <linyunsheng(a)huawei.com>; shenjian > (K) > >>>> <shenjian15(a)huawei.com>; moyufeng <moyufeng(a)huawei.com>; zhangjiaran > >>>> <zhangjiaran(a)huawei.com>; huangguangbin (A) <huangguangbin2(a)huawei.com>; > >>>> Jonathan Cameron <jonathan.cameron(a)huawei.com> > >>>> Subject: Re: [PATCH RFC net] net: hns3: fixes+refactors the broken set > channel > >>>> fallback logic > >>>> > >>>> > >>>> 在 2021/4/13 17:12, Salil Mehta 写道: > >>>>> The fallback logic of the set channels when set_channel() fails to configure > >>>>> TX Sched/RSS H/W configuration or for the code which brings down/restores > >>>>> client before/therafter is not handled properly. > >>>>> > >>>>> This patch fixes and refactors that code to improve the readibility. > >>>>> > >>>>> [INTERNAL ONLY] > >>>>> Fixes: <Tag TODO> ("Comment TODO") > >>>>> Signed-off-by: Salil Mehta <salil.mehta(a)huawei.com> > >>>>> --- > >>>>> .../net/ethernet/hisilicon/hns3/hns3_enet.c | 72 > +++++++++++-------- > >>>>> 1 file changed, 43 insertions(+), 29 deletions(-) > >>>>> > >>>>> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > >>>> b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > >>>>> index bf4302a5cf95..41d8bdb34f6e 100644 > >>>>> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > >>>>> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c > >>>>> @@ -4692,23 +4692,56 @@ static int hns3_reset_notify(struct hnae3_handle > >>>> *handle, > >>>>> static int hns3_change_channels(struct hnae3_handle *handle, u32 > >>>> new_tqp_num, > >>>>> bool rxfh_configured) > >>>>> { > >>>>> - int ret; > >>>>> + const struct hnae3_ae_ops *ops = handle->ae_algo->ops; > >>>>> + u32 org_tqp_num = handle->kinfo.num_tqps; > >>>>> + struct device *dev = &handle->pdev->dev; > >>>>> + u32 req_tqp_num = new_tqp_num; > >>>>> + bool revert_old_config = false; > >>>>> + int ret, retval = 0; > >>>>> + > >>>>> + /* bring down the client */ > >>>>> + ret = hns3_reset_notify(handle, HNAE3_DOWN_CLIENT); > >>>>> + if (ret) > >>>>> + return ret; > >>>>> > >>>>> - ret = handle->ae_algo->ops->set_channels(handle, new_tqp_num, > >>>>> - rxfh_configured); > >>>>> - if (ret) { > >>>>> - dev_err(&handle->pdev->dev, > >>>>> - "Change tqp num(%u) fail.\n", new_tqp_num); > >>>>> + ret = hns3_reset_notify(handle, HNAE3_UNINIT_CLIENT); > >>>>> + if (ret) > >>>>> return ret; > >>>>> + > >>>>> +revert_old_tpqs_config: > >>>>> + /* update the traffic sched and RSS config in the H/W as per new TPQ > num > >>>> */ > >>>>> + ret = ops->set_channels(handle, req_tqp_num, rxfh_configured); > >>>>> + if (ret) { > >>>>> + dev_err(dev, "failed(=%d) to update TX sched/RSS h/w cfg for %s > >> TPQs\n", > >>>>> + ret, revert_old_config?"old":"new"); > >>>>> + > >>>>> + /* try reverting back h/w config with old TPQ num */ > >>>>> + if (!revert_old_config) { > >>>>> + dev_warn(dev, > >>>>> + "will try to revert TX sched/RSS h/w cfg with old TPQs\n"); > >>>>> + req_tqp_num = org_tqp_num; > >>>>> + revert_old_config = true; > >>>>> + retval = ret; > >>>>> + > >>>>> + goto revert_old_tpqs_config; > >>>>> + } > >>>>> + > >>>>> + /* bad, we could not revert to h/w config with old TQP number */ > >>>>> + goto err_set_chan_fail; > >>>> why you changelike this ? > >>>> > >>>> > >>>> when setting fail, the port should work OK just like setting before. > >>> The port can get into problematic state if the client remains in un-initialized > >>> state after errors are encountered during the process of setting the channels > >>> for new number of TPQs. Port cannot be said to be in sane state. > >>> > >>> Conditions(after desperate attempt to revert to old TPQ config fails): > >>> 1. half un-initialized state of the client or > >>> 2. client un-initialized but not re-initialized or > >>> 3. client re-initialization fails later > >>> > >>> > >>> This condition can only be recovered when you reset or re-load the driver. > >>> > >>> > >> do you have any test case for it ? > > > > We need to simulate the TX Sched/RSS hardware config failure at firmware/IMP. > > For the integration Testing, we can always create one but for system testing > > we need ways in the firmware to be able to simulate these failures. Some > > debugging feature is required in the firmware. Maybe somebody can take this > > task and introduce this feature in the IMP firmware code if it does not exists > > already? I would suggest to expose all these controls using 'devlink' interface > > to the user which can be used by sys test team as well. > > > > > >> when user change channel larger by ethtool command , and the > >> memory not enough, it will fail. > >> > >> we should recovered too. > > All of these should get conveyed by the hnae3 layer when you do set channels > or when > > we do client re-initialization(init+up) > > > This patch will make some test case fail, it is OK before this change. Can you please list down the test case which is failing or will fail?

1 0

[RFC PATCH v3 0/2] scheduler: expose the topology of clusters and add cluster scheduler
by Barry Song 14 Apr '21

14 Apr '21

ARM64 server chip Kunpeng 920 has 6 clusters in each NUMA node, and each cluster has 4 cpus. All clusters share L3 cache data while each cluster has local L3 tag. On the other hand, each cluster will share some internal system bus. This means cache is much more affine inside one cluster than across clusters. +-----------------------------------+ +---------+ | +------+ +------+ +---------------------------+ | | | CPU0 | | cpu1 | | +-----------+ | | | +------+ +------+ | | | | | | +----+ L3 | | | | +------+ +------+ cluster | | tag | | | | | CPU2 | | CPU3 | | | | | | | +------+ +------+ | +-----------+ | | | | | | +-----------------------------------+ | | +-----------------------------------+ | | | +------+ +------+ +--------------------------+ | | | | | | | +-----------+ | | | +------+ +------+ | | | | | | | | L3 | | | | +------+ +------+ +----+ tag | | | | | | | | | | | | | | +------+ +------+ | +-----------+ | | | | | | +-----------------------------------+ | L3 | | data | +-----------------------------------+ | | | +------+ +------+ | +-----------+ | | | | | | | | | | | | | +------+ +------+ +----+ L3 | | | | | | tag | | | | +------+ +------+ | | | | | | | | | | ++ +-----------+ | | | +------+ +------+ |---------------------------+ | +-----------------------------------| | | +-----------------------------------| | | | +------+ +------+ +---------------------------+ | | | | | | | +-----------+ | | | +------+ +------+ | | | | | | +----+ L3 | | | | +------+ +------+ | | tag | | | | | | | | | | | | | | +------+ +------+ | +-----------+ | | | | | | +-----------------------------------+ | | +-----------------------------------+ | | | +------+ +------+ +--------------------------+ | | | | | | | +-----------+ | | | +------+ +------+ | | | | | Through the following small program, you can see the performance impact of running it in one cluster and across two clusters: struct foo { int x; int y; } f; void *thread1_fun(void *param) { int s = 0; for (int i = 0; i < 0xfffffff; i++) s += f.x; } void *thread2_fun(void *param) { int s = 0; for (int i = 0; i < 0xfffffff; i++) f.y++; } int main(int argc, char **argv) { pthread_t tid1, tid2; pthread_create(&tid1, NULL, thread1_fun, NULL); pthread_create(&tid2, NULL, thread2_fun, NULL); pthread_join(tid1, NULL); pthread_join(tid2, NULL); } While running this program in one cluster, it takes: $ time taskset -c 0,1 ./a.out real 0m0.832s user 0m1.649s sys 0m0.004s As a contrast, it takes much more time if we run the same program in two clusters: $ time taskset -c 0,4 ./a.out real 0m1.133s user 0m1.960s sys 0m0.000s 0.832/1.133 = 73%, it is a huge difference. Also, hackbench running on 4 cpus in single one cluster and 4 cpus in different clusters also shows a large contrast: * inside a cluster: root@ubuntu:~# taskset -c 0,1,2,3 hackbench -p -T -l 20000 -g 1 Running in threaded mode with 1 groups using 40 file descriptors each (== 40 tasks) Each sender will pass 20000 messages of 100 bytes Time: 4.285 * across clusters: root@ubuntu:~# taskset -c 0,4,8,12 hackbench -p -T -l 20000 -g 1 Running in threaded mode with 1 groups using 40 file descriptors each (== 40 tasks) Each sender will pass 20000 messages of 100 bytes Time: 5.524 The score is 4.285 vs 5.524, shorter time means better performance. All these testing implies that we should let the Linux scheduler use this topology to make better load balancing and WAKE_AFFINE decisions. However, the current scheduler totally has no idea of clusters. This patchset exposed the cluster topology first, then added the sched domain for cluster. While it is named as "cluster", architectures and machines can define the exact meaning of cluster as long as they have some resources sharing under llc and they can leverage the affinity of this resource to achive better scheduling performance. -v3: - rebased againest 5.11-rc2 - with respect to the comments of Valentin Schneider, Peter Zijlstra, Vincent Guittot and Mel Gorman etc. * moved the scheduler changes from arm64 to the common place for all architectures. * added SD_SHARE_CLS_RESOURCES sd_flags specifying the sched_domain where select_idle_cpu() should begin to scan from * removed redundant select_idle_cluster() function since all code is in select_idle_cpu() now. it also avoided scanning cluster cpus twice in v2 code; * redo the hackbench in one numa after the above changes Valentin suggested that select_idle_cpu() could begin to scan from domain with SD_SHARE_PKG_RESOURCES. Changing like this might be too aggressive and limit the spreading of tasks. Thus, this patch lets the architectures and machines to decide where to start by adding a new SD_SHARE_CLS_RESOURCES. Barry Song (1): scheduler: add scheduler level for clusters Jonathan Cameron (1): topology: Represent clusters of CPUs within a die. Documentation/admin-guide/cputopology.rst | 26 +++++++++++--- arch/arm64/Kconfig | 7 ++++ arch/arm64/kernel/topology.c | 2 ++ drivers/acpi/pptt.c | 60 +++++++++++++++++++++++++++++++ drivers/base/arch_topology.c | 14 ++++++++ drivers/base/topology.c | 10 ++++++ include/linux/acpi.h | 5 +++ include/linux/arch_topology.h | 5 +++ include/linux/sched/sd_flags.h | 9 +++++ include/linux/sched/topology.h | 7 ++++ include/linux/topology.h | 13 +++++++ kernel/sched/fair.c | 27 ++++++++++---- kernel/sched/topology.c | 6 ++++ 13 files changed, 181 insertions(+), 10 deletions(-) -- 2.7.4

7 19

[PATCH RFC net] net: hns3: fixes+refactors the broken set channel fallback logic
by Salil Mehta 13 Apr '21

13 Apr '21

The fallback logic of the set channels when set_channel() fails to configure TX Sched/RSS H/W configuration or for the code which brings down/restores client before/therafter is not handled properly. This patch fixes and refactors that code to improve the readibility. [INTERNAL ONLY] Fixes: <Tag TODO> ("Comment TODO") Signed-off-by: Salil Mehta <salil.mehta(a)huawei.com> --- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 72 +++++++++++-------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index bf4302a5cf95..41d8bdb34f6e 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -4692,23 +4692,56 @@ static int hns3_reset_notify(struct hnae3_handle *handle, static int hns3_change_channels(struct hnae3_handle *handle, u32 new_tqp_num, bool rxfh_configured) { - int ret; + const struct hnae3_ae_ops *ops = handle->ae_algo->ops; + u32 org_tqp_num = handle->kinfo.num_tqps; + struct device *dev = &handle->pdev->dev; + u32 req_tqp_num = new_tqp_num; + bool revert_old_config = false; + int ret, retval = 0; + + /* bring down the client */ + ret = hns3_reset_notify(handle, HNAE3_DOWN_CLIENT); + if (ret) + return ret; - ret = handle->ae_algo->ops->set_channels(handle, new_tqp_num, - rxfh_configured); - if (ret) { - dev_err(&handle->pdev->dev, - "Change tqp num(%u) fail.\n", new_tqp_num); + ret = hns3_reset_notify(handle, HNAE3_UNINIT_CLIENT); + if (ret) return ret; + +revert_old_tpqs_config: + /* update the traffic sched and RSS config in the H/W as per new TPQ num */ + ret = ops->set_channels(handle, req_tqp_num, rxfh_configured); + if (ret) { + dev_err(dev, "failed(=%d) to update TX sched/RSS h/w cfg for %s TPQs\n", + ret, revert_old_config?"old":"new"); + + /* try reverting back h/w config with old TPQ num */ + if (!revert_old_config) { + dev_warn(dev, + "will try to revert TX sched/RSS h/w cfg with old TPQs\n"); + req_tqp_num = org_tqp_num; + revert_old_config = true; + retval = ret; + + goto revert_old_tpqs_config; + } + + /* bad, we could not revert to h/w config with old TQP number */ + goto err_set_chan_fail; } + /* restore the client */ ret = hns3_reset_notify(handle, HNAE3_INIT_CLIENT); if (ret) - return ret; + goto err_set_chan_fail; ret = hns3_reset_notify(handle, HNAE3_UP_CLIENT); if (ret) - hns3_reset_notify(handle, HNAE3_UNINIT_CLIENT); + goto err_set_chan_fail; + + return retval; +err_set_chan_fail: + dev_warn(dev, "device could be in insane state. Reset rqd. or reload the driver!\n"); return ret; } @@ -4720,7 +4753,6 @@ int hns3_set_channels(struct net_device *netdev, struct hnae3_knic_private_info *kinfo = &h->kinfo; bool rxfh_configured = netif_is_rxfh_configured(netdev); u32 new_tqp_num = ch->combined_count; - u16 org_tqp_num; int ret; if (hns3_nic_resetting(netdev)) @@ -4750,28 +4782,10 @@ int hns3_set_channels(struct net_device *netdev, "set channels: tqp_num=%u, rxfh=%d\n", new_tqp_num, rxfh_configured); - ret = hns3_reset_notify(h, HNAE3_DOWN_CLIENT); - if (ret) - return ret; - - ret = hns3_reset_notify(h, HNAE3_UNINIT_CLIENT); - if (ret) - return ret; - - org_tqp_num = h->kinfo.num_tqps; ret = hns3_change_channels(h, new_tqp_num, rxfh_configured); if (ret) { - int ret1; - - netdev_warn(netdev, - "Change channels fail, revert to old value\n"); - ret1 = hns3_change_channels(h, org_tqp_num, rxfh_configured); - if (ret1) { - netdev_err(netdev, - "revert to old channel fail\n"); - return ret1; - } - + netdev_err(netdev, "fail(=%d) to set number of channels to %u\n", ret, + new_tqp_num); return ret; } -- 2.17.1

2 4

[PATCH net] ice: Re-organizes reqstd/avail {R,T}XQ check/code for efficiency+readability
by Salil Mehta 13 Apr '21

13 Apr '21

If user has explicitly requested the number of {R,T}XQs, then it is unnecessary to get the count of already available {R,T}XQs from the PF avail_{r,t}xqs bitmap. This value will get overriden by user specified value in any case. This patch does minor re-organization of the code for improving the flow and readabiltiy. This scope of improvement was found during the review of the ICE driver code. FYI, I could not test this change due to unavailability of the hardware. It would helpful if somebody can test this and provide Tested-by Tag. Many thanks! Fixes: 11b7551e096d ("ice: Implement ethtool ops for channels") Signed-off-by: Salil Mehta <salil.mehta(a)huawei.com> --- drivers/net/ethernet/intel/ice/ice_lib.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index d13c7fc8fb0a..161e8dfe548c 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -161,12 +161,13 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) switch (vsi->type) { case ICE_VSI_PF: - vsi->alloc_txq = min3(pf->num_lan_msix, - ice_get_avail_txq_count(pf), - (u16)num_online_cpus()); if (vsi->req_txq) { vsi->alloc_txq = vsi->req_txq; vsi->num_txq = vsi->req_txq; + } else { + vsi->alloc_txq = min3(pf->num_lan_msix, + ice_get_avail_txq_count(pf), + (u16)num_online_cpus()); } pf->num_lan_tx = vsi->alloc_txq; @@ -175,12 +176,13 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) if (!test_bit(ICE_FLAG_RSS_ENA, pf->flags)) { vsi->alloc_rxq = 1; } else { - vsi->alloc_rxq = min3(pf->num_lan_msix, - ice_get_avail_rxq_count(pf), - (u16)num_online_cpus()); if (vsi->req_rxq) { vsi->alloc_rxq = vsi->req_rxq; vsi->num_rxq = vsi->req_rxq; + } else { + vsi->alloc_rxq = min3(pf->num_lan_msix, + ice_get_avail_rxq_count(pf), + (u16)num_online_cpus()); } } -- 2.17.1

2 2

[PATCH v1 0/2] scsi: libsas: few clean up patches
by Luo Jiaxing 13 Apr '21

13 Apr '21

Two types of errors are detected by the checkpatch. 1. Alignment between switches and cases 2. Improper use of some spaces Here are the clean up patches. Luo Jiaxing (2): scsi: libsas: make switch and case at the same indent in sas_to_ata_err() scsi: libsas: clean up for white spaces drivers/scsi/libsas/sas_ata.c | 74 ++++++++++++++++++-------------------- drivers/scsi/libsas/sas_discover.c | 2 +- drivers/scsi/libsas/sas_expander.c | 15 ++++---- 3 files changed, 43 insertions(+), 48 deletions(-) -- 2.7.4

3 4

[RFC PATCH v3 0/3] vfio/hisilicon: add acc live migration driver
by Longfang Liu 13 Apr '21

13 Apr '21

The live migration solution relies on the vfio_device_migration_info protocol. The structure vfio_device_migration_info is placed at the 0th offset of the VFIO_REGION_SUBTYPE_MIGRATION region to get and set VFIO device related migration information. Field accesses from this structure are only supported at their native width and alignment. Otherwise, the result is undefined and vendor drivers should return an error. (1).The driver framework is based on vfio_pci_register_dev_region() of vfio-pci, and then a new live migration region is added, and the live migration is realized through the ops of this region. (2).In order to ensure the compatibility of the devices before and after the migration, the device compatibility information check will be performed in the Pre-copy stage. If the check fails, an error will be returned and the source VM will exit the migration function. (3).After the compatibility check is passed, it will enter the Stop-and-copy stage. At this time, all the live migration data will be copied, and then saved to the VF device of the destination, and then the VF device of the destination will be started and the VM of the source will be exited. Longfang Liu (3): vfio/hisilicon: add acc live migration driver vfio/hisilicon: register the driver to vfio vfio/hisilicom: add debugfs for driver drivers/vfio/pci/Kconfig | 9 + drivers/vfio/pci/Makefile | 3 +- drivers/vfio/pci/hisilicon/acc_vf_migration.c | 1357 +++++++++++++++++++++++++ drivers/vfio/pci/hisilicon/acc_vf_migration.h | 172 ++++ drivers/vfio/pci/vfio_pci.c | 11 + drivers/vfio/pci/vfio_pci_private.h | 10 + 6 files changed, 1561 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/pci/hisilicon/acc_vf_migration.c create mode 100644 drivers/vfio/pci/hisilicon/acc_vf_migration.h -- 2.8.1

2 4

[RFC PATCH v3 0/3] vfio/hisilicon: add acc live migration driver
by Longfang Liu 13 Apr '21

13 Apr '21

The live migration solution relies on the vfio_device_migration_info protocol. The structure vfio_device_migration_info is placed at the 0th offset of the VFIO_REGION_SUBTYPE_MIGRATION region to get and set VFIO device related migration information. Field accesses from this structure are only supported at their native width and alignment. Otherwise, the result is undefined and vendor drivers should return an error. (1).The driver framework is based on vfio_pci_register_dev_region() of vfio-pci, and then a new live migration region is added, and the live migration is realized through the ops of this region. (2).In order to ensure the compatibility of the devices before and after the migration, the device compatibility information check will be performed in the Pre-copy stage. If the check fails, an error will be returned and the source VM will exit the migration function. (3).After the compatibility check is passed, it will enter the Stop-and-copy stage. At this time, all the live migration data will be copied, and then saved to the VF device of the destination, and then the VF device of the destination will be started and the VM of the source will be exited. Longfang Liu (3): vfio/hisilicon: add acc live migration driver vfio/hisilicon: register the driver to vfio vfio/hisilicom: add debugfs for driver drivers/vfio/pci/Kconfig | 9 + drivers/vfio/pci/Makefile | 3 +- drivers/vfio/pci/hisilicon/acc_vf_migration.c | 1357 +++++++++++++++++++++++++ drivers/vfio/pci/hisilicon/acc_vf_migration.h | 172 ++++ drivers/vfio/pci/vfio_pci.c | 11 + drivers/vfio/pci/vfio_pci_private.h | 10 + 6 files changed, 1561 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/pci/hisilicon/acc_vf_migration.c create mode 100644 drivers/vfio/pci/hisilicon/acc_vf_migration.h -- 2.8.1

2 4

[PATCH 0/3] Fixes for testpmd
by Lijun Ou 12 Apr '21

12 Apr '21

This series add two test bug fixes and a print style. Hongbo Zheng (1): app/testpmd: use of Rx/Tx in testpmd Huisong Li (2): app/testpmd: fix forwarding configuration when DCB test app/testpmd: remove forwarding config from parsing Rx and Tx app/test-pmd/cmdline.c | 106 ++++++++++++++++---------------- app/test-pmd/config.c | 147 +++++++++++++++++++++++++-------------------- app/test-pmd/csumonly.c | 22 +++---- app/test-pmd/icmpecho.c | 2 +- app/test-pmd/ieee1588fwd.c | 18 +++--- app/test-pmd/parameters.c | 50 +++++++-------- app/test-pmd/testpmd.c | 132 ++++++++++++++++++++-------------------- app/test-pmd/testpmd.h | 28 ++++----- app/test-pmd/txonly.c | 2 +- 9 files changed, 263 insertions(+), 244 deletions(-) -- 2.7.4

7 37

[PATCH drivers/iio 0/3] convert sysfs sprintf/snprintf/scnprintf to sysfs_emit
by Tian Tao 12 Apr '21

12 Apr '21

Use the generic sysfs_emit() function to take place of sprintf/snprintf/scnprintf, to avoid buffer overrun. Tian Tao (3): iio:chemical:sps30: Convert sysfs sprintf/snprintf family to sysfs_emit iio: light: Convert sysfs sprintf/snprintf family to sysfs_emit iio: trigger: stm32-timer: Convert sysfs sprintf/snprintf family to sysfs_emit drivers/iio/chemical/sps30.c | 6 +++--- drivers/iio/light/veml6030.c | 2 +- drivers/iio/trigger/stm32-timer-trigger.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.7.4

2 4

Re: [PATCH net v3] net: sched: fix packet stuck problem for lockless qdisc
by Yunsheng Lin 12 Apr '21

12 Apr '21

On 2021/4/9 13:31, Juergen Gross wrote: > On 25.03.21 04:13, Yunsheng Lin wrote: >> Lockless qdisc has below concurrent problem: >> cpu0 cpu1 >> . . >> q->enqueue . >> . . >> qdisc_run_begin() . >> . . >> dequeue_skb() . >> . . >> sch_direct_xmit() . >> . . >> . q->enqueue >> . qdisc_run_begin() >> . return and do nothing >> . . >> qdisc_run_end() . >> >> cpu1 enqueue a skb without calling __qdisc_run() because cpu0 >> has not released the lock yet and spin_trylock() return false >> for cpu1 in qdisc_run_begin(), and cpu0 do not see the skb >> enqueued by cpu1 when calling dequeue_skb() because cpu1 may >> enqueue the skb after cpu0 calling dequeue_skb() and before >> cpu0 calling qdisc_run_end(). >> >> Lockless qdisc has below another concurrent problem when >> tx_action is involved: >> >> cpu0(serving tx_action) cpu1 cpu2 >> . . . >> . q->enqueue . >> . qdisc_run_begin() . >> . dequeue_skb() . >> . . q->enqueue >> . . . >> . sch_direct_xmit() . >> . . qdisc_run_begin() >> . . return and do nothing >> . . . >> clear __QDISC_STATE_SCHED . . >> qdisc_run_begin() . . >> return and do nothing . . >> . . . >> . qdisc_run_end() . >> >> This patch fixes the above data race by: >> 1. Get the flag before doing spin_trylock(). >> 2. If the first spin_trylock() return false and the flag is not >> set before the first spin_trylock(), Set the flag and retry >> another spin_trylock() in case other CPU may not see the new >> flag after it releases the lock. >> 3. reschedule if the flags is set after the lock is released >> at the end of qdisc_run_end(). >> >> For tx_action case, the flags is also set when cpu1 is at the >> end if qdisc_run_end(), so tx_action will be rescheduled >> again to dequeue the skb enqueued by cpu2. >> >> Only clear the flag before retrying a dequeuing when dequeuing >> returns NULL in order to reduce the overhead of the above double >> spin_trylock() and __netif_schedule() calling. >> >> The performance impact of this patch, tested using pktgen and >> dummy netdev with pfifo_fast qdisc attached: >> >> threads without+this_patch with+this_patch delta >> 1 2.61Mpps 2.60Mpps -0.3% >> 2 3.97Mpps 3.82Mpps -3.7% >> 4 5.62Mpps 5.59Mpps -0.5% >> 8 2.78Mpps 2.77Mpps -0.3% >> 16 2.22Mpps 2.22Mpps -0.0% >> >> Fixes: 6b3ba9146fe6 ("net: sched: allow qdiscs to handle locking") >> Signed-off-by: Yunsheng Lin <linyunsheng(a)huawei.com> > > I have a setup which is able to reproduce the issue quite reliably: > > In a Xen guest I'm mounting 8 NFS shares and run sysbench fileio on > each of them. The average latency reported by sysbench is well below > 1 msec, but at least once per hour I get latencies in the minute > range. > > With this patch I don't see these high latencies any longer (test > is running for more than 20 hours now). > > So you can add my: > > Tested-by: Juergen Gross <jgross(a)suse.com> Hi, Juergen Thanks for the testing. With the simulated test case suggested by Michal, I still has some potential issue to debug, hopefully will send out new version in this week. Also, is it possible to run your testcase any longer? I think "72 hours" would be enough to testify that it fixes the problem completely:) > > > Juergen

2 1

Re: [PATCH 2/3] app/testpmd: remove forwarding config from parsing Rx and Tx
by oulijun 10 Apr '21

10 Apr '21

在 2021/4/9 15:08, Li, Xiaoyun 写道: > > >> -----Original Message----- >> From: oulijun <oulijun(a)huawei.com> >> Sent: Friday, April 9, 2021 14:10 >> To: linuxarm(a)openeuler.org; dev <dev(a)dpdk.org>; Li, Xiaoyun >> <xiaoyun.li(a)intel.com> >> Subject: Re: [Linuxarm] Re: [PATCH 2/3] app/testpmd: remove forwarding >> config from parsing Rx and Tx >> >> >> >> 在 2021/4/2 10:33, Li, Xiaoyun 写道: >>> >>> >>>> -----Original Message----- >>>> From: oulijun <oulijun(a)huawei.com> >>>> Sent: Friday, April 2, 2021 09:45 >>>> To: Li, Xiaoyun <xiaoyun.li(a)intel.com>; Yigit, Ferruh >>>> <ferruh.yigit(a)intel.com> >>>> Cc: dev(a)dpdk.org; linuxarm(a)openeuler.org >>>> Subject: Re: [PATCH 2/3] app/testpmd: remove forwarding config from >>>> parsing Rx and Tx >>>> >>>> >>>> >>>> 在 2021/3/29 9:53, Li, Xiaoyun 写道: >>>>> >>>>> >>>>>> -----Original Message----- >>>>>> From: oulijun <oulijun(a)huawei.com> >>>>>> Sent: Thursday, March 25, 2021 11:04 >>>>>> To: Li, Xiaoyun <xiaoyun.li(a)intel.com>; Yigit, Ferruh >>>>>> <ferruh.yigit(a)intel.com> >>>>>> Cc: dev(a)dpdk.org; linuxarm(a)openeuler.org >>>>>> Subject: Re: [PATCH 2/3] app/testpmd: remove forwarding config from >>>>>> parsing Rx and Tx >>>>>> >>>>>> >>>>>> >>>>>> 在 2021/3/24 9:44, Li, Xiaoyun 写道: >>>>>>> >>>>>>> >>>>>>>> -----Original Message----- >>>>>>>> From: oulijun <oulijun(a)huawei.com> >>>>>>>> Sent: Wednesday, March 24, 2021 09:01 >>>>>>>> To: Li, Xiaoyun <xiaoyun.li(a)intel.com>; Yigit, Ferruh >>>>>>>> <ferruh.yigit(a)intel.com> >>>>>>>> Cc: dev(a)dpdk.org; linuxarm(a)openeuler.org >>>>>>>> Subject: Re: [PATCH 2/3] app/testpmd: remove forwarding config >>>>>>>> from parsing Rx and Tx >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> 在 2021/3/23 15:50, Li, Xiaoyun 写道: >>>>>>>>> Hi >>>>>>>>> >>>>>>>>>> -----Original Message----- >>>>>>>>>> From: Lijun Ou <oulijun(a)huawei.com> >>>>>>>>>> Sent: Friday, March 5, 2021 18:22 >>>>>>>>>> To: Yigit, Ferruh <ferruh.yigit(a)intel.com> >>>>>>>>>> Cc: Li, Xiaoyun <xiaoyun.li(a)intel.com>; dev(a)dpdk.org; >>>>>>>>>> linuxarm(a)openeuler.org >>>>>>>>>> Subject: [PATCH 2/3] app/testpmd: remove forwarding config from >>>>>>>>>> parsing Rx and Tx >>>>>>>>>> >>>>>>>>>> From: Huisong Li <lihuisong(a)huawei.com> >>>>>>>>>> >>>>>>>>> >>>>>>>>> The commit message should be more simple and avoids grammar >>>> mistakes. >>>>>>>>> >>>>>>>> All right, I will simply it. >>>>>>>>>> The "fwd_config_setup()" function does release and apply for >>>>>>>>>> memory of forwarding flows, and re-establish these streams when >>>>>>>>>> rxq/txq or rxd/txd is changed. The function is also called by >>>>>>>>>> "start_packet_forwarding()" when user executes "start" cmd. >>>>>>>>>> All changes for rxq/txq or rxd/txd can be updated uniformly >>>>>>>>>> when this command is executed. Therefore, it is a little >>>>>>>>>> redundant in the >>>>>>>> "cmd_config_rx_tx_parsed" >>>>>>>>>> function. >>>>>>>>> >>>>>>>>> It's not redundant. This command may configure number of rxq/txq. >>>>>>>>> So the >>>>>>>> fwd streams map may change. >>>>>>>>> Then it's common to check the fwd streams after this command >>>>>>>>> using "show >>>>>>>> config fwd". >>>>>>>>> If you remove this fwd stream update, users can't get the >>>>>>>>> correct new fwd >>>>>>>> streams until they start the traffic. >>>>>>>>> But they may change a lot of things and want to check if the >>>>>>>>> setting is correct >>>>>>>> before they start the traffic. >>>>>>>>> >>>>>>>> Yes, you are right. It's really unfriendly. >>>>>>>>>> >>>>>>>>>> In addition, the forwarding stream under one TC is configured >>>>>>>>>> based on number of queues allocated to TC. And number of queues >>>>>>>>>> allocated to TC is updated after calling "rte_eth_dev_configure" >>>>>>>>>> again. If the number of queues is reduced after configuring the >>>>>>>>>> DCB, and then, release and apply for stream memory, and >>>>>>>>>> reinitialize the forwarding stream under the DCB mode based on >>>>>>>>>> the old TC >>>>>> information. >>>>>>>>>> As a result, null pointer may be accessed. >>>>>>>>> >>>>>>>>> I think you should add "rte_eth_dev_configure " into >>>>>>>>> dcb_fwd_config_setup() >>>>>>>> before rte_eth_dev_get_dcb_info(). >>>>>>>>> >>>>>>>>> And the commit message should be similar like the following: >>>>>>>>> Segment fault might happen after configuring queue number to >>>>>>>>> less because >>>>>>>> dcb_fwd_config_setup setup dcb based on old dcb info. >>>>>>>>> And dcb info can only update after rte_eth_dev_configure(). >>>>>>>>> So this patch adds rte_eth_dev_configure() before >>>>>>>>> rte_eth_dev_get_dcb_info() >>>>>>>> to get updated dcb info to fix this issue. >>>>>>>>> >>>>>>>> Thank you for your advice. But the above adjustments may still >>>>>>>> not work for some drivers. The mapping between queues and TCs in >>>>>>>> these drivers is updated in the dev_start stage. >>>>>>>> >>>>>>>> I have an idea. We can move fwd_config_setup() to start_port(), >>>>>>>> which is called by main() and after starting ports This not only >>>>>>>> solves the segment fault, but also does not have the problem you >>>>>>>> mentioned above. I >>>>>> test it and it is ok. >>>>>>>> >>>>>>>> What do you think, xiaoyun? >>>>>>> >>>>>>> How can you fix the issue I mentioned? >>>>>>> You still need to start port first to see the updated fwd config. >>>>>> Yes. But it can make sure that users get the correct new fwd >>>>>> streams before executing the 'start' command. >>>>>>> And for those drivers, why does the mapping has to be updated in >>>>>>> dev_start >>>>>> stage? >>>>>>> What does it need? Can't it be moved to dev_configure? >>>>>> The framework does not require that the configuration parameters >>>>>> transferred by the dev_configure API must be updated in the >>>>>> interface of driver. The driver can verify the correctness of >>>>>> these parameters in the interface, and then complete the update in >>>>>> the dev_start stage. It depends on the design and need of the >>>>>> driver. Maybe it's more appropriate to put it in dev_configure, but >>>>>> now we can't ask all these >>>> drivers to modify the operation. >>>>> >>>>> I still think it's driver's responsibility to configure DCB in dev_configure. >>>>> >>>>> Calling fwd_config_setup here is because this command changes queue >>>> number. Users just change queue number so want to check fwd setup. >>>> It's a normal and reasonable behavior. >>>>> Starting port will be called in many situations. I don't think it's >>>>> appropriate to >>>> call fwd_config_setup every time calling port_start. And you can't >>>> expect users know the fwd setup only change after port_start. >>>>> >>>>> These are only my thoughts. If anyone else agrees you, they can give you >> ack. >>>>>>>> >>>> @Ferruh, what do you think? >>>> Currently, both ixgbe and i40e also have this problem. Even if >>>> testpmd can be modified according to Xiaoyun's suggestion, and the >>>> driver is not modified, this problem still exists in some drivers, such as ixgbe >> and hns3. >>> >>> NO. I40e and ixgbe DON'T have the issue. >>> I40e tc mapping is done in dev_configure. >>> ixgbe tc mapping is always fixed due to hw design. It only needs dev_configure >> to get dcb_conf info. No matter you configure dcb or not, the mapping is always >> the same. You can check ixgbe_dev_get_dcb_info(). >>> >>> So for i40e and ixgbe, you only need to add dev_configure in >> dcb_fwd_config_setup(). >>> >> Hi, Xiaoyun, >> >> The fwd_config_setup() is called when the port is in the stop state and start >> state. >> When we run "start" cmd, all port are in the start state. Namely, we need to >> decide whether to call rte_eth_dev_configure() based on the state of all ports >> before rte_eth_dev_get_dcb_info() in dcb_fwd_config_setup(). >> Modify as follows: >> @@ -1834,6 +1834,7 @@ cmd_config_rx_tx_parsed(void *parsed_result, >> return; >> } >> >> + fwd_config_setup(); >> init_port_config(); >> >> cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1); diff --git a/app/test- >> pmd/config.c b/app/test-pmd/config.c index bd6ee8b..5981b50 100644 >> --- a/app/test-pmd/config.c >> +++ b/app/test-pmd/config.c >> @@ -3179,7 +3179,24 @@ dcb_fwd_config_setup(void) >> uint16_t nb_rx_queue, nb_tx_queue; >> uint16_t i, j, k, sm_id = 0; >> uint16_t total_tc_num = 0; >> + struct rte_port *port; >> uint8_t tc = 0; >> + portid_t pid; >> + int ret; >> + >> + if (all_ports_stopped()) { >> + /* re-configure the device after changing queue numbers. */ >> + for (pid = 0; pid < nb_fwd_ports; pid++) { >> + port = &ports[pid]; >> + ret = rte_eth_dev_configure(pid, nb_rxq, nb_txq, >> + &port->dev_conf); >> + if (ret < 0) { >> + printf("Failed to re-configure port %d, >> ret = %d.\n", >> + pid, ret); >> + return; >> + } >> + } >> + } >> >> cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores; >> cur_fwd_config.nb_fwd_ports = nb_fwd_ports; >> >> But there's still no way to get away with the segment fault for ixgbe and i40e. >> 1/ For ixgbe, tc mapping is always fixed after DCB is configured. If the number >> of queues is reduced, segment fault occur. >> Does it mean that the number of queues cannot be modified for ixgbe after >> DCB is configured? >> 2/ For i40e, it appears that the mapping between tc and queue is not updated >> after changing queue numbers. From i40e_vsi_config_tc(), its update seems to >> depend only on tc_map changes. >> >> please check it? > > No. > After users config queue numbers using cmd "port config all rxq 4". It's normal that they may want to check what new fwd config will be like using "show config fwd" > So you should call fwd_config_setup() in cmd_config_rx_tx_parsed(). The ports are in stopped state. > I see. The current modification has rolled back this behavior. dcb_fwd_config_setup() will call rte_eth_dev_get_dcb_info() at first to get the dcb info first. The segment fault happens because rte_eth_dev_get_dcb_info() get the wrong info based on old queue numbers (new queue number is small). > dcb_fwd_config_setup() will call rte_eth_dev_get_dcb_info() at first to get the dcb info first. > The segment fault happens because rte_eth_dev_get_dcb_info() get the wrong info based on old queue numbers (new queue number is small). > Yes! Currently, calling dev_configure at first in dcb_fwd_config_setup() is to update tc and queue mapping because of the change of queue number, so that testpmd can get valid the dcb info by rte_eth_dev_get_dcb_info(). For ixgbe, The fixed mapping means for maximum queue numbers for example 128 queues. Each queue and tc mapping is fixed to fill to hw. Fixed values. It's just you enable which queues or not. You can change queue number as you want. In dev_start stage, tc will actually take effect. get_dcb_info() only needs rx_adv_conf.dcb_rx_conf which info is included in dev_conf. So for ixgbe, you only need to call dev_configure to update the new dcb_rx_conf for get_dcb_info(). > For ixgbe, The fixed mapping means for maximum queue numbers for example 128 queues. Each queue and tc mapping is fixed to fill to hw. Fixed values. It's just you enable which queues or not. > You can change queue number as you want. In dev_start stage, tc will actually take effect. get_dcb_info() only needs rx_adv_conf.dcb_rx_conf which info is included in dev_conf. > So for ixgbe, you only need to call dev_configure to update the new dcb_rx_conf for get_dcb_info(). > > For i40e, dcb_setup is in dev_configure stage. i40e_dev_get_dcb_info() will get the correct info too. > The mapping for i40e is really updated in dev_configure. However, if the tc_map in i40e_vsi_config_tc() does not change, it seems that the mapping will not be updated. Namely, This mapping can not be remodified due to queue count changes. Maybe it is a bug for i40e. I think this suggestion is reasonable. It's just that I think ixgbe and i40e may have the above issues. >>>>>>>> >>>>>>>>>> >>>>>>>>>> Like: >>>>>>>>>> set nbcore 4 >>>>>>>>>> port stop all >>>>>>>>>> port config 0 dcb vt off 4 pfc on port start all port stop all >>>>>>>>>> port config all rxq 8 port config all txq 8 >>>>>>>>>> >>>>>>>>>> At the moment, a segmentation fault occurs. >>>>>>>>>> >>>>>>>>>> Fixes: ce8d561418d4 ("app/testpmd: add port configuration >>>>>>>>>> settings") >>>>>>>>>> Cc: stable(a)dpdk.org >>>>>>>>>> >>>>>>>>>> Signed-off-by: Huisong Li <lihuisong(a)huawei.com> >>>>>>>>>> Signed-off-by: Lijun Ou <oulijun(a)huawei.com> >>>>>>>>>> --- >>>>>>>>>> V1->V2: >>>>>>>>>> - use stream instead of flow >>>>>>>>>> --- >>>>>>>>>> app/test-pmd/cmdline.c | 2 -- >>>>>>>>>> 1 file changed, 2 deletions(-) >>>>>>>>>> >>>>>>>>>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c >>>>>>>>>> index 4df0c32..e316f5c 100644 >>>>>>>>>> --- a/app/test-pmd/cmdline.c >>>>>>>>>> +++ b/app/test-pmd/cmdline.c >>>>>>>>>> @@ -1837,8 +1837,6 @@ cmd_config_rx_tx_parsed(void >>>> *parsed_result, >>>>>>>>>> return; >>>>>>>>>> } >>>>>>>>>> >>>>>>>>>> - fwd_config_setup(); >>>>>>>>>> - >>>>>>>>>> init_port_config(); >>>>>>>>>> >>>>>>>>>> cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1); >>>>>>>>>> -- >>>>>>>>>> 2.7.4 >>>>>>>>> >>>>>>>>> . >>>>>>>>> >>>>>>> . >>>>>>> >>>>> . >>>>> >>> _______________________________________________ >>> Linuxarm mailing list -- linuxarm(a)openeuler.org To unsubscribe send an >>> email to linuxarm-leave(a)openeuler.org >>>

1 0

Re: [PATCH net] net: hns3: Trivial spell fix in hns3 driver
by patchwork-bot+netdevbpf＠kernel.org 10 Apr '21

10 Apr '21

Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 9 Apr 2021 08:42:23 +0100 you wrote: > Some trivial spelling mistakes which caught my eye during the > review of the code. > > Signed-off-by: Salil Mehta <salil.mehta(a)huawei.com> > --- > drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- > drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Here is the summary with links: - [net] net: hns3: Trivial spell fix in hns3 driver https://git.kernel.org/netdev/net/c/cd7e963d2f08 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html

1 0

[PATCH 00/10] tty: Fix some coding style issues
by Xiaofei Tan 09 Apr '21

09 Apr '21

Fix some issues reported by checkpatch.pl. All of them are coding style issues, no function changes. Xiaofei Tan (10): tty/sysrq: Add a blank line after declarations tty/sysrq: Fix issues of code indent should use tabs tty: tty_jobctrl: Add a blank line after declarations tty: tty_jobctrl: Fix coding style issues of block comments tty: tty_jobctrl: Remove spaces before tabs tty: tty_ldisc: Fix an issue of code indent should use tabs tty: tty_ldisc: Add a blank line after declarations tty: tty_ldisc: Fix coding style issues of block comments tty: tty_ldisc: Do not use assignment in if condition tty: tty_ldisc: Remove the repeated word 'the' drivers/tty/sysrq.c | 35 ++++++++++++++++++----------------- drivers/tty/tty_jobctrl.c | 29 +++++++++++++++++++---------- drivers/tty/tty_ldisc.c | 41 ++++++++++++++++++++++++++--------------- 3 files changed, 63 insertions(+), 42 deletions(-) -- 2.8.1

4 16

[PATCH net-next 0/2] net: hns3: add support for pm_ops
by Huazhong Tan 09 Apr '21

09 Apr '21

This series adds support for pm_ops in the HNS3 ethernet driver. Jiaran Zhang (2): net: hns3: change flr_prepare/flr_done function names net: hns3: add suspend and resume pm_ops drivers/net/ethernet/hisilicon/hns3/hnae3.h | 5 +-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 37 +++++++++++++++++++--- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 29 ++++++++++------- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 27 +++++++++------- 4 files changed, 68 insertions(+), 30 deletions(-) -- 2.7.4

2 3

[PATCH v3 00/12] acpi: fix some coding style issues
by Xiaofei Tan 08 Apr '21

08 Apr '21

Fix some coding style issues reported by checkpatch.pl. Only cleanup and no function changes. Differences from v2 to v3: - Remove the modifications that may cause function change. Differences from v1 to v2: - Add subsystem and module name in the name of patch 05/15. - Change to use more proper module name for some patch names. Xiaofei Tan (12): ACPI: APD: fix a block comment align issue ACPI: processor: fix some coding style issues ACPI: ipmi: remove useless return statement for void function ACPI: LPSS: add a missed blank line after declarations ACPI: acpi_pad: add a missed blank line after declarations ACPI: battery: fix some coding style issues ACPI: button: fix some coding style issues ACPI: CPPC: fix some coding style issues ACPI: custom_method: fix a coding style issue ACPI: PM: add a missed blank line after declarations ACPI: sysfs: fix some coding style issues ACPI: dock: fix some coding style issues drivers/acpi/acpi_apd.c | 8 ++--- drivers/acpi/acpi_ipmi.c | 1 - drivers/acpi/acpi_lpss.c | 2 ++ drivers/acpi/acpi_pad.c | 4 +++ drivers/acpi/acpi_processor.c | 18 +++-------- drivers/acpi/battery.c | 63 ++++++++++++++++++++------------------ drivers/acpi/button.c | 9 ++---- drivers/acpi/cppc_acpi.c | 71 ++++++++++++++++++++++--------------------- drivers/acpi/custom_method.c | 2 +- drivers/acpi/device_pm.c | 3 ++ drivers/acpi/device_sysfs.c | 15 ++++++--- drivers/acpi/dock.c | 7 +++-- 12 files changed, 106 insertions(+), 97 deletions(-) -- 2.8.1

2 15

[PATCH v2] ACPI: AC: fix some coding style issues
by Xiaofei Tan 08 Apr '21

08 Apr '21

Fix some coding style issues reported by checkpatch.pl, including following types: ERROR: "foo * bar" should be "foo *bar" ERROR: code indent should use tabs where possible WARNING: Block comments use a trailing */ on a separate line WARNING: braces {} are not necessary for single statement blocks WARNING: void function return statements are not generally useful WARNING: CVS style keyword markers, these will _not_ be updated Signed-off-by: Xiaofei Tan <tanxiaofei(a)huawei.com> --- drivers/acpi/ac.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index b86ee6e..b0cb662 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * acpi_ac.c - ACPI AC Adapter Driver ($Revision: 27 $) + * acpi_ac.c - ACPI AC Adapter Driver (Revision: 27) * * Copyright (C) 2001, 2002 Andy Grover <andrew.grover(a)intel.com> * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh(a)intel.com> @@ -78,17 +78,14 @@ static struct acpi_driver acpi_ac_driver = { struct acpi_ac { struct power_supply *charger; struct power_supply_desc charger_desc; - struct acpi_device * device; + struct acpi_device *device; unsigned long long state; struct notifier_block battery_nb; }; #define to_acpi_ac(x) power_supply_get_drvdata(x) -/* -------------------------------------------------------------------------- - AC Adapter Management - -------------------------------------------------------------------------- */ - +/* AC Adapter Management */ static int acpi_ac_get_state(struct acpi_ac *ac) { acpi_status status = AE_OK; @@ -109,9 +106,7 @@ static int acpi_ac_get_state(struct acpi_ac *ac) return 0; } -/* -------------------------------------------------------------------------- - sysfs I/F - -------------------------------------------------------------------------- */ +/* sysfs I/F */ static int get_ac_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) @@ -138,10 +133,7 @@ static enum power_supply_property ac_props[] = { POWER_SUPPLY_PROP_ONLINE, }; -/* -------------------------------------------------------------------------- - Driver Model - -------------------------------------------------------------------------- */ - +/* Driver Model */ static void acpi_ac_notify(struct acpi_device *device, u32 event) { struct acpi_ac *ac = acpi_driver_data(device); @@ -174,8 +166,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) acpi_notifier_call_chain(device, event, (u32) ac->state); kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE); } - - return; } static int acpi_ac_battery_notify(struct notifier_block *nb, @@ -282,9 +272,8 @@ static int acpi_ac_add(struct acpi_device *device) ac->battery_nb.notifier_call = acpi_ac_battery_notify; register_acpi_notifier(&ac->battery_nb); end: - if (result) { + if (result) kfree(ac); - } return result; } @@ -293,7 +282,7 @@ static int acpi_ac_add(struct acpi_device *device) static int acpi_ac_resume(struct device *dev) { struct acpi_ac *ac; - unsigned old_state; + unsigned int old_state; if (!dev) return -EINVAL; @@ -352,9 +341,8 @@ static int __init acpi_ac_init(void) } result = acpi_bus_register_driver(&acpi_ac_driver); - if (result < 0) { + if (result < 0) return -ENODEV; - } return 0; } -- 2.8.1

2 1

[PATCH 0/2] meson build fixes for hns3
by Lijun Ou 08 Apr '21

08 Apr '21

This series fix meson build for kunpeng920 and kunpeng930 boards. Chengchang Tang (2): config/arm: fix Hisilicon kunpeng920 SoC build config/arm: fix Hisilicon kunpeng930 Soc build config/arm/arm64_kunpeng920_linux_gcc | 19 +++++++++++++++ config/arm/arm64_kunpeng930_linux_gcc | 19 +++++++++++++++ config/arm/meson.build | 27 ++++++++++++++++++++++ .../linux_gsg/cross_build_dpdk_for_arm64.rst | 5 ++++ 4 files changed, 70 insertions(+) create mode 100644 config/arm/arm64_kunpeng920_linux_gcc create mode 100644 config/arm/arm64_kunpeng930_linux_gcc -- 2.7.4

8 46

[PATCH] iommu: Fix a boundary issue to avoid performance drop
by chenxiang 07 Apr '21

07 Apr '21

From: Xiang Chen <chenxiang66(a)hisilicon.com> After the change of patch ("iommu: Switch gather->end to the inclusive end"), the performace drops from 1600+K IOPS to 1200K in our kunpeng ARM64 platform. We find that the range [start1, end1) actually is joint from the range [end1, end2), but it is considered as disjoint after the change, so it needs more times of TLB sync, and spends more time on it. So fix the boundary issue to avoid performance drop. Fixes: 862c3715de8f ("iommu: Switch gather->end to the inclusive end") Signed-off-by: Xiang Chen <chenxiang66(a)hisilicon.com> --- include/linux/iommu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index ae8eddd..4d5bcc2 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -547,7 +547,7 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain, * structure can be rewritten. */ if (gather->pgsize != size || - end < gather->start || start > gather->end) { + end + 1 < gather->start || start > gather->end + 1) { if (gather->pgsize) iommu_iotlb_sync(domain, gather); gather->pgsize = size; -- 2.8.1

4 4

[PATCH v3 00/10] tty: Fix some coding style issues
by Xiaofei Tan 07 Apr '21

07 Apr '21

Fix some issues reported by checkpatch.pl. All of them are coding style issues, no function changes. Differences from v2 to v3: - Fix the misunderstanding of 'period' for the patch 04/10. Differences from v1 to v2: - Remove one redundant tab for the patch 02/10. - Add some expression optimization for some sentenses following - Jiri's advice for the patch 04/10. Xiaofei Tan (10): tty/sysrq: Add a blank line after declarations tty/sysrq: Fix issues of code indent should use tabs tty: tty_jobctrl: Add a blank line after declarations tty: tty_jobctrl: Fix coding style issues of block comments tty: tty_jobctrl: Remove spaces before tabs tty: tty_ldisc: Fix an issue of code indent should use tabs tty: tty_ldisc: Add a blank line after declarations tty: tty_ldisc: Fix coding style issues of block comments tty: tty_ldisc: Do not use assignment in if condition tty: tty_ldisc: Remove the repeated word 'the' drivers/tty/sysrq.c | 35 ++++++++++++++++++----------------- drivers/tty/tty_jobctrl.c | 29 +++++++++++++++++++---------- drivers/tty/tty_ldisc.c | 41 ++++++++++++++++++++++++++--------------- 3 files changed, 63 insertions(+), 42 deletions(-) -- 2.8.1

1 10