From patchwork Wed Apr 18 04:42:18 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: 900112 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="Osyb2Xwa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40R2pc5c4Pz9s3X for ; Wed, 18 Apr 2018 23:22:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753950AbeDRNWO (ORCPT ); Wed, 18 Apr 2018 09:22:14 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:40463 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753896AbeDRNWL (ORCPT ); Wed, 18 Apr 2018 09:22:11 -0400 Received: by mail-pl0-f68.google.com with SMTP id t22-v6so1115840plo.7 for ; Wed, 18 Apr 2018 06:22:11 -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=I/2pAhWUdF/wOdcAqAOQ45Y2kOEZFr9kRnkPKBTYKuw=; b=Osyb2XwaAJKlufJXe9nXZW35QW7kjZl55uV8w5JZRUHy1KyPTZQdpiRLnzeoVrN3bp C4aU11Qj7QlWoyOP/+6qxVAzkOnpTV8iqAPkeyTKMhjLngHeoSGHemutyGRp9m8WuimQ 8RZJfPfP8S/ELsM9a3SmTnHTN5boIxvGMQLDw2UbHH7xjGzG8iEQ2m/ELeReP8rgOW4h YheGpeI8HtbDXW/d9upAvoeuelZVoz+qMsyvV3IPnJWbnS/xdaon4kOYIFEZmPYtqflH d5HfB3A7RgP3KnC42rBkP3UPvLs3Nv3jg0wpEVcRtQsIgeKkP5g1qd/YR2ZhA1Rc5BwJ /nQA== 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=I/2pAhWUdF/wOdcAqAOQ45Y2kOEZFr9kRnkPKBTYKuw=; b=MjvG19JQE6ZzN71xwKIlgmj5BfUpS59x7zdzZVCMm/3B2YYMM+DM27f+lzm5cF+zkr MWwu11LdHW2LcFzkUpDNXYxIBol52EFQwh2wFKQ8vjqucSRXyNMrEACtrpxADwdsggkQ gIh4xfQgkYiExTDdRbstP42i3GqDKukfKMdWq/yZfwaN/cAFM4vyhLEHPkDas89OWpP7 3lEt+GMgfJYRP/5Hd88tvQiHtzCpD+zLwfO97yDC5RNYWq1fOUpzb/gYW+IkuyvPNACc srkPEQcewIq4cPA6ZAqHHSMsUrP5IENNoSahFCIDtrNtQ2w5zD1KlFScFqCjMfENh+r4 3xww== X-Gm-Message-State: ALQs6tBOdN9XLpEZHPAUMvpcsfTFZAM7QyHk+qyoE44Oqf49HAc+gCF8 ek66wPbGYL79t1Pta6jAv59IHA== X-Google-Smtp-Source: AIpwx4/AqbWGzMKtIHtTIVANorE7c/vKdeOf1KJueWvAIZgx/4ZgPGVj6BVKf8BptEoAbQq7xiiWnA== X-Received: by 2002:a17:902:2c83:: with SMTP id n3-v6mr2097840plb.140.1524057731404; Wed, 18 Apr 2018 06:22:11 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 06:22:10 -0700 (PDT) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH bpf-next v3 06/11] bpf: make netronome nfp compatible w/ bpf_xdp_adjust_tail Date: Tue, 17 Apr 2018 21:42:18 -0700 Message-Id: <20180418044223.17685-7-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 nfp driver we will just calculate packet's length unconditionally Acked-by: Alexei Starovoitov Acked-by: Jakub Kicinski Signed-off-by: Nikita V. Shirokov --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 1eb6549f2a54..d9111c077699 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1722,7 +1722,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget) act = bpf_prog_run_xdp(xdp_prog, &xdp); - pkt_len -= xdp.data - orig_data; + pkt_len = xdp.data_end - xdp.data; pkt_off += xdp.data - orig_data; switch (act) {