Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D00A5C77B61 for ; Fri, 28 Apr 2023 23:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347087AbjD1X5p (ORCPT ); Fri, 28 Apr 2023 19:57:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347081AbjD1X5o (ORCPT ); Fri, 28 Apr 2023 19:57:44 -0400 Received: from out-23.mta1.migadu.com (out-23.mta1.migadu.com [95.215.58.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A1D9213C for ; Fri, 28 Apr 2023 16:57:42 -0700 (PDT) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1682726261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dO6v56vs+QxlrFpmQ7AvOvrHiPid5mwYbwnINcXqQO0=; b=Iw2q2b0yzkPx9lUcRa1gz57ZjFDkpJmKwZCFZkJHanoPeZnbObWFWG6sS/BmGtUpi8/hJq gXXP+7RFCms6TRXvTEQqmH8NMyOR6VZSMeXVDhb7qG2FuvHIgWlvHpj9dK8I+73JibS/VV 8Ai/74Gd6ml3HrzQ3/n8bPVKkgtxhUo= Date: Fri, 28 Apr 2023 16:57:36 -0700 MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v2 2/4] selftests/bpf: Update EFAULT {g,s}etsockopt selftests Content-Language: en-US To: Stanislav Fomichev Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, haoluo@google.com, jolsa@kernel.org, bpf@vger.kernel.org References: <20230427200409.1785263-1-sdf@google.com> <20230427200409.1785263-3-sdf@google.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau In-Reply-To: <20230427200409.1785263-3-sdf@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On 4/27/23 1:04 PM, Stanislav Fomichev wrote: > Instead of assuming EFAULT, let's assume the BPF program's > output is ignored. > > Remove "getsockopt: deny arbitrary ctx->retval" because it > was actually testing optlen. We have separate set of tests > for retval. > > Signed-off-by: Stanislav Fomichev > --- > .../selftests/bpf/prog_tests/sockopt.c | 80 +++++++++++++++++-- > 1 file changed, 74 insertions(+), 6 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt.c b/tools/testing/selftests/bpf/prog_tests/sockopt.c > index aa4debf62fc6..8dad30ce910e 100644 > --- a/tools/testing/selftests/bpf/prog_tests/sockopt.c > +++ b/tools/testing/selftests/bpf/prog_tests/sockopt.c > @@ -273,10 +273,30 @@ static struct sockopt_test { > .error = EFAULT_GETSOCKOPT, > }, > { > - .descr = "getsockopt: deny arbitrary ctx->retval", > + .descr = "getsockopt: ignore >PAGE_SIZE optlen", > .insns = { > - /* ctx->retval = 123 */ > - BPF_MOV64_IMM(BPF_REG_0, 123), > + /* write 0xFF to the first optval byte */ > + > + /* r6 = ctx->optval */ > + BPF_LDX_MEM(BPF_DW, BPF_REG_6, BPF_REG_1, > + offsetof(struct bpf_sockopt, optval)), > + /* r2 = ctx->optval */ > + BPF_MOV64_REG(BPF_REG_2, BPF_REG_6), > + /* r6 = ctx->optval + 1 */ > + BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, 1), > + > + /* r7 = ctx->optval_end */ > + BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_1, > + offsetof(struct bpf_sockopt, optval_end)), > + > + /* if (ctx->optval + 1 <= ctx->optval_end) { */ > + BPF_JMP_REG(BPF_JGT, BPF_REG_6, BPF_REG_7, 1), > + /* ctx->optval[0] = 0xF0 */ > + BPF_ST_MEM(BPF_B, BPF_REG_2, 0, 0xFF), > + /* } */ > + > + /* ctx->retval = 0 */ > + BPF_MOV64_IMM(BPF_REG_0, 0), > BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, > offsetof(struct bpf_sockopt, retval)), > > @@ -287,9 +307,10 @@ static struct sockopt_test { > .attach_type = BPF_CGROUP_GETSOCKOPT, > .expected_attach_type = BPF_CGROUP_GETSOCKOPT, > > - .get_optlen = 64, > - > - .error = EFAULT_GETSOCKOPT, > + .get_level = 1234, > + .get_optname = 5678, > + .get_optval = {}, /* the changes are ignored */ > + .get_optlen = 4096 + 1, The patchset looks good. Thanks for taking care of it. One question, is it safe to the assume 4096 page size for all platforms in the selftests?