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 229C8C4708C for ; Tue, 29 Nov 2022 19:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236424AbiK2Tfo (ORCPT ); Tue, 29 Nov 2022 14:35:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236957AbiK2Tf1 (ORCPT ); Tue, 29 Nov 2022 14:35:27 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72A1F4B999 for ; Tue, 29 Nov 2022 11:35:06 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id a24-20020a056a001d1800b00575cd7524a2so493186pfx.5 for ; Tue, 29 Nov 2022 11:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=a1tnNrGYpSCeOnYtuUapfNCW6KKkKkqa0sSN/w1HvUM=; b=b8Hm8315X/DgTDNwVxD6Y2pfqvt+Ow2k99Fsnw7XmqXqHn4K1RafIYOIyyABiKrlbB G7YP1BIjl9Ju1djx/ilUB72s/V2LelOyYvwXEG/7vw0jodKrASdT7qmTcW1h4OjEuJ54 Y/OJ9rekSfGu9CzRwv48UGfjydZGdxvjjs/1UPni2aMjv9oLg8ZMqjzl/R56p+Txym22 nDL9tLcSJdW1moLhHgEaa5tbZH1m+UcgBvk383gS9dAUNkKG290HG35IH2qkkr/8+K/F +Wlv3VKT2bsIQHQL8XXuJIaYatRyGGmPoEtYTikVcdtViqEOqt91+EhWRhS0MvOZORkF 8Uew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a1tnNrGYpSCeOnYtuUapfNCW6KKkKkqa0sSN/w1HvUM=; b=4+r1xmQB5eYsJKMgGvzsHOgzo3ZLglShU1TzQmb260DEpE1tpJV0UdrIYQnalS2Jq5 NGrR87+Zg7rE5D171m30gIJ6AlhdIUWrI1NIZBRbvTyM3U8xeXGZKRVPk6hIkbNvBOF0 Ldn7J/+D9O10hY0cZkekAMC05ZLRV+xVNKgfhB7SIRT/6xmheKiYd/Y1FcTqV186+9Hc uELK5txQSnNes6O0aFQ19RKwQ4C4lkMvulm8XpVhEotXyCltu6SvkJlVPAtzsSWb/h2W zk/kClu93F5wobmPMYDL/8e5FPNHV7sCkNnddTzUc0+mg0Q/s2zW20pVkzL2tFjUBv0T Jxgw== X-Gm-Message-State: ANoB5pnWQIcGWQEz1ZyZxqTBffm9EA+XPKGPxXDnnCmkfMk62f5KYW3B 58Mi2EFEVeAiCl3uIFYNLxKhY7f/wViFZ44DDnYiE5DjeTtL9XRHTYxjlyqBJ+crC6Gf2/0tMol MU+z8xQi0kmTXoMMI/hCky6U8fLsd9dPcoFJFOHjvll1btmyEXg== X-Google-Smtp-Source: AA0mqf43J29tbBuhXUy5Pf25oij2I61cbbmcUASgkJMs9iMUYLd1nukMzlvwCw4Ad8l0vHiR8wQiNyA= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a17:902:f08d:b0:189:6b32:27dc with SMTP id p13-20020a170902f08d00b001896b3227dcmr21816328pla.29.1669750505819; Tue, 29 Nov 2022 11:35:05 -0800 (PST) Date: Tue, 29 Nov 2022 11:34:48 -0800 In-Reply-To: <20221129193452.3448944-1-sdf@google.com> Mime-Version: 1.0 References: <20221129193452.3448944-1-sdf@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221129193452.3448944-8-sdf@google.com> Subject: [PATCH bpf-next v3 07/11] mxl4: Support RX XDP metadata From: Stanislav Fomichev To: bpf@vger.kernel.org Cc: 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, sdf@google.com, 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 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); + #endif /* MLX4_DEVICE_H */ -- 2.38.1.584.g0f3c55d4c2-goog