From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CE5438836A for ; Thu, 13 Aug 2026 17:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786642313; cv=none; b=CLluFDU5wCU6GoDYR/JhSxPpjCUBBjbKVm+ybLa8K2GAUzFbvydmGRPaZCLjr5Gny/oFdhFuKBvRzuAirR6/sca1OPpGkH2yultDk8v+wKM4XJ39nHI/ukZKVR3eUTreuqMoMevjqK/gb1x00IMeKb20wQ/KPb2xI32ZpS7GNtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786642313; c=relaxed/simple; bh=sCm4JC/C/nrh5towOjwGQMmxpw99/kz1n1+sjCZg3OM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Asr8Tm4P21dHzmfLB8IrT+k9uxNPHwJ5h2J594hPpco6hcwwP0PiaInruiFv2RiiA/4H8e8ONR96dStojnriXCA2IYia1OHetvU/GR78nJVXcfc0UpSHfEG2fydMVUh2JJRZioXJSqjFtW9owr/XHy0SBk0n24kOu220I6QEOJQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KqYP55oS; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KqYP55oS" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-38dfe7eb825so93260a91.0 for ; Thu, 13 Aug 2026 10:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786642311; x=1787247111; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PMBuQPRPUkDIdWcPkANLnrxOobcaxz+FksX3Qk8GmDY=; b=KqYP55oSxthzUjO12VlOeGSb7bj1EOrY5HBI/DOOo9CsVtjGSXHm3CMgvVzzcyloxu wiU7ZYTuQxC88o1uM5nVee6JeTf7ByBrLtxipIY7dYBDCS8hxk/aJz+C7E3eFJOMIFw+ a6RylTU+PggdDgaVVNZ3nQiBDkTn4YvR1ojGeFHU7eYcsV4PhuolA4zCsJgXO3Dl62nQ jp+bZSC4nXAnH+wx3ghGY9o9jdJt4CjPp9iKRgqHsFCZCwnsKzL2sIM6uPDMZ5RBKXlA 4+VMBh9aYYdisgc4wND/x5lp6d3jKYqmDeeNDgIopowjLJOnaPDtsMB7RtAhloYcySE7 Xajg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786642311; x=1787247111; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=PMBuQPRPUkDIdWcPkANLnrxOobcaxz+FksX3Qk8GmDY=; b=VZgioAq0y58CQMmcRyEGHqt+nvZjRcoeKK6fnAYzUstbBXN0fVlgVu54syR0xSNMRB ZmLL6ZRrNL1j2HASQfiNbAHSIIISJbGpv1rVghZ/WpzPZUpyzrqxMvwYJxs6O8Li2BCq y/bzrImajDkOTxtdJT3Bjg9jGV94KzoF1R/S4hD38pEoha3cxGTlD5/O6NjhJDjPTgPf xAq23zS/gptkvJM7+wcqtPUhMSIC61S5QkGh33IVycY08Q9hm0qTf2st4/00jTviGoI/ b9ZhWPbrz7qJR59KzXc06AApPVsoyKsDBUWraLIFc53JSjsyzioj+dYsTjLP01NQZfbK UWww== X-Forwarded-Encrypted: i=1; AHgh+Rqmx38vmpBP1ajD42ItdktVwwT7eaYjaIKFV48ZwiTYcFyN5mW+TbQwnOMpkW8HHfw0JVHZwdD4QD3iPVM=@vger.kernel.org X-Gm-Message-State: AOJu0YyLpJZj01mmn4QVzHLU5cEi4M7HidtnEMeElUPJcZ359RUn24lT aWGToxnlZW0wmlHmmyJKB3JgZNvyLCY7jNT8bCf3DJBCZv+uiDdE7oLv X-Gm-Gg: AR+sD13oxSjcDxmmPw8U2PMQvwFxol46huR6UbGkbsNVW61wc9EKcIuoAjxYE0uPtyZ kYXus2N9h7B1s2pcMReSSdMjm9EXrT38g0rK7Ub+paKEjYpRLwjBsmAUF2BltjyrTC0BnBQxEkE yaHL9Le1fH4BMPaq6e+4YBIlTf3RGeNi3v494U50+fxvClnulBhGls2U5cXOYv6Hc0dc2qOmRLh ixUB43PuqBsvvCxjij1jDGfGy1o0U2SWX3hB2SWJih104iFMoe2wV6pJA/drpWPeSsyyJvIZz0y TvZ3Fh6oOTBQycHlZTZkCkmlMScLL3Z1BXkw1A4wJ91q3P4fg+gnCZfKqQKfwWBXNUDiFL4kMro xZC11+iH/NWAqmwd8QcA0HfYi6Nx7U9JzZExIQgjU27rblOFsO7LwnAXOR1op2kYE2nOQN7jnOE uMo1QbGPE+xtC5ZxqQCvYUzRyenocjWgJ/U//Gynxo4YUbXYnoQV1Dl1LxLAHVDg== X-Received: by 2002:a17:90b:4d01:b0:381:528a:808c with SMTP id 98e67ed59e1d1-3931e0fd153mr7752510a91.12.1786642311225; Thu, 13 Aug 2026 10:31:51 -0700 (PDT) Received: from phi.nguyendp ([116.86.160.247]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31ebc75d8casm10961169eec.3.2026.08.13.10.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 10:31:50 -0700 (PDT) From: Nguyen Dinh Phi To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: Nguyen Dinh Phi , virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/3] vsock: remove the now-unused rejected flag Date: Fri, 14 Aug 2026 01:30:19 +0800 Message-ID: <20260813173024.2362935-3-phind.uet@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260813173024.2362935-1-phind.uet@gmail.com> References: <20260813173024.2362935-1-phind.uet@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit After previous patch, the branch marking a socket rejected in vsock_accept() is unreachable, and nothing ever sets vsk->rejected elsewhere. In fact, since commit d021c344051a ("VSOCK: Introduce VM Sockets"), where `rejected` was introduced, there has never been a path that sets sk_err on a listening socket, so that branch has been dead code since the beginning. Therefore, we can remove the `rejected` field from vsock_sock structure. Suggested-by: Stefano Garzarella Signed-off-by: Nguyen Dinh Phi --- include/net/af_vsock.h | 5 +---- net/vmw_vsock/af_vsock.c | 46 +++++++++++++--------------------------- 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index 30046a3c20f7..3357ee62d10b 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -52,13 +52,10 @@ struct vsock_sock { * The listening socket is the head for both lists. Sockets created * for connection requests are placed in the pending list until they * are connected, at which point they are put in the accept queue list - * so they can be accepted in accept(). If accept() cannot accept the - * connection, it is marked as rejected so the cleanup function knows - * to clean up the socket. + * so they can be accepted in accept(). */ struct list_head pending_links; struct list_head accept_queue; - bool rejected; struct delayed_work connect_work; struct delayed_work pending_work; struct delayed_work close_work; diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 3cd5c3561be3..62e22c4b13c0 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -38,10 +38,9 @@ * pending socket. When that socket reaches the connected state, it is removed * from the listener socket's pending list and enqueued in the listener * socket's accept queue. Callers of accept(2) will accept connected sockets - * from the listener socket's accept queue. If the socket cannot be accepted - * for some reason then it is marked rejected. Once the connection is - * accepted, it is owned by the user process and the responsibility for cleanup - * falls with that user process. + * from the listener socket's accept queue. Once the connection is accepted, + * it is owned by the user process and the responsibility for cleanup falls + * with that user process. * * - It is possible that these pending sockets will never reach the connected * state; in fact, we may never receive another packet after the connection @@ -49,9 +48,7 @@ * future, after some amount of time passes where a connection should have been * established. This function ensures that the socket is off all lists so it * cannot be retrieved, then drops all references to the socket so it is cleaned - * up (sock_put() -> sk_free() -> our sk_destruct implementation). Note this - * function will also cleanup rejected sockets, those that reach the connected - * state but leave it before they have been accepted. + * up (sock_put() -> sk_free() -> our sk_destruct implementation). * * - Lock ordering for pending or accept queue sockets is: * @@ -774,11 +771,10 @@ static void vsock_pending_work(struct work_struct *work) if (vsock_is_pending(sk)) { vsock_remove_pending(listener, sk); - } else if (!vsk->rejected) { - /* We are not on the pending list and accept() did not reject - * us, so we must have been accepted by our user process. We - * just need to drop our references to the sockets and be on - * our way. + } else { + /* We are not on the pending list so we must have been accepted + * by our user process. We just need to drop our references to + * the sockets and be on our way. */ cleanup = false; goto out; @@ -942,7 +938,6 @@ static struct sock *__vsock_create(struct net *net, vsk->listener = NULL; INIT_LIST_HEAD(&vsk->pending_links); INIT_LIST_HEAD(&vsk->accept_queue); - vsk->rejected = false; vsk->sent_request = false; vsk->ignore_connecting_rst = false; WRITE_ONCE(vsk->peer_shutdown, 0); @@ -1914,26 +1909,15 @@ static int vsock_accept(struct socket *sock, struct socket *newsock, lock_sock_nested(connected, SINGLE_DEPTH_NESTING); vconnected = vsock_sk(connected); - /* If the listener socket has received an error, then we should - * reject this socket and return. Note that we simply mark the - * socket rejected, drop our reference, and let the cleanup - * function handle the cleanup; the fact that we found it in - * the listener's accept queue guarantees that the cleanup - * function hasn't run yet. - */ - if (err) { - vconnected->rejected = true; - } else { - newsock->state = SS_CONNECTED; - sock_graft(connected, newsock); + newsock->state = SS_CONNECTED; + sock_graft(connected, newsock); - set_bit(SOCK_CUSTOM_SOCKOPT, - &connected->sk_socket->flags); + set_bit(SOCK_CUSTOM_SOCKOPT, + &connected->sk_socket->flags); - if (vsock_msgzerocopy_allow(vconnected->transport)) - set_bit(SOCK_SUPPORT_ZC, - &connected->sk_socket->flags); - } + if (vsock_msgzerocopy_allow(vconnected->transport)) + set_bit(SOCK_SUPPORT_ZC, + &connected->sk_socket->flags); release_sock(connected); sock_put(connected); -- 2.53.0