From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.198 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794927354; b=5oQSXtojrcgIHf0Dys4Mgt8zlMEW03zFCqT8PXWI6JaQ8wS9p1tiSxzqEwVWBlSp67WS AscPu+LvTxOgGf/52gW1O6oYUWGEgb+8fotuGntvU6krkVbqz2KGsia6PQ7i1ds2nnwM8 f/xfc12i4v2ESv6cSFclxyhXkpa41VsjXcrRnb0SDoeVLBAs/dejKGScNE4w75zX0QcMv p1z19tkIantIxytzH1VneTmAVWgGBFe1rDUy5GLuE4CVIEUu3WjnBNjjfPqolA7POiPKu yZyd/GLWmA4nXQ3xZFU3bAN/Xck+/dYlKW+srErToCn5wuH8pQNem5zJfmeGeY87hLw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794927354; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Received:Date:In-Reply-To:Mime-Version: References:X-Mailer:Message-ID:Subject:From:To:Cc:Content-Type; bh=j/02eyou4M60KpUrF8lLMNeinWTXVYjClptMJA9JWgg=; b=UwMN9yzpfnD+QAYyt3i2X8J/p0AJpkc9VIDpBQGVe1NrKTcbQ5gFfO4btYkJpoKIBOWB 11t9jIWwD4+QGIanwwDm66zhwucKm/Z2BS9VGY0BoN8pbUWKgS0kELc/JUXjPiq0tdMgK lyyD3epgRBmeiGL9yrn3JzdBeKou8euTRbzvbIFuVjrslIHxKjyhEBPK6W7+/OugYztBB 9IH8YC7FCFukUYXbPbMhdHzNqot157K0JI6C9XT7Ev+5wZGc+W4VFsMTaJJHjEfVOHw0m HlK97nmojKlWCjTN08xpdkSGgjQw83WUjpFZ7ussFfat8k4PW6xUpU9NXLAzcxyeyIw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--stani.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=A81waOJF; arc=none smtp.remote-ip=209.85.128.198 Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C294606A32F for ; Tue, 17 Nov 2026 14:55:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6C294606A32F Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--stani.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=A81waOJF Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-8b0cfe694c3so70577967b3.2 for ; Tue, 17 Nov 2026 06:55:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794927352; x=1795532152; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=j/02eyou4M60KpUrF8lLMNeinWTXVYjClptMJA9JWgg=; b=A81waOJFnF8DhHvqdyiRdXI0Dw3tyTQYB4xPCpoInj+PjW00fid38fbCYe+hZGAHMY cIuSyBOaWwrxGIbrnafniE0Kbyd1KLtuiKPUpEbCqHlqL45NoLLZyI+dKW1X44mVBSJ7 YSJ6PZE151Sx+HiCJqvj7+KNEGS8HjxoV/guLI8ENcVK+c2RnTrj1GswSBBb28ziDcvj X3+ecSHgN5r+HF04R4WFO4jtdx0+qRoUv3mkdvYP8WxLUKeU9VTJFHfa1krBCglr0kNn jQjFMxto+iM05icjKzMmktgUan8UXx/k6DZDaLP6JSR1qxWYbh/2cSiQsRlgengRQ+J/ pCeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794927352; x=1795532152; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=j/02eyou4M60KpUrF8lLMNeinWTXVYjClptMJA9JWgg=; b=R3x+QWy5zxTbqpxO5znqzJHbdcZguasRFlV4mtf9Wf5ceYtHoYptmnVw7Bwl/m1tzp J6X/GAls144L47JydwchYOjALnglKl2kzYggY7Z392SXaNNfSuDi+FiZUjbEJo8kpFvQ hDCv696Pk2k0pHQ5x5PGH0Wl+G/QOZqCRXKY5QGXZ2ehH33WijyZYiURUWQh8uf/hngg v9AAFruOBEi+kB5Lr76XxkzFZ70UkoSGzJZSCoWVcQCd8kavmJCPn2UyFCMHJ+SyzqNJ ntMKUnwni8FMeENPx8GYo+IaYZlVFCwIkNwW/Zlx7Id1nM1uQMudcaGE6RB6oUOrfiPT 5Tow== X-Gm-Message-State: APuU4Z+qoEqYkgUQYMrsv8UTkqMvO8Xw4Kty1ndnhrurQqZVAWDaBLtM JkZG/lCneRbVIFTySKSxgEzxclKneOIwbZaKqZs5w//SEopcyLIz3HTxiul2kYUwjOdRnSGwRdj U3g== X-Received: from ywzz28.prod.google.com ([2002:a05:690c:a71c:b0:8ab:3345:c617]) (user=stani job=prod-delivery.src-stubby-dispatcher) by 2002:a05:690c:e64b:b0:8b0:d9ff:4f74 with SMTP id 00721157ae682-8b4aa32e148mr55968407b3.42.1794927352263; Tue, 17 Nov 2026 06:55:52 -0800 (PST) Date: Tue, 17 Nov 2026 14:55:21 +0000 In-Reply-To: <20261117145522.1910636-1-stani@google.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261117145522.1910636-1-stani@google.com> X-Mailer: git-send-email 2.56.0.679.gc527c65306-goog Message-ID: <20261117145522.1910636-16-stani@google.com> Subject: [PATCH iwl-next 15/15] idpf: psp: add psp tx key registration From: Stan Iliev To: Tony Nguyen , Przemek Kitszel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Decotigny , Madhu Chittim , Emil Tantilov , Sridhar Samudrala , Brian Vazquez , Li Li , Alexander Lobakin , Daniel Zahka , Willem de Bruijn , Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Add idpf_psp_queue_insert(), which queues a TX key for insertion: - The key reserves a SADB entry, released if the insertion fails, or once its SA index was deleted. An SA index that couldn't be deleted keeps its SADB entry, as does the SA index of a late insertion reply until it is deleted. - New keys are refused with -ENOSPC once the SADB or the insert queue (IDPF_PSP_INS_QUEUE_MAX keys) is full. - The RX SPI allocation refuses the RX keys of new connections then, instead of failing their TX keys later. Signed-off-by: Stan Iliev --- drivers/net/ethernet/intel/idpf/idpf_psp.c | 62 +++++++++++++++++++ drivers/net/ethernet/intel/idpf/idpf_psp.h | 2 + .../net/ethernet/intel/idpf/idpf_psp_def.h | 4 ++ .../ethernet/intel/idpf/idpf_psp_virtchnl.c | 4 ++ 4 files changed, 72 insertions(+) diff --git a/drivers/net/ethernet/intel/idpf/idpf_psp.c b/drivers/net/ethernet/intel/idpf/idpf_psp.c index 95926ac99777..1dfec4177c43 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_psp.c +++ b/drivers/net/ethernet/intel/idpf/idpf_psp.c @@ -11,6 +11,9 @@ /* Delay before the PSP work sends again a request that couldn't be sent */ #define IDPF_PSP_RETRY_MSEC 100 +/* Maximum number of TX keys queued for insertion */ +#define IDPF_PSP_INS_QUEUE_MAX 1024 + /** * idpf_queue_psp_work - Queue the PSP work * @adapter: private data struct @@ -237,6 +240,8 @@ void idpf_psp_init(struct idpf_adapter *adapter) atomic_set(&psp->keys_inserted, 0); atomic_set(&psp->insert_errors, 0); atomic_set(&psp->insert_late, 0); + atomic_set(&psp->sadb_used, 0); + atomic_set(&psp->keys_refused, 0); WRITE_ONCE(psp->enabled, true); } @@ -436,6 +441,8 @@ void idpf_psp_tx_key_failed(struct idpf_adapter *adapter, struct idpf_psp_tx_key *key) { atomic_inc(&adapter->psp.insert_errors); + /* The SADB entry reserved for the key wasn't used */ + atomic_dec(&adapter->psp.sadb_used); spin_lock_bh(&key->lock); if (key->idx == IDPF_PSP_IDX_IN_PROG) @@ -443,6 +450,54 @@ void idpf_psp_tx_key_failed(struct idpf_adapter *adapter, spin_unlock_bh(&key->lock); } +/** + * idpf_psp_sadb_full - Check if new PSP keys must be refused + * @adapter: private data struct + * + * Return: true if the SADB or the insertion queue is full, false otherwise. + */ +static bool idpf_psp_sadb_full(struct idpf_adapter *adapter) +{ + /* sadb_entries fits in 26 bits, see idpf_psp_negotiate_caps() */ + return atomic_read(&adapter->psp.sadb_used) >= + (int)adapter->psp.sadb_entries || + READ_ONCE(adapter->psp.ins_queued) >= IDPF_PSP_INS_QUEUE_MAX; +} + +/** + * idpf_psp_queue_insert - Queue a TX key for insertion into the SADB + * @adapter: private data struct + * @key: the TX key, with its SPI and key set + * + * Reserve a SADB entry for the key and queue it for insertion. The PSP work + * inserts the queued keys, see idpf_send_insert_psp_keys(), and releases the + * reference taken on @key once the insertion completed. + * + * Return: 0 on success, -ENOSPC if the SADB or the insertion queue is full. + */ +int idpf_psp_queue_insert(struct idpf_adapter *adapter, + struct idpf_psp_tx_key *key) +{ + struct idpf_adapter_psp *psp = &adapter->psp; + + spin_lock_bh(&psp->insert_lock); + if (idpf_psp_sadb_full(adapter)) { + spin_unlock_bh(&psp->insert_lock); + atomic_inc(&psp->keys_refused); + return -ENOSPC; + } + + atomic_inc(&psp->sadb_used); + idpf_psp_tx_key_get(key); + list_add_tail(&key->ins_node, &psp->ins_list); + WRITE_ONCE(psp->ins_queued, psp->ins_queued + 1); + spin_unlock_bh(&psp->insert_lock); + + idpf_queue_psp_work(adapter); + + return 0; +} + /** * idpf_psp_set_config - Set the PSP device configuration * @psd: PSP device @@ -515,6 +570,13 @@ static int idpf_psp_rx_spi_alloc(struct psp_dev *psd, u32 version, return -EOPNOTSUPP; } + /* Refuse new connections whose TX key couldn't be inserted */ + if (idpf_psp_sadb_full(adapter)) { + atomic_inc(&adapter->psp.keys_refused); + NL_SET_ERR_MSG_MOD(extack, "PSP SADB full"); + return -ENOSPC; + } + err = idpf_send_allocate_psp_key(adapter, &rx_key); if (err) { NL_SET_ERR_MSG_MOD(extack, "Failed to allocate RX SPI and key"); diff --git a/drivers/net/ethernet/intel/idpf/idpf_psp.h b/drivers/net/ethernet/intel/idpf/idpf_psp.h index 0b2ae019b4a0..377cd4889f51 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_psp.h +++ b/drivers/net/ethernet/intel/idpf/idpf_psp.h @@ -59,6 +59,8 @@ void idpf_psp_tx_key_inserted(struct idpf_adapter *adapter, struct idpf_psp_tx_key *key, u32 saidx); void idpf_psp_tx_key_failed(struct idpf_adapter *adapter, struct idpf_psp_tx_key *key); +int idpf_psp_queue_insert(struct idpf_adapter *adapter, + struct idpf_psp_tx_key *key); #else /* !CONFIG_INET_PSP */ diff --git a/drivers/net/ethernet/intel/idpf/idpf_psp_def.h b/drivers/net/ethernet/intel/idpf/idpf_psp_def.h index 5af3347d9596..449bcb3c9ee2 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_psp_def.h +++ b/drivers/net/ethernet/intel/idpf/idpf_psp_def.h @@ -134,6 +134,7 @@ struct idpf_psp_rx_gen { * see idpf_psp_insert_timeout() * @ins_list: TX keys queued for insertion * @ins_queued: number of keys in @ins_list + * @sadb_used: SADB entries used, or reserved by keys queued for insertion * @keys_allocated: RX keys allocated * @keys_inserted: TX keys inserted into the SADB * @insert_errors: TX keys whose insertion failed @@ -141,6 +142,7 @@ struct idpf_psp_rx_gen { * @keys_removed: SA indexes deleted * @keys_lost: SA indexes that couldn't be deleted * @del_retries: SA indexes retried after a failed deletion request + * @keys_refused: RX and TX keys refused, SADB or insertion queue full * @psp_dev: the PSP device, see idpf_psp_register() * @caps: capabilities of @psp_dev */ @@ -172,6 +174,7 @@ struct idpf_adapter_psp { struct timer_list insert_timer; struct list_head ins_list; u32 ins_queued; + atomic_t sadb_used; atomic_t keys_allocated; atomic_t keys_inserted; atomic_t insert_errors; @@ -179,6 +182,7 @@ struct idpf_adapter_psp { atomic_t keys_removed; atomic_t keys_lost; atomic_t del_retries; + atomic_t keys_refused; struct psp_dev *psp_dev; struct psp_dev_caps caps; }; diff --git a/drivers/net/ethernet/intel/idpf/idpf_psp_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_psp_virtchnl.c index 480b56ce8164..0843f8e0ffea 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_psp_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_psp_virtchnl.c @@ -416,6 +416,7 @@ static void idpf_psp_delete_done(struct idpf_adapter *adapter, struct idpf_psp_tx_key *key, *tmp; atomic_add(removed, &adapter->psp.keys_removed); + atomic_sub(removed, &adapter->psp.sadb_used); if (lost) { atomic_add(lost, &adapter->psp.keys_lost); net_warn_ratelimited("%s: %u SA indexes couldn't be deleted\n", @@ -661,6 +662,8 @@ static void idpf_psp_insert_late(struct idpf_adapter *adapter, continue; atomic_inc(&adapter->psp.insert_late); + /* The SA index is used until it is deleted */ + atomic_inc(&adapter->psp.sadb_used); key = idpf_psp_tx_key_alloc(); if (!key) { atomic_inc(&adapter->psp.keys_lost); @@ -826,6 +829,7 @@ void idpf_psp_recv_late_reply(struct idpf_adapter *adapter, max(atomic_read(&adapter->psp.keys_lost), 0)); atomic_sub(deleted, &adapter->psp.keys_lost); atomic_add(deleted, &adapter->psp.keys_removed); + atomic_sub(deleted, &adapter->psp.sadb_used); break; case VIRTCHNL2_OP_PSP_INSERT_KEYS: if (idpf_is_psp_ena(adapter) && !ctlq_msg->chnl_retval) -- 2.56.0.679.gc527c65306-goog