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 41FE613665A for ; Sat, 26 Apr 2025 13:23:00 +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=1745673781; cv=none; b=Axrl98eQQWYuUsa2YbMh5yfsvqf7IzGzS8GEz0DCbeuDL85jo7jIGqB103dJgJY5WmrZamqmfePJNhQVaFqedGG1uabYxVXTCTpm6S4qzzt/SqsgY6WrTqBjKnM3oa75SyDrsJmMppn+yr719wdBJz8O9YKhXKhXrKxm3/ty3C4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745673781; c=relaxed/simple; bh=l4Au7TvyFPL0umQ9bBfhGdAE7WvP8xx3odewFUETOm4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=RGHyOsqGqLYyJruPAf1ilg2pn5DfHE2vZrqHk61gHnKwIHPTFZKqHaxYduk0o+Xn/6zcn/AcPw1S0mGmguJCaPIztOpTQCXjqqV/CfI99zOscC/YBIjR0XOlAglXJp1ChxmaN1/sO6fwqxSz5To8sVC12Og8ia+B6JTBfAi+Xmc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OBTmzuC0; 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="OBTmzuC0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DC4CC4CEE2; Sat, 26 Apr 2025 13:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745673780; bh=l4Au7TvyFPL0umQ9bBfhGdAE7WvP8xx3odewFUETOm4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OBTmzuC0YaCx6x2X/UEWnIjEIDSKptE6cSvT3kHafB4xQCFyZGpRx8ZzLJXpHOacL w7NjMBsCqd1Q1WWYOuNyuTobolhXitOJAfq7g+Tu7BPwJjOa68pHwxF54oPnRhcpNe 0DSGGr/dYd8TaFdJsduHwCmUUM9CcE91Ot2bXuGB8VUCmfluuOBoPWh6QOJt3bGJil kDpcoPWzrrftCcsx1CFHS2KwcszH83yQ0uLR4f9nSrAIkAgoGsAb5U/j/6y2ElP9zS JLOSjI8JRM/0hIlCpYELcOOQnl6i6hldEUv6T0Yefi+MBE1y6CXSTInqnzSVQg9rTH ub3+UyzvXb19w== From: Sasha Levin To: stable@vger.kernel.org, david@redhat.com Cc: Sasha Levin Subject: Re: [PATCH 6.1.y] s390/virtio_ccw: Don't allocate/assign airqs for non-existing queues Date: Sat, 26 Apr 2025 09:22:59 -0400 Message-Id: <20250426054018-5d68df23198167c6@stable.kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250425160120.2164213-1-david@redhat.com> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ Sasha's backport helper bot ] Hi, Summary of potential issues: ⚠️ Found matching upstream commit but patch is missing proper reference to it Found matching upstream commit: 2ccd42b959aaf490333dbd3b9b102eaf295c036a Status in newer kernel trees: 6.14.y | Present (different SHA1: fc90e2379125) 6.12.y | Present (different SHA1: f268ee2fbb53) 6.6.y | Present (different SHA1: 3867566eb8a4) Note: The patch differs from the upstream commit: --- 1: 2ccd42b959aaf ! 1: d82417fb38b9a s390/virtio_ccw: Don't allocate/assign airqs for non-existing queues @@ Commit message Acked-by: Christian Borntraeger Link: https://lore.kernel.org/r/20250402203621.940090-1-david@redhat.com Signed-off-by: Heiko Carstens + (cherry picked from commit 2ccd42b959aaf490333dbd3b9b102eaf295c036a) + Signed-off-by: David Hildenbrand ## drivers/s390/virtio/virtio_ccw.c ## @@ drivers/s390/virtio/virtio_ccw.c: static struct airq_info *new_airq_info(int index) - static unsigned long *get_airq_indicator(struct virtqueue *vqs[], int nvqs, - u64 *first, void **airq_info) + static unsigned long get_airq_indicator(struct virtqueue *vqs[], int nvqs, + u64 *first, void **airq_info) { - int i, j; + int i, j, queue_idx, highest_queue_idx = -1; struct airq_info *info; - unsigned long *indicator_addr = NULL; + unsigned long indicator_addr = 0; unsigned long bit, flags; + /* Array entries without an actual queue pointer must be ignored. */ @@ drivers/s390/virtio/virtio_ccw.c: static struct airq_info *new_airq_info(int ind for (i = 0; i < MAX_AIRQ_AREAS && !indicator_addr; i++) { mutex_lock(&airq_areas_lock); if (!airq_areas[i]) -@@ drivers/s390/virtio/virtio_ccw.c: static unsigned long *get_airq_indicator(struct virtqueue *vqs[], int nvqs, +@@ drivers/s390/virtio/virtio_ccw.c: static unsigned long get_airq_indicator(struct virtqueue *vqs[], int nvqs, if (!info) - return NULL; + return 0; write_lock_irqsave(&info->lock, flags); - bit = airq_iv_alloc(info->aiv, nvqs); + bit = airq_iv_alloc(info->aiv, highest_queue_idx + 1); if (bit == -1UL) { /* Not enough vacancies. */ write_unlock_irqrestore(&info->lock, flags); -@@ drivers/s390/virtio/virtio_ccw.c: static unsigned long *get_airq_indicator(struct virtqueue *vqs[], int nvqs, +@@ drivers/s390/virtio/virtio_ccw.c: static unsigned long get_airq_indicator(struct virtqueue *vqs[], int nvqs, *first = bit; *airq_info = info; - indicator_addr = info->aiv->vector; + indicator_addr = (unsigned long)info->aiv->vector; - for (j = 0; j < nvqs; j++) { - airq_iv_set_ptr(info->aiv, bit + j, + for (j = 0, queue_idx = 0; j < nvqs; j++) { --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |