From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 02BF818DB24 for ; Thu, 20 Mar 2025 05:36:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742448973; cv=none; b=VHfxe+ut2AfcmPVt71Kqpa6eMEH3MgvfKLYBTIQ61EZ4dnn9bIQbXF08Z0u+1z7lE7p2M4UIWIx6qKtlVWtJFogR11vGar0vGYPuLqV3DiE+EpRPG8WQj+eOtJE/UmVdBsOWRCpltYBXvTsFp6kyXV9bAO6m8+/AqZlU4PMuE98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742448973; c=relaxed/simple; bh=pykQWiiCufg9UKjHIJTQCkNZCnZqG7otAUgzUYRGDng=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=hFGPw81dvq6CC2drGh/1k2f8+wkDetyVbyDDaus5ggzJvFJcViefUplJrF3ODotJMeLFE01czctt3qUakK3mxf5Vq0o4DEivJjR7xfmV8QCFCZIte99kQE0DvLqOcxxxOHLs92ZmT1tEk3KaXDCVgxLl68JIhiPaj/SJOT6pwCI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=ELsMzPGe; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="ELsMzPGe" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-225a28a511eso5720665ad.1 for ; Wed, 19 Mar 2025 22:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742448971; x=1743053771; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=RbGnsTCcev6pYDQx9u/sGBjWd1vcflm1xvB7Aplfx1U=; b=ELsMzPGelMHj6/3W0OmjnVamtZoCueZhxniH/FycdsvGNvtMacSkxtIvLcxcvpWU7u 9g6H0AQjfHgkobaIAS4L9OoQGbl/4wOilBT/4hGQZzY2M2S6J5pGcCW/sHJb3Ea564kd AY8vM1k4MpgRCZIl5enUsvH5No2C/IrAkaaMbK8kRqRwzTafydcYPPcxEt2JDP66psVQ fyLq2LwlRXX/c0fpxqu7Yj3/QlI788wiKjJ/1dMugi6N3K0+kv9+zkx+ux92k6JdfFvF 0vzJKRIEVDGdBwFFT3Dka8Hvi2N3wtfA96KtruB/AB0XUoHLJ/WqwkKzqLi0BH/OABZL DtNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742448971; x=1743053771; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RbGnsTCcev6pYDQx9u/sGBjWd1vcflm1xvB7Aplfx1U=; b=WiSY8SuZtMuKGSx4k8GuVpdKa9a9hvIcd+zNk1Gjk4o1R383UwwJg1ywBxsP01yich aGkAjRbYc/x4cyr9l4+lO5LeBbpoplKOQl8HwSuNZW6U5n4lZqw2zgPKqm/d4e6WKLW7 ibbxBNMGktPEzD+D8Cq4HQo2YXe9S4jCARyzMMNdUDFzWbP8iQm14Cr22YHsh8PecaBw issiM+dcYQpeTA4XZxEqqpMwwnsDyM0nz+jRTNS8aRoe60iKtsnJD5Mkijnp3+PLhMLL NQ4vkSOqyjE2Rdcfgd1bxuZqtEDYhBkXbBL6AeubW6m5AOHN56KNe/EX+rnsHccUUneJ XpNg== X-Forwarded-Encrypted: i=1; AJvYcCVKJJ/H7md99QUkoWMv16JPCZCxBx3f+f0ZI7Cr22LnerCujI8uTtASCrSS6Kv3TCgV7zE0D52KzVv87zk=@vger.kernel.org X-Gm-Message-State: AOJu0YxLN8f4KSuBDE7v1ku5mP8p7J31zKfLJlyXLrl33OihBAI7iAqn 6uQno+qX4EHAthw4CVFq/99yJ5oRJNkYplgCDX5/WHU16y7GCMXsWFYq83+OIsE= X-Gm-Gg: ASbGncuNsYBoDMwTyPX1XSJc1EYrWYzB8eyFFlMvRhJJRcdxQ3IRzNG4s0qcLPNqU8K 6mIjzc1SzsRNus8knV5JWKxIJB7WWnWV2sHBQImd4l7xUxtYyuu0ieqBRjiLk9VisTfQL9aWYBm /2f8Mvy9NhYWyqUHgC5BXtBZ0fErknLZy2uHdrIDPFNDWCf1DXW1wfu35/K5dr9S8CEHOTWa8xq /p5qfccajQTNfTHgi3zhIdVdC8bDjgu7K2RJpKMUkgvhosbhNUlF87VRlfAjO2L+XZovDsH5VdN qCmAS4JV2Nh33FaoB0TU+vIYentaBgOHX+xNYpnQ8Iljwvx7/2bthTr6oA== X-Google-Smtp-Source: AGHT+IErhQqYwyVfjSSFE49cyYQSwTfv6bxLT2Cv1e2uEHao33rhRGfa+oAbBrQwdclN/m7vUf+GeA== X-Received: by 2002:a17:902:ce0d:b0:224:1eab:97b2 with SMTP id d9443c01a7336-22649ccca04mr93156685ad.53.1742448971138; Wed, 19 Mar 2025 22:36:11 -0700 (PDT) Received: from [157.82.207.107] ([157.82.207.107]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6ba721esm125565465ad.149.2025.03.19.22.36.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Mar 2025 22:36:10 -0700 (PDT) Message-ID: <83a5ab7b-7b29-413e-a854-31c7893f3c4a@daynix.com> Date: Thu, 20 Mar 2025 14:36:06 +0900 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next 3/4] virtio_net: Use new RSS config structs To: Jason Wang Cc: "Michael S. Tsirkin" , Xuan Zhuo , =?UTF-8?Q?Eugenio_P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Melnychenko , Joe Damato , Philo Lu , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devel@daynix.com References: <20250318-virtio-v1-0-344caf336ddd@daynix.com> <20250318-virtio-v1-3-344caf336ddd@daynix.com> Content-Language: en-US From: Akihiko Odaki In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025/03/20 10:50, Jason Wang wrote: > On Wed, Mar 19, 2025 at 12:48 PM Akihiko Odaki wrote: >> >> On 2025/03/19 10:43, Jason Wang wrote: >>> On Tue, Mar 18, 2025 at 5:57 PM Akihiko Odaki wrote: >>>> >>>> The new RSS configuration structures allow easily constructing data for >>>> VIRTIO_NET_CTRL_MQ_RSS_CONFIG as they strictly follow the order of data >>>> for the command. >>>> >>>> Signed-off-by: Akihiko Odaki >>>> --- >>>> drivers/net/virtio_net.c | 117 +++++++++++++++++------------------------------ >>>> 1 file changed, 43 insertions(+), 74 deletions(-) >>>> >>>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c >>>> index d1ed544ba03a..4153a0a5f278 100644 >>>> --- a/drivers/net/virtio_net.c >>>> +++ b/drivers/net/virtio_net.c >>>> @@ -360,24 +360,7 @@ struct receive_queue { >>>> struct xdp_buff **xsk_buffs; >>>> }; >>>> >>>> -/* This structure can contain rss message with maximum settings for indirection table and keysize >>>> - * Note, that default structure that describes RSS configuration virtio_net_rss_config >>>> - * contains same info but can't handle table values. >>>> - * In any case, structure would be passed to virtio hw through sg_buf split by parts >>>> - * because table sizes may be differ according to the device configuration. >>>> - */ >>>> #define VIRTIO_NET_RSS_MAX_KEY_SIZE 40 >>>> -struct virtio_net_ctrl_rss { >>>> - __le32 hash_types; >>>> - __le16 indirection_table_mask; >>>> - __le16 unclassified_queue; >>>> - __le16 hash_cfg_reserved; /* for HASH_CONFIG (see virtio_net_hash_config for details) */ >>>> - __le16 max_tx_vq; >>>> - u8 hash_key_length; >>>> - u8 key[VIRTIO_NET_RSS_MAX_KEY_SIZE]; >>>> - >>>> - __le16 *indirection_table; >>>> -}; >>>> >>>> /* Control VQ buffers: protected by the rtnl lock */ >>>> struct control_buf { >>>> @@ -421,7 +404,9 @@ struct virtnet_info { >>>> u16 rss_indir_table_size; >>>> u32 rss_hash_types_supported; >>>> u32 rss_hash_types_saved; >>>> - struct virtio_net_ctrl_rss rss; >>>> + struct virtio_net_rss_config_hdr *rss_hdr; >>>> + struct virtio_net_rss_config_trailer rss_trailer; >>>> + u8 rss_hash_key_data[VIRTIO_NET_RSS_MAX_KEY_SIZE]; >>>> >>>> /* Has control virtqueue */ >>>> bool has_cvq; >>>> @@ -523,23 +508,16 @@ enum virtnet_xmit_type { >>>> VIRTNET_XMIT_TYPE_XSK, >>>> }; >>>> >>>> -static int rss_indirection_table_alloc(struct virtio_net_ctrl_rss *rss, u16 indir_table_size) >>>> +static size_t virtnet_rss_hdr_size(const struct virtnet_info *vi) >>>> { >>>> - if (!indir_table_size) { >>>> - rss->indirection_table = NULL; >>>> - return 0; >>>> - } >>>> + u16 indir_table_size = vi->has_rss ? vi->rss_indir_table_size : 1; >>>> >>>> - rss->indirection_table = kmalloc_array(indir_table_size, sizeof(u16), GFP_KERNEL); >>>> - if (!rss->indirection_table) >>>> - return -ENOMEM; >>>> - >>>> - return 0; >>>> + return struct_size(vi->rss_hdr, indirection_table, indir_table_size); >>>> } >>>> >>>> -static void rss_indirection_table_free(struct virtio_net_ctrl_rss *rss) >>>> +static size_t virtnet_rss_trailer_size(const struct virtnet_info *vi) >>>> { >>>> - kfree(rss->indirection_table); >>>> + return struct_size(&vi->rss_trailer, hash_key_data, vi->rss_key_size); >>>> } >>>> >>>> /* We use the last two bits of the pointer to distinguish the xmit type. */ >>>> @@ -3576,15 +3554,16 @@ static void virtnet_rss_update_by_qpairs(struct virtnet_info *vi, u16 queue_pair >>>> >>>> for (; i < vi->rss_indir_table_size; ++i) { >>>> indir_val = ethtool_rxfh_indir_default(i, queue_pairs); >>>> - vi->rss.indirection_table[i] = cpu_to_le16(indir_val); >>>> + vi->rss_hdr->indirection_table[i] = cpu_to_le16(indir_val); >>>> } >>>> - vi->rss.max_tx_vq = cpu_to_le16(queue_pairs); >>>> + vi->rss_trailer.max_tx_vq = cpu_to_le16(queue_pairs); >>>> } >>>> >>>> static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) >>>> { >>>> struct virtio_net_ctrl_mq *mq __free(kfree) = NULL; >>>> - struct virtio_net_ctrl_rss old_rss; >>>> + struct virtio_net_rss_config_hdr *old_rss_hdr; >>>> + struct virtio_net_rss_config_trailer old_rss_trailer; >>>> struct net_device *dev = vi->dev; >>>> struct scatterlist sg; >>>> >>>> @@ -3599,24 +3578,28 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) >>>> * update (VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET below) and return directly. >>>> */ >>>> if (vi->has_rss && !netif_is_rxfh_configured(dev)) { >>>> - memcpy(&old_rss, &vi->rss, sizeof(old_rss)); >>>> - if (rss_indirection_table_alloc(&vi->rss, vi->rss_indir_table_size)) { >>>> - vi->rss.indirection_table = old_rss.indirection_table; >>>> + old_rss_hdr = vi->rss_hdr; >>>> + old_rss_trailer = vi->rss_trailer; >>>> + vi->rss_hdr = kmalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); >>>> + if (!vi->rss_hdr) { >>>> + vi->rss_hdr = old_rss_hdr; >>>> return -ENOMEM; >>>> } >>>> >>>> + *vi->rss_hdr = *old_rss_hdr; >>>> virtnet_rss_update_by_qpairs(vi, queue_pairs); >>>> >>>> if (!virtnet_commit_rss_command(vi)) { >>>> /* restore ctrl_rss if commit_rss_command failed */ >>>> - rss_indirection_table_free(&vi->rss); >>>> - memcpy(&vi->rss, &old_rss, sizeof(old_rss)); >>>> + kfree(vi->rss_hdr); >>>> + vi->rss_hdr = old_rss_hdr; >>>> + vi->rss_trailer = old_rss_trailer; >>>> >>>> dev_warn(&dev->dev, "Fail to set num of queue pairs to %d, because committing RSS failed\n", >>>> queue_pairs); >>>> return -EINVAL; >>>> } >>>> - rss_indirection_table_free(&old_rss); >>>> + kfree(old_rss_hdr); >>>> goto succ; >>>> } >>>> >>>> @@ -4059,28 +4042,12 @@ static int virtnet_set_ringparam(struct net_device *dev, >>>> static bool virtnet_commit_rss_command(struct virtnet_info *vi) >>>> { >>>> struct net_device *dev = vi->dev; >>>> - struct scatterlist sgs[4]; >>>> - unsigned int sg_buf_size; >>>> + struct scatterlist sgs[2]; >>>> >>>> /* prepare sgs */ >>>> - sg_init_table(sgs, 4); >>>> - >>>> - sg_buf_size = offsetof(struct virtio_net_ctrl_rss, hash_cfg_reserved); >>>> - sg_set_buf(&sgs[0], &vi->rss, sg_buf_size); >>>> - >>>> - if (vi->has_rss) { >>>> - sg_buf_size = sizeof(uint16_t) * vi->rss_indir_table_size; >>>> - sg_set_buf(&sgs[1], vi->rss.indirection_table, sg_buf_size); >>>> - } else { >>>> - sg_set_buf(&sgs[1], &vi->rss.hash_cfg_reserved, sizeof(uint16_t)); >>>> - } >>>> - >>>> - sg_buf_size = offsetof(struct virtio_net_ctrl_rss, key) >>>> - - offsetof(struct virtio_net_ctrl_rss, max_tx_vq); >>>> - sg_set_buf(&sgs[2], &vi->rss.max_tx_vq, sg_buf_size); >>>> - >>>> - sg_buf_size = vi->rss_key_size; >>>> - sg_set_buf(&sgs[3], vi->rss.key, sg_buf_size); >>>> + sg_init_table(sgs, 2); >>>> + sg_set_buf(&sgs[0], vi->rss_hdr, virtnet_rss_hdr_size(vi)); >>>> + sg_set_buf(&sgs[1], &vi->rss_trailer, virtnet_rss_trailer_size(vi)); >>> >>> So I still see this: >>> >>> if (vi->has_rss || vi->has_rss_hash_report) { >>> if (!virtnet_commit_rss_command(vi)) { >>> >>> Should we introduce a hash config helper instead? >> >> I think it's fine to use virtnet_commit_rss_command() for hash >> reporting. struct virtio_net_hash_config and struct >> virtio_net_rss_config are defined to have a common layout to allow >> sharing this kind of logic. > > Well, this trick won't work if the reserved field in hash_config is > used in the future. Right, but we can add a hash config helper when that happens. It will only result in a duplication of logic for now. Regards, Akihiko Odaki > > Thanks > >> >> Regards, >> Akihiko Odaki >> >>> >>> Thanks >>> >> >