From patchwork Tue Apr 17 06:51:26 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: 899089 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="aowmE8js"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QGC51NBRz9s1P for ; Tue, 17 Apr 2018 16:52:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752326AbeDQGwO (ORCPT ); Tue, 17 Apr 2018 02:52:14 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34964 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752078AbeDQGvz (ORCPT ); Tue, 17 Apr 2018 02:51:55 -0400 Received: by mail-pf0-f194.google.com with SMTP id j5so2189200pfh.2 for ; Mon, 16 Apr 2018 23:51:55 -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=fAVNHwqdGhPXqTnLz5ZoIB+lMpiBx04tssZQzOM5jJI=; b=aowmE8jsRD7ANc4NtJ0iz7siqtBFMm6UQPNmx0YJ80Y3Myzqhq5N0qkPuteOcNGcUq 10ttpjv8KW3pPZfMZPmkmk3elVs/OfliDTJHqWWyIHTflLmpNAEYwodFecqMG6oUmSWY K0H+hF8Wc5c3jIV8UhXkQET0Cx7l+ZxUZNIqI7jSvW9uGJCSgbzlRReXCwFaN2AuVtV1 cFyO3bE4awYhLkbOYGvaZKJb3BVUwtYP1uFTMr8/STb13JSMYKT3lMbAK1c7QwhG1TDA LuqNpqEXlanDdmkou3M9Nq+cEw/74w/9ulURZGpF6TOQ2KQcRNuJFZqOJ1xfDybLJyG2 pwjQ== 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=fAVNHwqdGhPXqTnLz5ZoIB+lMpiBx04tssZQzOM5jJI=; b=WFwXB2u6p7V/OHJbDQep4/Ku2YL5WQmppprfCIFhOhibPUyhyZ2Wfcv+GJNkIPppo7 Xsm10MkDT66cxbQMDtqcUw7/KxfsA5TIINzgbdM3FPLmCuuqf5lQY4gLJOyQk1a2ozlB tw27y3Lg6sAxrWHXvzRAml/rZQ/rauOAqQJKwDmorU+O2MYcRNn+sWJVZiXJqNtIAgKS pqqCOFis9jyukM1T8Oh2w1HNswJK0khk/syLRZ9BrEH59BpyRwgq7uAdYF0lStwqeFyr rA15dWsBooHlIcTlE5oguteN9MtfcGn+MRTszQHc3TGmgQ8CkpyBX5loMyTDr9O+rKeY RHAw== X-Gm-Message-State: ALQs6tCSe21D3Ojca0ywxVcb22aNrJp0xc9+DOeMOXRetud/iUnJAsLG LZPAhAoq39RAlIWRAfVQPfPelw== X-Google-Smtp-Source: AIpwx49vmH3Vq08rV1Ld0VlmKhIB3oo+h9S036wLMkR8+74LBGyIStUrcf/MpFHf2Q5GkBuFNwF+jw== X-Received: by 10.101.96.47 with SMTP id p15mr809381pgu.430.1523947914708; Mon, 16 Apr 2018 23:51:54 -0700 (PDT) Received: from maindev.thefacebook.com ([199.201.64.2]) by smtp.gmail.com with ESMTPSA id u13sm32268031pfd.112.2018.04.16.23.51.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 23:51:54 -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 05/10] [bpf]: make mlx4 compatible w/ bpf_xdp_adjust_tail Date: Mon, 16 Apr 2018 23:51:26 -0700 Message-Id: <20180417065131.3632-6-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180417065131.3632-1-tehnerd@tehnerd.com> References: <20180417065131.3632-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) Signed-off-by: Nikita V. Shirokov Acked-by: Alexei Starovoitov --- 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;