From patchwork Tue Apr 17 06:51:30 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: 899092 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="HxgTFd/w"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QGFW4cjbz9s1P for ; Tue, 17 Apr 2018 16:54:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752087AbeDQGyV (ORCPT ); Tue, 17 Apr 2018 02:54:21 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:39583 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbeDQGyT (ORCPT ); Tue, 17 Apr 2018 02:54:19 -0400 Received: by mail-pl0-f65.google.com with SMTP id e7-v6so11458720plt.6 for ; Mon, 16 Apr 2018 23:54:19 -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=gJaFrczty5UhggSEE01VPAo4QH1KQHq2caxWQ7xIzVg=; b=HxgTFd/w2NZt/eg//NOwPb8gIiPq88yq3TgL4eoCwCAXVn/gwGUmhImPgX2pb0pH6T q5m0XBUmWBCfNJm/u10gsjCgZDWNIhHBjKIIGp/UCMp10aTD3+UtQgytI0fEJ2E3WucL /d/fdeNtnVL2fyu109P7gi6Af/o1c3aJw3/RKQ9fYcHuA/u4LAeYojJd4nJYjq/yNbgM gYXBRfcISZnbUQcEuZP7t0OkEhgD8LkTNgY2HdhG5kpiSIJQGNmdGv3qDRRXGKxULM9U NisBHs3qM6Z+LorKLVRRbYJb/3SN7VgGMzbRLUKmuGrE0TOK2GFNo9v4xy8RCnt8lhoN KKJg== 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=gJaFrczty5UhggSEE01VPAo4QH1KQHq2caxWQ7xIzVg=; b=b1WJS2/pSGm1LT7QdRl0QTEDkp/euOnDmlaFDwihOoiNHIls97TpdGSVmCnAfGz9c0 JQEKCVHzrHX2w4BxPghDU2EVr3M5382Ye4frDQN/Aek6TQ1PauZNwoNwX+P7Ohd3xacr M/pj0AMyTFerKc5CO5Tw6L7itycquAlH+bQZJGLjhIuWpnAD35p+wnmMKoe77V3nAHQP cmbxhn2Yqkqse33enkCKpyn+1TsTZYPFi42bGWHL5LEECFOlYxS888xIxx141lzztHKu +zE/75SXPDrDpqMYxhegRxtql9rm0UT/vLHMIlQ7p22ytRr22sAwDUIZzuPmluCT57bV ixvQ== X-Gm-Message-State: ALQs6tB80IRKOFe3Nuu2hUsg4VTXTduoOwSvCr+VbQwZqLh2ruA9m0Xj 9yaHL3HWtlqF5aIdkn5+zQteKMzAIueNvw== X-Google-Smtp-Source: AIpwx4/l2b7B21kV6kagPJskE/dmMGYFoOSoePxEALdVX5OzNIthWphO3M+7wYDmFc5csCrMdGNGGg== X-Received: by 2002:a17:902:b112:: with SMTP id q18-v6mr494297plr.371.1523948059074; Mon, 16 Apr 2018 23:54:19 -0700 (PDT) Received: from maindev.thefacebook.com ([199.201.64.2]) by smtp.gmail.com with ESMTPSA id u13sm32268031pfd.112.2018.04.16.23.54.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 23:54:18 -0700 (PDT) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , Jason Wang , mst@redhat.com Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH bpf-next 09/10] [bpf]: make tun compatible w/ bpf_xdp_adjust_tail Date: Mon, 16 Apr 2018 23:51:30 -0700 Message-Id: <20180417065131.3632-10-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 tun driver we need to adjust XDP_PASS handling by recalculating length of the packet if it was passed to the TCP/IP stack (in case if after xdp's prog run data_end pointer was adjusted) Signed-off-by: Nikita V. Shirokov Reviewed-by: Jason Wang --- drivers/net/tun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 28583aa0c17d..0b488a958076 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1688,6 +1688,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, return NULL; case XDP_PASS: delta = orig_data - xdp.data; + len = xdp.data_end - xdp.data; break; default: bpf_warn_invalid_xdp_action(act); @@ -1708,7 +1709,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, } skb_reserve(skb, pad - delta); - skb_put(skb, len + delta); + skb_put(skb, len); get_page(alloc_frag->page); alloc_frag->offset += buflen;