From patchwork Fri Jan 12 15:20:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Sun X-Patchwork-Id: 187771 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp246261dyc; Fri, 12 Jan 2024 07:21:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbdwBkw57TG6Tjypy1VstpNSCZVGFfn8XNXjMHZnm8Pu6hw3qWqQRpF+J31qlIctM196iH X-Received: by 2002:a17:907:c90:b0:a2c:2071:8633 with SMTP id gi16-20020a1709070c9000b00a2c20718633mr602149ejc.97.1705072878433; Fri, 12 Jan 2024 07:21:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705072878; cv=none; d=google.com; s=arc-20160816; b=ijLMJ/UVgTpaSahHgHYWU1zXjmcMXj/ETxGyVacFBZHTPJyq0M+w1hjhB8cXYj6feR ifNwuLtd1LBi2ew8atNEp6Aonoq8bZl3xexfHMe9ftpDMwUXgH6LKxZ4fp4DbDPyDueu QTNK5KlX5AJyv6Uffe+4bfzgKr5g0fpTYPTY2GBCMo1zaijyQtsNsEuTefAF6VnP173m AF/eEErIqlR9Yeoq4wMgiSg12/aTk4ZZ7gN85XoA3hs5Kf2sQs3rCXDgN+j9a5WYRunz WD2eoxQSVkhvoEDGo7ilXN/yrd01ESY4qOdUlEMAUGrahUM6BnvN+ZlYY66lFUEio2lR g2NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8I1BW+/RBUVVGnyZE279+XSC+1yYL53hkEdjOLq0rlQ=; fh=RQUKi0OoUNnOdmX7GG/VntCPecOWDfBmtcySJCTKYZ8=; b=0Mznwy6dcnnlra4rn/gktENsTKzpppTWh3WwuVNmhS/V3GKMJUj5gyusW8HzAK7h/k AyCtRSTD1k0tgXGfm7aGw3O71ByF7gG+xhDn4jvqqYM9C/s4eqIteQkodWiY5fznyyv6 XNbHkzn+9x0KHhayZgpzwzGwm8nHxUCbD8hkXxvCbrHcjvGTmz83TQ62ihKipty0IwGe bIeBIwFdW+E0FgAd8lqMgtZ6J2qbRwCyLiHlmulHokCwMVmzA3v50G/i+2wTSMgc7P2w Zlacyy4nhnU+wBvqH9nrvbEESW5tpt6kezLWP2b7ERIukYbKu++9cNr8Q0G21AhCMTr1 3a2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GRWvsh33; spf=pass (google.com: domain of linux-kernel+bounces-24794-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24794-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id cf4-20020a170906b2c400b00a2335936fc9si1524413ejb.458.2024.01.12.07.21.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 07:21:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-24794-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GRWvsh33; spf=pass (google.com: domain of linux-kernel+bounces-24794-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-24794-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 076C71F2124B for ; Fri, 12 Jan 2024 15:21:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 24EB273167; Fri, 12 Jan 2024 15:20:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GRWvsh33" Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 163436DD1D; Fri, 12 Jan 2024 15:20:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-40e60e135a7so15708465e9.0; Fri, 12 Jan 2024 07:20:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705072839; x=1705677639; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8I1BW+/RBUVVGnyZE279+XSC+1yYL53hkEdjOLq0rlQ=; b=GRWvsh33wZpIViaLre+J5Q0UD0h+Dkag3Ufb2dDXi7TP7tswSqLbOKAbtEeVJEGzbA jEzacjDMqGg3sLODNX3nNfFHM/CCBzbF3mkHyTbytiF5uVaFVcO86kbhjUDOIW/rkB6s A56XdwCpi31kOy3GeTDShkcxhUYjFyXvjfdmNvlZtj9Gs63jDf7Jj9mI5x3TZ2OiL+D2 Ma1Wp1Qv+wZAszoC/YR3y/irIuwC0nY8AOn9WbLeIRoVut8MnPfW3o4Y3Fx63RBRZVE3 2LdInY0rZ0ubjR4jkWd78FTepAqe7lRvMAsd2p32q+qjBOt88TxMVPHrxS65tUc+1O39 0jig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705072839; x=1705677639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8I1BW+/RBUVVGnyZE279+XSC+1yYL53hkEdjOLq0rlQ=; b=sp1g9WMYXQFaFBIg/0KIFc/R4NkH8XIhgW1xqPSNTa8EMQSoR0NoHdQchhaYZM2NN5 Excp3mmB2Elkpyc1/vOQzemByLDKZWx3ksnyOc46ZN8Lu2hxP9a/9k0tuF0C1ZSglSt7 WFJHu9xQQbcmBRXdh0LsfU4PjuUD5ErXEAE41B1GFj53x+AhJR/4KweBOfFjeeLfBUma unE3VOZP8GEysV7QFY5PxAgqcqkKdBzHZ2VqxzzorBHU5pUCOigYsu5ykZWM/Zr23B70 JizuU7akSLtQM9hWFK812LBpcH9/iYbsz41i1idw2poN4uVysD24+B0xymEw6c9povY7 KGDg== X-Gm-Message-State: AOJu0Ywh3y3FmvLpAH6SfCKURuOqMpl9P83nZ1g7BZIrTS/FSEikWLUA ab46XwqA16Qq/vFLE5tvhgTtviPV1A== X-Received: by 2002:a05:600c:45cb:b0:40e:6455:7105 with SMTP id s11-20020a05600c45cb00b0040e64557105mr804945wmo.20.1705072838504; Fri, 12 Jan 2024 07:20:38 -0800 (PST) Received: from staff-net-cx-3510.intern.ethz.ch (2001-67c-10ec-5784-8000--16b.net6.ethz.ch. [2001:67c:10ec:5784:8000::16b]) by smtp.gmail.com with ESMTPSA id o23-20020a05600c511700b0040e4c1b0c14sm10157728wms.34.2024.01.12.07.20.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 12 Jan 2024 07:20:38 -0800 (PST) From: Hao Sun To: bpf@vger.kernel.org Cc: willemb@google.com, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, eddyz87@gmail.com, linux-kernel@vger.kernel.org, Hao Sun Subject: [PATCH v3 2/2] selftests/bpf: Add tests for alu on PTR_TO_FLOW_KEYS Date: Fri, 12 Jan 2024 16:20:11 +0100 Message-ID: <20240112152011.6264-2-sunhao.th@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240112152011.6264-1-sunhao.th@gmail.com> References: <20240112152011.6264-1-sunhao.th@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787898498358692288 X-GMAIL-MSGID: 1787898498358692288 Add two cases for PTR_TO_FLOW_KEYS alu. One for rejecting alu with variable offset, another for fixed offset. Signed-off-by: Hao Sun --- .../bpf/progs/verifier_value_illegal_alu.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c index 71814a753216..3bcccb4cbc85 100644 --- a/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c +++ b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c @@ -146,4 +146,40 @@ l0_%=: exit; \ : __clobber_all); } +SEC("flow_dissector") +__description("flow_keys illegal alu op with variable offset") +__failure __msg("R7 pointer arithmetic on flow_keys prohibited") +__naked void flow_keys_illegal_variable_offset_alu(void) +{ + asm volatile(" \ + r6 = r1; \ + r7 = *(u64*)(r6 + %[flow_keys_off]); \ + r8 = 8; \ + r8 /= 1; \ + r8 &= 8; \ + r7 += r8; \ + r0 = *(u64*)(r7 + 0); \ + exit; \ +" : + : __imm_const(flow_keys_off, offsetof(struct __sk_buff, flow_keys)) + : __clobber_all); +} + +SEC("flow_dissector") +__description("flow_keys valid alu op with fixed offset") +__success +__naked void flow_keys_legal_fixed_offset_alu(void) +{ + asm volatile(" \ + r6 = r1; \ + r7 = *(u64*)(r6 + %[flow_keys_off]); \ + r8 = 8; \ + r7 += r8; \ + r0 = *(u64*)(r7 + 0); \ + exit; \ +" : + : __imm_const(flow_keys_off, offsetof(struct __sk_buff, flow_keys)) + : __clobber_all); +} + char _license[] SEC("license") = "GPL";