Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2230464imm; Mon, 28 May 2018 04:23:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp0AteKrda7S3nlcdjd3kpJND0IIMsz2zIKQa7Jk1dbwWKSc27TRv9FPHnA8ppeoYtiGv1R X-Received: by 2002:a17:902:8a82:: with SMTP id p2-v6mr13253440plo.244.1527506632027; Mon, 28 May 2018 04:23:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527506632; cv=none; d=google.com; s=arc-20160816; b=Nrmb+mhmhRYe6jTNWu0NxvYqEDGI8SP4obrb8WLU+h6VHQvhRRhUKTkARnw3yHWQaB f8cR3ruFER7e/lonFPCmy/Rr+Ki4nYRGWGYonrzmuigy7Sjzf0xoRvLBYZsPhlnd/ICl niJkuz8rrTLL6E1NFLqhlLGBcWMFHYGoGOtoS/pdDH3oLh5Gyw9r7zaQHa1enmISyBgF d9Pd547uJSxLTmtoKAt9q9M3en0AKiJv2Ag28tZRCHWzQJ3iuYynLtWuZpXifwi/eWfR Elenu+d4Ew8iLrq04qB4PweZyAgzDvsreaLoATGCg2lz66rOQ7mJom/PpeHzWV4X37Qp KdwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=Lqxs8LVP1CKaIlfs7sAyu9WyynpFhceAUWUif7tKfI4=; b=KeuiARJyXrVU93T6XK8b+wEH7IpMGvQvCnnmN1TKMUp5e8IJMVYbrGhLNK6bvSrdsy h4AV8P3l9ZLFctoJSjcb29edUBVxRzlpX3lQrI+OSjb7llJWm6JupTYDjb7Co/fEIpYv Va4a1nweDtE1/G4eJAgxTpJKWzkwUlCDH3GfGobDeyydwBMXm6iN0PZvgS65E3DCpwkg 7HqCR0txNaXoN0Li6zW5fD5iv+t+ZCQjieZXJg4Npf4Up20k9M8jzYMYb/0mcfZT+ug8 28ZxvNnfKTWeeZWeI8Z7fX+1b3D8RO/wsiR8+BEw18vDHnI9CT7fHVN7yO+3Me8ZjcV4 81bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y1DAjPP9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 203-v6si29690538pfa.60.2018.05.28.04.23.37; Mon, 28 May 2018 04:23:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y1DAjPP9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424814AbeE1LWo (ORCPT + 99 others); Mon, 28 May 2018 07:22:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:34822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424598AbeE1LPo (ORCPT ); Mon, 28 May 2018 07:15:44 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6770B208A1; Mon, 28 May 2018 11:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527506144; bh=CSSH+x0VSa2qSja2tXVAoDhDRJICtuKZCb64eCQPf20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y1DAjPP9WzY/ahKOkvVVV/epGA29YGkwwWYkp+3k4P50sD7GDU6uv/HZc45P3Wmg/ Uv2DHeaFlmRKeJuhOpxQhhrOqDS2W64dXaSLkvljmODbPnJXjYTWpMm72YgbTu9bF8 5VTHcsO5vKjjB9Vdt3wY5UKSUU3G5aY43Nm8pJoI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Prashant Bhole , Willem de Bruijn , "David S. Miller" , Sasha Levin Subject: [PATCH 4.16 255/272] selftests/net: fixes psock_fanout eBPF test case Date: Mon, 28 May 2018 12:04:48 +0200 Message-Id: <20180528100301.652733057@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100240.256525891@linuxfoundation.org> References: <20180528100240.256525891@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Prashant Bhole [ Upstream commit ddd0010392d9cbcb95b53d11b7cafc67b373ab56 ] eBPF test fails due to verifier failure because log_buf is too small. Fixed by increasing log_buf size Signed-off-by: Prashant Bhole Acked-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/psock_fanout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/tools/testing/selftests/net/psock_fanout.c +++ b/tools/testing/selftests/net/psock_fanout.c @@ -128,6 +128,8 @@ static void sock_fanout_getopts(int fd, static void sock_fanout_set_ebpf(int fd) { + static char log_buf[65536]; + const int len_off = __builtin_offsetof(struct __sk_buff, len); struct bpf_insn prog[] = { { BPF_ALU64 | BPF_MOV | BPF_X, 6, 1, 0, 0 }, @@ -140,7 +142,6 @@ static void sock_fanout_set_ebpf(int fd) { BPF_ALU | BPF_MOV | BPF_K, 0, 0, 0, 0 }, { BPF_JMP | BPF_EXIT, 0, 0, 0, 0 } }; - char log_buf[512]; union bpf_attr attr; int pfd;