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 8DA0035E1BF for ; Mon, 25 May 2026 11:25:47 +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=1779708350; cv=none; b=uzFOD3gWTiir6lZpIyobw8Vd9OT0cibLiY6rPBQdgaQe5CP9KY1rFB4uTZNTFyKvTCN5mpCnFYrGVlKpem00hVybrtk15tnZo81QlQDybbOGhNgjOR/ZwXxP1BzkE0O39wQJ+LIn/0g3Kc9weExSdo0S/24FF/WQ+Hnp+7H+ujE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779708350; c=relaxed/simple; bh=zuX0Di4TKhnMq54tvjmHDzO+X5SQw874TgobIrg3T80=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=A+w+4mWEcg6r4t98eAGoooP6M+Ila2M1vZFyN0r0LOyTJ3XWvaRlJW16B1KHGI9jmqu8/Cg5HQF10g6xHUJKzAqs4yCShe1xr/Vcy51vNkw8Qh9nq6lNRj5HXelFojax62amFqisLaj9k5RB1zL2DDGwxoekqVQGz6v3deVeCec= 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=eBq1y+E9; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=lmgy4AaL; 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="eBq1y+E9"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="lmgy4AaL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779708346; 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=7IxQxHR/6kpLhzpKQfpUJefi9nFgXyGkAWeI40YgJOo=; b=eBq1y+E96i+zwBYCjDe2OkDzOBFsBXnRoI0rJEppAqfpi8Fk70pnMlZKkwGsdOpXUmWG0i koIDk2yIm6OcsT0RQKguJnMVwgZt4A4558gLIOXX9KP7jDs5s/9HR5SP1sNbC8Cu8asKJ0 C6k1ino/l0LuEkcVMeiGS4CpMrhXnRA= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-84-KSigEEpOOB6P2o_CDCTaIA-1; Mon, 25 May 2026 07:25:45 -0400 X-MC-Unique: KSigEEpOOB6P2o_CDCTaIA-1 X-Mimecast-MFC-AGG-ID: KSigEEpOOB6P2o_CDCTaIA_1779708344 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-49047e22ed4so22427575e9.1 for ; Mon, 25 May 2026 04:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779708344; x=1780313144; 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=7IxQxHR/6kpLhzpKQfpUJefi9nFgXyGkAWeI40YgJOo=; b=lmgy4AaLlJfOdThQu5yi+DCX8IwCo7BVxLO/aaXkN98Fy/FfcDdA+Vhq7wrfndnGlu 6IiyWYnK5fmNaGKMOgc8Q0rescBU/gD9DErPgMS41DrH7NpZ6KoeXO8XDilylLpB1eNI wGjzoij19PRsgzzW6Dz/W1x0XSjzs6xB2/sldWEemCQaEddiaIxoa2eKCxlVCybrMRaN X4ZELGBV/u2O+JNv8BTyWl3gHUkOXWUh5wtaAHx30GoP2ZEWHpu+hMYwFuLHqzMFg5rm /NJHI94zk+OHiC+tb2W9iEwj0ZP2QHYRRzgi9+EB9whMq3NJ5riIpDNG8j9TmoAUDb9y 7TRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779708344; x=1780313144; 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=7IxQxHR/6kpLhzpKQfpUJefi9nFgXyGkAWeI40YgJOo=; b=e1VzpIIwzGecsNyMPCl0xB8O62eAZ9xrlAXNHSGNDWCuunr9ytJ6vIvq/WyZzAtGQO 2lWMHJHdVPK0nSKvAS9L7xhuGat51jbw9GoMbmfhZ+q73mFN9c0XMAvXjSOiQOlaGw3F g3qiMrmYQO/PdJElGyts6+Ua06tr46MWPYnPpmaU7cBbhbLTrubiDfw+OLx0fh84gmZT 4/l9Ri/VFJ3/1R/IlVCURWJzvCgkClyZYtYSvCjcNMRt8QbdIjcmi12k/Jehx1TxMgTk UuHfTGxmWAKKig1ol6y3kpPFUd6VTzGRZ5E1ds+RvI7cpg5n96S0YMbCvvPokkNdt32z zqqg== X-Forwarded-Encrypted: i=1; AFNElJ9oBXPk6jiMZBpdOQAsn/trt+/91URpGM/bAmu4b1KiMYWuTE7iFpvozS+mTG2xaDgo8bmp7se9mnlbU7A=@vger.kernel.org X-Gm-Message-State: AOJu0YyWyuc+YdWHlFf4V/JD9klbe3b7KCVbd9f1I5rvO6vcUEX9JsmQ icGvPeHGzFcDBmIOXwlCivMww8lBaaesnIWQsMII9OtKayQFMpOvvDqkW07Vn4OA4YClGhALZ4z xqpnkUwItJDDWlLkfd1Y4uXyqqci/wQ0IzDrR6C7EBLgoUfUl7D1yJR4WPzdeKlnsSA== X-Gm-Gg: Acq92OFALGe6UgPd7Lnk0UKkj0ykwDENp7A6FfcABJzkyqLxQ+UIse1Ldx4Tn/5LaqJ O7xwu4RCYI4YblvHhG1lkrOnglVIod0da+skTw7r+SOtyW0ug3cDl76hnHTuG+H5qu0mfUmkgza ZsDWajmrIYrofW4WTGKF0QcM8605z39ku8yVR0YBfjX8j7n/KlkVRvh97t0CpxOdKnWeeXpvhiR 5zb0Yph4vrDN9pN+Q4Zhm5okqsro0iBmWa4vRpkdK20PPybDiZbUgrjK8LdgQ2oy3trUPr2QY9m LNMcvTw+0jiYKunQcALT+612KBuB2y3oTe1ua6wSHwjGd4dUkW8VbKc7LgKXHEjTFGPv1Mmojoh JKTs0RhMyKW7Ku7mSukADlKtg5MeGloZRiEo8OX0t5fI= X-Received: by 2002:a05:600c:4510:b0:489:1c1f:35df with SMTP id 5b1f17b1804b1-490424a682emr215601175e9.10.1779708344014; Mon, 25 May 2026 04:25:44 -0700 (PDT) X-Received: by 2002:a05:600c:4510:b0:489:1c1f:35df with SMTP id 5b1f17b1804b1-490424a682emr215600375e9.10.1779708343354; Mon, 25 May 2026 04:25:43 -0700 (PDT) Received: from redhat.com (IGLD-80-230-25-45.inter.net.il. [80.230.25.45]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49045282201sm268455945e9.8.2026.05.25.04.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2026 04:25:42 -0700 (PDT) Date: Mon, 25 May 2026 07:25:38 -0400 From: "Michael S. Tsirkin" To: "malin (R)" Cc: Arseniy Krasnov , tanjingguo , "jasowang@redhat.com" , "xuanzhuo@linux.alibaba.com" , "eperezma@redhat.com" , "stefanha@redhat.com" , "sgarzare@redhat.com" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "horms@kernel.org" , Chenzhe , cenxianlong , cuirongzhen , "virtualization@lists.linux.dev" , "kvm@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH net] vsock/virtio: bind uarg before filling zerocopy skb Message-ID: <20260525072533-mutt-send-email-mst@kernel.org> References: <9fece5ea269049f883f367642c07eaa0@huawei.com> 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=us-ascii Content-Disposition: inline In-Reply-To: <9fece5ea269049f883f367642c07eaa0@huawei.com> On Mon, May 25, 2026 at 11:15:12AM +0000, malin (R) wrote: > >From 9eea4f61a4dca97f56c23e12267219bf791a20d1 Mon Sep 17 00:00:00 2001 > From: Jingguo Tan > Date: Fri, 22 May 2026 19:53:45 +0800 > Subject: [PATCH net] vsock/virtio: bind uarg before filling zerocopy skb > > virtio_transport_send_pkt_info() allocates or reuses the zerocopy uarg > before entering the send loop, but virtio_transport_alloc_skb() still > fills the skb before it inherits that uarg. When fixed-buffer vectored > zerocopy hits MAX_SKB_FRAGS, io_sg_from_iter() may partially attach > managed frags and return -EMSGSIZE. The rollback path calls kfree_skb() > to free an skb that carries SKBFL_MANAGED_FRAG_REFS but no uarg, so > skb_release_data() falls through to ordinary frag unref. > > Pass the uarg into virtio_transport_alloc_skb() and bind it immediately > before virtio_transport_fill_skb(). This keeps control or no-payload skbs > untouched while ensuring success and rollback share one lifetime rule. > > Fixes: 581512a6dc93 ("vsock/virtio: MSG_ZEROCOPY flag support") > Signed-off-by: Lin Ma > Signed-off-by: Rongzhen Cui > Signed-off-by: Jingguo Tan Acked-by: Michael S. Tsirkin > --- > > net/vmw_vsock/virtio_transport_common.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c > index df3b418e0392..73f58925ff72 100644 > --- a/net/vmw_vsock/virtio_transport_common.c > +++ b/net/vmw_vsock/virtio_transport_common.c > @@ -205,6 +205,7 @@ static u16 virtio_transport_get_type(struct sock *sk) > static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *info, > size_t payload_len, > bool zcopy, > + struct ubuf_info *uarg, > u32 src_cid, > u32 src_port, > u32 dst_cid, > @@ -245,6 +246,11 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info * > if (info->msg && payload_len > 0) { > int err; > > + /* Bind the zerocopy lifetime before filling frags so error rollback > + * frees managed fixed-buffer pages through the uarg-aware path. > + */ > + skb_zcopy_set(skb, uarg, NULL); > + > err = virtio_transport_fill_skb(skb, info, payload_len, zcopy); > if (err) > goto out; > @@ -364,6 +370,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, > skb_len = min(max_skb_len, rest_len); > > skb = virtio_transport_alloc_skb(info, skb_len, can_zcopy, > + uarg, > src_cid, src_port, > dst_cid, dst_port); > if (!skb) { > @@ -371,8 +378,6 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, > break; > } > > - skb_zcopy_set(skb, uarg, NULL); > - > virtio_transport_inc_tx_pkt(vvs, skb); > > ret = t_ops->send_pkt(skb, info->net); > @@ -1183,7 +1188,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t, > if (!t) > return -ENOTCONN; > > - reply = virtio_transport_alloc_skb(&info, 0, false, > + reply = virtio_transport_alloc_skb(&info, 0, false, NULL, > le64_to_cpu(hdr->dst_cid), > le32_to_cpu(hdr->dst_port), > le64_to_cpu(hdr->src_cid), > -- > 2.53.0