From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id B0DC61B586 for ; Fri, 23 Nov 2018 15:50:44 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Nov 2018 06:50:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,270,1539673200"; d="scan'208";a="98491159" Received: from violet.igk.intel.com ([10.102.54.137]) by FMSMGA003.fm.intel.com with ESMTP; 23 Nov 2018 06:50:42 -0800 From: Darek Stojaczyk To: dev@dpdk.org Cc: thomas@monjalon.net, Darek Stojaczyk , qi.z.zhang@intel.com Date: Fri, 23 Nov 2018 15:45:06 +0100 Message-Id: <20181123144506.95367-1-dariusz.stojaczyk@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] dev: fix attach rollback of a device that was already attached X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 14:50:45 -0000 When primary process receives an IPC attach request of a device that's already locally-attached, it doesn't setup its variables properly and is prone to segfaulting on a subsequent rollback. `ret = local_dev_probe(req->devargs, &dev)` The above function will set `dev` pointer to the proper device *unless* it returns with error. One of those errors is -EEXIST, which the hotplug function explicitly ignores. For -EEXIST, it proceeds with attaching the device and expects the dev pointer to be valid. Despite this patch being a fix, it also introduces a design decision - when any secondary process fails to attach a device, the primary process that already had the device attached won't attempt to detach that device locally as a part of the rollback routine. Primary process would have already printed a message "Failed to [...] on secondary" and now it will also print a warning "Devices may not be in sync [...]". Fixes: ac9e4a17370f ("eal: support attach/detach shared device from secondary") Cc: qi.z.zhang@intel.com Signed-off-by: Darek Stojaczyk --- lib/librte_eal/common/hotplug_mp.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/librte_eal/common/hotplug_mp.c index 7c9fcc46c..7ee074a31 100644 --- a/lib/librte_eal/common/hotplug_mp.c +++ b/lib/librte_eal/common/hotplug_mp.c @@ -88,7 +88,7 @@ __handle_secondary_request(void *param) (const struct eal_dev_mp_req *)msg->param; struct eal_dev_mp_req tmp_req; struct rte_devargs *da; - struct rte_device *dev; + struct rte_device *dev = NULL; struct rte_bus *bus; int ret = 0; @@ -168,7 +168,15 @@ __handle_secondary_request(void *param) if (req->t == EAL_DEV_REQ_TYPE_ATTACH) { tmp_req.t = EAL_DEV_REQ_TYPE_ATTACH_ROLLBACK; eal_dev_hotplug_request_to_secondary(&tmp_req); - local_dev_remove(dev); + if (dev == NULL) { + /* device was already attached at the time we got the + * request, don't detach it now. + */ + RTE_LOG(WARNING, EAL, + "Devices in secondary may not sync with primary\n"); + } else { + local_dev_remove(dev); + } } else { tmp_req.t = EAL_DEV_REQ_TYPE_DETACH_ROLLBACK; eal_dev_hotplug_request_to_secondary(&tmp_req); -- 2.17.1