From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by mail.toke.dk (Postfix) with ESMTPS id DE1459CD1AA for ; Thu, 8 Dec 2022 21:24:01 +0100 (CET) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=QP3aH3jG Received: by mail-ej1-x634.google.com with SMTP id x22so6673944ejs.11 for ; Thu, 08 Dec 2022 12:24:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=+vXzR938OUovXCt7bgJhdL3De7hYMb/Y+x0vg/+7HEI=; b=QP3aH3jGFDDI23oKUJCA39pAxK035EdzzMwCcrfXTIFFFmJmShY4FMN8HowI1/A5Xy fzFspNXemTAwTAAv6VHsVN8Cg/Y+qVX7tbcf732siMcpHBgRO9KFj6pZUTEKKYSc/5GQ XNKz5VYfnMMjRIJuHChdUQlP0zE86VO8R6KLl23Rzqzodfo3ESQyXu6p3lZVAPuVjqFX 3kWvrks4K+NA6Mgl7KL+lUNAFLg1Zw9kUbtCFeTgvr1lbUAAwaQtzzi9yjq+jT0qwROr PEwPX+e8ZFmTB321PqbhMeXemNxeDXiovefyuzqrDFkp7K6vcmqImO4FZo94uSYZa0Zy PTxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+vXzR938OUovXCt7bgJhdL3De7hYMb/Y+x0vg/+7HEI=; b=THdmeWwfsU3GVrC+8CGJta4m0j+yIosZ6pDZ/6YzQpChfMOSu89rHLylpOY4Kq1WB8 4jhtxRPVqiAjTF6J7M4mMBHW6njd3bcZ7SfELc9xXN4u/w+fcOgK/Xh+MYZawR+2NzjX fwTRA+Ykd+/Lpis/ngv+tjqaARi5PVLONIEsbc77nNa5SovoAjPpEVO/Gb/hfuzs/TP6 KcNBrrbnysOWP1fC5aZW1Vkc3C80IKw80JgmJreog4Aadakp+C/FLWU3EAsCgrB7MwQR +mydCxHC7Wc8JrpLeA1TifPTZRQL6cgAZJkf0lTkRuZZ4D0bCQEjwapb/tZ8qrf8Tscn 4mXg== X-Gm-Message-State: ANoB5plp6WWW7MKUJhFuWpcFLcHjdl8ZqS61Y8D0d71fu4YBTRYcY/Zw l+TlarZpZIowCSDwlsq86LM= X-Google-Smtp-Source: AA0mqf5r5OQhu8ML9Gxi1fHYml+nmjRexekKMvh+BiSjR6q4Ff9yFPnnUG+/Z1jle1mfCjgYpfwxGQ== X-Received: by 2002:a17:906:3c03:b0:7c1:9c6:aaa1 with SMTP id h3-20020a1709063c0300b007c109c6aaa1mr9300927ejg.583.1670531040982; Thu, 08 Dec 2022 12:24:00 -0800 (PST) Received: from [192.168.0.105] ([77.126.19.155]) by smtp.gmail.com with ESMTPSA id b11-20020a0564021f0b00b00461816beef9sm3777768edb.14.2022.12.08.12.23.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Dec 2022 12:24:00 -0800 (PST) Message-ID: <71718db2-d302-ab24-940b-c785bc7439d1@gmail.com> Date: Thu, 8 Dec 2022 22:23:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US To: Stanislav Fomichev References: <20221206024554.3826186-1-sdf@google.com> <20221206024554.3826186-9-sdf@google.com> From: Tariq Toukan In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: HMKYYOLUX6BMA743MXTO6AYCXI4G2PSQ X-Message-ID-Hash: HMKYYOLUX6BMA743MXTO6AYCXI4G2PSQ X-MailFrom: ttoukan.linux@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header 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 X-Mailman-Version: 3.3.7 Precedence: list Subject: [xdp-hints] Re: [PATCH bpf-next v3 08/12] mxl4: Support RX XDP metadata List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 12/8/2022 9:07 PM, Stanislav Fomichev wrote: > 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?) > For the newer mlx5 driver we use a shorter form, net/mlx5e. >> 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 */