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.129.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 5544D192580 for ; Tue, 5 Aug 2025 10:02:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754388134; cv=none; b=PdKiFu0lVkv9UY12kfvzKw1NZCF72Dly2o3xKXsNZ9wtWpFw7XXI2DYbHsK21hApho6TiszVVSF+rybmbRFKcpxG+HsD4FDAq44HKpvrvWs9tDuzb3TeymBigFW7feojcyW0v4cSCANkTChrilod6IBkJwo5V6nvbCA2PDKokOQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754388134; c=relaxed/simple; bh=ghVc4jUywvAFQR8Cbgq1AJpVrOuHaExsk9z8LbGUnck=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: In-Reply-To:Content-Type:Content-Disposition; b=r4ThBUYn/JgzZCLwCqnA73L0b9krn5LdExPjMQWxHoirqsZ6UtkWE++XdST8kqV1E256hrgLQBBcn/7NzZgim/VB2KK9vlmTHd0MQKwr5zWOcniJrPrq+5jdPgDNisCmd9HOYZKswfxD3dWz/aniQEbAtq2k0E95YkoQXCruiy0= 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=ccQ2XHSD; arc=none smtp.client-ip=170.10.129.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="ccQ2XHSD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754388131; 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=C8iq3DcQDje5KaWsGWyrnSm7HvAQMMkFMgKVgyZHegI=; b=ccQ2XHSDfFZ4MT0Ppu2Inx6A8Lcumf5RxtcBADimZD4KV/Uea/mMLJ+T5XfNLYbrgTMBMV g5DFO8gCsyyKrg7jshTTagG38yV4mQbSa8lIXos2dlo73ftuf1J6Gm38JpiEVUYsxzp8WD l5lPw+4OVZfHBn38++A/LJbsH8ypwNw= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-449-qnItDj48OL6pxQ0LrEHlyw-1; Tue, 05 Aug 2025 06:02:10 -0400 X-MC-Unique: qnItDj48OL6pxQ0LrEHlyw-1 X-Mimecast-MFC-AGG-ID: qnItDj48OL6pxQ0LrEHlyw_1754388129 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3b7891afb31so2765210f8f.2 for ; Tue, 05 Aug 2025 03:02:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754388129; x=1754992929; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=C8iq3DcQDje5KaWsGWyrnSm7HvAQMMkFMgKVgyZHegI=; b=GLuo0qc9b+JMebmMQq2XcKGY1EAKHfeqFrSNoMduMDdG36/OqVagh69i5rEDt75Qpq Tdp3DwxiPfffYtfI9EFEh8WwY+no2bHDifVd+ozbyO+3wil9EvnlFatI8LJ4uW0Aba6E fYtRkpZTw+9W9gclV1wK7jSdju3A7LN+qEnuJ0xAzUifJY6OVJDQmVqyTpIx/Fn6j51k zfZQJyTGd20csAR4amaihEkN+u3ZEuBKX+zCbinEC73kIhp76WDIb4CfOqv1PPanDpLq JRHt/mW2tLuN9HbLsVsI3wLRbAn/018yqZ1hTyh5YvSDQ+gpHGDS7IlIYFjgpd8xOl1q CpVQ== X-Forwarded-Encrypted: i=1; AJvYcCX9nBKaAlhvaltGRpKW5rocHcLxNxScdP/6tx6gFh8pwI7KEQKO23N/BIYZ1OTWrH3gtf9iROvm7qUk+x+DQQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yxh8vXKxBV/zWksTSNNRHZ8AWl5j1a51co8W18dH9il9kWG7XZU Y2lUQKEwj6ojRvuGzmPtxsfkyYSKqbNT3X1dn42bNZT+tfZHtNYVyQIzi6OOSCGvmcF9Zrpp3i9 Jme0jRRqjUV+3LsI7bDgJw/5gqjudngVk2NqRxnMjlpq4r3yPt0vVKtHHIBDwqhQ4rL2B X-Gm-Gg: ASbGnctHcfmd/Wf00lLREVltzmS0U+Lbb2iKekhOy/2QOjZym3TNeiBDQhiqVMjCVBF OBr6MgAN4AFGpPWUSnhljSRrKdIMDv+3HKfUQjo9LR2/ptrDNOvwfWVA534YvW7QRgTFIzBU01T wV3mJzak6W3kjsjg1ONg4+1UQ85q98aMSTGQTF0csmqx5xq2lR82WCF9u/CazXyDgvZPgSF9Qt8 5UR+Wx5BRvN3lc3BBXZQ7Rc+awkLVKE7RWZaoCrnRP0Hd42Woq95gAB5mGpjDxWidJD1KXBbgj5 Y/iFai2SJvm1vWif/xJAWhZYJMGWddZ1 X-Received: by 2002:a5d:584b:0:b0:3b7:924a:998f with SMTP id ffacd0b85a97d-3b8d946b3a2mr10486260f8f.5.1754388128673; Tue, 05 Aug 2025 03:02:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0h3EuzIaMa9Wir/mQMI0EF1I5NZk8tEiHqXjJLyBPOFpTj+sXNt2uVT98K1ru7T8YB22hmw== X-Received: by 2002:a5d:584b:0:b0:3b7:924a:998f with SMTP id ffacd0b85a97d-3b8d946b3a2mr10486210f8f.5.1754388128107; Tue, 05 Aug 2025 03:02:08 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1515:7300:62e6:253a:2a96:5e3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c48de68sm18532205f8f.67.2025.08.05.03.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 03:02:07 -0700 (PDT) Date: Tue, 5 Aug 2025 06:02:04 -0400 From: "Michael S. Tsirkin" To: Nikolay Kuratov Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org, Jason Wang , Eugenio =?iso-8859-1?Q?P=E9rez?= , Lei Yang , Hillf Danton , stable@vger.kernel.org, Andrey Ryabinin , Andrey Smetanin Subject: Re: [PATCH v2] vhost/net: Replace wait_queue with completion in ubufs reference Message-ID: <20250805060149-mutt-send-email-mst@kernel.org> References: <20250718110355.1550454-1-kniv@yandex-team.ru> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20250718110355.1550454-1-kniv@yandex-team.ru> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YvXRGGXFr3VyDqbkSQLBRN4urQzTkeMIIU1iIeoa7Xo_1754388129 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jul 18, 2025 at 02:03:55PM +0300, Nikolay Kuratov wrote: > When operating on struct vhost_net_ubuf_ref, the following execution > sequence is theoretically possible: > CPU0 is finalizing DMA operation CPU1 is doing VHOST_NET_SET_BACKEND > // &ubufs->refcount == 2 > vhost_net_ubuf_put() vhost_net_ubuf_put_wait_and_free(oldubufs) > vhost_net_ubuf_put_and_wait() > vhost_net_ubuf_put() > int r = atomic_sub_return(1, &ubufs->refcount); > // r = 1 > int r = atomic_sub_return(1, &ubufs->refcount); > // r = 0 > wait_event(ubufs->wait, !atomic_read(&ubufs->refcount)); > // no wait occurs here because condition is already true > kfree(ubufs); > if (unlikely(!r)) > wake_up(&ubufs->wait); // use-after-free > > This leads to use-after-free on ubufs access. This happens because CPU1 > skips waiting for wake_up() when refcount is already zero. > > To prevent that use a completion instead of wait_queue as the ubufs > notification mechanism. wait_for_completion() guarantees that there will > be complete() call prior to its return. > > We also need to reinit completion in vhost_net_flush(), because > refcnt == 0 does not mean freeing in that case. > > Cc: stable@vger.kernel.org > Fixes: 0ad8b480d6ee9 ("vhost: fix ref cnt checking deadlock") > Reported-by: Andrey Ryabinin > Suggested-by: Andrey Smetanin > Suggested-by: Hillf Danton > Tested-by: Lei Yang (v1) > Signed-off-by: Nikolay Kuratov Nikolay should I expect v3? > --- > v2: > * move reinit_completion() into vhost_net_flush(), thanks > to Hillf Danton > * add Tested-by: Lei Yang > * check that usages of put_and_wait() are consistent across > LTS kernels > > drivers/vhost/net.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index 7cbfc7d718b3..69e1bfb9627e 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -94,7 +94,7 @@ struct vhost_net_ubuf_ref { > * >1: outstanding ubufs > */ > atomic_t refcount; > - wait_queue_head_t wait; > + struct completion wait; > struct vhost_virtqueue *vq; > }; > > @@ -240,7 +240,7 @@ vhost_net_ubuf_alloc(struct vhost_virtqueue *vq, bool zcopy) > if (!ubufs) > return ERR_PTR(-ENOMEM); > atomic_set(&ubufs->refcount, 1); > - init_waitqueue_head(&ubufs->wait); > + init_completion(&ubufs->wait); > ubufs->vq = vq; > return ubufs; > } > @@ -249,14 +249,14 @@ static int vhost_net_ubuf_put(struct vhost_net_ubuf_ref *ubufs) > { > int r = atomic_sub_return(1, &ubufs->refcount); > if (unlikely(!r)) > - wake_up(&ubufs->wait); > + complete_all(&ubufs->wait); > return r; > } > > static void vhost_net_ubuf_put_and_wait(struct vhost_net_ubuf_ref *ubufs) > { > vhost_net_ubuf_put(ubufs); > - wait_event(ubufs->wait, !atomic_read(&ubufs->refcount)); > + wait_for_completion(&ubufs->wait); > } > > static void vhost_net_ubuf_put_wait_and_free(struct vhost_net_ubuf_ref *ubufs) > @@ -1381,6 +1381,7 @@ static void vhost_net_flush(struct vhost_net *n) > mutex_lock(&n->vqs[VHOST_NET_VQ_TX].vq.mutex); > n->tx_flush = false; > atomic_set(&n->vqs[VHOST_NET_VQ_TX].ubufs->refcount, 1); > + reinit_completion(&n->vqs[VHOST_NET_VQ_TX].ubufs->wait); > mutex_unlock(&n->vqs[VHOST_NET_VQ_TX].vq.mutex); > } > } > -- > 2.34.1