From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 99BD8369203 for ; Fri, 1 May 2026 21:21:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777670470; cv=none; b=DqT5niDlbbnocCY0D7/y5F1kvLq8iWtoIe00gtYzsAyVrF96F2oMUKPBlR59qdw3hUL5CuBGAijYHSUftN4JNXkBwJmFVUbdoCVqzt1IeQKrkCPTQy4bhm95NvZMBcTojIjbSAhXm+ZLPysSATORRPBgZRNLwKkzBa29uaFfJLw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777670470; c=relaxed/simple; bh=gbYFLTANvKgL0YLaobKU6Pf+SimnzpTiv2B12KmDMck=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=P0tBfyUwVyhZyKeeu3OfS1ueQXN2Nhddh1uH0OZylJ6qmv+Q+evuZF3tsORo0uOdYead0VwRZ2ob14rPKTnFXJEhR1GHc4fZwarMjoFr4Il70ZALypIwY3XsrmDcOSxtUPRHdFr+tgUezEWXMCv86OFTAcKwgzFTSA1PGXYwvwk= 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=hfdHCQeN; arc=none smtp.client-ip=209.85.128.49 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="hfdHCQeN" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso16714015e9.0 for ; Fri, 01 May 2026 14:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777670467; x=1778275267; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=E3Cu+Df2v8gmiZwpX0nD5Z+6tJtgNGySMwqyhPLW2dM=; b=hfdHCQeNUln6gHwi1iBuwm14cFds+HdQDBOtrNoYNcD+kxhnUbEzJBWjnEvmGjHR0Y yAlRWd8V0TM/DY5MU7upUq9oS68W1u8MztcoIk5yTXM2qpBdOLihOyfwUUXMorC8Isqf YavOHcuYz22bGxMj6jStImcOjvmr4GDbJeHd6DlPPNMehYZBklbgKS+AZ8oy9c/qg5N2 sAgczoppa60yf5RPsdKadsakqR6DXtYzzwd9B5nOSo637ZhdRgtKEVkesBRt6mMaTqmM jVAxizVSm1YjmLNIkk4y8Z3I3hv/YWtKTGIsaleDK7vVFoNND8vh3a/I7y6UPFkj/72t A9pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777670467; x=1778275267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=E3Cu+Df2v8gmiZwpX0nD5Z+6tJtgNGySMwqyhPLW2dM=; b=CNXlldzo1AMfroLpTm/bJNTZEDd78WF6CP38oCymA1RRl7qHyFOuk/K4C3BmBrIJ5u +GU1SUkufMdmn9n8bdGr9DMhccjHVYyA5aCoHhutdkWbUs101YdPAJPOuc5SmrI0pZT9 ItwZ664ulRMY7dIR1UYql1aPkEMJDAqyq9vxg1xc87Fiz2AB3dYOXxRlDeDIZsANg84h EcBgpkAq1VVYO3xwVj2fMai6bXK93ONp0hrKpuBWmU7KxkrGvAR/JJxWeWpFpiqvim71 Yg1CSEBxBj894bGTlvc5n4lUHx/ZGKUYrzt3ijPWSIg1ZTdnSGqKI/p+1Poiq4FHBj2S fzEQ== X-Forwarded-Encrypted: i=1; AFNElJ+PggtNGYe8SKKzfGa0LaC502ELagRyPc9ykmuZ2nlCdm2Hz1EKeAAgCaHTcwT+Oj3aOr15Ttn3mN8oFoI=@vger.kernel.org X-Gm-Message-State: AOJu0Ywhc+ePtE532uc2WxdkNxuBg6TtuswSdh4uiLHI0BOod4JD+5N1 uP1jM0ThzgdWTmOrvbLuTHU69A0MRnxUnk/V9jatp8XymWGHAVoE2oNf X-Gm-Gg: AeBDiev6yxvnmtOVCMGLgkLD7vtolWNuRzr34zi46VTwMpGaTl+ieu6s/3SFvE6m2cI H67ZKTOnRDY7LItWe4LHAC4+SbCGUomhH0GzK//UreNartlDHpqSX7c4wc6ax8pZ5SqGXq+Eo5O PYOnjxaji5NCaLY3KaLdo/5KVz1sybah6zwmDnOAeZ0TOrAnAbm2tiRLVRCOaR+fh5UyFrCPK9T q6+H/QLUt5QBv4D5vMZ67R9I36RUDKSMsrDnY0Ow4Ulr0AcQ5NDmPTd3mg1UuM743ZyN7r/8nnb iFeCB/Ky8sWUNLfme//FWqKAG7sKGrbWmgN7CH8AAnjiFaoeKSD58y1CJDP8C01JKcFR77SoE9j hrnU4oi+krQYIQQ8NXIN5FvkVW7Mwl9xAGYwP8BecNS/3y+4HEwSN3Zz5ScD/6Hi6o+ypp0y4sr EnRH1w4oC2btIumcV1VwbajzrUkg7A1BbDZHwK/3AJZ2Jqv0Uq2znO+FBtnjqxVWknVU+w8/5mr mY= X-Received: by 2002:a05:6000:288b:b0:43d:7a97:78b5 with SMTP id ffacd0b85a97d-44bb5e2deb9mr1495268f8f.33.1777670466885; Fri, 01 May 2026 14:21:06 -0700 (PDT) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a8f51bac8sm7514313f8f.16.2026.05.01.14.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 14:21:06 -0700 (PDT) Date: Fri, 1 May 2026 22:21:05 +0100 From: David Laight To: Bobby Eshleman Cc: Breno Leitao , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefano Garzarella , Shuah Khan , sdf.kernel@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, linux-kselftest@vger.kernel.org, kernel-team@meta.com Subject: Re: [PATCH net-next 2/3] vsock: convert to getsockopt_iter Message-ID: <20260501222105.747dea59@pumpkin> In-Reply-To: References: <20260501-getsock_one-v1-0-810ce23ea70e@debian.org> <20260501-getsock_one-v1-2-810ce23ea70e@debian.org> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 1 May 2026 10:32:44 -0700 Bobby Eshleman wrote: > On Fri, May 01, 2026 at 08:52:52AM -0700, Breno Leitao wrote: > > Convert AF_VSOCK's getsockopt implementation to use the new > > getsockopt_iter callback with sockopt_t. The single > > vsock_connectible_getsockopt() callback is shared by both > > vsock_stream_ops and vsock_seqpacket_ops, so both proto_ops are > > updated to use .getsockopt_iter. > > > > Key changes: > > - Replace (char __user *optval, int __user *optlen) with sockopt_t *opt > > - Use opt->optlen for buffer length (input) and returned size (output) > > - Use copy_to_iter() instead of put_user()/copy_to_user() > > > > Signed-off-by: Breno Leitao > > --- > > net/vmw_vsock/af_vsock.c | 16 +++++++--------- > > 1 file changed, 7 insertions(+), 9 deletions(-) > > > > diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c > > index 44037b066a5ff..d4a97eeb596e6 100644 > > --- a/net/vmw_vsock/af_vsock.c > > +++ b/net/vmw_vsock/af_vsock.c > > @@ -155,6 +155,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -2091,8 +2092,7 @@ static int vsock_connectible_setsockopt(struct socket *sock, > > > > static int vsock_connectible_getsockopt(struct socket *sock, > > int level, int optname, > > - char __user *optval, > > - int __user *optlen) > > + sockopt_t *opt) > > { > > struct sock *sk = sock->sk; > > struct vsock_sock *vsk = vsock_sk(sk); > > @@ -2110,8 +2110,7 @@ static int vsock_connectible_getsockopt(struct socket *sock, > > if (level != AF_VSOCK) > > return -ENOPROTOOPT; > > > > - if (get_user(len, optlen)) > > - return -EFAULT; > > + len = opt->optlen; > > > > memset(&v, 0, sizeof(v)); > > > > @@ -2142,11 +2141,10 @@ static int vsock_connectible_getsockopt(struct socket *sock, > > return -EINVAL; > > if (len > lv) > > len = lv; > > - if (copy_to_user(optval, &v, len)) > > + if (copy_to_iter(&v, len, &opt->iter_out) != len) I'd wrap that as copy_to_sockopt(&v, len, opt). or to make the edits easier: copy_to_sockopt(opt, &v, len). Then if someone decides to change the implementation none of the call sites need changing. -- David > > return -EFAULT; > > > > - if (put_user(len, optlen)) > > - return -EFAULT; > > + opt->optlen = len; > > > > return 0; > > } > > @@ -2631,7 +2629,7 @@ static const struct proto_ops vsock_stream_ops = { > > .listen = vsock_listen, > > .shutdown = vsock_shutdown, > > .setsockopt = vsock_connectible_setsockopt, > > - .getsockopt = vsock_connectible_getsockopt, > > + .getsockopt_iter = vsock_connectible_getsockopt, > > .sendmsg = vsock_connectible_sendmsg, > > .recvmsg = vsock_connectible_recvmsg, > > .mmap = sock_no_mmap, > > @@ -2653,7 +2651,7 @@ static const struct proto_ops vsock_seqpacket_ops = { > > .listen = vsock_listen, > > .shutdown = vsock_shutdown, > > .setsockopt = vsock_connectible_setsockopt, > > - .getsockopt = vsock_connectible_getsockopt, > > + .getsockopt_iter = vsock_connectible_getsockopt, > > .sendmsg = vsock_connectible_sendmsg, > > .recvmsg = vsock_connectible_recvmsg, > > .mmap = sock_no_mmap, > > > > -- > > 2.52.0 > > > > Reviewed-by: Bobby Eshleman >