Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1629741ybt; Thu, 9 Jul 2020 11:24:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIlh81KxlGM4NIMfhyq4b3v3P4w7TUN8eDM0bQdo1unUDC6U1zojXpGIJIj3wnOGKDgKZN X-Received: by 2002:a50:fc88:: with SMTP id f8mr42491251edq.314.1594319058614; Thu, 09 Jul 2020 11:24:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594319058; cv=none; d=google.com; s=arc-20160816; b=gpo27WHgCOclV2Ep0Bnph/ImKCfPPmpEMLHz02hK7S1avOx3WSO+PixAllIM2MevPr tSp0LVtdeis2UOLWFwt4bIaQZdmm1EecWk+6s1v8NnaazGjYVbfDmfgRTz2VJwjR7kH2 d8hCdiuRzkCK0/4+kGtGDOMpA6EujLxPCbo0y4EpwNMuBKo+CDCo0li/F0bsM0Gmgsyj qLTOQPV2e3WK5v2ji+r8V6VqlIocNDSIACza9fRLWp8ziQ/PYLyfJbTqJu28XtMHtDAZ B/w0Keysr1Q6orGJX2NSZw47BQZPpkS3DsEfIu62XefJ3pNOxLJBhxfa7tTH8bxcoE0L WgYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:in-reply-to :subject:cc:to:from:user-agent:references:dkim-signature; bh=11gPwvbTzhcBYbo+vwPUgMj7SJcAk2yAyF7jDQyYrDQ=; b=fxbakgoPHmmvLNd1OOUohe0sX7JYQImjZkLV+joPGCpH6ytF4m1tAebk7pfEw89a1k 7RxfZSbCSbN/ciXE286svnXmPFyVrmLBnCCI+C5IOKruDeJsHr0KFIaIJhpgk+aTZa35 BkRTs1sUoi7+3ohbLa8/H1wL+UrSLVeIpUn3xk7pIfMNUc24ogYCCv8xrwWQQd3+K9nG cs0PE/MEOCPxIeJIfuk8SsGPPbBopnI2DBEu5vDA5yEAOpopThiHr39iK8JNjXwyIetj /NWY39uVYdf5nrmGG/5nWX5qo2Qw6kHWd9DoDwZQVcbtZiyun/JlW2XZ7Vv3EJQdagwQ olQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=L2ZWb2PT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w5si2534823edx.179.2020.07.09.11.23.56; Thu, 09 Jul 2020 11:24:18 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=L2ZWb2PT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726196AbgGISV2 (ORCPT + 99 others); Thu, 9 Jul 2020 14:21:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726163AbgGISV1 (ORCPT ); Thu, 9 Jul 2020 14:21:27 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D966C08C5DC for ; Thu, 9 Jul 2020 11:21:27 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id h22so3480657lji.9 for ; Thu, 09 Jul 2020 11:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=11gPwvbTzhcBYbo+vwPUgMj7SJcAk2yAyF7jDQyYrDQ=; b=L2ZWb2PTR19zzCqVEjb9Xmg361g/AUvEoxd18yaexoIIIvj4/Uzz4hmrNv96qSuZN/ sjxlAngpsGDhag86wEs9xg1hvFA7pr+jyFrHN0+OqdUCJ3IqRn5mCpLu8FW2nx6TNYVu GeNVqzhJX+JufNDuVCUt81ZikTeRMxc/LFTIE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=11gPwvbTzhcBYbo+vwPUgMj7SJcAk2yAyF7jDQyYrDQ=; b=QAZxDM54b8rWrM4KPKlfMNvWpm/pFJcK8LmgHakJwS+N/7uPyMrXayAtQiWMwbeY1P feLNryEWJ8N1GCVG1WIBxhqCvLRY0+SinuD2FyPr1KLkG5CsSDEi3s2tRh1RWD9UErDe HsrCr7cMItVkQ0lRJUC4cHk/+eF7exGr1nosUbOXMvdzkJydl+ByqjUuxu3e5mNAw232 c2CorE9+S1GePqjUm6QG7AV+fOf56DTqMuiwZn7EnLHs1Qo3b7WDyZADezxnELBHXaP8 8xRBPwH9p7oZQaw9D8qlgE1ynLqD0uSvXms5UzT1bgUoJOUL9HSKQpCr/uTrl6B2tFiB 4cUQ== X-Gm-Message-State: AOAM531yn9DvZUAJEM+vy0lxk9mAccVpHuPmRbyrjYAWrsLJd7Rt2SCu F4xDNPcb/EAXP6ncmA4NDy7zFQ== X-Received: by 2002:a2e:9b41:: with SMTP id o1mr25390840ljj.360.1594318885862; Thu, 09 Jul 2020 11:21:25 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id m9sm1212543lfb.5.2020.07.09.11.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 11:21:25 -0700 (PDT) References: <20200709115151.75829-1-lmb@cloudflare.com> User-agent: mu4e 1.1.0; emacs 26.3 From: Jakub Sitnicki To: Lorenz Bauer Cc: Shuah Khan , Alexei Starovoitov , Daniel Borkmann , kernel-team@cloudflare.com, Martin KaFai Lau , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH bpf] selftests: bpf: fix detach from sockmap tests In-reply-to: <20200709115151.75829-1-lmb@cloudflare.com> Date: Thu, 09 Jul 2020 20:21:24 +0200 Message-ID: <87eepka6sb.fsf@cloudflare.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 09, 2020 at 01:51 PM CEST, Lorenz Bauer wrote: > Fix sockmap tests which rely on old bpf_prog_dispatch behaviour. > In the first case, the tests check that detaching without giving > a program succeeds. Since these are not the desired semantics, > invert the condition. In the second case, the clean up code doesn't > supply the necessary program fds. > > Reported-by: Martin KaFai Lau > Signed-off-by: Lorenz Bauer > Fixes: bb0de3131f4c ("bpf: sockmap: Require attach_bpf_fd when detaching a program") > --- > tools/testing/selftests/bpf/test_maps.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c > index 6a12a0e01e07..754cf611723e 100644 > --- a/tools/testing/selftests/bpf/test_maps.c > +++ b/tools/testing/selftests/bpf/test_maps.c > @@ -789,19 +789,19 @@ static void test_sockmap(unsigned int tasks, void *data) > } > > err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_PARSER); > - if (err) { > + if (!err) { > printf("Failed empty parser prog detach\n"); > goto out_sockmap; > } > > err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_VERDICT); > - if (err) { > + if (!err) { > printf("Failed empty verdict prog detach\n"); > goto out_sockmap; > } > > err = bpf_prog_detach(fd, BPF_SK_MSG_VERDICT); > - if (err) { > + if (!err) { > printf("Failed empty msg verdict prog detach\n"); > goto out_sockmap; > } > @@ -1090,19 +1090,19 @@ static void test_sockmap(unsigned int tasks, void *data) > assert(status == 0); > } > > - err = bpf_prog_detach(map_fd_rx, __MAX_BPF_ATTACH_TYPE); > + err = bpf_prog_detach2(parse_prog, map_fd_rx, __MAX_BPF_ATTACH_TYPE); > if (!err) { > printf("Detached an invalid prog type.\n"); > goto out_sockmap; > } > > - err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_PARSER); > + err = bpf_prog_detach2(parse_prog, map_fd_rx, BPF_SK_SKB_STREAM_PARSER); > if (err) { > printf("Failed parser prog detach\n"); > goto out_sockmap; > } > > - err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_VERDICT); > + err = bpf_prog_detach2(verdict_prog, map_fd_rx, BPF_SK_SKB_STREAM_VERDICT); > if (err) { > printf("Failed parser prog detach\n"); > goto out_sockmap; Reviewed-by: Jakub Sitnicki