From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9158FC433FE for ; Thu, 17 Nov 2022 11:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239724AbiKQLNR (ORCPT ); Thu, 17 Nov 2022 06:13:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239600AbiKQLM7 (ORCPT ); Thu, 17 Nov 2022 06:12:59 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3F9E56D61 for ; Thu, 17 Nov 2022 03:12:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 92EC5B81FF8 for ; Thu, 17 Nov 2022 11:12:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C728EC433D7; Thu, 17 Nov 2022 11:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668683545; bh=ykM/WI39JMF5r4rbNKA6HBei0N/gsnh/YXKtw1hb2Zo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=D/yuae2a4VoIL29qpSWiUVyPt3ztLlh6Rxf2Ci5qDx5/hZwLg94vpgAd7L7c1RQND FaYbf4GZdkQhzIxQsJs0zi61fbRYX78D3smglUrR+hBeYsxQiX4NOwjjGIbEFclVSk lri7gtWNw6y8lonacNw29G7fU5x/YvWX+/NDCnzvVaRZWiv5bWDeyKX3zHtNG3wm7n u7+TX/Q0M89XyviDyOe58/Yj1ZsQOPgAGahRZBWJ8dto86ZelFw9ZGOzcaBjrdwMxW 1zI3fW/yverxFXno1DBXhKLNn0EzKvAHGaS/S5T1m2pu1o5ixYHV1W+ZrjvU11BiBh T8SVu1sKCKMfg== Date: Thu, 17 Nov 2022 13:12:20 +0200 From: Leon Romanovsky To: Jeroen de Borst Cc: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, jesse.brandeburg@intel.com Subject: Re: [PATCH net-next v4 2/2] gve: Handle alternate miss completions Message-ID: References: <20221116181725.2207544-1-jeroendb@google.com> <20221116181725.2207544-3-jeroendb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221116181725.2207544-3-jeroendb@google.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Nov 16, 2022 at 10:17:25AM -0800, Jeroen de Borst wrote: > The virtual NIC has 2 ways of indicating a miss-path > completion. This handles the alternate. > > Signed-off-by: Jeroen de Borst > Reviewed-by: Jesse Brandeburg > --- > drivers/net/ethernet/google/gve/gve_adminq.h | 4 +++- > drivers/net/ethernet/google/gve/gve_desc_dqo.h | 5 +++++ > drivers/net/ethernet/google/gve/gve_tx_dqo.c | 18 ++++++++++++------ > 3 files changed, 20 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/ethernet/google/gve/gve_adminq.h > index b9ee8be73f96..cf29662e6ad1 100644 > --- a/drivers/net/ethernet/google/gve/gve_adminq.h > +++ b/drivers/net/ethernet/google/gve/gve_adminq.h > @@ -154,6 +154,7 @@ enum gve_driver_capbility { > gve_driver_capability_gqi_rda = 1, > gve_driver_capability_dqo_qpl = 2, /* reserved for future use */ > gve_driver_capability_dqo_rda = 3, > + gve_driver_capability_alt_miss_compl = 4, > }; > > #define GVE_CAP1(a) BIT((int)a) > @@ -164,7 +165,8 @@ enum gve_driver_capbility { > #define GVE_DRIVER_CAPABILITY_FLAGS1 \ > (GVE_CAP1(gve_driver_capability_gqi_qpl) | \ > GVE_CAP1(gve_driver_capability_gqi_rda) | \ > - GVE_CAP1(gve_driver_capability_dqo_rda)) > + GVE_CAP1(gve_driver_capability_dqo_rda) | \ > + GVE_CAP1(gve_driver_capability_alt_miss_compl)) > > #define GVE_DRIVER_CAPABILITY_FLAGS2 0x0 > #define GVE_DRIVER_CAPABILITY_FLAGS3 0x0 > diff --git a/drivers/net/ethernet/google/gve/gve_desc_dqo.h b/drivers/net/ethernet/google/gve/gve_desc_dqo.h > index e8fe9adef7f2..f79cd0591110 100644 > --- a/drivers/net/ethernet/google/gve/gve_desc_dqo.h > +++ b/drivers/net/ethernet/google/gve/gve_desc_dqo.h > @@ -176,6 +176,11 @@ static_assert(sizeof(struct gve_tx_compl_desc) == 8); > #define GVE_COMPL_TYPE_DQO_MISS 0x1 /* Miss path completion */ > #define GVE_COMPL_TYPE_DQO_REINJECTION 0x3 /* Re-injection completion */ > > +/* The most significant bit in the completion tag can change the completion > + * type from packet completion to miss path completion. > + */ > +#define GVE_ALT_MISS_COMPL_BIT BIT(15) > + > /* Descriptor to post buffers to HW on buffer queue. */ > struct gve_rx_desc_dqo { > __le16 buf_id; /* ID returned in Rx completion descriptor */ > diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c > index 588d64819ed5..762915c6063b 100644 > --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c > +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c > @@ -953,12 +953,18 @@ int gve_clean_tx_done_dqo(struct gve_priv *priv, struct gve_tx_ring *tx, > atomic_set_release(&tx->dqo_compl.hw_tx_head, tx_head); > } else if (type == GVE_COMPL_TYPE_DQO_PKT) { > u16 compl_tag = le16_to_cpu(compl_desc->completion_tag); > - > - gve_handle_packet_completion(priv, tx, !!napi, > - compl_tag, > - &pkt_compl_bytes, > - &pkt_compl_pkts, > - /*is_reinjection=*/false); > + if (compl_tag & GVE_ALT_MISS_COMPL_BIT) { > + compl_tag &= ~GVE_ALT_MISS_COMPL_BIT; > + gve_handle_miss_completion(priv, tx, compl_tag, > + &miss_compl_bytes, > + &miss_compl_pkts); > + } else { > + gve_handle_packet_completion(priv, tx, !!napi, > + compl_tag, > + &pkt_compl_bytes, > + &pkt_compl_pkts, > + /*is_reinjection=*/false); Please don't add commented code in the function calls. Thanks > + } > } else if (type == GVE_COMPL_TYPE_DQO_MISS) { > u16 compl_tag = le16_to_cpu(compl_desc->completion_tag); > > -- > 2.38.1.431.g37b22c650d-goog >