From patchwork Wed Apr 18 04:29:49 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: 899912 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="SlYRcFGM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qs7K03jRz9s1v for ; Wed, 18 Apr 2018 16:06:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752841AbeDRGGD (ORCPT ); Wed, 18 Apr 2018 02:06:03 -0400 Received: from mail-pl0-f46.google.com ([209.85.160.46]:45075 "EHLO mail-pl0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752741AbeDRGF7 (ORCPT ); Wed, 18 Apr 2018 02:05:59 -0400 Received: by mail-pl0-f46.google.com with SMTP id k9-v6so452243pll.12 for ; Tue, 17 Apr 2018 23:05:58 -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=vMMnVEOe3Ow29exdysCREJncCJ8bq6Sgt122/Ieoitc=; b=SlYRcFGM6RXq7IqwWaYcqgIA2MVgdK9R+rRlbvzcitDeSZ1Glz88fYlQx/QCHmHzMN VHcLJFS1+eK3KapIkSYMCqz5vrRukihdz+qnLSlGC5IGvB8I0GXnk+FpGNhJxp6CM8wo 098zmWg+ZnWN86AgZ9AP5PbyPRIgizAbGuk1LEV8T5dCa/tsMPX83b1Ct0wrJLE//Xyi UEdJ4mccIwCelcpEAoiqeyQqA9Cyj3NmZqT1Sjf3boffAXqDuBt2JFahldC0YlbjVx0V alxVP/bN6vWGDsWIkSsN0KlW3EgB3nhvUvWSkUeXip0KBKaM8AlGUzuG6FBboQJsuHOT +QoQ== 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=vMMnVEOe3Ow29exdysCREJncCJ8bq6Sgt122/Ieoitc=; b=SwS+iBBczGJvSI5cyauKU1vSyCt2Zv96eo6AXzRW5xZ19tsdt6bA8IWbKKg5HbA87W x/bS+CQHV4lTWLN+b5vjS3ktavFBoLJ/MATY865EyuvjH2B64RcuY+2cV+HJwc0UR5vj AfKaTAM/2qdTkRaH/ZTQvOD6CSG2bl0uFpiTEMLG7i/BnTIKw+6/h9MWZ2dbpEFt4cMa QF5PWkWy/AJ8Mmk8mO4Wnqpt9xA4op6yB3dmJoUQSanlA6KnDAr4CVkWQk5iFBjfhY3a 0LjUuqhCABnRaOIdHR0KQspjpBtpEu57liaCq4XLqJ9QJ+/7eehtCpqs9Hr1MkbKcxrK WTGw== X-Gm-Message-State: ALQs6tD3UHjZrHXmVa/cKoKISydQoTcTWq04c1Tc85QSDYVndWaQ1uxM ZLULsxB9Qmjhu6sxgqSGKvIROQ== X-Google-Smtp-Source: AIpwx4/Ii/ZVSHodDT0gStUdT+cKQZZsCy36glZXUY5AwFsVs/tjJvI8DAFxYIQ5nNVp2XkyuvTCOg== X-Received: by 2002:a17:902:6f16:: with SMTP id w22-v6mr827208plk.216.1524031558623; Tue, 17 Apr 2018 23:05:58 -0700 (PDT) Received: from maindev.thefacebook.com ([199.201.64.2]) by smtp.gmail.com with ESMTPSA id a6sm799141pfo.157.2018.04.17.23.05.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 23:05:58 -0700 (PDT) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH bpf-next v2 09/11] bpf: making bpf_prog_test run aware of possible data_end ptr change Date: Tue, 17 Apr 2018 21:29:49 -0700 Message-Id: <20180418042951.17183-10-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180418042951.17183-1-tehnerd@tehnerd.com> References: <20180418042951.17183-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 --- 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);