From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1764F215783; Thu, 12 Dec 2024 17:47:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025678; cv=none; b=O7DMaI8xp4yUrOzvqDd+gXvwakMRjVdniAfs/2YEFjo2OvrV/fIRO0Hz5Pai2Y9SLYWi02ayoFdHeShWA9pqbsyMPKghQSejbSxSYbI/3W1ofzJf6+/OiprsymzasYDDZK2ww93OavCUtDvUFQs+rlHdp8bBjKEf//FifPp8qbc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025678; c=relaxed/simple; bh=XTQg/HJ9u97Do0MWMUhgUPen+QLhujZdbTOSCPWRW6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Wr0M9bvY9LW32H1Q37MR3oct2HBP+GfP678NEB/PZvk36Y6+1Gi8fByR8WfIg0Dnx2EdtUI1KW4wL+SMAPVJPE1/HDx4jNKrZSHxBfeK5fC1ZWejwZwU+Npt47tB4C4Q6FRkw8A4szbZod88CVWdxpRh9RvZJOYuSWaiB0n4iMk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y5E3kxNh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y5E3kxNh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90CE2C4CECE; Thu, 12 Dec 2024 17:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734025678; bh=XTQg/HJ9u97Do0MWMUhgUPen+QLhujZdbTOSCPWRW6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y5E3kxNhzq+Gc2nug7FBfZtKGV5MA0NlmFbuaDhrJRSMyccMJIxNblfdrSL/NRzgi jW9DeCbLNApVABa6ihnu6cNK1kJGYQs62To/btkZL3CUN9qsWnFOnnHeuRCz97kLcs paYhxy4MXuhkgFEC/2EBYSsfS1mPBz8EEh6TziDo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Daniel Borkmann , Hou Tao , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.4 251/321] bpf: Handle BPF_EXIST and BPF_NOEXIST for LPM trie Date: Thu, 12 Dec 2024 16:02:49 +0100 Message-ID: <20241212144239.885545206@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144229.291682835@linuxfoundation.org> References: <20241212144229.291682835@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hou Tao [ Upstream commit eae6a075e9537dd69891cf77ca5a88fa8a28b4a1 ] Add the currently missing handling for the BPF_EXIST and BPF_NOEXIST flags. These flags can be specified by users and are relevant since LPM trie supports exact matches during update. Fixes: b95a5c4db09b ("bpf: add a longest prefix match trie map implementation") Reviewed-by: Toke Høiland-Jørgensen Acked-by: Daniel Borkmann Signed-off-by: Hou Tao Link: https://lore.kernel.org/r/20241206110622.1161752-4-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- kernel/bpf/lpm_trie.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c index c372be6df264e..1f92d531b4466 100644 --- a/kernel/bpf/lpm_trie.c +++ b/kernel/bpf/lpm_trie.c @@ -364,6 +364,10 @@ static int trie_update_elem(struct bpf_map *map, * simply assign the @new_node to that slot and be done. */ if (!node) { + if (flags == BPF_EXIST) { + ret = -ENOENT; + goto out; + } rcu_assign_pointer(*slot, new_node); goto out; } @@ -372,18 +376,31 @@ static int trie_update_elem(struct bpf_map *map, * which already has the correct data array set. */ if (node->prefixlen == matchlen) { + if (!(node->flags & LPM_TREE_NODE_FLAG_IM)) { + if (flags == BPF_NOEXIST) { + ret = -EEXIST; + goto out; + } + trie->n_entries--; + } else if (flags == BPF_EXIST) { + ret = -ENOENT; + goto out; + } + new_node->child[0] = node->child[0]; new_node->child[1] = node->child[1]; - if (!(node->flags & LPM_TREE_NODE_FLAG_IM)) - trie->n_entries--; - rcu_assign_pointer(*slot, new_node); kfree_rcu(node, rcu); goto out; } + if (flags == BPF_EXIST) { + ret = -ENOENT; + goto out; + } + /* If the new node matches the prefix completely, it must be inserted * as an ancestor. Simply insert it between @node and *@slot. */ -- 2.43.0