From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26A43A04F3 for ; Tue, 7 Jan 2020 18:34:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E44B51D9EB; Tue, 7 Jan 2020 18:34:45 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 30C941C190; Tue, 7 Jan 2020 18:34:41 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 09:34:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,406,1571727600"; d="scan'208";a="303282422" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga001.jf.intel.com with ESMTP; 07 Jan 2020 09:34:33 -0800 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 7 Jan 2020 09:34:32 -0800 Received: from NAM04-CO1-obe.outbound.protection.outlook.com (104.47.45.54) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 7 Jan 2020 09:34:32 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSshKkZjwU1dCmhEZEmIukj5HYnXzeF7GpdPq5/a2liOeG7bSoFiGBmWwGKZxR9HCIhDWo+HdySFdXr2ZONpAQcz2CsmrSfG/kGYkdSH5rS4xx5nxO/ssRTnL/hyc9Pfv33aEqnB9GvYpqSPszlisDU+N+N865bSxT05+lZzwgEUfNNoAtGx3wQspGA0kr1XNmfjRWnbw6G+YMIWdeKHlrz7Omd3dNlyhMBqZwBpoeQ5S+Qee4JjDIFD7k0KNOp7FTJRl59BlgxIdTiUS4+G7FKjcMwlrpnX5cLnbTvv9Ntb/9AJLhcXP5oCYv1uc5ZXQtY5A+i06J7fmhdNtErApw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L9XSkM8pc2uV06or1uub36PzUVOMuNk8nkVholI3E3Y=; b=Geh7ieaDRbdQhc65qGIrClGO7tVcRpw3TCMLvrkKyu5AvSTCxox21lyMyPob0wdhRPvga4CD/ZUeL+V5ZWi9wLTgLcU7Iav91e31Acre3qqobp/y3VMq7/1UmkCRWlEVVIbraPCw0Yr2pynk4GlQ5UYyTbKusYuHFlqH771AJ8aLeH1TdGUmM9Wh9nPwbF7Jblt/44awSzzi439tUMI+iPFobS7LdczYYOVAR3XGhREwx1endpKkEHwBCcFSRaYGHQgrJ5gxK7URPVfuzKSqtesTqMqtQSrFcEG/MJvLr7wvVOR3kKre5oIGGOhqhURMx8UtGE45g/4sVV8E8i3BRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L9XSkM8pc2uV06or1uub36PzUVOMuNk8nkVholI3E3Y=; b=nvfB7vWFCbbNcC0s7jTBuk/+Dc4+kT0MiR0stnRZISWE/gCJM4bYGbPRwr80Y8naio4cZwF9k88YQYyASvT04K9pkpP6D+pPhSCR5GBX9VDrxc+aafFfmw7pN/ztcQAGg4Osn0A3Naej4AbjrTpEePZGIk4O+n0j4nbxaHSLISw= Received: from SN6PR11MB2558.namprd11.prod.outlook.com (52.135.94.19) by SN6PR11MB2816.namprd11.prod.outlook.com (52.135.93.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.15; Tue, 7 Jan 2020 17:34:17 +0000 Received: from SN6PR11MB2558.namprd11.prod.outlook.com ([fe80::4d86:362a:13c3:8386]) by SN6PR11MB2558.namprd11.prod.outlook.com ([fe80::4d86:362a:13c3:8386%7]) with mapi id 15.20.2623.008; Tue, 7 Jan 2020 17:34:17 +0000 From: "Ananyev, Konstantin" To: "Zhu, TaoX" CC: "dev@dpdk.org" , "stable@dpdk.org" , "Lu, Wenzhuo" , "Zhang, Qi Z" , "Xing, Beilei" , "Yu, PingX" Thread-Topic: [PATCH] net/ixgbe: fix blocking system events Thread-Index: AQHVu5b2suSAYbMK/0ejgMg/wdlOxafSrlrQgASAtICACFSJAA== Date: Tue, 7 Jan 2020 17:34:16 +0000 Message-ID: References: <1577328342-216505-1-git-send-email-taox.zhu@intel.com> <60652C6914E08D41B9AA1580751B3CA9C24A10@SHSMSX106.ccr.corp.intel.com> In-Reply-To: <60652C6914E08D41B9AA1580751B3CA9C24A10@SHSMSX106.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODVjMzlhMTEtZGNmOC00N2NiLWJlNTgtZjkxNjZlNjA4NWU4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUlhPS1diQmNwM2ZDdTVcLzJlbW0xTXFEUkVSS1VDcEFrTVIrK1ZZY09vdlMxYmJHYjY0dFE1TlBUNm9YRTJacisifQ== dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.2.0.6 x-ctpclassification: CTP_NT authentication-results: spf=none (sender IP is ) smtp.mailfrom=konstantin.ananyev@intel.com; x-originating-ip: [192.198.151.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2085ae30-84ef-4d54-6b50-08d79397d217 x-ms-traffictypediagnostic: SN6PR11MB2816: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 027578BB13 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(366004)(346002)(376002)(39860400002)(189003)(13464003)(199004)(316002)(9686003)(55016002)(81156014)(86362001)(81166006)(54906003)(71200400001)(8676002)(450100002)(478600001)(30864003)(8936002)(107886003)(6862004)(4326008)(5660300002)(66946007)(66476007)(2906002)(66446008)(66556008)(26005)(53546011)(52536014)(186003)(7696005)(33656002)(6506007)(64756008)(76116006)(6636002); DIR:OUT; SFP:1102; SCL:1; SRVR:SN6PR11MB2816; H:SN6PR11MB2558.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RrYsnKQjL8cLZLmgKu+qBbIM9KXE/5pU9wNNOCm3iIYDV5K4voP/gAlaGoEAMUPwhkXtG7iEqbi6POYu1NOVe5j/kh9kGUtiI1CKgQtviGSRDEV4Uc1xzddlvZEy2wyG4Pw4FAptbdnHjCIj4cJc+pt1XtcuurJO7YcNvLAOx0NKw2EQ+VvZrZGCYZJ0ebFgT9Nlp5779YqXq7j6gGY1P6aXyZnLdpXVHGwj/cbpddHCHIyBrLoM0HMWWV2rVvpDQSPhwnb3b8Kpuc07fj3qWPr2m0GmHUv5WGnVQd/eOw00qJrQLVvyDFgNC454G45G/O9UHt0/J+EJqc7PCllQKjeIcXkKRZDPZoTycdxffDRzHtzQa968oMibvmqZ5QybEGeuJdVjfnK9ClG/mlLeR3wgK053uLRMGBd8C7iBgtCwXTyvcXq+XVsbFiba6TJo6l1nHLUArlH9WmCkgtUP2H6oqw3jSdqcSpXrkicPe0XWa4b1LvjaIEsyb/k26FhW Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 2085ae30-84ef-4d54-6b50-08d79397d217 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jan 2020 17:34:16.7770 (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: HCDvhtiOANJa2brQJXNnkN/WDV2ZqfhEezrZU8N3z72nDRyuwrqi/MgoFrsNPhwENrQeXQK25I3zFq9xpEgzPIM0ombuPUgxKQyMSlO72BY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2816 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH] net/ixgbe: fix blocking system events X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi Tao, > Thank you for your advice. Your advice is excellent. I have the same idea= with you to solve this problem. > First. Consider whether the fallback function of alamer can shorten the = time. > But it seems difficult for the following reasons(If you have a good idea,= please let me know): > a. The entry of the fallback function is 'ixgbe_setup_mac_link_multispee= d_fiber', It's a little more complicated > b. This callback function not only has multiple sleeps, but also may hav= e long sleep in other functions it calls > c. The function called by the callback function has different implementa= tions for different NIC > d. This callback function and other functions it calls are all from ND's= shared code. After modification, upgrading will cause > trouble Agree, I also don't see a way to overcome that problem without reworking ixgbe/base code quite significantly. Which obviously is not an option.=20 >=20 > So I use a separate thread to replace alarm, This thread is created using= wrapper function: rte_ctrl_thread_create(). > A mechanism is provided to create a thread when PF or VF is initialized f= or the first time. This thread will select tasks from the task list > in order to execute. If the task list is empty, the thread sleeps. > Provides interface for adding and deleting tasks. > The specific implementation is as follows(See patch for detailed implemen= tation): > a. Thread create function: ixgbe_task_thread_init, it will call rte_ctrl= _thread_create to create thread > b. Thread destroy function: ixgbe_task_thread_uninit > c. Add task function: ixgbe_add_task, it add a task and wake up the slee= ping thread > d. Cancel task function: ixgbe_cancel_task, it cancel a task synchronous= ly >=20 > The reason why a task queue is used to manage tasks is that there may be = concurrent conflicts, because alarm has no concurrent > conflicts. Sorry, I probably wasn't clear in my previous mail. I realized what you did, but I think it is not a good practice to add task management thread/code into specific PMD. If we do need such code, then it probably has to be generic enough and be = in EAL. Though I wonder do we really need it for that case? Can't we just spawn a thread to execute ixgbe_dev_setup_link_alarm_handler? I.E just : rte_ctrl_thread_create(&hw->link_thread, ...., ixgbe_dev_setup_link_alarm_h= andler, dev); instead of rte_eal_alarm_set() And pthread_cancel(&hw->link_thread); pthread_join(hw->link_thread); Instead of rte_alarm_cancel(). >=20 > BR, > Zhu, Tao >=20 > > -----Original Message----- > > From: Ananyev, Konstantin > > Sent: Monday, December 30, 2019 9:58 PM > > To: Zhu, TaoX ; konstantin.ananyev@intel.com > > wenzhuo.lu@intel.com > > Cc: dev@dpdk.org; stable@dpdk.org > > Subject: RE: [PATCH] net/ixgbe: fix blocking system events > > > > Hi, > > > > > IXGBE link status task use rte alarm thread in old implementation. > > > Sometime ixgbe link status task takes up to 9 seconds. This will > > > severely affect the rte-alarm-thread-dependent a task in the system, > > > like interrupt or hotplug event. So replace with a independent threa= d > > > which has the same thread affinity settings as rte interrupt. > > > > > > I don't think it is a good idea to add into PMD code that creates/manag= es > > new threads. > > I think ideal would be to rework link setup code, so it can take less t= ime > > (make it interruptable/repeatable). > > If that is not possible, and control function is the only way, there is= a wrapper > > function: rte_ctrl_thread_create() that can be used here instead of cre= ating > > your own framework. > > > > > > > > > > Fixes: 0408f47b ("net/ixgbe: fix busy polling while fiber link > > > update") > > > Cc: stable@dpdk.org > > > > > > Signed-off-by: Zhu Tao > > > --- > > > drivers/net/ixgbe/ixgbe_ethdev.c | 184 > > > +++++++++++++++++++++++++++++++++++++-- > > > drivers/net/ixgbe/ixgbe_ethdev.h | 32 +++++++ > > > 2 files changed, 210 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c > > > b/drivers/net/ixgbe/ixgbe_ethdev.c > > > index 2c6fd0f..f0b387d 100644 > > > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > > > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > > > @@ -15,6 +15,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > > > > #include > > > #include > > > @@ -378,6 +379,9 @@ static int ixgbe_dev_udp_tunnel_port_del(struct > > rte_eth_dev *dev, > > > struct rte_eth_udp_tunnel *udp_tunnel); static int > > > ixgbe_filter_restore(struct rte_eth_dev *dev); static void > > > ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev); > > > +static int ixgbe_task_thread_init(struct rte_eth_dev *dev); static > > > +void ixgbe_task_thread_uninit(struct rte_eth_dev *dev); > > > + > > > > > > /* > > > * Define VF Stats MACRO for Non "cleared on read" register @@ > > > -1069,6 +1073,171 @@ struct rte_ixgbe_xstats_name_off { } > > > > > > /* > > > + * Add a task to task queue tail. > > > + */ > > > +int ixgbe_add_task(struct rte_eth_dev *dev, ixgbe_task_cb_fn task_cb= ) > > > +{ struct ixgbe_adapter *ad =3D dev->data->dev_private; struct > > > +ixgbe_task *task; > > > + > > > +if (ad->task_status =3D=3D IXGBE_TASK_THREAD_RUNNING) { task =3D > > > +rte_zmalloc("ixgbe", sizeof(struct ixgbe_task), 0); if (task =3D=3D = NULL) > > > +return -ENOMEM; > > > + > > > +task->arg =3D dev; > > > +task->task_cb =3D task_cb; > > > +task->status =3D IXGBE_TASK_READY; > > > + > > > +pthread_mutex_lock(&ad->task_lock); > > > +TAILQ_INSERT_TAIL(&ad->task_head, task, next); > > > +pthread_cond_signal(&ad->task_cond); > > > +pthread_mutex_unlock(&ad->task_lock); > > > +} else { > > > +return -EPERM;/* Operation not permitted */ } > > > + > > > +return 0; > > > +} > > > + > > > +/* > > > + * Sync cancel a task with all @task_cb be exit. > > > + */ > > > +int ixgbe_cancel_task(struct rte_eth_dev *dev, ixgbe_task_cb_fn > > > +task_cb) { struct ixgbe_adapter *ad =3D dev->data->dev_private; stru= ct > > > +ixgbe_task *task, *ttask; int i, executing; > > > +#define DELAY_TIMEOUT_LOG 2000// 2s > > > +#define DELAY_TIMEOUT_MAX 10000// 10s > > > + > > > +for (i =3D 0; i < DELAY_TIMEOUT_MAX; i++) { executing =3D 0; if > > > +(ad->task_status =3D=3D IXGBE_TASK_THREAD_RUNNING) { > > > +pthread_mutex_lock(&ad->task_lock); > > > +TAILQ_FOREACH_SAFE(task, &ad->task_head, next, ttask) { if > > > +(task->task_cb =3D=3D task_cb) { if (task->status =3D=3D IXGBE_TASK_= RUNNING) > > > +{ > > > +executing++; > > > +} else { > > > +TAILQ_REMOVE(&ad->task_head, task, next); rte_free(task); } } } > > > +pthread_mutex_unlock(&ad->task_lock); > > > + > > > +if (executing) { > > > +if (i > DELAY_TIMEOUT_LOG && (i % 1000 =3D=3D 0)) > > { PMD_DRV_LOG(WARNING, > > > + "Cannel task time wait %ds!", i / 1000); } > > > + > > > +rte_delay_us_sleep(1000);// 1ms > > > +continue; > > > +} > > > +} > > > +break; > > > +} > > > + > > > +if (i =3D=3D DELAY_TIMEOUT_MAX) > > > +return -EBUSY; > > > + > > > +return 0; > > > +} > > > + > > > +/* > > > + * Task main thread. Loop until state is set to IXGBE_TASK_THREAD_EX= IT. > > > + * For each task, set the status to IXGBE_TASK_RUNNING before > > > +execution, > > > + * execute and then be dequeue. > > > + */ > > > +static void *ixgbe_task_handler(void *args) { struct ixgbe_adapter > > > +*ad =3D > > > + ((struct rte_eth_dev *)args)->data->dev_private; struct > > > +ixgbe_task *task; > > > + > > > +PMD_INIT_LOG(DEBUG, "ixgbe task thread created"); while > > > +(ad->task_status) { pthread_mutex_lock(&ad->task_lock); > > > +if (TAILQ_EMPTY(&ad->task_head)) { > > > +pthread_cond_wait(&ad->task_cond, &ad->task_lock); > > > +pthread_mutex_unlock(&ad->task_lock); > > > +continue; > > > +} > > > + > > > +/* pop firt task and run it */ > > > +task =3D TAILQ_FIRST(&ad->task_head); > > > +task->status =3D IXGBE_TASK_RUNNING; > > > +pthread_mutex_unlock(&ad->task_lock); > > > + > > > +if (task && task->task_cb) > > > +task->task_cb(task->arg); > > > + > > > +pthread_mutex_lock(&ad->task_lock); > > > +TAILQ_REMOVE(&ad->task_head, task, next); rte_free(task); > > > +pthread_mutex_unlock(&ad->task_lock); > > > +} > > > + > > > +pthread_mutex_lock(&ad->task_lock); > > > +while (!TAILQ_EMPTY(&ad->task_head)) { task =3D > > > +TAILQ_FIRST(&ad->task_head); TAILQ_REMOVE(&ad->task_head, task, > > > +next); rte_free(task); } pthread_mutex_unlock(&ad->task_lock); > > > +ad->task_status =3D IXGBE_TASK_THREAD_EXIT_DONE; > > > + > > > +return NULL; > > > +} > > > + > > > +static int ixgbe_task_thread_init(struct rte_eth_dev *dev) { struct > > > +ixgbe_adapter *ad =3D dev->data->dev_private; struct rte_pci_device > > > +*pci_dev =3D RTE_ETH_DEV_TO_PCI(dev); char > > > +name[IXGBE_TASK_THREAD_NAME_LEN]; > > > +int ret; > > > + > > > +TAILQ_INIT(&ad->task_head); > > > +pthread_mutex_init(&ad->task_lock, NULL); > > > +pthread_cond_init(&ad->task_cond, NULL); > > > + > > > +snprintf(name, IXGBE_TASK_THREAD_NAME_LEN, "ixgbe-delay:%s", > > > +pci_dev->name); > > > + > > > +ret =3D rte_ctrl_thread_create(&ad->task_tid, name, NULL, > > > + ixgbe_task_handler, dev); > > > +if (ret < 0) { > > > +PMD_INIT_LOG(ERR, "Create control thread %s fail!", name); return > > > +ret; } > > > +ad->task_status =3D IXGBE_TASK_THREAD_RUNNING; > > > + > > > +return 0; > > > +} > > > + > > > +static void ixgbe_task_thread_uninit(struct rte_eth_dev *dev) { > > > +struct ixgbe_adapter *ad =3D dev->data->dev_private; int i; #define > > > +MAX_EXIT_TIMEOUT 3000/* 3s */ > > > + > > > +if (ad->task_status =3D=3D IXGBE_TASK_THREAD_RUNNING) { > > > +ad->task_status =3D IXGBE_TASK_THREAD_EXIT; > > > +pthread_cond_signal(&ad->task_cond); > > > +for (i =3D 0; i < MAX_EXIT_TIMEOUT; i++) { if (ad->task_status =3D= =3D > > > +IXGBE_TASK_THREAD_EXIT_DONE) { pthread_cond_destroy(&ad- > > >task_cond); > > > +pthread_mutex_destroy(&ad->task_lock); > > > +break; > > > +} > > > +rte_delay_us_sleep(1000);// 1ms > > > +} > > > +} > > > +} > > > + > > > +/* > > > * This function is based on code in ixgbe_attach() in base/ixgbe.c. > > > * It returns 0 on success. > > > */ > > > @@ -1301,6 +1470,7 @@ struct rte_ixgbe_xstats_name_off { > > > /* enable support intr */ > > > ixgbe_enable_intr(eth_dev); > > > > > > +ixgbe_task_thread_init(eth_dev); > > > ixgbe_dev_set_link_down(eth_dev); > > > > > > /* initialize filter info */ > > > @@ -1337,6 +1507,7 @@ struct rte_ixgbe_xstats_name_off { return 0; > > > > > > ixgbe_dev_close(eth_dev); > > > +ixgbe_task_thread_uninit(eth_dev); > > > > > > return 0; > > > } > > > @@ -1713,6 +1884,7 @@ static int ixgbe_l2_tn_filter_init(struct > > rte_eth_dev *eth_dev) > > > ixgbevf_dev_interrupt_handler, eth_dev); > > > rte_intr_enable(intr_handle); ixgbevf_intr_enable(eth_dev); > > > +ixgbe_task_thread_init(eth_dev); > > > > > > PMD_INIT_LOG(DEBUG, "port %d vendorID=3D0x%x deviceID=3D0x%x > > mac.type=3D%s", > > > eth_dev->data->port_id, pci_dev->id.vendor_id, @@ -1732,6 > > > +1904,7 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev > > > *eth_dev) return 0; > > > > > > ixgbevf_dev_close(eth_dev); > > > +ixgbe_task_thread_uninit(eth_dev); > > > > > > return 0; > > > } > > > @@ -2570,7 +2743,7 @@ static int eth_ixgbevf_pci_remove(struct > > > rte_pci_device *pci_dev) } > > > > > > /* Stop the link setup handler before resetting the HW. */ > > > -rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev); > > > +ixgbe_cancel_task(dev, ixgbe_dev_setup_link_alarm_handler); > > > > > > /* disable uio/vfio intr/eventfd mapping */ > > > rte_intr_disable(intr_handle); @@ -2842,7 +3015,7 @@ static int > > > eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev) > > > > > > PMD_INIT_FUNC_TRACE(); > > > > > > -rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev); > > > +ixgbe_cancel_task(dev, ixgbe_dev_setup_link_alarm_handler); > > > > > > /* disable interrupts */ > > > ixgbe_disable_intr(hw); > > > @@ -4162,8 +4335,7 @@ static int > > > ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, > > if > > > (link_up =3D=3D 0) { if (ixgbe_get_media_type(hw) =3D=3D > > > ixgbe_media_type_fiber) { intr->flags |=3D > > IXGBE_FLAG_NEED_LINK_CONFIG; > > > -rte_eal_alarm_set(10, -ixgbe_dev_setup_link_alarm_handler, dev); > > > +ixgbe_add_task(dev, ixgbe_dev_setup_link_alarm_handler); > > > } > > > return rte_eth_linkstatus_set(dev, &link); } @@ -5207,7 +5379,7 @@ > > > static int ixgbevf_dev_xstats_get_names(__rte_unused struct > > > rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); > > > > > > /* Stop the link setup handler before resetting the HW. */ > > > -rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev); > > > +ixgbe_cancel_task(dev, ixgbe_dev_setup_link_alarm_handler); > > > > > > err =3D hw->mac.ops.reset_hw(hw); > > > if (err) { > > > @@ -5305,7 +5477,7 @@ static int > > > ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, > > > > > > PMD_INIT_FUNC_TRACE(); > > > > > > -rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev); > > > +ixgbe_cancel_task(dev, ixgbe_dev_setup_link_alarm_handler); > > > > > > ixgbevf_intr_disable(dev); > > > > > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h > > > b/drivers/net/ixgbe/ixgbe_ethdev.h > > > index 76a1b9d..4426349 100644 > > > --- a/drivers/net/ixgbe/ixgbe_ethdev.h > > > +++ b/drivers/net/ixgbe/ixgbe_ethdev.h > > > @@ -470,6 +470,28 @@ struct ixgbe_tm_conf { bool committed; }; > > > > > > +#define IXGBE_TASK_THREAD_NAME_LEN 64 enum > > { IXGBE_TASK_THREAD_EXIT > > > +=3D 0, IXGBE_TASK_THREAD_RUNNING =3D 1, > > IXGBE_TASK_THREAD_EXIT_DONE =3D 2 > > > +}; enum { IXGBE_TASK_READY =3D 0, IXGBE_TASK_RUNNING =3D 1, > > > +IXGBE_TASK_FINISH =3D 2 }; > > > + > > > +typedef void (*ixgbe_task_cb_fn) (void *arg); struct ixgbe_task { > > > +TAILQ_ENTRY(ixgbe_task) next; > > > +void *arg; > > > +int status; > > > +ixgbe_task_cb_fn task_cb; > > > +}; > > > +TAILQ_HEAD(ixgbe_task_head, ixgbe_task); > > > + > > > + > > > /* > > > * Structure to store private data for each driver instance (for eac= h port). > > > */ > > > @@ -510,6 +532,13 @@ struct ixgbe_adapter { > > > * mailbox status) link status. > > > */ > > > uint8_t pflink_fullchk; > > > + > > > +/* Control thread per VF/PF, used for to do delay work */ pthread_t > > > +task_tid; struct ixgbe_task_head task_head; int task_status; > > > +pthread_mutex_t task_lock; pthread_cond_t task_cond; > > > }; > > > > > > struct ixgbe_vf_representor { > > > @@ -760,6 +789,9 @@ void ixgbe_dev_macsec_setting_save(struct > > > rte_eth_dev *dev, struct ixgbe_macsec_setting *macsec_setting); > > > > > > void ixgbe_dev_macsec_setting_reset(struct rte_eth_dev *dev); > > > +int ixgbe_add_task(struct rte_eth_dev *dev, ixgbe_task_cb_fn > > > +task_cb); int ixgbe_cancel_task(struct rte_eth_dev *dev, > > > +ixgbe_task_cb_fn task_cb); > > > + > > > > > > static inline int > > > ixgbe_ethertype_filter_lookup(struct ixgbe_filter_info *filter_info, > > > -- > > > 1.8.3.1 > > >=20