From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 DC9493F54C3 for ; Fri, 8 May 2026 14:53:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778252041; cv=none; b=fXXXZTvxYmGd9BGTpcTeICMmIx3Zjv5emXEsBvcezQiIzG1NzA1LmdhTa2PRBoY8wilH9gxQgpp8QA+KhG5I6RF0RIQJ1GE2kbVTsg1kBA+VwBb3WvDOSIV8FzkYAz2wSVW3uucuqWMfV7+lyWRPWU6lfnd+qdN+7/ZVY4nppUI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778252041; c=relaxed/simple; bh=Imh165vQ/goc4NSzO7qYhOZsclYavVhpTt2KZ2NZzGU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BUqiMkBy3spjTU9gDgf6qIYCwgjt3aCKw05id/KsHyJ7PYQOTTxgotDYGw8SFJWPEwOh63HtE4MGSFnYSw2XPTd8mba4QUobEe2PX3UeZFRnscV/DrfqtWIXLM+99G76sGCQcdTX3nvCmovyVxQKS8+zv7Y5tPjtkYfASvqYaso= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BoptMYnT; arc=none smtp.client-ip=209.85.210.54 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BoptMYnT" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-7dcd89701acso1879338a34.1 for ; Fri, 08 May 2026 07:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778252038; x=1778856838; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=p3yf/0EioU1Vkg8reIOYdru1mIh+jCd1PePb15OVlfI=; b=BoptMYnT3XYVkaWsOQkveikubxxOkLGFxXnwb1hS8/9I65AJRK41p0CtgtKfNESV4p dVYSRpA9+D0VBkGMClqYAKOdTiDSzEyz46ELu0h6BfjhK+GCi5xo1RADXLuCPsOLT0nl WDKEPhGSNckA5+qNB4gPwr/CGgZ6b3HufZpLsrGDfjz0jU/xzHBZreaQGArqSACe88oM DewzTbDpnIxMYuh9TMwFRUxsxX7AxWyXAgcvRTCxA3SatEYoq6o1qj1eebWsSSliKgAH 1ocsTbBi9Iff7ppNQEkuehCjM2XwOiapTpmb0a6HuqprytckWJDOCRZ7TLqjKPILzDFO 42sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778252038; x=1778856838; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=p3yf/0EioU1Vkg8reIOYdru1mIh+jCd1PePb15OVlfI=; b=dbUdxfszDQEtGdm8sbOw7/NReG900JBMWpL7vU/4JUU9/a51/giFaFYunFknf/WE5x lk6PLyZY749sLONB13SsugKBzplk7ndi/CkRzWQj4IzoIYfygsTDbnFutB6eqh2wAWsK XPYMehQGMyTXAGQl+8u2rNGJSE9TIRk4+gPyHlHAPZeiCBKdLqPf2uQwqEpszBoy0nre sdw3so6XFtrougfPh1NZDSRdJ3coaJSywpUsnNBoetqWmttirrKwjowyuYKCL7Yh3LdO LqXvDSI5T+zlg1Qugz/48O60HKIPuoV673IPOmbhSbfy+RVg5KZWguW1TWMb4hDOqQPW 4nqA== X-Forwarded-Encrypted: i=1; AFNElJ+HcKfJ8LckrltDnpPDVqOsj3Dmi8Spv1kVYPZmBnyrXDz0AriHA4eFt1B5b/9AviQTecIsosHRmRM4bSU=@vger.kernel.org X-Gm-Message-State: AOJu0YxtKBMd9a1Fsv79F3Dj88A4a0e8B0rXniQLPZDhbViAn8VT8bm5 42iviyRY2aVKfOkgrnkd7g+fNxPN/cejyNr45u1ckLb0XajgUfgPKNQx X-Gm-Gg: AeBDievVtVTgxz38gPGgOozPJVQDau1gPDbMWNc9rUXKsRopeKLSZJtT7u85CxQxr69 XGLjz/FFKk7seH90g+FnwQwzrEckc7Yi3ovNvxzMZlQTzBkbW+PwTOy/A7RiSnTSV7inmnkZAFl jDowt15tbLpzg9dAaZN/THr8UiXkYjD7+9XyDpcMpIN9P0xj3hsqzIjAcApSNrK/4NJMhXLHIoh UOCjrlmbSCyfxlleoYK8v4BKhMRbNc/Q8qKPtOsxRzFzeSYB9gbkKQvTLq5zxoAj75U5i+EH+5B 01ebsHjwzJJEvqqT60TlLKA66HqIdEd2KojR6N6dbPl6AxXq7k3TxROBlWAl3wSC2aknPpG8eC8 gbSQcCvWNm1+OHQT2TRkDpLM3LKBpwiDfGf3xidKGhHOhRwklSTW0J0HZXWwVnPdimIM9mZ78qo Bbe8j/3csfDOa4idJraBL6+H1qx8C2YSpze3K5q7QdIm9hb3fuPZpw X-Received: by 2002:a05:6820:3106:b0:696:924d:2fec with SMTP id 006d021491bc7-69998d5e1b6mr6025442eaf.56.1778252038577; Fri, 08 May 2026 07:53:58 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:52::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-69b25c76cc4sm1213298eaf.6.2026.05.08.07.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 07:53:58 -0700 (PDT) From: Daniel Zahka Date: Fri, 08 May 2026 07:53:44 -0700 Subject: [PATCH net-next 1/6] netdevsim: psp: reset spi on key rotation and check for exhaustion on alloc Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260508-nsim-psp-crypto-v1-1-4b50ed09b794@gmail.com> References: <20260508-nsim-psp-crypto-v1-0-4b50ed09b794@gmail.com> In-Reply-To: <20260508-nsim-psp-crypto-v1-0-4b50ed09b794@gmail.com> To: Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 The PSP spec states that the lower 31b of the SPI need to be non-zero. Though not in the spec, I think it is reasonable to reset the lower 31b of the spi space after a key rotation, and to also decline to generate session keys when the lower 31b saturate. Assisted-by: Claude:claude-opus-4.7 Signed-off-by: Daniel Zahka --- drivers/net/netdevsim/psp.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/netdevsim/psp.c b/drivers/net/netdevsim/psp.c index 6936ecb8173e..5073bda60883 100644 --- a/drivers/net/netdevsim/psp.c +++ b/drivers/net/netdevsim/psp.c @@ -132,14 +132,14 @@ nsim_rx_spi_alloc(struct psp_dev *psd, u32 version, struct netlink_ext_ack *extack) { struct netdevsim *ns = psd->drv_priv; - unsigned int new; int i; - new = ++ns->psp.spi & PSP_SPI_KEY_ID; - if (psd->generation & 1) - new |= PSP_SPI_KEY_PHASE; + if ((ns->psp.spi ^ (ns->psp.spi + 1)) & PSP_SPI_KEY_PHASE) { + NL_SET_ERR_MSG(extack, "SPI space exhausted"); + return -ENOSPC; + } - assoc->spi = cpu_to_be32(new); + assoc->spi = cpu_to_be32(++ns->psp.spi); assoc->key[0] = psd->generation; for (i = 1; i < PSP_MAX_KEY; i++) assoc->key[i] = ns->psp.spi + i; @@ -162,6 +162,10 @@ static int nsim_assoc_add(struct psp_dev *psd, struct psp_assoc *pas, static int nsim_key_rotate(struct psp_dev *psd, struct netlink_ext_ack *extack) { + struct netdevsim *ns = psd->drv_priv; + + ns->psp.spi = (ns->psp.spi & PSP_SPI_KEY_PHASE) ^ PSP_SPI_KEY_PHASE; + return 0; } -- 2.52.0