From patchwork Wed Apr 18 04:42:21 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: 900118 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="ru8mToyG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40R2q41ydjz9s3Z for ; Wed, 18 Apr 2018 23:22:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754009AbeDRNWh (ORCPT ); Wed, 18 Apr 2018 09:22:37 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:38934 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753896AbeDRNWP (ORCPT ); Wed, 18 Apr 2018 09:22:15 -0400 Received: by mail-pf0-f194.google.com with SMTP id z9so909210pfe.6 for ; Wed, 18 Apr 2018 06:22:15 -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=Px4lY6VCLcLcPQ9Q1D2LLYmu0BIVNiM53ae/JWp7E3g=; b=ru8mToyGwQDP/tt5TbO39gsVuUQk0pKZxaJyaxF7jHpdAoYzxnErXgfgywy+cUap/z 2SARpskYhtGIbIe3qL6FhoxaufcEdBSvbc9mmdw7ibU110SfmyrcMkZnbLV1riT89QYI 3YUis88vjEl7ExO+Oj7fwUh9mSg4mAUxiKffy/ZWe20dKV+63lMuLdluy4ISHZ03bdI3 pJ+I1dIsbsYePF19l2SgSRnpuKnr0hR/eQEEYtDDl3Rz+aUbk0Ze7Ssnpp/RyIROVazR UKtAnKJLsH57thoxA0vfimtmMSiD4VNYxy5ah3w3fGOZwtvx7bzCd0ZzW1x7TYFR4uNv uX9A== 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=Px4lY6VCLcLcPQ9Q1D2LLYmu0BIVNiM53ae/JWp7E3g=; b=fs0TAO9PFPkqh5ijIcxqSp8XuvCWEyX+ka9XiLdbxcIaSOIGz5mTZij8SNWX0dfbh/ YHiXHr1RVCEF6iByrS/C4lVyKiueQP5RC+Nqo61HSHjtEPaJcRB6lFIkOJ8QQgzimi4R qilkkwA+e9H94TYgDBwKE7iCBLCIigLrTrvc4wr0LrHXUebFX7x8UGxpfQYt48pEoTWt 4urYOla1fFzYwBHTBIml32L28rHiMJ/zPov403MF9RSfGyLrBcFj9lEewRBTEBhYtnYN r+sea/Z2SJEX1G40ZE5uitPn8aZ5UXHKmv9LS0UmD8KMcDQl85Ou+ZCcxn4gR9HMpRuf QDmg== X-Gm-Message-State: ALQs6tC+2Qwekr6L9PIkrMWu5cr6K9TgcfLqL5V4kuay98Be5UdIs1pN VzVBZ0Qvhz2cyGb/eARnEAXuqG/IqpGy+g== X-Google-Smtp-Source: AIpwx4+ZX4/OkQEE9jzKlNJb6+kXNLdP6qrNSxuuaqyddXugn8Q5F1Og1QnO3qozMi3T+TSZPGehoA== X-Received: by 10.98.245.139 with SMTP id b11mr1743555pfm.113.1524057734794; Wed, 18 Apr 2018 06:22:14 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 06:22:14 -0700 (PDT) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH bpf-next v3 09/11] bpf: making bpf_prog_test run aware of possible data_end ptr change Date: Tue, 17 Apr 2018 21:42:21 -0700 Message-Id: <20180418044223.17685-10-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 after introduction of bpf_xdp_adjust_tail helper packet length could be changed not only if xdp->data pointer has been changed but xdp->data_end as well. making bpf_prog_test_run aware of this possibility Signed-off-by: Nikita V. Shirokov --- net/bpf/test_run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 2ced48662c1f..68c3578343b4 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -170,7 +170,8 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, xdp.rxq = &rxqueue->xdp_rxq; retval = bpf_test_run(prog, &xdp, repeat, &duration); - if (xdp.data != data + XDP_PACKET_HEADROOM + NET_IP_ALIGN) + if (xdp.data != data + XDP_PACKET_HEADROOM + NET_IP_ALIGN || + xdp.data_end != xdp.data + size) size = xdp.data_end - xdp.data; ret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration); kfree(data);