From patchwork Thu Dec 13 03:41:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1012495 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="WcjDyHN3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43FfcH2bpRz9s9G for ; Thu, 13 Dec 2018 14:41:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726720AbeLMDle (ORCPT ); Wed, 12 Dec 2018 22:41:34 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:42243 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726520AbeLMDld (ORCPT ); Wed, 12 Dec 2018 22:41:33 -0500 Received: by mail-qk1-f196.google.com with SMTP id 68so356658qke.9 for ; Wed, 12 Dec 2018 19:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2ZM4FSvOE07IKxRjoxHNQvJdVnFgA6BT95r/DuZwbE4=; b=WcjDyHN3H5x0Y1iaGCgsrKfh0qQZjaWheBafRxsrissLQhQQE5yqdk7hdp/MDR9CrV oVbR1e73UIvYU0MJouP+bh0JTR/5NlIjxDLTE6eKuaOsN3vXD4KRsuWA1V1Y1V7rnPl9 wj1JO1Y8WoSz+lEaKKeE0grvTbh92h+TLK2oTLIAA1Gp3VcmxiM5xvNzXBa8IE9YKBaG UAjXa4cFvL2P1VjCwytmfVqxFQfoxcU+9kn1j+O0vsly1p81NzHrHkvZUd0CRvEqp/Uc BdKA5E7xD1U4sENDwLv8gh4DrClK7xbzwn1PBBVR5PU1CJO4H6Cr/WnC1+4nvq4U9Fun PQ/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2ZM4FSvOE07IKxRjoxHNQvJdVnFgA6BT95r/DuZwbE4=; b=IWUyHIxvuRwGvBc5uaaFq3coAk5FVw8TLsV5otO5htScilxIkjsNyKznviGNIEYoCH kXZhmAwr03HxEAUUrI3C0XmHrfSBkZxZkMmQwpJcvL/nKcTsHNBVaCho7fUJjYwtEeEa nYlC5+jD7gGmnNf4ollB1FQKa13T+AjvpTV4l7vsxwSNxG6edXsTjl9meLIys14dT9/g gLbYx62IIw6+sZWRWQcJJOG/+wDyQ9klpxqepW066FobqbGHrybVJ1BMINr74aeSmwpR BplTiSFDNAInGyV21HV7D1d8QzkT0ioOUgw4EELcNyk0gRVP25pA1UbHSSwu1jkAIOzm KS8w== X-Gm-Message-State: AA+aEWYZoEjjeOElcFjcIDsQwllKjaiXVT8+3yMPwUMY/UcpNy537WWI l6o8Ec6WqgrnYA//MLk3gf9ceA== X-Google-Smtp-Source: AFSGD/X/CA96fE2E3Y6RDMWS0hOLW/VjN1SPxWDx23baSXvr0lIRpLdQc4GACpim1iQLN2R0y9qKtA== X-Received: by 2002:a37:a7c3:: with SMTP id q186mr21008566qke.89.1544672491923; Wed, 12 Dec 2018 19:41:31 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id v42sm412985qth.32.2018.12.12.19.41.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 19:41:31 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH bpf-next 1/3] selftests: bpf: add trivial JSET test Date: Wed, 12 Dec 2018 19:41:08 -0800 Message-Id: <20181213034110.24361-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181213034110.24361-1-jakub.kicinski@netronome.com> References: <20181213034110.24361-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We seem to have no JSET instruction test, and LLVM does not generate it at all, so let's add a simple hand-coded test to make sure JIT implementations are correct. Signed-off-by: Jakub Kicinski --- tools/testing/selftests/bpf/test_progs.c | 71 ++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 126fc624290d..d9b7197fdf94 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -1882,6 +1882,76 @@ static void test_queue_stack_map(int type) bpf_object__close(obj); } +static void test_jset(void) +{ + /* LLVM does not seem to support JSET-like instructions so by hand.. */ + static const struct bpf_insn insns[] = { + /* r0 = 0 */ + BPF_MOV64_IMM(BPF_REG_0, 0), + /* prep for direct packet access via r2 */ + BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, + offsetof(struct __sk_buff, data)), + BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, + offsetof(struct __sk_buff, data_end)), + BPF_MOV64_REG(BPF_REG_4, BPF_REG_2), + BPF_ALU64_IMM(BPF_ADD, BPF_REG_4, 8), + BPF_JMP_REG(BPF_JLE, BPF_REG_4, BPF_REG_3, 1), + BPF_EXIT_INSN(), + + BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_2, 0), + + /* reg, bit 63 or bit 0 set, taken */ + BPF_LD_IMM64(BPF_REG_8, 0x8000000000000001), + BPF_JMP_REG(BPF_JSET, BPF_REG_7, BPF_REG_8, 1), + BPF_EXIT_INSN(), + + /* reg, bit 62, not taken */ + BPF_LD_IMM64(BPF_REG_8, 0x4000000000000000), + BPF_JMP_REG(BPF_JSET, BPF_REG_7, BPF_REG_8, 1), + BPF_JMP_IMM(BPF_JA, 0, 0, 1), + BPF_EXIT_INSN(), + + /* imm, any bit set, taken */ + BPF_JMP_IMM(BPF_JSET, BPF_REG_7, -1, 1), + BPF_EXIT_INSN(), + + /* imm, bit 31 set, taken */ + BPF_JMP_IMM(BPF_JSET, BPF_REG_7, 0x80000000, 1), + BPF_EXIT_INSN(), + + /* all good - return r0 == 2 */ + BPF_MOV64_IMM(BPF_REG_0, 2), + BPF_EXIT_INSN(), + }; + __u32 duration = 0, retval; + __u64 data[8] = {}; + int err, prog_fd; + + prog_fd = bpf_load_program(BPF_PROG_TYPE_SCHED_CLS, insns, + ARRAY_SIZE(insns), "GPL", 0, NULL, 0); + if (CHECK(prog_fd < 0, "jset", "load fd %d errno %d\n", prog_fd, errno)) + return; + +#define TEST(val, name, res) \ + do { \ + data[0] = (val); \ + err = bpf_prog_test_run(prog_fd, 1, data, sizeof(data), \ + NULL, NULL, &retval, &duration); \ + CHECK(err || retval != (res), (name), \ + "err %d errno %d retval %d duration %d\n", \ + err, errno, retval, duration); \ + } while (0) + + TEST((1ULL << 63) | (1U << 31) | (1U << 0), "bit63+31+0", 2); + TEST((1ULL << 63) | (1U << 31), "bit63+31", 2); + TEST((1ULL << 31) | (1U << 0), "bit31+0", 2); + TEST((__u32)-1, "u32", 2); + TEST(~0x4000000000000000ULL, "~bit62", 2); + TEST(0, "zero", 0); + TEST(~0ULL, "all", 0); +#undef TEST +} + int main(void) { srand(time(NULL)); @@ -1909,6 +1979,7 @@ int main(void) test_reference_tracking(); test_queue_stack_map(QUEUE); test_queue_stack_map(STACK); + test_jset(); printf("Summary: %d PASSED, %d FAILED\n", pass_cnt, error_cnt); return error_cnt ? EXIT_FAILURE : EXIT_SUCCESS; From patchwork Thu Dec 13 03:41:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1012496 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="p80GP91K"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43FfcL1BVFz9s8r for ; Thu, 13 Dec 2018 14:41:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbeLMDlg (ORCPT ); Wed, 12 Dec 2018 22:41:36 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:44685 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726630AbeLMDle (ORCPT ); Wed, 12 Dec 2018 22:41:34 -0500 Received: by mail-qt1-f193.google.com with SMTP id n32so662989qte.11 for ; Wed, 12 Dec 2018 19:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JYIoO04KR1F+QvFv9YLV4SAq7lambyeK3zqtwyQkYwg=; b=p80GP91KWYmnEjTwgE33L9uk1EY7u89uaMVujlYsDPLI/4NSuwQlxxCw+AQxbJClB7 zWOpJ0A7Iq6K1K/Pejb8Ko5HUrHNClCn1Z2Suoot3zh+J0xaNh6Ic0GdhdQhbzuQRgSj onDKqZI0ip2ZAZxuyZ9Fn63Q9XbfGyhFub8BMc/NLhlRKE8EmqCE6z07HCwqHH7fJvTt 85q5/U9+iMVdALWdop8arcU8skXSFAWW28222Ru6n2EcUfjKRSCpxQCCpW0z6co7POM8 ymDBFxuId4AxJEjitJM0e+44IS1yvQ03bCPF7dyTEuOs7cwkSjux0GarhdAOm0NEhVRk yTFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JYIoO04KR1F+QvFv9YLV4SAq7lambyeK3zqtwyQkYwg=; b=Bcd6B+1So9UrSJgGbI4bO4cne4+Pl3pPh04jXezGbW2RDFfvrK2PT1wrot+gGOsLE+ ZRS5fD3BIPLjJHf4HvtopZT1lgDGo59muU38zcP+Ph3QOuCQ3oe4Nr8oAr6mzTsm5AGn pOPFqh+Fkinvgww8i/Db7DHrURsdT4NM57HZvCHDTKVfoTdSOQBTxBsspE/n0MWXCqh6 5tOPdj2QJuXpz2ThC1kL05AbuOIaOKygrj4EaSyVD5SKWObqehjWgKH0FHruAPCl0kFW jDjnNDhQfJM0V/xqhwaGmcpmWVtvu9/O+dDUbHcpLycVHvRMA+cD2lCji8S2YAHeDraY F+WA== X-Gm-Message-State: AA+aEWYDOIPCOmfq2xbTT5Rq3A7zwo/3q833rVjSoGMlXnSY6hOsdsm2 ZkaR7It3Tuf+LlGshTm1Kqwu2Q== X-Google-Smtp-Source: AFSGD/UOwA7T1OnnT/Yn/3xOcXuOjL6Qxlk12WIPiRNAXnrXxZckwH4ssKF9u22kmASGqIyPTRQsxQ== X-Received: by 2002:a0c:81b5:: with SMTP id 50mr21713856qvd.166.1544672493292; Wed, 12 Dec 2018 19:41:33 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id v42sm412985qth.32.2018.12.12.19.41.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 19:41:32 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH bpf-next 2/3] bpf: verifier: teach the verifier to reason about the BPF_JSET instruction Date: Wed, 12 Dec 2018 19:41:09 -0800 Message-Id: <20181213034110.24361-3-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181213034110.24361-1-jakub.kicinski@netronome.com> References: <20181213034110.24361-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some JITs (nfp) try to optimize code on their own. It could make sense in case of BPF_JSET instruction which is currently not interpreted by the verifier, meaning for instance that dead could would not be detected if it was under BPF_JSET branch. Teach the verifier basics of BPF_JSET, JIT optimizations will be removed shortly. Signed-off-by: Jakub Kicinski Reviewed-by: Jiong Wang Acked-by: Edward Cree --- kernel/bpf/verifier.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 8b511a4fe84a..50bb45aa4f26 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3788,6 +3788,12 @@ static int is_branch_taken(struct bpf_reg_state *reg, u64 val, u8 opcode) if (tnum_is_const(reg->var_off)) return !tnum_equals_const(reg->var_off, val); break; + case BPF_JSET: + if ((~reg->var_off.mask & reg->var_off.value) & val) + return 1; + if (!((reg->var_off.mask | reg->var_off.value) & val)) + return 0; + break; case BPF_JGT: if (reg->umin_value > val) return 1; @@ -3872,6 +3878,13 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg, */ __mark_reg_known(false_reg, val); break; + case BPF_JSET: + false_reg->var_off = tnum_and(false_reg->var_off, + tnum_const(~val)); + if (is_power_of_2(val)) + true_reg->var_off = tnum_or(true_reg->var_off, + tnum_const(val)); + break; case BPF_JGT: false_reg->umax_value = min(false_reg->umax_value, val); true_reg->umin_value = max(true_reg->umin_value, val + 1); @@ -3944,6 +3957,13 @@ static void reg_set_min_max_inv(struct bpf_reg_state *true_reg, */ __mark_reg_known(false_reg, val); break; + case BPF_JSET: + false_reg->var_off = tnum_and(false_reg->var_off, + tnum_const(~val)); + if (is_power_of_2(val)) + true_reg->var_off = tnum_or(true_reg->var_off, + tnum_const(val)); + break; case BPF_JGT: true_reg->umax_value = min(true_reg->umax_value, val - 1); false_reg->umin_value = max(false_reg->umin_value, val); From patchwork Thu Dec 13 03:41:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1012497 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="C7X5HxYq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43FfcR63Glz9s9G for ; Thu, 13 Dec 2018 14:41:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726826AbeLMDlk (ORCPT ); Wed, 12 Dec 2018 22:41:40 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:42243 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726749AbeLMDlf (ORCPT ); Wed, 12 Dec 2018 22:41:35 -0500 Received: by mail-qk1-f193.google.com with SMTP id 68so356696qke.9 for ; Wed, 12 Dec 2018 19:41:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dDncH11YoM4HxKBtBi+I799ml+22luYvIUG8dWQHTMI=; b=C7X5HxYq3UM62RVNRo3Ba8dvOBF6Jf5kj2HrNwFtNIsnhFnl8Q/t5mEfJCrBz6nxwV xUVc4/aLMQVChrS3ZRBFjOG0SAMI1n4D7P0ctKweBrK/6+qGBicb5glAL8IjvNKz4sfh 3Iak/lIVAHFW5S1sGWR3yP69cZZd4MFlq1Ko5/aQe0yBmVHAZaRzWqYXvxkbWAfVsdZH 4OFOQTF9k5fAEdRER/3ucvgI3SxDp3Sj4HZ/tags9HAP7/S/a2u6E9/8mwGnmtYZJZ35 hmfFhaTSOD9/uMwdibEsnE9SL+rWNzwXlpNZWCGsEvEgNTthYvdU4PWj3Z3IRszwvKms MPZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dDncH11YoM4HxKBtBi+I799ml+22luYvIUG8dWQHTMI=; b=sXxIWvYkvpMzwzVoB+is6M+azpIPxHMnQREdLHWMxOdS+e2sad0Qu1LxUkueK7nZIi WPoZ3mZxj00T9ToDPJt4NhWj+8gOEA+349UaBIwCbDashnFCL67DGnQ+j18RidRoQ4vq Hh/HsKimcTF6j/CgNrwVlr0tp1a85CySjBmsPk7ice0+nMm4HmPCKMatZ/NuyjcjZVYr xjiadgg22ar3ZR77fnSxTBegQGb+Fvt7R803gi0+fstcRhXT0+MI98do2m2AKnvbWNoz lxRKPmv48fF3pInJQZL2zUR1w8mLwx68/4LWTsZTgfAklpxAWqjXgWi7qP9TRgHC+GZT /S0w== X-Gm-Message-State: AA+aEWadjb5u3gPqyzVL+EwzarTB6EDx1IrrW+GJJVCc1heoiXxlOdCG XvQUCNPNdysOylPXvGiEmACjcw== X-Google-Smtp-Source: AFSGD/WqblB1VUWeCuPfgHOfEHX24415Nbpv2SI7EvfpH3EWnlgx7v4RdjQ1MDnyqOfD0QX5rcDZpQ== X-Received: by 2002:a37:bcc1:: with SMTP id m184mr20034795qkf.286.1544672494596; Wed, 12 Dec 2018 19:41:34 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id v42sm412985qth.32.2018.12.12.19.41.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 19:41:34 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH bpf-next 3/3] selftests: bpf: verifier: add tests for JSET interpretation Date: Wed, 12 Dec 2018 19:41:10 -0800 Message-Id: <20181213034110.24361-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181213034110.24361-1-jakub.kicinski@netronome.com> References: <20181213034110.24361-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Validate that the verifier reasons correctly about the bounds and removes dead code based on results of JSET instruction. Signed-off-by: Jakub Kicinski --- tools/testing/selftests/bpf/test_verifier.c | 96 +++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index a08c67c8767e..69f4415f0169 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -14099,6 +14099,102 @@ static struct bpf_test tests[] = { .errstr_unpriv = "R1 leaks addr", .result = REJECT, }, + { + "jset: known const compare", + .insns = { + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 1, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_EXIT_INSN(), + }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .retval_unpriv = 1, + .result_unpriv = ACCEPT, + .retval = 1, + .result = ACCEPT, + }, + { + "jset: known const compare bad", + .insns = { + BPF_MOV64_IMM(BPF_REG_0, 0), + BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 1, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_EXIT_INSN(), + }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .errstr_unpriv = "!read_ok", + .result_unpriv = REJECT, + .errstr = "!read_ok", + .result = REJECT, + }, + { + "jset: unknown const compare taken", + .insns = { + BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, + BPF_FUNC_get_prandom_u32), + BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 1, 1), + BPF_JMP_IMM(BPF_JA, 0, 0, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_EXIT_INSN(), + }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .errstr_unpriv = "!read_ok", + .result_unpriv = REJECT, + .errstr = "!read_ok", + .result = REJECT, + }, + { + "jset: unknown const compare not taken", + .insns = { + BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, + BPF_FUNC_get_prandom_u32), + BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 1, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_EXIT_INSN(), + }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .errstr_unpriv = "!read_ok", + .result_unpriv = REJECT, + .errstr = "!read_ok", + .result = REJECT, + }, + { + "jset: half-known const compare", + .insns = { + BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, + BPF_FUNC_get_prandom_u32), + BPF_ALU64_IMM(BPF_OR, BPF_REG_0, 2), + BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 3, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_MOV64_IMM(BPF_REG_0, 0), + BPF_EXIT_INSN(), + }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .result_unpriv = ACCEPT, + .result = ACCEPT, + }, + { + "jset: range", + .insns = { + BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, + BPF_FUNC_get_prandom_u32), + BPF_MOV64_REG(BPF_REG_1, BPF_REG_0), + BPF_MOV64_IMM(BPF_REG_0, 0), + BPF_ALU64_IMM(BPF_AND, BPF_REG_1, 0xff), + BPF_JMP_IMM(BPF_JSET, BPF_REG_1, 0xf0, 3), + BPF_JMP_IMM(BPF_JLT, BPF_REG_1, 0x10, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_EXIT_INSN(), + BPF_JMP_IMM(BPF_JSET, BPF_REG_1, 0x10, 1), + BPF_EXIT_INSN(), + BPF_JMP_IMM(BPF_JGE, BPF_REG_1, 0x10, 1), + BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0), + BPF_EXIT_INSN(), + }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .result_unpriv = ACCEPT, + .result = ACCEPT, + }, }; static int probe_filter_length(const struct bpf_insn *fp)