Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2278803imm; Mon, 28 May 2018 05:16:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL/tdkWqrH6eECxvlykk+tiQIf8pd7Wm1Km1yC/vqIw0k9hdS5MRU/UJ7uea0pXfgfbxYF5 X-Received: by 2002:a62:ff1d:: with SMTP id b29-v6mr726709pfn.181.1527509803564; Mon, 28 May 2018 05:16:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527509803; cv=none; d=google.com; s=arc-20160816; b=xml8yuol7XhSPWDUovNRBB1qLaLVDblxH1YmtbDk8KXqxjd6LpFLu2P/aySUmO3xZt EpIVzpjTWCrfVBFygDXnVyCrFRgPJixPj0WSWIWG8PcmM/KZPc7RkgGmD3vi+w80NKLi h+2XQr91L08c30a2RJEm7c1XfdarGDbbZ8nWH047+S0+UXGPPGQEaGQ7ShGw9JiphC3q yTbMHLxzUQ/YtwDsyludBKffvpeNY0dGckrrNlLIA4uKN7scBvcBJ8TlPgxVJZ5y+Ub9 DDEEoA6bTmBKdpHUREYvUiX1h8VGB9wFds/qIoAuIoIgcKlYWHu4MJSjzD/8tSzYi7J1 lBVQ== 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=SyueBDIs70nhTJkQsoZDfIhGZc8tcdyDN1DK0gYGqnU=; b=fh+fW8mABuIVxS8zJscWzFGV5BTIh+Nd3AOX/KqAtiFay/xkxtIPZtZsMOegQ7GKp1 /iB1ymFY/AXKJmEuKUDBp3GSNt0fHzJTS3lIE8G3gIWqubNuYkKMuvtt7twh8IK3KzLU Brv+j68d+xp4MtEXvcSFgODVa4nCraJnjx2dng8Xe9BaBbzh50p7Q2G+nxssUATzeCM+ TFujR0iGDRlI676imodnKe3sI9If5FngVwLBigVAC9s6Ivh3zGsOS8yNZCbX4I1JFdh3 rvZr+TGUfARmQ5zoOKvynizEpjc6ENzCjzsQiyVMcFF8LPs0GW3ENIU3qMltHT+gdpvs gSCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W2yOSvQt; 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 a5-v6si29953152plh.340.2018.05.28.05.16.28; Mon, 28 May 2018 05:16:43 -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=W2yOSvQt; 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 S1164963AbeE1LD2 (ORCPT + 99 others); Mon, 28 May 2018 07:03:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:50584 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164949AbeE1LDT (ORCPT ); Mon, 28 May 2018 07:03:19 -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 E95E12075C; Mon, 28 May 2018 11:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527505399; bh=fU7MWvWCm9SZfWhfkHf288ttnN7Ew/ng/2fBvpUoeng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W2yOSvQt4cG6xZhXN6hDlP55h/B6Hw39p9IALzLjtq1khDt6awUBhXJBw4HCAYDlQ w1sul9iY+i4b6qZdmX1zs+yQDpORLwt+pzbnJb8lphH+eevI16E7TROXdmKIdk7IFw uJsQjQ7hIdccfOOs6LU1LDWKD2nzNe+BrEYBFnYQ= 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.14 483/496] selftests/net: fixes psock_fanout eBPF test case Date: Mon, 28 May 2018 12:04:28 +0200 Message-Id: <20180528100340.240809097@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@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.14-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;