From patchwork Tue Jun 7 20:17:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhaktipriya Shridhar X-Patchwork-Id: 631790 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rPNDd3kDzz9sdg for ; Wed, 8 Jun 2016 06:18:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=DxIWJPz/; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422947AbcFGUSG (ORCPT ); Tue, 7 Jun 2016 16:18:06 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:36711 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161152AbcFGUSF (ORCPT ); Tue, 7 Jun 2016 16:18:05 -0400 Received: by mail-pa0-f65.google.com with SMTP id fg1so14852192pad.3; Tue, 07 Jun 2016 13:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=xbKNbqfofQxBrl4zqOplgRNnlDErNj60UidcBy8fZHE=; b=DxIWJPz/KamCmPxbqxXECmpECLMma/rSMt+vTm7tsHrwcbkCHhQ9FVSToLHYYTbuZk vDbZx7oW0I+FubQE1Nq9HnZ4SQ+ptJ/h7TfHnn72Q9HdymN5J9FLvx0rT+OGkDvToRiT Jvo5jhVgKThuwj0RQxNJqbt3TA9940V80sMe073D4J9Iou8ITHdrMdjR8fHA0FWs9HGB HYh1ZjdpB3gdPhJYbAJ4JDulhPYqj9kcvTOAeE1NEeSrXfno3MphWn6VgztS2AhSuQSt XInaKTVB0E/mpAoLZUJ6KhwwY8vq0SfkRMaGFu490mDSZyFA4XqXSiSjHTYiFppNnJFj a9Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=xbKNbqfofQxBrl4zqOplgRNnlDErNj60UidcBy8fZHE=; b=eUhXjPDxBsdWT67F4Sk5y1TK7jI2bplI8/IbXjQUhuY7jLjzV6sB6QydA9LZBJ+xHX adofBlA0ONCrbhMdmpP55F053jH6KaYGJU5rMKAAx8PN2TaI4kRimfYECIZXpLzKNb2/ FdTIPSyTMAyirZxs9GBOGgChpePaOtRGkP+peYh6uFD6qicc/3C92gKQ5eraCtI6TnEj v/MKo9ADA6wDiKVi4jZAovwhv2RXQDnExkAoKKE+0t0QAiOIkewVI7s9HtuBN7TBquUz TpqZua9oGD/2pFmeABcjK75jOIStPJAUXYCZn1Hp7aBS8V1wz7ZC4fbR8Mwn9WFqtkX0 u8QA== X-Gm-Message-State: ALyK8tKMdJnCYnYWFCEtG+cOEKp+RSIhOgGOkB7Kr4ZVep7WTBWIwBoF9bDNHoFTC7o+qg== X-Received: by 10.66.132.72 with SMTP id os8mr1271039pab.63.1465330684023; Tue, 07 Jun 2016 13:18:04 -0700 (PDT) Received: from Karyakshetra ([1.23.6.72]) by smtp.gmail.com with ESMTPSA id p1sm35099629paz.8.2016.06.07.13.18.02 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jun 2016 13:18:03 -0700 (PDT) Date: Wed, 8 Jun 2016 01:47:59 +0530 From: Bhaktipriya Shridhar To: Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi Cc: Tejun Heo , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: cavium: liquidio: Remove deprecated create_workqueue Message-ID: <20160607201758.GA14937@Karyakshetra> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org alloc_workqueue replaces deprecated create_workqueue(). A dedicated workqueue has been used since the workitem viz (&lio->txq_status_wq.wk.work which maps to octnet_poll_check_txq_status) is involved in a brief poll routine for checking transmit queue status and is an intergral part of normal device operation. WQ_MEM_RECLAIM has been set to guarantee forward progress under memory pressure, which is a requirement here. Since there are only a fixed number of work items, explicit concurrency limit is unnecessary. flush_workqueue is unnecessary since destroy_workqueue() itself calls drain_workqueue() which flushes repeatedly till the workqueue becomes empty. Signed-off-by: Bhaktipriya Shridhar --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.1.4 diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 8de79ae..655d89e 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2036,7 +2036,8 @@ static inline void setup_tx_poll_fn(struct net_device *netdev) struct lio *lio = GET_LIO(netdev); struct octeon_device *oct = lio->oct_dev; - lio->txq_status_wq.wq = create_workqueue("txq-status"); + lio->txq_status_wq.wq = alloc_workqueue("txq-status", + WQ_MEM_RECLAIM, 0); if (!lio->txq_status_wq.wq) { dev_err(&oct->pci_dev->dev, "unable to create cavium txq status wq\n"); return; @@ -2103,7 +2104,6 @@ static int liquidio_stop(struct net_device *netdev) send_rx_ctrl_cmd(lio, 0); cancel_delayed_work_sync(&lio->txq_status_wq.wk.work); - flush_workqueue(lio->txq_status_wq.wq); destroy_workqueue(lio->txq_status_wq.wq); if (lio->ptp_clock) {