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 C8474C4332F for ; Tue, 20 Dec 2022 22:22:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234275AbiLTWWf (ORCPT ); Tue, 20 Dec 2022 17:22:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234280AbiLTWWC (ORCPT ); Tue, 20 Dec 2022 17:22:02 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5600960FE for ; Tue, 20 Dec 2022 14:21:07 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id n16-20020a056a000d5000b005764608bb24so7407180pfv.12 for ; Tue, 20 Dec 2022 14:21:07 -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=0Oy7FllImPrmrWnDEe5Btq4uEoMcI9LQQjpbM58Drwg=; b=rNHCJQuyndqPYsAB0LvRCWK3MfKBRi9WLT1xNtk72A3i/WoEXAsC2PkNkuCazTbsgl FEk3cJYrd9VtDsBN4iEUxUEPaxzZW9qW0cCvATvfeCQ1pi5w/ZaxCCRp8jvcZe/RLeNi HMrdn2KXSYG/oSi8ef4Z549PrTj82FGhYonloNjdQ3QIYztQewu7+cYfw9Rd7SvWkRdC WI5IETxB3fqjXvwtvvU8FzlNbqmYArv1moyLr6b4kSPdt9m61v+EzoAjqqx4LLlgCcYF s+65+7U7dM1nJ+r+seTliJ7ATO+y9eavNDemmuw0K3rHnOHgXI3+NLrDKdjjQ22bR49i u+rw== 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=0Oy7FllImPrmrWnDEe5Btq4uEoMcI9LQQjpbM58Drwg=; b=bmdHVLAsKHWZYTFbYCKcEpAnTvDggYYo5D4QsUEFWqnbjrsFM0B7JOAGscH+yoIFt7 8xz4+7OabFb/XVQfk/Rh4sFOXwjrX4qpip9ijEG7HxwVKEtcqnZPBCTIVS7koxnMI3TC rkyPE6m7T18ANrsmY5pH6KWAdwcdkklbyoHNfGrvIu9zqk0X+bl5YyiZIf4Va6fLSZB6 r+d4E0OYqXQOnLI0lESSzsAbOoXw62w7uTH/uA5ao5AjT7xpZJ75KhnOXCKrzzl6Qn8o fXwGx60P7+i4fYG+VsA4H6NT9eVSmx+/JtV4NN2yZH40eb4BWz73wW3MMdVMyt8NI91Z XRJw== X-Gm-Message-State: ANoB5pnPI/Y/uqAV43xcM3h6GOFMzSRZ0JWQ22vKueyn+qIlsEQxZgdK +1ypP8b58Hbt4RrX3BJG0Bjy8HT6AelTquJpM7VjWWX4HYUfanfxuRU0jqP6j+oczJgH4K8OSlJ WNQQZzqsuwlrD0AnaNprLRi99gtl3MeKARGWkt6s5CWeC6FDtMA== X-Google-Smtp-Source: AA0mqf4B0qKjDnFbii0seTzbtYlmwIuxpCYnOLZPvfdmitcDx9bN2Y8iTLRchjuWrlkqvDCN5A3V5OU= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a05:6a00:1624:b0:57b:30b6:9e84 with SMTP id e4-20020a056a00162400b0057b30b69e84mr1505798pfc.19.1671574866997; Tue, 20 Dec 2022 14:21:06 -0800 (PST) Date: Tue, 20 Dec 2022 14:20:38 -0800 In-Reply-To: <20221220222043.3348718-1-sdf@google.com> Mime-Version: 1.0 References: <20221220222043.3348718-1-sdf@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221220222043.3348718-13-sdf@google.com> Subject: [PATCH bpf-next v5 12/17] net/mlx4_en: Introduce wrapper for xdp_buff 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, 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, Tariq Toukan Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org No functional changes. Boilerplate to allow stuffing more data after xdp_buff. 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 Reviewed-by: Tariq Toukan Signed-off-by: Stanislav Fomichev --- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 8f762fc170b3..014a80af2813 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -661,9 +661,14 @@ static int check_csum(struct mlx4_cqe *cqe, struct sk_buff *skb, void *va, #define MLX4_CQE_STATUS_IP_ANY (MLX4_CQE_STATUS_IPV4) #endif +struct mlx4_en_xdp_buff { + struct xdp_buff xdp; +}; + 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); + struct mlx4_en_xdp_buff mxbuf = {}; int factor = priv->cqe_factor; struct mlx4_en_rx_ring *ring; struct bpf_prog *xdp_prog; @@ -671,7 +676,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud bool doorbell_pending; bool xdp_redir_flush; struct mlx4_cqe *cqe; - struct xdp_buff xdp; int polled = 0; int index; @@ -681,7 +685,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud ring = priv->rx_ring[cq_ring]; xdp_prog = rcu_dereference_bh(ring->xdp_prog); - xdp_init_buff(&xdp, priv->frag_info[0].frag_stride, &ring->xdp_rxq); + xdp_init_buff(&mxbuf.xdp, priv->frag_info[0].frag_stride, &ring->xdp_rxq); doorbell_pending = false; xdp_redir_flush = false; @@ -776,24 +780,24 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud priv->frag_info[0].frag_size, DMA_FROM_DEVICE); - xdp_prepare_buff(&xdp, va - frags[0].page_offset, + xdp_prepare_buff(&mxbuf.xdp, va - frags[0].page_offset, frags[0].page_offset, length, false); - orig_data = xdp.data; + orig_data = mxbuf.xdp.data; - act = bpf_prog_run_xdp(xdp_prog, &xdp); + act = bpf_prog_run_xdp(xdp_prog, &mxbuf.xdp); - length = xdp.data_end - xdp.data; - if (xdp.data != orig_data) { - frags[0].page_offset = xdp.data - - xdp.data_hard_start; - va = xdp.data; + length = mxbuf.xdp.data_end - mxbuf.xdp.data; + if (mxbuf.xdp.data != orig_data) { + frags[0].page_offset = mxbuf.xdp.data - + mxbuf.xdp.data_hard_start; + va = mxbuf.xdp.data; } switch (act) { case XDP_PASS: break; case XDP_REDIRECT: - if (likely(!xdp_do_redirect(dev, &xdp, xdp_prog))) { + if (likely(!xdp_do_redirect(dev, &mxbuf.xdp, xdp_prog))) { ring->xdp_redirect++; xdp_redir_flush = true; frags[0].page = NULL; -- 2.39.0.314.g84b9a713c41-goog