Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Pedro Tammela <pctammela@gmail.com>
To:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>, netdev@vger.kernel.org,
        bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Pedro Tammela <pctammela@mojatatu.com>
Subject: [PATCH] bpf: fix errno code for unsupported batch ops
Date:   Sun, 18 Apr 2021 17:02:49 -0300
Message-Id: <20210418200249.174835-1-pctammela@mojatatu.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

ENOTSUPP is not a valid userland errno[1], which is annoying for
userland applications that implement a fallback to iterative, report
errors via 'strerror()' or both.

The batched ops return this errno whenever an operation
is not implemented for kernels that implement batched ops.

In older kernels, pre batched ops, it returns EINVAL as the arguments
are not supported in the syscall.

[1] https://lore.kernel.org/netdev/20200511165319.2251678-1-kuba@kernel.org/

Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
---
 kernel/bpf/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index fd495190115e..88fe19c0aeb1 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -3961,7 +3961,7 @@ static int bpf_task_fd_query(const union bpf_attr *attr,
 #define BPF_DO_BATCH(fn)			\
 	do {					\
 		if (!fn) {			\
-			err = -ENOTSUPP;	\
+			err = -EOPNOTSUPP;	\
 			goto err_put;		\
 		}				\
 		err = fn(map, attr, uattr);	\
-- 
2.25.1