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 E92C92652AF; Mon, 14 Jul 2025 15:21:20 +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=1752506481; cv=none; b=nzeoS9ldZ3pb80uIHNgIc5mvCVNSWYcIEZdcjNgaBCaUCotICo+z+9qlNMEQ2gHIxSRM9IN0g3c0jNM5kWl4LwOweoc9n8SJsHCqJFHYzyh5VZphVPSrK33iuoK7bj/4NNPVC0AvpjnMipqLn5j84FmqhLMDPbiI21tvWygSeew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752506481; c=relaxed/simple; bh=niC6TH6Xk0NRMoecU58eySzzPeyslGYIOlCVhRbWLZk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aiTs46vn+nsQYf1Ihu99HnFE+GvZKHFmvsuE8X4VhxGzyoATwDn5FJQqObz7DpSsUpdYlbXWhftdi6FrLmssB5VzFzhGWhwEkCJhq/m4JkR5Z5fC31tm0kSj9coJjVb4eXwKVzpwzmqyDTTqfRBsiNK6xUFw1IQ6zh7w0exuC+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZunlIl11; 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="ZunlIl11" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42354C4CEED; Mon, 14 Jul 2025 15:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752506480; bh=niC6TH6Xk0NRMoecU58eySzzPeyslGYIOlCVhRbWLZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZunlIl114m7pBc1swV0/emnh3M5q8dONunc7t+dOe1i4uT9fk/kOIiwCFL2XSzhh6 BmGptrslyL8Y/sAESj2vLbRRn7Xvh6ROKlYi8xu7DBNddbe6IwJ7oHp9oBTQbprLq6 2zvzgsrM7KsuRiseBoVcyozwzBplBWPCt9uJoFPTkZRMiQs0hbk2KzqkAQtkBhmusR 4/oqfMHj4RvvozFgGdPb2vjnXHX3YUCE1ZdPVyQ6gQH1ZA9XbImsi+kj+z5VBeLLe7 0VFMtc3NAm5Zwo3Xex7EAEXgs88wvtoeOHToxJ07eTCuqfPgj5nX235wkhkqotgWW+ YbkOocXJ9Ub9Q== From: Will Deacon To: linux-kernel@vger.kernel.org Cc: Will Deacon , Keir Fraser , Steven Moreland , Frederick Mayle , Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , netdev@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH v3 3/9] vsock/virtio: Move length check to callers of virtio_vsock_skb_rx_put() Date: Mon, 14 Jul 2025 16:20:57 +0100 Message-Id: <20250714152103.6949-4-will@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250714152103.6949-1-will@kernel.org> References: <20250714152103.6949-1-will@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit virtio_vsock_skb_rx_put() only calls skb_put() if the length in the packet header is not zero even though skb_put() handles this case gracefully. Remove the functionally redundant check from virtio_vsock_skb_rx_put() and, on the assumption that this is a worthwhile optimisation for handling credit messages, augment the existing length checks in virtio_transport_rx_work() to elide the call for zero-length payloads. Since the callers all have the length, extend virtio_vsock_skb_rx_put() to take it as an additional parameter rather than fish it back out of the packet header. Note that the vhost code already has similar logic in vhost_vsock_alloc_skb(). Signed-off-by: Will Deacon --- drivers/vhost/vsock.c | 2 +- include/linux/virtio_vsock.h | 9 ++------- net/vmw_vsock/virtio_transport.c | 4 +++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 66a0f060770e..4c4a642945eb 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -375,7 +375,7 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq, return NULL; } - virtio_vsock_skb_rx_put(skb); + virtio_vsock_skb_rx_put(skb, payload_len); nbytes = copy_from_iter(skb->data, payload_len, &iov_iter); if (nbytes != payload_len) { diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 36fb3edfa403..97465f378ade 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -47,14 +47,9 @@ static inline void virtio_vsock_skb_clear_tap_delivered(struct sk_buff *skb) VIRTIO_VSOCK_SKB_CB(skb)->tap_delivered = false; } -static inline void virtio_vsock_skb_rx_put(struct sk_buff *skb) +static inline void virtio_vsock_skb_rx_put(struct sk_buff *skb, u32 len) { - u32 len; - - len = le32_to_cpu(virtio_vsock_hdr(skb)->len); - - if (len > 0) - skb_put(skb, len); + skb_put(skb, len); } static inline struct sk_buff *virtio_vsock_alloc_skb(unsigned int size, gfp_t mask) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index bd2c6aaa1a93..1af7723669cb 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -656,7 +656,9 @@ static void virtio_transport_rx_work(struct work_struct *work) continue; } - virtio_vsock_skb_rx_put(skb); + if (payload_len) + virtio_vsock_skb_rx_put(skb, payload_len); + virtio_transport_deliver_tap_pkt(skb); virtio_transport_recv_pkt(&virtio_transport, skb); } -- 2.50.0.727.gbf7dc18ff4-goog