From nobody Sun Sep 20 23:47:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785930862; cv=none; d=zohomail.com; s=zohoarc; b=K+mBnpx3YfkodNdFwp8c6cySd/vRfIhI6jnV0+wjJ9LRjUeHy1fVsIBUGaIreQY6+IsAirmNcaHCJ8Zo5dCt2ahNttzOYeuv/h7H5xqOXRdxAtqEMYI3f9/mxnRD56FyfbRrxFQhmjuNkR+65GF2pzt+gG3AQNDeoYy0Eek/ynA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785930862; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5jDhb2tARuSf+YKnlUfn3SUaBnFFNuXdl0nurjHO2es=; b=nB2Fr48tsySbDaMCvsSDOaLeutWJdNGmGk/jmQKpC6BG+F0r8Yl49m2lfgEjONVVt81t7BQAESfk98kF57Kj7IVncKl+P1xeEY5JYYb8gAbPVetyv1B3sODMd8IFV20Df89mJbI+7e618bMMyv0hPV0LrsjoHtICvfieX1djd/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785930862866923.6763806165178; Wed, 5 Aug 2026 04:54:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wraCH-0000k7-JV; Wed, 05 Aug 2026 07:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wraCF-0000aJ-O7 for qemu-devel@nongnu.org; Wed, 05 Aug 2026 07:54:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wraCD-0007PK-Ts for qemu-devel@nongnu.org; Wed, 05 Aug 2026 07:54:07 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-338-KZ0bwLT9NBeJ8nXM54CwdQ-1; Wed, 05 Aug 2026 07:53:57 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 55FD018001E3 for ; Wed, 5 Aug 2026 11:53:56 +0000 (UTC) Received: from localhost (unknown [10.44.22.2]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A75181956041; Wed, 5 Aug 2026 11:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785930845; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5jDhb2tARuSf+YKnlUfn3SUaBnFFNuXdl0nurjHO2es=; b=IMQK+B8NG896ZgE+Rn65IwQNST9Omknrg99pggITwvJUBmUV9Tcbqz7T5+6blzgKQTxe5M kE/W+Ip2BqICMJFYuJ+KQQm2FfKLecNx1Uh6zyGWRzy1sPVx2+Nsxp9e0WZJH+aUqQtAy5 G+KaMBFdtEkHtqi075xI5W0mSgQG4Uk= X-MC-Unique: KZ0bwLT9NBeJ8nXM54CwdQ-1 X-Mimecast-MFC-AGG-ID: KZ0bwLT9NBeJ8nXM54CwdQ_1785930836 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 05 Aug 2026 15:51:05 +0400 Subject: [PATCH 15/27] hw/usb/dev-smartcard-reader: drop current_bulk_in pointer MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260805-smartcard-fixes-v1-15-187ee9122441@redhat.com> References: <20260805-smartcard-fixes-v1-0-187ee9122441@redhat.com> In-Reply-To: <20260805-smartcard-fixes-v1-0-187ee9122441@redhat.com> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=4087; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=6DXD21OlPSmolUfb9FpDK83hcl7TtJL+zhY9NAez3qc=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqcyOtpYhXDuEwnHeaT671r47apxRl5xmLUK8Q0 6DeqYsKwjCJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCanMjrQAKCRDa6OEJdZac 5d8eD/0SjL9NQ0/kDbJAHl0AqVd7fmiVog+L6cWxYEQDfbDyw61BZmLdEbzkzVCqxB3QMVhG6BR Lue5e5iQL/hPKP38N3tStEwfIpcYgLseNHLgIAQvweNtvbru4m86C0mAIDTkqQtmagEXzYMFoCo YWb3c6tg7vss5zJGMzDArCT6xSetcogiqZEIh+cAK43sRHIZq3U9iL+TRfrtbYihkkTF9tiiLTw R32bZFvY3cyTlPnPr3ZH7meQIvLDxgSxBufn9gEy5ZAsuVhNO3vaiRd2w2e+srn7jPRM/uQMWte gk0sKIzzKAVRzDkl0KTKG7NW+UCGObkdVUbVO1Cjl7cpgHCTWmmMiV/6SoO0mlWpd+ZOrS6+oUn y4CFWQ70YahdfuYza06rdrvrddw0FImoxlZYvRG+PoNnzvQcEeya6YHsmgkssWIYCogDoAVAFEh IyYsfFm27HxlSPO3jLV5gCh2zoBedcjudUsnHMjnhYM1hcLjJYJT2IsYz3AsKYJVwjY5U+q1Trf 7oMZkRjrrWYkmxHnx/AOa8LmWeNNgJs1qoGJjAUnSOVagcBLczqtk7ssamxbf0AerXslckeAzqs 6pfZJw101NnwhZ2XqtLFcVZpsq4DwTCSWH6yd45Ez21ufZjC2KVLI0q9w/VCeLxupl+VQLpCOOB A63BGUsNhi0i8mg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.852, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785930864195158500 Replace the eagerly-dequeued current_bulk_in pointer with a ccid_bulk_in_peek() that returns the head of the ring without advancing it. The element now stays at bulk_in_pending[start] while being partially consumed, and start is advanced together with the num decrement in ccid_bulk_in_release(). This removes a field from USBCCIDState and simplifies the bulk-in ring buffer lifecycle from three states (queued, grabbed, released) down to two (queued, released). Note that this changes the semantic of bulk_in_pending_start in the migration stream too. But since migration with pending current_bulk_in was broken, this doesn't make further damages. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/usb/dev-smartcard-reader.c | 42 +++++++++++++++++++++------------------= --- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 699e236f624e..3f128791f3ef 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -296,7 +296,6 @@ struct USBCCIDState { uint32_t bulk_in_pending_start; uint32_t bulk_in_pending_end; /* first free */ uint32_t bulk_in_pending_num; - BulkIn *current_bulk_in; uint8_t bulk_out_data[BULK_OUT_DATA_SIZE]; uint32_t bulk_out_pos; uint64_t last_answer_error; @@ -583,24 +582,27 @@ static void ccid_bulk_in_clear(USBCCIDState *s) s->bulk_in_pending_start =3D 0; s->bulk_in_pending_end =3D 0; s->bulk_in_pending_num =3D 0; - s->current_bulk_in =3D NULL; } =20 static void ccid_bulk_in_release(USBCCIDState *s) { - assert(s->current_bulk_in !=3D NULL); - s->current_bulk_in->pos =3D 0; - s->current_bulk_in =3D NULL; + BulkIn *bulk_in; + + assert(s->bulk_in_pending_num > 0); + bulk_in =3D + &s->bulk_in_pending[s->bulk_in_pending_start % BULK_IN_PENDING_NUM= ]; + bulk_in->pos =3D 0; + s->bulk_in_pending_start++; s->bulk_in_pending_num--; } =20 -static void ccid_bulk_in_get(USBCCIDState *s) +static BulkIn *ccid_bulk_in_peek(USBCCIDState *s) { - if (s->current_bulk_in !=3D NULL || s->bulk_in_pending_num =3D=3D 0) { - return; + if (s->bulk_in_pending_num =3D=3D 0) { + return NULL; } - s->current_bulk_in =3D - &s->bulk_in_pending[(s->bulk_in_pending_start++) % BULK_IN_PENDING= _NUM]; + return &s->bulk_in_pending[ + s->bulk_in_pending_start % BULK_IN_PENDING_NUM]; } =20 static void *ccid_reserve_recv_buf(USBCCIDState *s, uint16_t len) @@ -1135,18 +1137,17 @@ err: static void ccid_bulk_in_copy_to_guest(USBCCIDState *s, USBPacket *p) { int len =3D 0; + BulkIn *bulk_in; =20 - ccid_bulk_in_get(s); - if (s->current_bulk_in !=3D NULL) { - assert(s->current_bulk_in->pos <=3D s->current_bulk_in->len); - len =3D MIN(s->current_bulk_in->len - s->current_bulk_in->pos, - p->iov.size); + bulk_in =3D ccid_bulk_in_peek(s); + if (bulk_in !=3D NULL) { + assert(bulk_in->pos <=3D bulk_in->len); + len =3D MIN(bulk_in->len - bulk_in->pos, p->iov.size); if (len) { - usb_packet_copy(p, s->current_bulk_in->data + - s->current_bulk_in->pos, len); + usb_packet_copy(p, bulk_in->data + bulk_in->pos, len); } - s->current_bulk_in->pos +=3D len; - if (s->current_bulk_in->pos =3D=3D s->current_bulk_in->len + bulk_in->pos +=3D len; + if (bulk_in->pos =3D=3D bulk_in->len && (len !=3D CCID_MAX_PACKET_SIZE || len < p->iov.size)) { ccid_bulk_in_release(s); } @@ -1439,8 +1440,7 @@ static bool ccid_pre_save(void *opaque, Error **errp) { USBCCIDState *s =3D opaque; =20 - if (s->pending_answers_num || s->bulk_in_pending_num || - s->current_bulk_in) { + if (s->pending_answers_num || s->bulk_in_pending_num) { error_setg(errp, "usb-ccid has pending queue state which cannot be= " "migrated safely"); return false; --=20 2.55.0