From patchwork Wed Apr 18 04:42:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nikita V. Shirokov" X-Patchwork-Id: 900111 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tehnerd.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tehnerd-com.20150623.gappssmtp.com header.i=@tehnerd-com.20150623.gappssmtp.com header.b="OiSNf1Oe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40R2pY3pYDz9s3X for ; Wed, 18 Apr 2018 23:22:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753938AbeDRNWK (ORCPT ); Wed, 18 Apr 2018 09:22:10 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:44043 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753896AbeDRNWI (ORCPT ); Wed, 18 Apr 2018 09:22:08 -0400 Received: by mail-pl0-f66.google.com with SMTP id s13-v6so1110751plq.11 for ; Wed, 18 Apr 2018 06:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tehnerd-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yc8q9wM99y4+hrl5sGNzNfMhX0TFXYUZmDxyvfemTuU=; b=OiSNf1OelUY/H9azo3BezRmr0U+0PypNdWVq9s1PVgKD3e6eftw68D5ST2Fno6GPjl 9bgLtBBvqeFshIVUUnLadqYunYHBzlaoKklPustSUTGrKxyjoINl3kx/dnSF//d8fBUL 7h4xykhlXnR9WoUKvZzErzjyJ651P1wBlKzn/wBVRvhg4WpsubKUIwltnNExFkpmyFtI yb2/nS4ju4Sgc7YrfRx7C9z9FoPY5CSFv+JK9Npn4suejS0ILsg6fRDC16FYXOtJaPJG IUlXVgp+Py5q7WJFY1TIvw1w0o1VXzP+SN4p4A3CTJHnXSZmVBkJ3u427S5R3OGeKp7F luAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yc8q9wM99y4+hrl5sGNzNfMhX0TFXYUZmDxyvfemTuU=; b=eeo63nFf/PSPWglgGfJWssR3b5EoZjwPqCTNzc/GxXt39DbtHJ2vKI7gQ+/g35az17 pTMRmPWMAu4He4qarf49AG4mE8QE5owDTGfTBQJ+F1Vs4VGQAv9NQwJteZX4XHUbBkPs BMFdVp+CbcCB1F3QsEnLTOcwgecGSrKTKgv9Cmd8Yq+rKl881avfnD4LBL5Ib6pTZbOF AysBVQAuI5VOuhVOE5T6CyOPprMdy6TZuKbtsybTunDIAXHK03OJ0Sbk7TwR91JFZhOz C3ypOXvxJYsvSdrOK2ActQxNAAo5lQKtWoXY/WIuKODC6bTDhetIQDHgmG/Up1aHWfm/ Q+vA== X-Gm-Message-State: ALQs6tD9q3UmJhVhc9RNKkc4GJkZ3tQ+y4QQtqtfP3dhM/hGFvrb1JNF Pq8NuikORLwuyVHlpIJ2IT9Apg== X-Google-Smtp-Source: AIpwx4+kl8xNih1FXOo33DBzJdyCGOPlploptyOlK6TC+cZol4a6vnJ24K+yqBWmXh0uK1Di/NOvPw== X-Received: by 2002:a17:902:6786:: with SMTP id g6-v6mr2079387plk.362.1524057728012; Wed, 18 Apr 2018 06:22:08 -0700 (PDT) Received: from maindev.thefacebook.com ([199.201.64.2]) by smtp.gmail.com with ESMTPSA id u7sm3836378pfa.96.2018.04.18.06.22.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 06:22:07 -0700 (PDT) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , Tariq Toukan Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH bpf-next v3 03/11] bpf: make mlx4 compatible w/ bpf_xdp_adjust_tail Date: Tue, 17 Apr 2018 21:42:15 -0700 Message-Id: <20180418044223.17685-4-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180418044223.17685-1-tehnerd@tehnerd.com> References: <20180418044223.17685-1-tehnerd@tehnerd.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org w/ bpf_xdp_adjust_tail helper xdp's data_end pointer could be changed as well (only "decrease" of pointer's location is going to be supported). changing of this pointer will change packet's size. for mlx4 driver we will just calculate packet's length unconditionally (the same way as it's already being done in mlx5) Acked-by: Alexei Starovoitov Acked-by: Tariq Toukan Signed-off-by: Nikita V. Shirokov --- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 5c613c6663da..efc55feddc5c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -775,8 +775,8 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud act = bpf_prog_run_xdp(xdp_prog, &xdp); + length = xdp.data_end - xdp.data; if (xdp.data != orig_data) { - length = xdp.data_end - xdp.data; frags[0].page_offset = xdp.data - xdp.data_hard_start; va = xdp.data;