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 D290C3CF680 for ; Wed, 8 Apr 2026 13:43:53 +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=1775655833; cv=none; b=LyBNL0/dCmXUlf2eXHh0IQRnqGINcBGYnYw+B9lwqIw7pBqZ/a7E9ykpbZkGBwgGAGALCUJ0UFAzXOgyVEvgsLwcSfxcouJ4vtP4JHxtu+Zgmyq6L2w0XExkS3oknfFPWhi+ElrIv22T2b+eu9SFL0XhCxx7HwXQqigDuLB9iB0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775655833; c=relaxed/simple; bh=6NFuAVVstvuhmLNvomRh+nicaQG+nTFQhtcM1JgVmFM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DQ/F0Qcl7YimR6x68IUueIwFBsNt25zaXtCnAYLbk1XmUauh6yt6EJAJ7LQV9GefKXkplfKPMG/dnP66dyB4Pcon2fMwGHmoiIKoCFEmqB1qn0C8gGsrhA3XtRWXYfGFO3AcxvMsogX5WMjPbyEQqnLoS9pL7kOo1xJmZFoRB6o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iH/4wx6T; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iH/4wx6T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D14BEC19421; Wed, 8 Apr 2026 13:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775655833; bh=6NFuAVVstvuhmLNvomRh+nicaQG+nTFQhtcM1JgVmFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iH/4wx6TstHN3UzywIL7XQ3jPHub0nfoJO1Hyrc68NK7wlg4zc5Ru2rCC8hdE5UkH o/vxjm2Ee5FJw7csoUNjekxdv2C9tZD21i55330VWapcY99th8IZXBNhBJGAd7oaOb Y66zJvWhIxl6hFq9o03lXLLYweLUeACZaV5Namuq5iwzzgTjuc+Fgtvrn4UF3xC3MZ tpswMYwtqhi7uY4pmLZQEW46yY/ndke+skSohoci/uFuyyiJRVxQ1GTJZBr33FmLBB Ka/W7MrahpgfXuj6ajJOJR0ifRcbPo/VXh1BzpnoSfAW5sS+SWgr5isc2tE5wj29hj BWI+KOPnb9kdQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Srujana Challa , "Michael S. Tsirkin" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] virtio_net: clamp rss_max_key_size to NETDEV_RSS_KEY_LEN Date: Wed, 8 Apr 2026 09:43:51 -0400 Message-ID: <20260408134351.1100654-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026040856-ploy-antiviral-fecc@gregkh> References: <2026040856-ploy-antiviral-fecc@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Srujana Challa [ Upstream commit b4e5f04c58a29c499faa85d12952ca9a4faf1cb9 ] rss_max_key_size in the virtio spec is the maximum key size supported by the device, not a mandatory size the driver must use. Also the value 40 is a spec minimum, not a spec maximum. The current code rejects RSS and can fail probe when the device reports a larger rss_max_key_size than the driver buffer limit. Instead, clamp the effective key length to min(device rss_max_key_size, NETDEV_RSS_KEY_LEN) and keep RSS enabled. This keeps probe working on devices that advertise larger maximum key sizes while respecting the netdev RSS key buffer size limit. Fixes: 3f7d9c1964fc ("virtio_net: Add hash_key_length check") Cc: stable@vger.kernel.org Signed-off-by: Srujana Challa Acked-by: Michael S. Tsirkin Link: https://patch.msgid.link/20260326142344.1171317-1-schalla@marvell.com Signed-off-by: Jakub Kicinski [ changed clamp target from NETDEV_RSS_KEY_LEN to VIRTIO_NET_RSS_MAX_KEY_SIZE ] Signed-off-by: Sasha Levin --- drivers/net/virtio_net.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9ee3465082c5a..0fcd662d15d51 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3796,6 +3796,7 @@ static int virtnet_probe(struct virtio_device *vdev) struct virtnet_info *vi; u16 max_queue_pairs; int mtu = 0; + u16 key_sz; /* Find if host supports multiqueue/rss virtio_net device */ max_queue_pairs = 1; @@ -3915,14 +3916,13 @@ static int virtnet_probe(struct virtio_device *vdev) } if (vi->has_rss || vi->has_rss_hash_report) { - vi->rss_key_size = - virtio_cread8(vdev, offsetof(struct virtio_net_config, rss_max_key_size)); - if (vi->rss_key_size > VIRTIO_NET_RSS_MAX_KEY_SIZE) { - dev_err(&vdev->dev, "rss_max_key_size=%u exceeds the limit %u.\n", - vi->rss_key_size, VIRTIO_NET_RSS_MAX_KEY_SIZE); - err = -EINVAL; - goto free; - } + key_sz = virtio_cread8(vdev, offsetof(struct virtio_net_config, rss_max_key_size)); + + vi->rss_key_size = min_t(u16, key_sz, VIRTIO_NET_RSS_MAX_KEY_SIZE); + if (key_sz > vi->rss_key_size) + dev_warn(&vdev->dev, + "rss_max_key_size=%u exceeds driver limit %u, clamping\n", + key_sz, vi->rss_key_size); vi->rss_hash_types_supported = virtio_cread32(vdev, offsetof(struct virtio_net_config, supported_hash_types)); -- 2.53.0