From: "Ahmed S. Darwish" <a.darwish@linutronix.de>
To: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,
Rohit Maheshwari <rohitm@chelsio.com>,
Vinay Kumar Yadav <vinay.yadav@chelsio.com>,
Vishal Kulkarni <vishal@chelsio.com>,
netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
LKML <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Sebastian A. Siewior" <bigeasy@linutronix.de>
Subject: Re: [RFC PATCH 1/3] chelsio: cxgb: Remove ndo_poll_controller()
Date: Thu, 24 Dec 2020 14:31:37 +0100 [thread overview]
Message-ID: <X+SYOYn3jnwrldnA@lx-t490> (raw)
In-Reply-To: <20201224131148.300691-2-a.darwish@linutronix.de>
[[ Actually adding Eric to Cc ]]
On Thu, Dec 24, 2020 at 02:11:46PM +0100, Ahmed S. Darwish wrote:
> Since commit ac3d9dd034e5 ("netpoll: make ndo_poll_controller()
> optional"), networking drivers which use NAPI for clearing their TX
> completions should not provide an ndo_poll_controller(). Netpoll simply
> triggers the necessary TX queues cleanup by synchronously calling the
> driver's NAPI poll handler -- with irqs off and a zero budget.
>
> Modify the cxgb's poll method to clear the TX queues upon zero budget.
> Per API requirements, make sure to never consume any RX packet in that
> case (budget=0), and thus also not to increment the budget upon return.
>
> Afterwards, remove ndo_poll_controller().
>
> Link: https://lkml.kernel.org/r/20180921222752.101307-1-edumazet@google.com
> Link: https://lkml.kernel.org/r/A782704A-DF97-4E85-B10A-D2268A67DFD7@fb.com
> References: 822d54b9c2c1 ("netpoll: Drop budget parameter from NAPI polling call hierarchy")
> Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de>
> Cc: Eric Dumazet <edumazet@google.com>
> ---
> drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 14 --------------
> drivers/net/ethernet/chelsio/cxgb/sge.c | 9 ++++++++-
> 2 files changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
> index 0e4a0f413960..7b5a98330ef7 100644
> --- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
> +++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
> @@ -878,17 +878,6 @@ static int t1_set_features(struct net_device *dev, netdev_features_t features)
>
> return 0;
> }
> -#ifdef CONFIG_NET_POLL_CONTROLLER
> -static void t1_netpoll(struct net_device *dev)
> -{
> - unsigned long flags;
> - struct adapter *adapter = dev->ml_priv;
> -
> - local_irq_save(flags);
> - t1_interrupt(adapter->pdev->irq, adapter);
> - local_irq_restore(flags);
> -}
> -#endif
>
> /*
> * Periodic accumulation of MAC statistics. This is used only if the MAC
> @@ -973,9 +962,6 @@ static const struct net_device_ops cxgb_netdev_ops = {
> .ndo_set_mac_address = t1_set_mac_addr,
> .ndo_fix_features = t1_fix_features,
> .ndo_set_features = t1_set_features,
> -#ifdef CONFIG_NET_POLL_CONTROLLER
> - .ndo_poll_controller = t1_netpoll,
> -#endif
> };
>
> static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
> index 2d9c2b5a690a..d6df1a87db0b 100644
> --- a/drivers/net/ethernet/chelsio/cxgb/sge.c
> +++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
> @@ -1609,7 +1609,14 @@ static int process_pure_responses(struct adapter *adapter)
> int t1_poll(struct napi_struct *napi, int budget)
> {
> struct adapter *adapter = container_of(napi, struct adapter, napi);
> - int work_done = process_responses(adapter, budget);
> + int work_done = 0;
> +
> + if (budget)
> + work_done = process_responses(adapter, budget);
> + else {
> + /* budget=0 means: don't poll rx data */
> + process_pure_responses(adapter);
> + }
>
> if (likely(work_done < budget)) {
> napi_complete_done(napi, work_done);
> --
> 2.29.2
>
next prev parent reply other threads:[~2020-12-24 13:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-24 13:11 [RFC PATCH 0/3] chelsio: cxgb: Use threaded irqs Ahmed S. Darwish
2020-12-24 13:11 ` [RFC PATCH 1/3] chelsio: cxgb: Remove ndo_poll_controller() Ahmed S. Darwish
2020-12-24 13:31 ` Ahmed S. Darwish [this message]
2020-12-24 13:11 ` [RFC PATCH 2/3] chelsio: cxgb: Move slow interrupt handling to threaded irqs Ahmed S. Darwish
2021-01-11 10:38 ` Sebastian A. Siewior
2020-12-24 13:11 ` [RFC PATCH 3/3] chelsio: cxgb: Do not schedule a workqueue for external interrupts Ahmed S. Darwish
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=X+SYOYn3jnwrldnA@lx-t490 \
--to=a.darwish@linutronix.de \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rahul.lakkireddy@chelsio.com \
--cc=rohitm@chelsio.com \
--cc=tglx@linutronix.de \
--cc=vinay.yadav@chelsio.com \
--cc=vishal@chelsio.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).