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 B12A1C3A5A7 for ; Thu, 8 Dec 2022 06:09:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229478AbiLHGJe (ORCPT ); Thu, 8 Dec 2022 01:09:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbiLHGJd (ORCPT ); Thu, 8 Dec 2022 01:09:33 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66EAD8659C; Wed, 7 Dec 2022 22:09:32 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id b2so1474737eja.7; Wed, 07 Dec 2022 22:09:32 -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=KuvwUod5tzc7OY/wJzqgwFynpvntM6kbxZnQbCFlDsw=; b=KApXgtQpur48aXXokUSoXvyObjqsaMM2r3DQX1Kn6ouqG3umYi6MQ2OAdgW8uB4j6X NTnZWKgOijPOUHnsgAg9b67fjAVBM+K6jyn30Yo30lUyABLCkHaHxrYrscX/2e40rlcA +sVuq0p2hQWArd2K0Q+Jw8wCcNepxn9rZGR9gciEZr70xHG+NmPmWxzEEyq+9dRodR12 TTua1tk96UrbmohQSNnLCrVhznMaqfLixzrMq9G1zS3mSTnSAsEvH65LBoY5qrQdHWPP 8Rc578L2KfovF0YnJc/1BFdcuB/patPi+AV78ul5z9TjOArio50rrCB8MqyDYG6sysly sL4w== 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=KuvwUod5tzc7OY/wJzqgwFynpvntM6kbxZnQbCFlDsw=; b=E7fensbXQNSAvppJVVJNduuQjv4B3g0nl+OVETnqIC5C/os2dMrHO3Cq82xGpifTtw XzKOEfMOSxG+k88ijABQjSjAe5TZfJLHimCaHaG7pOc8ZQVB+0LWMuNasn+dCpYTIc/T oiOel4adP2GeHGZM0rD/2oObpP9UObrhlucNS44c1+Ey0BZfhRVv65Ys30aDRRfjPrMt Q5Yw+ca1C6Mf5E9rWT2973afTUqSEsg2Cuxwrq9VCIGyxN+lposdljCBg+9kp1A371x0 nGQ61YHvxdOm4eIpVw86jDspdy311tNaufMEFdnxs01WOE9HZKocEdNPGAluOnG6vpTF Ek6A== X-Gm-Message-State: ANoB5pmRUSwIzvZznw8gcn36V+l8gocuxu2gN1aZkAc+Nguwq2B60g84 MORCptWtTtQjjijL2N8UGyU= X-Google-Smtp-Source: AA0mqf4VuDx4ogafd9+dWRRVkfeGs0t4u/S3xRYjrNRIYQcNat21La8G+iPQnqX+ZohBjnAUnXomnw== X-Received: by 2002:a17:907:8e09:b0:7bc:420d:709f with SMTP id th9-20020a1709078e0900b007bc420d709fmr51085788ejc.658.1670479770829; Wed, 07 Dec 2022 22:09:30 -0800 (PST) Received: from [192.168.0.105] ([77.126.19.155]) by smtp.gmail.com with ESMTPSA id iy17-20020a170907819100b007c03fa39c33sm9235185ejc.71.2022.12.07.22.09.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Dec 2022 22:09:30 -0800 (PST) Message-ID: Date: Thu, 8 Dec 2022 08:09:27 +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 Subject: Re: [PATCH bpf-next v3 08/12] mxl4: Support RX XDP metadata Content-Language: en-US To: Stanislav Fomichev , 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, 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 References: <20221206024554.3826186-1-sdf@google.com> <20221206024554.3826186-9-sdf@google.com> From: Tariq Toukan In-Reply-To: <20221206024554.3826186-9-sdf@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Typo in title mxl4 -> mlx4. Preferably: net/mlx4_en. 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. > #endif /* MLX4_DEVICE_H */