From nobody Fri Sep 20 01:39:43 2024 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 528AC194C79; Tue, 30 Jul 2024 18:34:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722364465; cv=none; b=spg/p/PeO19+oQG6J7KiudOz3svkI0/dEkmS0lmiISq1ABvF3Rf0u0tOJFiSPC6JZIsH1vcCcec7xmIq1HcOwGZ5VhwpiFc/CVVeg7bt5VIiXC9A+vrkHINlcFVw5aoC3y+e2KUvq/VUjwQX3//kbgVl6mPePsEnYLGV1OzrtKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722364465; c=relaxed/simple; bh=A5jrWr1IghZ5fJq1hB2wTRQQ/a3/d6XdhbZEDYs8RaI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Wx7KF0H5Cv4wHDnNkWEdIfw/bLxSBpZD5iVDwM+VctHBzHibUdVAO+3jr/pdYxObyzfuywfCyLt57HNltFUZSypW34EA6FjFom83IJ5Xyxdq+ggkbf6u8NBI/t7wJTtrKXq94mCNL3/m9ktYvl2cHQW0NhE1dZTBNeFhlP34yB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JywRwFwr; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JywRwFwr" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-70d316f0060so102745b3a.1; Tue, 30 Jul 2024 11:34:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722364462; x=1722969262; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OdRV3tBKurUC7JL5LN0RX0YIj/b6iO27dMB9vD9DlaM=; b=JywRwFwryb/okkmnCi3onS+zCLEVjcb3vQFy/xsYNF1Llk+r8cOZUmgjlNPNRBAisY frBHgcu0AuhXu/4SxecWPI4AlBjNHG7iq1St2rPRD6KJsnuvWxnJhSHXV9FltAGOKYjI y3HBqp45qAHnDs5KjRfgMgBgauZqU2QPWLmLa/DqChNvRROZytYfe025CpRYsm4PxSDb 7/Jby+pTZcn4BjxiPY5ljYs2goCLLtMfQJOUIRDqul2t/eSyPL5eOmWt+3VFdiZoieVY 2OZEl10VdQ7WYap4HCLQONj5jdZUsxnA6lx0S3I3uomYHZRf6b27741FxeWfpUdW3wB8 /ZEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722364462; x=1722969262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OdRV3tBKurUC7JL5LN0RX0YIj/b6iO27dMB9vD9DlaM=; b=fKurplNvWxaqhhzTNr/Wd19GFMaqeu4TFp5KyQjQCtzE1qmDrd5lkiePfPMWXoEeFT cU6DygywMfPlH0CX3Fu2dnkJOTxKxKRTkC5qEdlNxUdvVIfhN4WxVaMiPtfeqXqAED+v 5rDy9ZKG8KEJy/N3RlZd9LNHD5VJnewjYO+4kAZzC9oI2fY+TCCWyZehRw1y4kBJNZnf BDdQK1Jn/BufOlVku395vCu6vSZ4HtoA0u/KlDcRTow9KCOzkdbDZaGUxBP8E8QBmrO1 93mcobcRJXzaNrjyLB17nMB/YpeRdTAmOhY2gUg8p2dkTpbMpLO3w1cwzfQTKNKO9Mlt qADA== X-Forwarded-Encrypted: i=1; AJvYcCXCsjIkgTRqLOobJS1OZ1cvfEqmidiQMCpVT0QDXR0BIyvto5G5e129ujea+Go9UAR8Jt14/6pNv0WGYMx4SyovrQdR/wkN2XxLkpXX6SyAYTCL+auZZVvG1maunaNfDywByeyApIbKneU9UFOhHgbHkM9alVUOEomDljcUrFnmKw== X-Gm-Message-State: AOJu0YxTdxL6zBelUJWCIjrt1usPwuej8M8Ml/1WDHTnGLSmZ44KqbHx z2+Hhmb46nfVnzTbjYVCkf6fxEGnKgF4SrMxmdvRpkUNZ0eOWLO9 X-Google-Smtp-Source: AGHT+IE5CEFG0QL8+HJAnhugLdWRJxd0gblZEHd2FiL4s+DlPnYc3pLWQhzTRm6zOgq3LdUXGGqE2A== X-Received: by 2002:a05:6a20:5508:b0:1c0:c6c9:80bc with SMTP id adf61e73a8af0-1c4e470d444mr3545018637.9.1722364462335; Tue, 30 Jul 2024 11:34:22 -0700 (PDT) Received: from apais-devbox.. ([2001:569:766d:6500:f2df:af9:e1f6:390e]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7a9f817f5a2sm7837763a12.24.2024.07.30.11.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 11:34:21 -0700 (PDT) From: Allen Pais To: kuba@kernel.org, "David S. Miller" , Eric Dumazet , Paolo Abeni Cc: jes@trained-monkey.org, kda@linux-powerpc.org, cai.huoqing@linux.dev, dougmill@linux.ibm.com, npiggin@gmail.com, christophe.leroy@csgroup.eu, aneesh.kumar@kernel.org, naveen.n.rao@linux.ibm.com, nnac123@linux.ibm.com, tlfalcon@linux.ibm.com, cooldavid@cooldavid.org, marcin.s.wojtas@gmail.com, mlindner@marvell.com, stephen@networkplumber.org, nbd@nbd.name, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, lorenzo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, borisp@nvidia.com, bryan.whitehead@microchip.com, UNGLinuxDriver@microchip.com, louis.peens@corigine.com, richardcochran@gmail.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acenic@sunsite.dk, linux-net-drivers@amd.com, netdev@vger.kernel.org, Allen Pais , Sunil Goutham Subject: [net-next v3 05/15] net: cavium/liquidio: Convert tasklet API to new bottom half workqueue mechanism Date: Tue, 30 Jul 2024 11:33:53 -0700 Message-Id: <20240730183403.4176544-6-allen.lkml@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730183403.4176544-1-allen.lkml@gmail.com> References: <20240730183403.4176544-1-allen.lkml@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Migrate tasklet APIs to the new bottom half workqueue mechanism. It replaces all occurrences of tasklet usage with the appropriate workqueue APIs throughout the cavium/liquidio driver. This transition ensures compatibility with the latest design and enhances performance. Reviewed-by: Sunil Goutham Signed-off-by: Allen Pais --- .../net/ethernet/cavium/liquidio/lio_core.c | 4 ++-- .../net/ethernet/cavium/liquidio/lio_main.c | 24 +++++++++---------- .../ethernet/cavium/liquidio/lio_vf_main.c | 10 ++++---- .../ethernet/cavium/liquidio/octeon_droq.c | 4 ++-- .../ethernet/cavium/liquidio/octeon_main.h | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/= ethernet/cavium/liquidio/lio_core.c index 674c54831875..37307e02a6ff 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -925,7 +925,7 @@ int liquidio_schedule_msix_droq_pkt_handler(struct octe= on_droq *droq, u64 ret) if (OCTEON_CN23XX_VF(oct)) dev_err(&oct->pci_dev->dev, "should not come here should not get rx when poll mode =3D 0 for vf\n= "); - tasklet_schedule(&oct_priv->droq_tasklet); + queue_work(system_bh_wq, &oct_priv->droq_bh_work); return 1; } /* this will be flushed periodically by check iq db */ @@ -975,7 +975,7 @@ static void liquidio_schedule_droq_pkt_handlers(struct = octeon_device *oct) droq->ops.napi_fn(droq); oct_priv->napi_mask |=3D BIT_ULL(oq_no); } else { - tasklet_schedule(&oct_priv->droq_tasklet); + queue_work(system_bh_wq, &oct_priv->droq_bh_work); } } } diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/= ethernet/cavium/liquidio/lio_main.c index 1d79f6eaa41f..d348656c2f38 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -150,12 +150,12 @@ static int liquidio_set_vf_link_state(struct net_devi= ce *netdev, int vfidx, static struct handshake handshake[MAX_OCTEON_DEVICES]; static struct completion first_stage; =20 -static void octeon_droq_bh(struct tasklet_struct *t) +static void octeon_droq_bh(struct work_struct *work) { int q_no; int reschedule =3D 0; - struct octeon_device_priv *oct_priv =3D from_tasklet(oct_priv, t, - droq_tasklet); + struct octeon_device_priv *oct_priv =3D from_work(oct_priv, work, + droq_bh_work); struct octeon_device *oct =3D oct_priv->dev; =20 for (q_no =3D 0; q_no < MAX_OCTEON_OUTPUT_QUEUES(oct); q_no++) { @@ -180,7 +180,7 @@ static void octeon_droq_bh(struct tasklet_struct *t) } =20 if (reschedule) - tasklet_schedule(&oct_priv->droq_tasklet); + queue_work(system_bh_wq, &oct_priv->droq_bh_work); } =20 static int lio_wait_for_oq_pkts(struct octeon_device *oct) @@ -199,7 +199,7 @@ static int lio_wait_for_oq_pkts(struct octeon_device *o= ct) } if (pkt_cnt > 0) { pending_pkts +=3D pkt_cnt; - tasklet_schedule(&oct_priv->droq_tasklet); + queue_work(system_bh_wq, &oct_priv->droq_bh_work); } pkt_cnt =3D 0; schedule_timeout_uninterruptible(1); @@ -1130,7 +1130,7 @@ static void octeon_destroy_resources(struct octeon_de= vice *oct) break; } /* end switch (oct->status) */ =20 - tasklet_kill(&oct_priv->droq_tasklet); + cancel_work_sync(&oct_priv->droq_bh_work); } =20 /** @@ -1234,7 +1234,7 @@ static void liquidio_destroy_nic_device(struct octeon= _device *oct, int ifidx) list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) netif_napi_del(napi); =20 - tasklet_enable(&oct_priv->droq_tasklet); + enable_and_queue_work(system_bh_wq, &oct_priv->droq_bh_work); =20 if (atomic_read(&lio->ifstate) & LIO_IFSTATE_REGISTERED) unregister_netdev(netdev); @@ -1770,7 +1770,7 @@ static int liquidio_open(struct net_device *netdev) int ret =3D 0; =20 if (oct->props[lio->ifidx].napi_enabled =3D=3D 0) { - tasklet_disable(&oct_priv->droq_tasklet); + disable_work_sync(&oct_priv->droq_bh_work); =20 list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) napi_enable(napi); @@ -1896,7 +1896,7 @@ static int liquidio_stop(struct net_device *netdev) if (OCTEON_CN23XX_PF(oct)) oct->droq[0]->ops.poll_mode =3D 0; =20 - tasklet_enable(&oct_priv->droq_tasklet); + enable_and_queue_work(system_bh_wq, &oct_priv->droq_bh_work); } =20 dev_info(&oct->pci_dev->dev, "%s interface is stopped\n", netdev->name); @@ -4204,9 +4204,9 @@ static int octeon_device_init(struct octeon_device *o= cteon_dev) } } =20 - /* Initialize the tasklet that handles output queue packet processing.*/ - dev_dbg(&octeon_dev->pci_dev->dev, "Initializing droq tasklet\n"); - tasklet_setup(&oct_priv->droq_tasklet, octeon_droq_bh); + /* Initialize the bh work that handles output queue packet processing.*/ + dev_dbg(&octeon_dev->pci_dev->dev, "Initializing droq bh work\n"); + INIT_WORK(&oct_priv->droq_bh_work, octeon_droq_bh); =20 /* Setup the interrupt handler and record the INT SUM register address */ diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/n= et/ethernet/cavium/liquidio/lio_vf_main.c index 62c2eadc33e3..04117625f388 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -87,7 +87,7 @@ static int lio_wait_for_oq_pkts(struct octeon_device *oct) } if (pkt_cnt > 0) { pending_pkts +=3D pkt_cnt; - tasklet_schedule(&oct_priv->droq_tasklet); + queue_work(system_bh_wq, &oct_priv->droq_bh_work); } pkt_cnt =3D 0; schedule_timeout_uninterruptible(1); @@ -584,7 +584,7 @@ static void octeon_destroy_resources(struct octeon_devi= ce *oct) break; } =20 - tasklet_kill(&oct_priv->droq_tasklet); + cancel_work_sync(&oct_priv->droq_bh_work); } =20 /** @@ -687,7 +687,7 @@ static void liquidio_destroy_nic_device(struct octeon_d= evice *oct, int ifidx) list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) netif_napi_del(napi); =20 - tasklet_enable(&oct_priv->droq_tasklet); + enable_and_queue_work(system_bh_wq, &oct_priv->droq_bh_work); =20 if (atomic_read(&lio->ifstate) & LIO_IFSTATE_REGISTERED) unregister_netdev(netdev); @@ -911,7 +911,7 @@ static int liquidio_open(struct net_device *netdev) int ret =3D 0; =20 if (!oct->props[lio->ifidx].napi_enabled) { - tasklet_disable(&oct_priv->droq_tasklet); + disable_work_sync(&oct_priv->droq_bh_work); =20 list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) napi_enable(napi); @@ -986,7 +986,7 @@ static int liquidio_stop(struct net_device *netdev) =20 oct->droq[0]->ops.poll_mode =3D 0; =20 - tasklet_enable(&oct_priv->droq_tasklet); + enable_and_queue_work(system_bh_wq, &oct_priv->droq_bh_work); } =20 cancel_delayed_work_sync(&lio->stats_wk.work); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c b/drivers/n= et/ethernet/cavium/liquidio/octeon_droq.c index eef12fdd246d..4e5f8bbc891b 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c @@ -96,7 +96,7 @@ u32 octeon_droq_check_hw_for_pkts(struct octeon_droq *dro= q) last_count =3D pkt_count - droq->pkt_count; droq->pkt_count =3D pkt_count; =20 - /* we shall write to cnts at napi irq enable or end of droq tasklet */ + /* we shall write to cnts at napi irq enable or end of droq bh_work */ if (last_count) atomic_add(last_count, &droq->pkts_pending); =20 @@ -764,7 +764,7 @@ octeon_droq_process_packets(struct octeon_device *oct, (u16)rdisp->rinfo->recv_pkt->rh.r.subcode)); } =20 - /* If there are packets pending. schedule tasklet again */ + /* If there are packets pending. schedule bh_work again */ if (atomic_read(&droq->pkts_pending)) return 1; =20 diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_main.h b/drivers/n= et/ethernet/cavium/liquidio/octeon_main.h index 5b4cb725f60f..a8f2a0a7b08e 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_main.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_main.h @@ -24,6 +24,7 @@ #define _OCTEON_MAIN_H_ =20 #include +#include =20 #if BITS_PER_LONG =3D=3D 32 #define CVM_CAST64(v) ((long long)(v)) @@ -36,8 +37,7 @@ #define DRV_NAME "LiquidIO" =20 struct octeon_device_priv { - /** Tasklet structures for this device. */ - struct tasklet_struct droq_tasklet; + struct work_struct droq_bh_work; unsigned long napi_mask; struct octeon_device *dev; }; --=20 2.34.1