From: Paolo Abeni <pabeni@redhat.com>
To: Haiyang Zhang <haiyangz@linux.microsoft.com>,
linux-hyperv@vger.kernel.org, netdev@vger.kernel.org,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
Long Li <longli@microsoft.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Konstantin Taranov <kotaranov@microsoft.com>,
Simon Horman <horms@kernel.org>,
Shradha Gupta <shradhagupta@linux.microsoft.com>,
Erni Sri Satya Vennela <ernis@linux.microsoft.com>,
Dipayaan Roy <dipayanroy@linux.microsoft.com>,
Aditya Garg <gargaditya@linux.microsoft.com>,
Kees Cook <kees@kernel.org>, Breno Leitao <leitao@debian.org>,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org
Cc: paulros@microsoft.com
Subject: Re: [PATCH net-next v2] net: mana: Add Interrupt Moderation support
Date: Tue, 9 Jun 2026 15:49:25 +0200 [thread overview]
Message-ID: <dcd35c42-3aae-4ba2-bd84-4af08467b2fc@redhat.com> (raw)
In-Reply-To: <20260604234211.2056341-1-haiyangz@linux.microsoft.com>
On 6/5/26 1:41 AM, Haiyang Zhang wrote:
> diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
> index db14357d3732..b1e0c444f414 100644
> --- a/drivers/net/ethernet/microsoft/mana/mana_en.c
> +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
> @@ -1551,6 +1551,9 @@ int mana_create_wq_obj(struct mana_port_context *apc,
>
> mana_gd_init_req_hdr(&req.hdr, MANA_CREATE_WQ_OBJ,
> sizeof(req), sizeof(resp));
> +
> + req.hdr.req.msg_version = GDMA_MESSAGE_V3;
> + req.hdr.resp.msg_version = GDMA_MESSAGE_V2;
Sashiko noted the above cold break initialization on older firmware:
https://sashiko.dev/#/patchset/20260604234211.2056341-1-haiyangz%40linux.microsoft.com
[...]
> +static void mana_update_rx_dim(struct mana_cq *cq)
> +{
> + struct mana_port_context *apc = netdev_priv(cq->rxq->ndev);
> + struct mana_rxq *rxq = cq->rxq;
> + struct dim_sample dim_sample = {};
Minor nit: please fix the variable declaration order above. Other
occurrences below.
[...]
> @@ -440,17 +474,94 @@ static int mana_set_coalesce(struct net_device *ndev,
> return -EINVAL;
> }
>
> - saved_cqe_coalescing_enable = apc->cqe_coalescing_enable;
> + if (ec->rx_coalesce_usecs > MANA_INTR_MODR_USEC_MAX ||
> + ec->tx_coalesce_usecs > MANA_INTR_MODR_USEC_MAX) {
> + NL_SET_ERR_MSG_FMT(extack,
> + "coalesce usecs must be <= %lu",
> + MANA_INTR_MODR_USEC_MAX);
> + return -EINVAL;
> + }
> +
> + if (ec->rx_max_coalesced_frames > MANA_INTR_MODR_COMP_MAX ||
> + ec->tx_max_coalesced_frames > MANA_INTR_MODR_COMP_MAX) {
> + NL_SET_ERR_MSG_FMT(extack,
> + "coalesce frames must be <= %lu",
> + MANA_INTR_MODR_COMP_MAX);
> + return -EINVAL;
> + }
> +
> + if (ec->rx_coalesce_usecs != apc->intr_modr_rx_usec ||
> + ec->rx_max_coalesced_frames != apc->intr_modr_rx_comp ||
> + ec->tx_coalesce_usecs != apc->intr_modr_tx_usec ||
> + ec->tx_max_coalesced_frames != apc->intr_modr_tx_comp)
> + modr_changed = true;
> +
> + saved.intr_modr_rx_usec = apc->intr_modr_rx_usec;
> + saved.intr_modr_rx_comp = apc->intr_modr_rx_comp;
> + saved.intr_modr_tx_usec = apc->intr_modr_tx_usec;
> + saved.intr_modr_tx_comp = apc->intr_modr_tx_comp;
> +
> + apc->intr_modr_rx_usec = ec->rx_coalesce_usecs;
> + apc->intr_modr_rx_comp = ec->rx_max_coalesced_frames;
> + apc->intr_modr_tx_usec = ec->tx_coalesce_usecs;
> + apc->intr_modr_tx_comp = ec->tx_max_coalesced_frames;
> +
> + if (!!ec->use_adaptive_rx_coalesce != apc->rx_dim_enabled ||
> + !!ec->use_adaptive_tx_coalesce != apc->tx_dim_enabled)
> + dim_changed = true;
> +
> + saved.rx_dim_enabled = apc->rx_dim_enabled;
> + saved.tx_dim_enabled = apc->tx_dim_enabled;
> + apc->rx_dim_enabled = !!ec->use_adaptive_rx_coalesce;
> + apc->tx_dim_enabled = !!ec->use_adaptive_tx_coalesce;
> +
> + saved.cqe_coalescing_enable = apc->cqe_coalescing_enable;
> apc->cqe_coalescing_enable =
> kernel_coal->rx_cqe_frames == MANA_RXCOMP_OOB_NUM_PPI;
>
> if (!apc->port_is_up)
> return 0;
>
> - err = mana_config_rss(apc, TRI_STATE_TRUE, false, false);
> - if (err)
> - apc->cqe_coalescing_enable = saved_cqe_coalescing_enable;
> + if (apc->cqe_coalescing_enable != saved.cqe_coalescing_enable &&
> + !modr_changed && !dim_changed) {
> + /* If only CQE coalescing setting is changed, we can just update
> + * RSS configuration.
> + */
> + err = mana_config_rss(apc, TRI_STATE_TRUE, false, false);
> + if (err) {
> + netdev_err(ndev, "Change CQE coalescing failed: %d\n",
> + err);
> + apc->cqe_coalescing_enable =
> + saved.cqe_coalescing_enable;
> + return err;
> + }
> + return 0;
> + }
> +
> + if (modr_changed || dim_changed) {
> + err = mana_detach(ndev, false);
> + if (err) {
> + netdev_err(ndev, "mana_detach failed: %d\n", err);
> + goto restore_modr;
> + }
> +
> + err = mana_attach(ndev);
> + if (err) {
> + netdev_err(ndev, "mana_attach failed: %d\n", err);
> + goto restore_modr;
> + }
You should try hard to avoid this sequence: if mana_attach fails,
mana_set_coalesce() will leave the NIC unexpectedly down.
/P
prev parent reply other threads:[~2026-06-09 13:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-04 23:41 [PATCH net-next v2] net: mana: Add Interrupt Moderation support Haiyang Zhang
2026-06-09 13:49 ` Paolo Abeni [this message]
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=dcd35c42-3aae-4ba2-bd84-4af08467b2fc@redhat.com \
--to=pabeni@redhat.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=dipayanroy@linux.microsoft.com \
--cc=edumazet@google.com \
--cc=ernis@linux.microsoft.com \
--cc=gargaditya@linux.microsoft.com \
--cc=haiyangz@linux.microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=horms@kernel.org \
--cc=kees@kernel.org \
--cc=kotaranov@microsoft.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=leitao@debian.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=netdev@vger.kernel.org \
--cc=paulros@microsoft.com \
--cc=shradhagupta@linux.microsoft.com \
--cc=wei.liu@kernel.org \
/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