From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 6C80D38E5C5 for ; Wed, 25 Feb 2026 10:03:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772013839; cv=none; b=CeT8oJfr7JRius0d5Ad3vrac4TAuftag2lYUd+aw/KjS+EpPbCO2NFpI4pDO9hLU7qcOL4TWRLU+QYMA3TzTq25PjK15eg6/ztxqPsBDi1ScTsXzW5zODu7KIQ45rjgas5pG4T/ujEi3ghYgg7BPdYuk61M6MjD2C6lVZ8w4HcY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772013839; c=relaxed/simple; bh=MlGwjzWpXwzqj1theVwJR7UUQV7kxnwLCrbDJttd5R4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=JWBs+AfitMZsZwNfZiD4TTNXvgVb45npC6puDuIOVe0Bene3oM6Tdx4aNUSc6zlFeahPJVK27oqk8BwD964G1qXItkMwsO0e8ZGy//hrn4IcW3JsLDHJoGfo7f06jCF8FbcoN4XBsmGGrJJJqqovZbOQLfV50cQ5LnvPNJjM8Qc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=aqSFo7u3; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=t9e1us5M; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aqSFo7u3"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="t9e1us5M" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772013837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pdDT+ULPxR7vs0Kn+FgSJEXLQt+Ky2Cw9evRXmYJ0ZA=; b=aqSFo7u3TPDOhVRiJEOHdInGecH73KkpYWLQhACNv6pTOshgNzf2sL/Ej0JkfGd1HzlvRM k/VsZdZ7o6GF650vXaC0WRVw9uQrAjjE5U7/Myn/NlbYE6u6vS6IfR490DsaUOtI2Anfos E2r/MRnxo1OINGwKxHPqK1rTDm2x6zU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-Bnp0kuzyMRyaKzpZN68LYg-1; Wed, 25 Feb 2026 05:03:56 -0500 X-MC-Unique: Bnp0kuzyMRyaKzpZN68LYg-1 X-Mimecast-MFC-AGG-ID: Bnp0kuzyMRyaKzpZN68LYg_1772013835 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4836cc0b38eso19303945e9.2 for ; Wed, 25 Feb 2026 02:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1772013835; x=1772618635; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=pdDT+ULPxR7vs0Kn+FgSJEXLQt+Ky2Cw9evRXmYJ0ZA=; b=t9e1us5MxjbgUPdNIDsBGADQj0ZVFf9J/6G1QtD40/FONFIhYhLEq8XZeAI6EBpuuL HG4ZYW00Jjki5sxFDOH8HvSNraEhcSQjD6vGK7Qhj9i9PwmcGcdYY0nY1pIZZPoiB45L 4zhg1z4CpAeN0Bz6XQylGboGXg9AWzBR2eoOT8XXAbJPJ8PuNrkdIqstqY67mTl+xVZP ot6FMAViBXxQFD1/hJrxSiqwnXnhytuP9sG7Y4w5fTLbnqtu+QKa0CuMmC52+3Zp7Jrh IoGgI5BCU2OWkIAQ1hzW26QfgqZKSJ8qCn1+J61aqjsI26M2v38jORrGdCKeUHqJuUas 4ByQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772013835; x=1772618635; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdDT+ULPxR7vs0Kn+FgSJEXLQt+Ky2Cw9evRXmYJ0ZA=; b=A6U+6SHBrOaPd0QQuuqu1/Z1BjXn7XC5OjpvfxPKd1jxseJ6Av151pqMW/gXW0BeVA P2t9V6H6IE0tiBaxMgyfK7GO4+/Imm0CQyTlgYRn35gISOH7PvK72v9Gz3vDUlIQQE6K d/MOQov82N09mPEpIb7pzG+GWsAao4EIeZV8Xb3KUmv5DqZ/1OjE9GEEWFilzik2p15O 56r24CHWVYOWYm0fjYQVNC0m8urQFuq1wY90y/xzSRH6mxWmQVWxPw8e3o+UgtvDgqvr lm7heOq/bEVX6qA7qlUCaL/aE+xh7dcu+MZl3sSKJeicH4t4vaChvOvHLpDUFUtvCHGT J1xw== X-Forwarded-Encrypted: i=1; AJvYcCUbtPeKaSmhFju1SnOmvnpyO3UxVeq/NelNOoUutRIYjXaIdrGRMx+cFwZLxZC9FxB20nm6gWk=@vger.kernel.org X-Gm-Message-State: AOJu0YxSmCIMetB6qYx95jOt5AeM1ZD7I1EJU2tYbgRkpSPsRsHV222p dIKKPAgTlD3KRHOaCf8oNn/wNCVQXzaERIJLCNcqFC84IDAsfempG+w6b8u1MR6LuTYKr3jAhYK 7unkPVdpI3weRDjV3xlZcPvq3/JfADyihQrfIOqJcDOqDJHOI5zcb0o/I7A== X-Gm-Gg: ATEYQzxa71I3RxEgx89rDp8uyaCHgFYwqPHEka895dkIcm8o8X7nBs5Z01f1Ti9n4dA t2+8bGlZwrr2Wc2JO6VuC/W91gEXLX93sMma7NAZyOoPC5gO2PDmaXbr+4cvCLKCXtnFO8rAxnp jaT2fLmI61Ydmvmi4d2jU1y2nXxuuZbxBjQhDVRYE09UGTc8tXGID35p4OHfbJn9EtYj5cJNdQ/ LKJ0Y4KuTvyq3C/1ZNWHp336ulBBjuLNS36PgKVDKLxEZwIm7T0/TuQ2iV+W1H9OM8fQaJCYSEU 1kP8TCQ1ep/3nuZ+dW12L9kUhpplGajBDOxayVjuhjP4XGDvtXdGCpC1yL6VLfxe9XPav8awdM8 HcFyn68sJk88ft3vz8xPwDk6UXVtCPdCQ6K/QHF7fH3MgUw== X-Received: by 2002:a05:600c:8b66:b0:483:6f7c:19f4 with SMTP id 5b1f17b1804b1-483a95ed6f3mr232787325e9.30.1772013834431; Wed, 25 Feb 2026 02:03:54 -0800 (PST) X-Received: by 2002:a05:600c:8b66:b0:483:6f7c:19f4 with SMTP id 5b1f17b1804b1-483a95ed6f3mr232786485e9.30.1772013833899; Wed, 25 Feb 2026 02:03:53 -0800 (PST) Received: from redhat.com (IGLD-80-230-79-166.inter.net.il. [80.230.79.166]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bd6f19f5sm143757215e9.1.2026.02.25.02.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 02:03:53 -0800 (PST) Date: Wed, 25 Feb 2026 05:03:50 -0500 From: "Michael S. Tsirkin" To: Srujana Challa Cc: netdev@vger.kernel.org, virtualization@lists.linux.dev, pabeni@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, ndabilpuram@marvell.com, kshankar@marvell.com, stable@vger.kernel.org Subject: Re: [PATCH net,v4,1/2] virtio_net: Improve RSS key size validation and use NETDEV_RSS_KEY_LEN Message-ID: <20260225050154-mutt-send-email-mst@kernel.org> References: <20260224065850.962826-1-schalla@marvell.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260224065850.962826-1-schalla@marvell.com> On Tue, Feb 24, 2026 at 12:28:49PM +0530, Srujana Challa wrote: > Replace hardcoded RSS max key size limit with NETDEV_RSS_KEY_LEN to > align with kernel's standard RSS key length. Add validation for RSS > key size against spec minimum (40 bytes) and driver maximum. When > validation fails, gracefully disable RSS features and continue > initialization rather than failing completely. > > Cc: stable@vger.kernel.org > Fixes: 3f7d9c1964fc ("virtio_net: Add hash_key_length check") > Signed-off-by: Srujana Challa --- should come here before changelog. > v3: > - Moved RSS key validation checks to virtnet_validate. > - Add fixes: tag and CC -stable > v4: > - Use NETDEV_RSS_KEY_LEN instead of type_max for the maximum rss key size. > --- > drivers/net/virtio_net.c | 34 ++++++++++++++++++++++++---------- > 1 file changed, 24 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index db88dcaefb20..eeefe8abc122 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -381,8 +381,6 @@ struct receive_queue { > struct xdp_buff **xsk_buffs; > }; > > -#define VIRTIO_NET_RSS_MAX_KEY_SIZE 40 > - > /* Control VQ buffers: protected by the rtnl lock */ > struct control_buf { > struct virtio_net_ctrl_hdr hdr; > @@ -486,7 +484,7 @@ struct virtnet_info { > > /* Must be last as it ends in a flexible-array member. */ > TRAILING_OVERLAP(struct virtio_net_rss_config_trailer, rss_trailer, hash_key_data, > - u8 rss_hash_key_data[VIRTIO_NET_RSS_MAX_KEY_SIZE]; > + u8 rss_hash_key_data[NETDEV_RSS_KEY_LEN]; > ); > }; > static_assert(offsetof(struct virtnet_info, rss_trailer.hash_key_data) == > @@ -6627,6 +6625,29 @@ static int virtnet_validate(struct virtio_device *vdev) > __virtio_clear_bit(vdev, VIRTIO_NET_F_STANDBY); > } > > + if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS) || > + virtio_has_feature(vdev, VIRTIO_NET_F_HASH_REPORT)) { > + u8 key_sz = virtio_cread8(vdev, > + offsetof(struct virtio_net_config, > + rss_max_key_size)); > + /* Spec requires at least 40 bytes */ > +#define VIRTIO_NET_RSS_MIN_KEY_SIZE 40 > + if (key_sz < VIRTIO_NET_RSS_MIN_KEY_SIZE) { > + dev_warn(&vdev->dev, > + "rss_max_key_size=%u is less than spec minimum %u, disabling RSS\n", > + key_sz, VIRTIO_NET_RSS_MIN_KEY_SIZE); > + __virtio_clear_bit(vdev, VIRTIO_NET_F_RSS); > + __virtio_clear_bit(vdev, VIRTIO_NET_F_HASH_REPORT); > + } > + if (key_sz > NETDEV_RSS_KEY_LEN) { > + dev_warn(&vdev->dev, > + "rss_max_key_size=%u exceeds driver limit %u, disabling RSS\n", > + key_sz, NETDEV_RSS_KEY_LEN); > + __virtio_clear_bit(vdev, VIRTIO_NET_F_RSS); > + __virtio_clear_bit(vdev, VIRTIO_NET_F_HASH_REPORT); you flipped the logic here and it makes no sense now. Did you test this path? So if device is powerful and supports a very big key size then... we disable the feature? how does this make sense? > + } > + } > + > return 0; > } > > @@ -6839,13 +6860,6 @@ 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; > - } > - > vi->rss_hash_types_supported = > virtio_cread32(vdev, offsetof(struct virtio_net_config, supported_hash_types)); > vi->rss_hash_types_supported &= > -- > 2.25.1