Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230413032541.885238-1-yoong.siang.song@intel.com> <20230413032541.885238-3-yoong.siang.song@intel.com>
In-Reply-To: <20230413032541.885238-3-yoong.siang.song@intel.com>
From:   Stanislav Fomichev <sdf@google.com>
Date:   Thu, 13 Apr 2023 09:34:35 -0700
Message-ID: <CAKH8qBsWwaGrL4X_xkqGtDB_4Qr3oM4wcFcWVtBanCEE6F9gCg@mail.gmail.com>
Subject: Re: [PATCH net-next v4 2/3] net: stmmac: add Rx HWTS metadata to XDP
 receive pkt
To:     Song Yoong Siang <yoong.siang.song@intel.com>
Cc:     Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Alexander Duyck <alexanderduyck@fb.com>,
        Ong Boon Leong <boon.leong.ong@intel.com>,
        netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        bpf@vger.kernel.org, xdp-hints@xdp-project.net
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Apr 12, 2023 at 8:26=E2=80=AFPM Song Yoong Siang
<yoong.siang.song@intel.com> wrote:
>
> Add receive hardware timestamp metadata support via kfunc to XDP receive
> packets.
>
> Suggested-by: Stanislav Fomichev <sdf@google.com>
> Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>

Conceptually looks good, thanks!
Acked-by: Stanislav Fomichev <sdf@google.com>


> ---
>  drivers/net/ethernet/stmicro/stmmac/stmmac.h  |  3 ++
>  .../net/ethernet/stmicro/stmmac/stmmac_main.c | 40 ++++++++++++++++++-
>  2 files changed, 42 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/e=
thernet/stmicro/stmmac/stmmac.h
> index ac8ccf851708..826ac0ec88c6 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> @@ -94,6 +94,9 @@ struct stmmac_rx_buffer {
>
>  struct stmmac_xdp_buff {
>         struct xdp_buff xdp;
> +       struct stmmac_priv *priv;
> +       struct dma_desc *p;
> +       struct dma_desc *np;
>  };
>
>  struct stmmac_rx_queue {
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/=
net/ethernet/stmicro/stmmac/stmmac_main.c
> index 6ffce52ca837..831a3e22e0d8 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -5313,10 +5313,15 @@ static int stmmac_rx(struct stmmac_priv *priv, in=
t limit, u32 queue)
>
>                         xdp_init_buff(&ctx.xdp, buf_sz, &rx_q->xdp_rxq);
>                         xdp_prepare_buff(&ctx.xdp, page_address(buf->page=
),
> -                                        buf->page_offset, buf1_len, fals=
e);
> +                                        buf->page_offset, buf1_len, true=
);
>
>                         pre_len =3D ctx.xdp.data_end - ctx.xdp.data_hard_=
start -
>                                   buf->page_offset;
> +
> +                       ctx.priv =3D priv;
> +                       ctx.p =3D p;
> +                       ctx.np =3D np;
> +
>                         skb =3D stmmac_xdp_run_prog(priv, &ctx.xdp);
>                         /* Due xdp_adjust_tail: DMA sync for_device
>                          * cover max len CPU touch
> @@ -7060,6 +7065,37 @@ void stmmac_fpe_handshake(struct stmmac_priv *priv=
, bool enable)
>         }
>  }
>
> +static int stmmac_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *times=
tamp)
> +{
> +       const struct stmmac_xdp_buff *ctx =3D (void *)_ctx;
> +       struct stmmac_priv *priv =3D ctx->priv;
> +       struct dma_desc *desc =3D ctx->p;
> +       struct dma_desc *np =3D ctx->np;
> +       struct dma_desc *p =3D ctx->p;
> +       u64 ns =3D 0;
> +
> +       if (!priv->hwts_rx_en)
> +               return -ENODATA;
> +
> +       /* For GMAC4, the valid timestamp is from CTX next desc. */
> +       if (priv->plat->has_gmac4 || priv->plat->has_xgmac)
> +               desc =3D np;
> +
> +       /* Check if timestamp is available */
> +       if (stmmac_get_rx_timestamp_status(priv, p, np, priv->adv_ts)) {
> +               stmmac_get_timestamp(priv, desc, priv->adv_ts, &ns);
> +               ns -=3D priv->plat->cdc_error_adj;
> +               *timestamp =3D ns_to_ktime(ns);
> +               return 0;
> +       }
> +
> +       return -ENODATA;
> +}
> +
> +static const struct xdp_metadata_ops stmmac_xdp_metadata_ops =3D {
> +       .xmo_rx_timestamp               =3D stmmac_xdp_rx_timestamp,
> +};
> +
>  /**
>   * stmmac_dvr_probe
>   * @device: device pointer
> @@ -7167,6 +7203,8 @@ int stmmac_dvr_probe(struct device *device,
>
>         ndev->netdev_ops =3D &stmmac_netdev_ops;
>
> +       ndev->xdp_metadata_ops =3D &stmmac_xdp_metadata_ops;
> +
>         ndev->hw_features =3D NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6=
_CSUM |
>                             NETIF_F_RXCSUM;
>         ndev->xdp_features =3D NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDI=
RECT |
> --
> 2.34.1
>