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 3754AC4332F for ; Thu, 8 Dec 2022 19:07:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230058AbiLHTH3 (ORCPT ); Thu, 8 Dec 2022 14:07:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230030AbiLHTH1 (ORCPT ); Thu, 8 Dec 2022 14:07:27 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6189C9493D for ; Thu, 8 Dec 2022 11:07:23 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id k79so2026546pfd.7 for ; Thu, 08 Dec 2022 11:07:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=p72DqsSWTk0V96ispZBBSfGe61c1WSp/d/Jwlj5rNog=; b=baD7IsgxJleNn3Su5CnlSO7rICWbWl4mmP35bA+EJ+xa7EJBFkj35Gk1NWZtXhmyE/ 53IUwcem9a5T02Db1x2pm5FfWEfhsiLpZ21IN5hkLJsVB/Txs7AGR4X6l6FAg7A9PIwx vBXUYATNPd1MVovwRZVJLPpMLZYjJIKOeLsaFZ+Qy5Sl1hRA0vl6fdOQEHup/+P8dhG4 p78TEeVkvCUDybypa0o7FjmqJJjNHN4ZsvvhJhW97Dt6QXLJQy8ib3jbvFeYkIJfZklt hQ05He3oVVDuNHCM/p5VsaJj0AO6RMt0YtFMENaD/88HqikE+X6qxiBzWLSby39HfXt8 OG4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=p72DqsSWTk0V96ispZBBSfGe61c1WSp/d/Jwlj5rNog=; b=YmilPbk2BkNWR4K5vJY2JFXOD8GWK5AoGazaoUj4M24iTAF4Fcb7P1+r1w7Kc7vzVh w7LgBYl+yMAyAEGjKHojMlPMSRBY7yLUsCszCyVWeQ8ysQQ+6yHZVSYRazv0UZO8+2/i zPj//hLONPq0mucZGFtjIwusG2Ck92537eZZuBbZQtab+fdHN4kR3olD6xxilR/sxQ/F +aMJjP+o3FyUEmweH6nLqvhq2PMqpvUMi47A4BJ/WxQcXFGyZiWVUtRB2Qln4BBg0WYB 9wqdhnB/cWVgr82jb/IkZAKClK4+1RMTl6Cd4++A65T9paz22OyJMfGWM94mS+wN9r9W TsWA== X-Gm-Message-State: ANoB5plA9bKjlh0XNLXDKvyYwUjJ5mi3LBSM20bcuEU1/YOOUUb1gK6c iI0RAe0ZUOhbXYZr6QGEBpV46NT7pJO6nYCy/ueHCxSh0CcYyg== X-Google-Smtp-Source: AA0mqf6MG+ddiWqf4IpmAK44iS9BfOOxJ4NEc7q1DctE3S91gWYOJ7F0DkxPqbtq90opI2EQ+jdypRxpQcQ+J7o29mc= X-Received: by 2002:a62:2785:0:b0:576:bb84:7b50 with SMTP id n127-20020a622785000000b00576bb847b50mr21665733pfn.71.1670526442493; Thu, 08 Dec 2022 11:07:22 -0800 (PST) MIME-Version: 1.0 References: <20221206024554.3826186-1-sdf@google.com> <20221206024554.3826186-9-sdf@google.com> In-Reply-To: From: Stanislav Fomichev Date: Thu, 8 Dec 2022 11:07:10 -0800 Message-ID: Subject: Re: [PATCH bpf-next v3 08/12] mxl4: Support RX XDP metadata To: Tariq Toukan Cc: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, haoluo@google.com, jolsa@kernel.org, Tariq Toukan , David Ahern , Jakub Kicinski , Willem de Bruijn , Jesper Dangaard Brouer , Anatoly Burakov , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, Dec 7, 2022 at 10:09 PM Tariq Toukan wrote: > > Typo in title mxl4 -> mlx4. > Preferably: net/mlx4_en. Oh, I always have to fight with this. Somehow mxl feels more natural :-) Thanks for spotting, will use net/mlx4_en instead. (presumably the same should be for mlx5?) > On 12/6/2022 4:45 AM, Stanislav Fomichev wrote: > > RX timestamp and hash for now. Tested using the prog from the next > > patch. > > > > Also enabling xdp metadata support; don't see why it's disabled, > > there is enough headroom.. > > > > Cc: Tariq Toukan > > Cc: John Fastabend > > Cc: David Ahern > > Cc: Martin KaFai Lau > > Cc: Jakub Kicinski > > Cc: Willem de Bruijn > > Cc: Jesper Dangaard Brouer > > Cc: Anatoly Burakov > > Cc: Alexander Lobakin > > Cc: Magnus Karlsson > > Cc: Maryam Tahhan > > Cc: xdp-hints@xdp-project.net > > Cc: netdev@vger.kernel.org > > Signed-off-by: Stanislav Fomichev > > --- > > drivers/net/ethernet/mellanox/mlx4/en_clock.c | 13 +++++-- > > .../net/ethernet/mellanox/mlx4/en_netdev.c | 10 +++++ > > drivers/net/ethernet/mellanox/mlx4/en_rx.c | 38 ++++++++++++++++++- > > drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + > > include/linux/mlx4/device.h | 7 ++++ > > 5 files changed, 64 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c > > index 98b5ffb4d729..9e3b76182088 100644 > > --- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c > > +++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c > > @@ -58,9 +58,7 @@ u64 mlx4_en_get_cqe_ts(struct mlx4_cqe *cqe) > > return hi | lo; > > } > > > > -void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev, > > - struct skb_shared_hwtstamps *hwts, > > - u64 timestamp) > > +u64 mlx4_en_get_hwtstamp(struct mlx4_en_dev *mdev, u64 timestamp) > > { > > unsigned int seq; > > u64 nsec; > > @@ -70,8 +68,15 @@ void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev, > > nsec = timecounter_cyc2time(&mdev->clock, timestamp); > > } while (read_seqretry(&mdev->clock_lock, seq)); > > > > + return ns_to_ktime(nsec); > > +} > > + > > +void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev, > > + struct skb_shared_hwtstamps *hwts, > > + u64 timestamp) > > +{ > > memset(hwts, 0, sizeof(struct skb_shared_hwtstamps)); > > - hwts->hwtstamp = ns_to_ktime(nsec); > > + hwts->hwtstamp = mlx4_en_get_hwtstamp(mdev, timestamp); > > } > > > > /** > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c > > index 8800d3f1f55c..1cb63746a851 100644 > > --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c > > +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c > > @@ -2855,6 +2855,11 @@ static const struct net_device_ops mlx4_netdev_ops = { > > .ndo_features_check = mlx4_en_features_check, > > .ndo_set_tx_maxrate = mlx4_en_set_tx_maxrate, > > .ndo_bpf = mlx4_xdp, > > + > > + .ndo_xdp_rx_timestamp_supported = mlx4_xdp_rx_timestamp_supported, > > + .ndo_xdp_rx_timestamp = mlx4_xdp_rx_timestamp, > > + .ndo_xdp_rx_hash_supported = mlx4_xdp_rx_hash_supported, > > + .ndo_xdp_rx_hash = mlx4_xdp_rx_hash, > > }; > > > > static const struct net_device_ops mlx4_netdev_ops_master = { > > @@ -2887,6 +2892,11 @@ static const struct net_device_ops mlx4_netdev_ops_master = { > > .ndo_features_check = mlx4_en_features_check, > > .ndo_set_tx_maxrate = mlx4_en_set_tx_maxrate, > > .ndo_bpf = mlx4_xdp, > > + > > + .ndo_xdp_rx_timestamp_supported = mlx4_xdp_rx_timestamp_supported, > > + .ndo_xdp_rx_timestamp = mlx4_xdp_rx_timestamp, > > + .ndo_xdp_rx_hash_supported = mlx4_xdp_rx_hash_supported, > > + .ndo_xdp_rx_hash = mlx4_xdp_rx_hash, > > }; > > > > struct mlx4_en_bond { > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c > > index 9c114fc723e3..1b8e1b2d8729 100644 > > --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c > > +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c > > @@ -663,8 +663,40 @@ static int check_csum(struct mlx4_cqe *cqe, struct sk_buff *skb, void *va, > > > > struct mlx4_xdp_buff { > > struct xdp_buff xdp; > > + struct mlx4_cqe *cqe; > > + struct mlx4_en_dev *mdev; > > + struct mlx4_en_rx_ring *ring; > > + struct net_device *dev; > > }; > > > > +bool mlx4_xdp_rx_timestamp_supported(const struct xdp_md *ctx) > > +{ > > + struct mlx4_xdp_buff *_ctx = (void *)ctx; > > + > > + return _ctx->ring->hwtstamp_rx_filter == HWTSTAMP_FILTER_ALL; > > +} > > + > > +u64 mlx4_xdp_rx_timestamp(const struct xdp_md *ctx) > > +{ > > + struct mlx4_xdp_buff *_ctx = (void *)ctx; > > + > > + return mlx4_en_get_hwtstamp(_ctx->mdev, mlx4_en_get_cqe_ts(_ctx->cqe)); > > +} > > + > > +bool mlx4_xdp_rx_hash_supported(const struct xdp_md *ctx) > > +{ > > + struct mlx4_xdp_buff *_ctx = (void *)ctx; > > + > > + return _ctx->dev->features & NETIF_F_RXHASH; > > +} > > + > > +u32 mlx4_xdp_rx_hash(const struct xdp_md *ctx) > > +{ > > + struct mlx4_xdp_buff *_ctx = (void *)ctx; > > + > > + return be32_to_cpu(_ctx->cqe->immed_rss_invalid); > > +} > > + > > int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int budget) > > { > > struct mlx4_en_priv *priv = netdev_priv(dev); > > @@ -781,8 +813,12 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud > > DMA_FROM_DEVICE); > > > > xdp_prepare_buff(&mxbuf.xdp, va - frags[0].page_offset, > > - frags[0].page_offset, length, false); > > + frags[0].page_offset, length, true); > > orig_data = mxbuf.xdp.data; > > + mxbuf.cqe = cqe; > > + mxbuf.mdev = priv->mdev; > > + mxbuf.ring = ring; > > + mxbuf.dev = dev; > > > > act = bpf_prog_run_xdp(xdp_prog, &mxbuf.xdp); > > > > diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h > > index e132ff4c82f2..b7c0d4899ad7 100644 > > --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h > > +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h > > @@ -792,6 +792,7 @@ int mlx4_en_netdev_event(struct notifier_block *this, > > * Functions for time stamping > > */ > > u64 mlx4_en_get_cqe_ts(struct mlx4_cqe *cqe); > > +u64 mlx4_en_get_hwtstamp(struct mlx4_en_dev *mdev, u64 timestamp); > > void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev, > > struct skb_shared_hwtstamps *hwts, > > u64 timestamp); > > diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h > > index 6646634a0b9d..d5904da1d490 100644 > > --- a/include/linux/mlx4/device.h > > +++ b/include/linux/mlx4/device.h > > @@ -1585,4 +1585,11 @@ static inline int mlx4_get_num_reserved_uar(struct mlx4_dev *dev) > > /* The first 128 UARs are used for EQ doorbells */ > > return (128 >> (PAGE_SHIFT - dev->uar_page_shift)); > > } > > + > > +struct xdp_md; > > +bool mlx4_xdp_rx_timestamp_supported(const struct xdp_md *ctx); > > +u64 mlx4_xdp_rx_timestamp(const struct xdp_md *ctx); > > +bool mlx4_xdp_rx_hash_supported(const struct xdp_md *ctx); > > +u32 mlx4_xdp_rx_hash(const struct xdp_md *ctx); > > + > > These are ethernet only functions, not known to the mlx4 core driver. > Please move to mlx4_en.h, and use mlx4_en_xdp_*() prefix. For sure, thanks for the review! > > #endif /* MLX4_DEVICE_H */