Received-SPF: pass (google.com: domain of linux-kernel+bounces-175166-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20240507225945.1408516-1-ziweixiao@google.com>
 <20240507225945.1408516-4-ziweixiao@google.com> <6a98fda2-54f4-4c1d-9b4a-bd39abe27179@davidwei.uk>
In-Reply-To: <6a98fda2-54f4-4c1d-9b4a-bd39abe27179@davidwei.uk>
From: Ziwei Xiao <ziweixiao@google.com>
Date: Thu, 9 May 2024 17:18:13 -0700
Message-ID: <CAG-FcCM5-c3vCRWenUoxdswfKAfaVNkBEpzkvKRhy6UfSzbu0Q@mail.gmail.com>
Subject: Re: [PATCH net-next 3/5] gve: Add flow steering device option
To: David Wei <dw@davidwei.uk>
Cc: netdev@vger.kernel.org, jeroendb@google.com, pkaligineedi@google.com, 
	shailend@google.com, davem@davemloft.net, edumazet@google.com, 
	kuba@kernel.org, pabeni@redhat.com, willemb@google.com, 
	hramamurthy@google.com, rushilg@google.com, jfraker@google.com, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, May 7, 2024 at 10:33=E2=80=AFPM David Wei <dw@davidwei.uk> wrote:
>
> On 2024-05-07 15:59, Ziwei Xiao wrote:
> > From: Jeroen de Borst <jeroendb@google.com>
> >
> > Add a new device option to signal to the driver that the device support=
s
> > flow steering. This device option also carries the maximum number of
> > flow steering rules that the device can store.
> >
> > Signed-off-by: Jeroen de Borst <jeroendb@google.com>
> > Co-developed-by: Ziwei Xiao <ziweixiao@google.com>
> > Signed-off-by: Ziwei Xiao <ziweixiao@google.com>
> > Reviewed-by: Praveen Kaligineedi <pkaligineedi@google.com>
> > Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com>
> > Reviewed-by: Willem de Bruijn <willemb@google.com>
> > ---
> >  drivers/net/ethernet/google/gve/gve.h        |  2 +
> >  drivers/net/ethernet/google/gve/gve_adminq.c | 42 ++++++++++++++++++--
> >  drivers/net/ethernet/google/gve/gve_adminq.h | 11 +++++
> >  3 files changed, 51 insertions(+), 4 deletions(-)
>
> Think something went wrong here. The title is different but patch is
> same as 2/5.
This is the patch for adding the device option(3/5), while the
previous patch you commented is actually for adding extended
adminq(2/5). I don't see any wrong with these two patches. Maybe it's
replying in the wrong thread?

>
> >
> > diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethern=
et/google/gve/gve.h
> > index ca7fce17f2c0..58213c15e084 100644
> > --- a/drivers/net/ethernet/google/gve/gve.h
> > +++ b/drivers/net/ethernet/google/gve/gve.h
> > @@ -786,6 +786,8 @@ struct gve_priv {
> >
> >       u16 header_buf_size; /* device configured, header-split supported=
 if non-zero */
> >       bool header_split_enabled; /* True if the header split is enabled=
 by the user */
> > +
> > +     u32 max_flow_rules;
> >  };
> >
> >  enum gve_service_task_flags_bit {
> > diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net=
/ethernet/google/gve/gve_adminq.c
> > index 514641b3ccc7..85d0d742ad21 100644
> > --- a/drivers/net/ethernet/google/gve/gve_adminq.c
> > +++ b/drivers/net/ethernet/google/gve/gve_adminq.c
> > @@ -44,6 +44,7 @@ void gve_parse_device_option(struct gve_priv *priv,
> >                            struct gve_device_option_jumbo_frames **dev_=
op_jumbo_frames,
> >                            struct gve_device_option_dqo_qpl **dev_op_dq=
o_qpl,
> >                            struct gve_device_option_buffer_sizes **dev_=
op_buffer_sizes,
> > +                          struct gve_device_option_flow_steering **dev=
_op_flow_steering,
> >                            struct gve_device_option_modify_ring **dev_o=
p_modify_ring)
> >  {
> >       u32 req_feat_mask =3D be32_to_cpu(option->required_features_mask)=
;
> > @@ -189,6 +190,23 @@ void gve_parse_device_option(struct gve_priv *priv=
,
> >               if (option_length =3D=3D GVE_DEVICE_OPTION_NO_MIN_RING_SI=
ZE)
> >                       priv->default_min_ring_size =3D true;
> >               break;
> > +     case GVE_DEV_OPT_ID_FLOW_STEERING:
> > +             if (option_length < sizeof(**dev_op_flow_steering) ||
> > +                 req_feat_mask !=3D GVE_DEV_OPT_REQ_FEAT_MASK_FLOW_STE=
ERING) {
> > +                     dev_warn(&priv->pdev->dev, GVE_DEVICE_OPTION_ERRO=
R_FMT,
> > +                              "Flow Steering",
> > +                              (int)sizeof(**dev_op_flow_steering),
> > +                              GVE_DEV_OPT_REQ_FEAT_MASK_FLOW_STEERING,
> > +                              option_length, req_feat_mask);
> > +                     break;
> > +             }
> > +
> > +             if (option_length > sizeof(**dev_op_flow_steering))
> > +                     dev_warn(&priv->pdev->dev,
> > +                              GVE_DEVICE_OPTION_TOO_BIG_FMT,
> > +                              "Flow Steering");
> > +             *dev_op_flow_steering =3D (void *)(option + 1);
> > +             break;
> >       default:
> >               /* If we don't recognize the option just continue
> >                * without doing anything.
> > @@ -208,6 +226,7 @@ gve_process_device_options(struct gve_priv *priv,
> >                          struct gve_device_option_jumbo_frames **dev_op=
_jumbo_frames,
> >                          struct gve_device_option_dqo_qpl **dev_op_dqo_=
qpl,
> >                          struct gve_device_option_buffer_sizes **dev_op=
_buffer_sizes,
> > +                        struct gve_device_option_flow_steering **dev_o=
p_flow_steering,
> >                          struct gve_device_option_modify_ring **dev_op_=
modify_ring)
> >  {
> >       const int num_options =3D be16_to_cpu(descriptor->num_device_opti=
ons);
> > @@ -230,7 +249,7 @@ gve_process_device_options(struct gve_priv *priv,
> >                                       dev_op_gqi_rda, dev_op_gqi_qpl,
> >                                       dev_op_dqo_rda, dev_op_jumbo_fram=
es,
> >                                       dev_op_dqo_qpl, dev_op_buffer_siz=
es,
> > -                                     dev_op_modify_ring);
> > +                                     dev_op_flow_steering, dev_op_modi=
fy_ring);
> >               dev_opt =3D next_opt;
> >       }
> >
> > @@ -838,6 +857,8 @@ static void gve_enable_supported_features(struct gv=
e_priv *priv,
> >                                         *dev_op_dqo_qpl,
> >                                         const struct gve_device_option_=
buffer_sizes
> >                                         *dev_op_buffer_sizes,
> > +                                       const struct gve_device_option_=
flow_steering
> > +                                       *dev_op_flow_steering,
> >                                         const struct gve_device_option_=
modify_ring
> >                                         *dev_op_modify_ring)
> >  {
> > @@ -890,10 +911,22 @@ static void gve_enable_supported_features(struct =
gve_priv *priv,
> >                       priv->min_tx_desc_cnt =3D be16_to_cpu(dev_op_modi=
fy_ring->min_tx_ring_size);
> >               }
> >       }
> > +
> > +     if (dev_op_flow_steering &&
> > +         (supported_features_mask & GVE_SUP_FLOW_STEERING_MASK)) {
> > +             if (dev_op_flow_steering->max_flow_rules) {
> > +                     priv->max_flow_rules =3D
> > +                             be32_to_cpu(dev_op_flow_steering->max_flo=
w_rules);
> > +                     dev_info(&priv->pdev->dev,
> > +                              "FLOW STEERING device option enabled wit=
h max rule limit of %u.\n",
> > +                              priv->max_flow_rules);
> > +             }
> > +     }
> >  }
> >
> >  int gve_adminq_describe_device(struct gve_priv *priv)
> >  {
> > +     struct gve_device_option_flow_steering *dev_op_flow_steering =3D =
NULL;
> >       struct gve_device_option_buffer_sizes *dev_op_buffer_sizes =3D NU=
LL;
> >       struct gve_device_option_jumbo_frames *dev_op_jumbo_frames =3D NU=
LL;
> >       struct gve_device_option_modify_ring *dev_op_modify_ring =3D NULL=
;
> > @@ -930,6 +963,7 @@ int gve_adminq_describe_device(struct gve_priv *pri=
v)
> >                                        &dev_op_gqi_qpl, &dev_op_dqo_rda=
,
> >                                        &dev_op_jumbo_frames, &dev_op_dq=
o_qpl,
> >                                        &dev_op_buffer_sizes,
> > +                                      &dev_op_flow_steering,
> >                                        &dev_op_modify_ring);
> >       if (err)
> >               goto free_device_descriptor;
> > @@ -969,9 +1003,8 @@ int gve_adminq_describe_device(struct gve_priv *pr=
iv)
> >       /* set default descriptor counts */
> >       gve_set_default_desc_cnt(priv, descriptor);
> >
> > -     /* DQO supports LRO. */
> >       if (!gve_is_gqi(priv))
> > -             priv->dev->hw_features |=3D NETIF_F_LRO;
> > +             priv->dev->hw_features |=3D NETIF_F_LRO | NETIF_F_NTUPLE;
> >
> >       priv->max_registered_pages =3D
> >                               be64_to_cpu(descriptor->max_registered_pa=
ges);
> > @@ -991,7 +1024,8 @@ int gve_adminq_describe_device(struct gve_priv *pr=
iv)
> >
> >       gve_enable_supported_features(priv, supported_features_mask,
> >                                     dev_op_jumbo_frames, dev_op_dqo_qpl=
,
> > -                                   dev_op_buffer_sizes, dev_op_modify_=
ring);
> > +                                   dev_op_buffer_sizes, dev_op_flow_st=
eering,
> > +                                   dev_op_modify_ring);
> >
> >  free_device_descriptor:
> >       dma_pool_free(priv->adminq_pool, descriptor, descriptor_bus);
> > diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net=
/ethernet/google/gve/gve_adminq.h
> > index e0370ace8397..e64a0e72e781 100644
> > --- a/drivers/net/ethernet/google/gve/gve_adminq.h
> > +++ b/drivers/net/ethernet/google/gve/gve_adminq.h
> > @@ -146,6 +146,14 @@ struct gve_device_option_modify_ring {
> >
> >  static_assert(sizeof(struct gve_device_option_modify_ring) =3D=3D 12);
> >
> > +struct gve_device_option_flow_steering {
> > +     __be32 supported_features_mask;
> > +     __be32 reserved;
> > +     __be32 max_flow_rules;
> > +};
> > +
> > +static_assert(sizeof(struct gve_device_option_flow_steering) =3D=3D 12=
);
> > +
> >  /* Terminology:
> >   *
> >   * RDA - Raw DMA Addressing - Buffers associated with SKBs are directl=
y DMA
> > @@ -163,6 +171,7 @@ enum gve_dev_opt_id {
> >       GVE_DEV_OPT_ID_DQO_QPL                  =3D 0x7,
> >       GVE_DEV_OPT_ID_JUMBO_FRAMES             =3D 0x8,
> >       GVE_DEV_OPT_ID_BUFFER_SIZES             =3D 0xa,
> > +     GVE_DEV_OPT_ID_FLOW_STEERING            =3D 0xb,
> >  };
> >
> >  enum gve_dev_opt_req_feat_mask {
> > @@ -174,12 +183,14 @@ enum gve_dev_opt_req_feat_mask {
> >       GVE_DEV_OPT_REQ_FEAT_MASK_DQO_QPL               =3D 0x0,
> >       GVE_DEV_OPT_REQ_FEAT_MASK_BUFFER_SIZES          =3D 0x0,
> >       GVE_DEV_OPT_REQ_FEAT_MASK_MODIFY_RING           =3D 0x0,
> > +     GVE_DEV_OPT_REQ_FEAT_MASK_FLOW_STEERING         =3D 0x0,
> >  };
> >
> >  enum gve_sup_feature_mask {
> >       GVE_SUP_MODIFY_RING_MASK        =3D 1 << 0,
> >       GVE_SUP_JUMBO_FRAMES_MASK       =3D 1 << 2,
> >       GVE_SUP_BUFFER_SIZES_MASK       =3D 1 << 4,
> > +     GVE_SUP_FLOW_STEERING_MASK      =3D 1 << 5,
> >  };
> >
> >  #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0