From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793989518; b=LdbJo1O9fXU39ZzkL43k7vJ0mE0QH2sdn39QGVap7uYmsQ6f8viLeFYR9/l5bEdKpgli KhnyyrRE8k1AWmB1XgakYkar9tHSdJyuVaRL2poz7KSy8n1iRB5KS3Bek/lmMfOznNcwf 3o+PvC5ce39VtJqiR9z42Ny1gizH2bNuYCUvmBrtn92MoT+N8i5aGtYzOUBPewUA1OpMr xo/pocfd5ZazxEN3CldrVdF6wcrctQUy0Qs+1jxA2YUDLLNRZtKqA5y1ZbHr49e2x35/l ZrHpvzEu1I0xzUSMd9SGMCqsl+6cC0fkPJ9HbKBDDd7CJP/RbX9+KPM1gkUIfe3c/Og== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793989518; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=G6N4KPZ87bL01Do/91S0+dnuL4SvkQTk0X2ObVNjwdg=; b=2ryHFYFVKEjEw0M+lzpl73zjj8aUh3ByujFweCvL9D9iRJPm3uAaFLLBfnysJR9ZydeV HFruDixn1AtQLEjEh+jeYQiYyG180ZOvHKoeWGi7sTWoh0KhqPQ+6bS+ITeQGo2efS3ST sjuQMBuZtkb3fxfUj96Dbj8+8Tp7+mNq//jgzAnLlSU0RUOk4M4D7upRgOccer9gzTusE pQWXiM8HZILkGD3Yo5CSqZjvpuFm5cPW0Nrj9julXuhiEDJQRgfdhioXsDzU2rw0JMepv rR+aB9x99tSiUzrEp/+rM22roglOEBvowxXcYDsQZnN8jMFYuEFOxFCD7aYAykzN50A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=CBsjFI9P; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AC2D606A338; Fri, 6 Nov 2026 18:25:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=CBsjFI9P Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAD661F0089F; Fri, 6 Nov 2026 18:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793989518; bh=G6N4KPZ87bL01Do/91S0+dnuL4SvkQTk0X2ObVNjwdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CBsjFI9P/z+Ja0fl8Ft1+HXT5y6Dw1JnH9C7SEucJcadcYWYj7vpar1Q5LbqDKekM i+h+ZAs6X1olpwGOK2iW9/LNUIenVvxNuHvjxsAiKtQk/POmR3ITd+kDRdpn/FVXqY E5FSZBnd8pY4jM/XIt6JmMcykM0vJjTkrwNd/yow= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, stable@vger.kernel.org Cc: lwn@lwn.net, jslaby@suse.cz, Greg Kroah-Hartman Subject: Re: Linux 6.12.116 Date: Fri, 6 Nov 2026 13:25:13 -0500 Message-ID: <2026110613-unhook-confiding-555d@gregkh> X-Mailer: git-send-email 2.56.0 In-Reply-To: <2026110613-recycled-giant-5f1b@gregkh> References: <2026110613-recycled-giant-5f1b@gregkh> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit diff --git a/Makefile b/Makefile index 82dfb3e137ea..d425ff91e15b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 12 -SUBLEVEL = 115 +SUBLEVEL = 116 EXTRAVERSION = NAME = Baby Opossum Posse diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index b427d54bc120..f5890b3f1df9 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -318,8 +318,10 @@ struct xen_blkif { unsigned int nr_ring_pages; bool multi_ref; /* All rings for this device. */ + rwlock_t rings_lock; struct xen_blkif_ring *rings; unsigned int nr_rings; + unsigned long buffer_squeeze_end; }; diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index 0621878940ae..628611ff4b8e 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -127,15 +127,23 @@ static void xen_update_blkif_status(struct xen_blkif *blkif) return; } -static int xen_blkif_alloc_rings(struct xen_blkif *blkif) +static int xen_blkif_alloc_rings(struct xen_blkif *blkif, + unsigned int nr_rings) { unsigned int r; + struct xen_blkif_ring *rings; - blkif->rings = kcalloc(blkif->nr_rings, sizeof(struct xen_blkif_ring), - GFP_KERNEL); - if (!blkif->rings) + rings = kcalloc(nr_rings, sizeof(struct xen_blkif_ring), GFP_KERNEL); + if (!rings) return -ENOMEM; + write_lock(&blkif->rings_lock); + + blkif->rings = rings; + blkif->nr_rings = nr_rings; + + write_unlock(&blkif->rings_lock); + for (r = 0; r < blkif->nr_rings; r++) { struct xen_blkif_ring *ring = &blkif->rings[r]; @@ -175,6 +183,7 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid) blkif->domid = domid; atomic_set(&blkif->refcnt, 1); init_completion(&blkif->drain_complete); + rwlock_init(&blkif->rings_lock); /* * Because freeing back to the cache may be deferred, it is not @@ -269,6 +278,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) struct pending_req *req, *n; unsigned int j, r; bool busy = false; + struct xen_blkif_ring *rings; for (r = 0; r < blkif->nr_rings; r++) { struct xen_blkif_ring *ring = &blkif->rings[r]; @@ -335,10 +345,16 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif) * blkif->rings was allocated in connect_ring, so we should free it in * here. */ - kfree(blkif->rings); + write_lock(&blkif->rings_lock); + + rings = blkif->rings; blkif->rings = NULL; blkif->nr_rings = 0; + write_unlock(&blkif->rings_lock); + + kfree(rings); + return 0; } @@ -386,6 +402,7 @@ void xen_blkif_interface_fini(void) unsigned int i; \ unsigned long long result = 0; \ \ + read_lock(&blkif->rings_lock); \ if (!blkif->rings) \ goto out; \ \ @@ -396,6 +413,7 @@ void xen_blkif_interface_fini(void) } \ \ out: \ + read_unlock(&blkif->rings_lock); \ return sprintf(buf, format, result); \ } \ static DEVICE_ATTR(name, 0444, show_##name, NULL) @@ -1105,8 +1123,7 @@ static int connect_ring(struct backend_info *be) requested_num_queues, xenblk_max_queues); return -ENOSYS; } - blkif->nr_rings = requested_num_queues; - if (xen_blkif_alloc_rings(blkif)) + if (xen_blkif_alloc_rings(blkif, requested_num_queues)) return -ENOMEM; pr_info("%s: using %d queues, protocol %d (%s) %s\n", dev->nodename, diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 325fcb3d1075..4f1fdc1ed5b2 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -812,8 +812,6 @@ void xenvif_disconnect_data(struct xenvif *vif) xenvif_disconnect_queue(queue); } - - xenvif_mcast_addr_list_free(vif); } void xenvif_disconnect_ctrl(struct xenvif *vif) diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 61b547aab286..aca25db2503b 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -267,6 +267,8 @@ static void backend_disconnect(struct backend_info *be) vif->num_queues = 0; synchronize_net(); + xenvif_mcast_addr_list_free(vif); + for (queue_index = 0; queue_index < num_queues; ++queue_index) xenvif_deinit_queue(&vif->queues[queue_index]); @@ -837,6 +839,7 @@ static void connect(struct backend_info *be) err: if (be->vif->num_queues > 0) xenvif_disconnect_data(be->vif); /* Clean up existing queues */ + synchronize_net(); for (queue_index = 0; queue_index < be->vif->num_queues; ++queue_index) xenvif_deinit_queue(&be->vif->queues[queue_index]); vfree(be->vif->queues);