From patchwork Mon Apr 23 04:16:48 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: 902732 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="HxiuL707"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40TtV86Xxdz9s16 for ; Mon, 23 Apr 2018 14:17:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750853AbeDWERN (ORCPT ); Mon, 23 Apr 2018 00:17:13 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:45201 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750736AbeDWERM (ORCPT ); Mon, 23 Apr 2018 00:17:12 -0400 Received: by mail-pf0-f194.google.com with SMTP id l27so8146713pfk.12 for ; Sun, 22 Apr 2018 21:17:12 -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; bh=yvzzgMH+MUp6JTf3K1yuMSRApAUERoTrSv9UAh4cRUY=; b=HxiuL7078LrJ8T418rZT0HYyis8oIDjkBelseIKBCCAlx9UpOVdQBgJZnkv6KCpqZ/ tzMb3T8rhnRr7oi/GIlSe5mRXPqRQ2vtIeJWxAjiDBSwkUHAjuivc6WSRl1MoDHGezjc k6w7OFVUTJbELNQ9cfHNRkwbeF6bY6w9zI/+siK58nG9nF6j3rloYXpM2eFLN8kSSJj1 FD5wpuWjK9zqIsaxe9fuc4+YxMXWQHs3veoUvThAgw8efwac3e7Sfexn0Y2poMSTSCVR +rzxNNVUakz9LvznmAp4NOSHxRMV+OeouElQ53vLM5PPiVCrDaHbBHJQd2snNnNwuJ4Y fcnw== 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; bh=yvzzgMH+MUp6JTf3K1yuMSRApAUERoTrSv9UAh4cRUY=; b=sQqP3ml6Ws1F+eqrap1IqE7AreBPpTc1WolYze/voCVkO5OUHkyW6DIzFThzlGTsfb NtVla+phZOEMpxAdRFE6pLMq+GIt/qGcg/8Plq1K4UyXjq2GMgHEzeRhFLfAkKf55Q3C hCztxGzkdBdubc8herNfkCvPshP2pHlW1n1BpoEsOpu2aHt0Vzp2WvaKDiFh7U+iztha /b6Lv8ZTWygwQdUGRI6K14OKKTDktQyqPbJGHXfmtz7OI4qkjt5bZ17HJ/hpBXe1ysFn 8hl/zym73tOBZZlZA6mQk0FwST4k1WfGYerX8fDQw+hmOyFQuOZ5zL70kpz/Y0aHQkqa dOXA== X-Gm-Message-State: ALQs6tDCSpTR9btIQvfEBGtNPallGVqeIwL1W8VIjFXSQ0Cf9IeHt7jv Y+3ndLMLxNH7+TY0JNZVDJoivQ== X-Google-Smtp-Source: AIpwx4/ksI88YeDYlBp79fV3R9dHzcLKgatLXsKIx2I8tYocFfS+0U+4PVi1U4NRYU8/GjHLBXH0pA== X-Received: by 10.101.93.82 with SMTP id e18mr16229916pgt.123.1524457031664; Sun, 22 Apr 2018 21:17:11 -0700 (PDT) Received: from localhost.localdomain (c-69-181-140-199.hsd1.ca.comcast.net. [69.181.140.199]) by smtp.gmail.com with ESMTPSA id v187sm20768372pfv.21.2018.04.22.21.17.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 21:17:10 -0700 (PDT) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , "Michael S. Tsirkin" , Jason Wang Cc: netdev@vger.kernel.org, David Ahern , "Nikita V. Shirokov" Subject: [PATCH bpf-next] bpf: fix virtio-net's length calc for XDP_PASS Date: Sun, 22 Apr 2018 21:16:48 -0700 Message-Id: <20180423041648.2285-1-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In commit 6870de435b90 ("bpf: make virtio compatible w/ bpf_xdp_adjust_tail") i didn't account for vi->hdr_len during new packet's length calculation after bpf_prog_run in receive_mergeable. because of this all packets, if they were passed to the kernel, were truncated by 12 bytes. Fixes:6870de435b90 ("bpf: make virtio compatible w/ bpf_xdp_adjust_tail") Reported-by: David Ahern Signed-off-by: Nikita V. Shirokov Acked-by: Jason Wang --- Notes: unfortunately it looks like that xdp_tx is still broken because fix by Jason (introduced in "XDP_TX for virtio_net not working in recent kernel? " thread) haven't landed yet) drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 779a4f798522..08ac2cc986aa 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -761,7 +761,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, /* recalculate len if xdp.data or xdp.data_end were * adjusted */ - len = xdp.data_end - xdp.data; + len = xdp.data_end - xdp.data + vi->hdr_len; /* We can only create skb based on xdp_page. */ if (unlikely(xdp_page != page)) { rcu_read_unlock();