From nobody Fri Dec 19 17:58:09 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 BFA8E21C165 for ; Fri, 23 May 2025 23:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041536; cv=none; b=nKY8460/pRZVOcxPyJ+Lpf08QWVhcGFqi+E7w8nciMZxI+0Hn7kmWEC4ZlPfsxJYcNR8ybOywlyyAp0rxBz1gxO6eI7uxqA3tQNKDIR3HEWo6krQMSdX/riO58F7AvCuhQqaB13Xp0Za2QN+apLX6WHuQVa33pCq96C+bir4bxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748041536; c=relaxed/simple; bh=0WyWdlblD1opyDXTAcioi+FN4eUkunAJc10HflKJZ/c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=O1SspBEiV1q4WUxdicCz7zlavQ5tHHMlWEfO8GqY9qm/VQKdyhCkt5OHjof4giPUNtRdz9lnHA1JdBii8Zw37HxAbLTz29MtnK9AMD3znK6aYEDXA3kNO77cDeprXNMnZEKoxOfhSSxsfwt7XCg3eSHjIEajry+4k3v86mmMDwo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lNUvomD7; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lNUvomD7" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-745fd5b7b65so230331b3a.0 for ; Fri, 23 May 2025 16:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748041534; x=1748646334; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YGa5vpAckjVMn+DJyOLrdnNXFOJ4oaSqmPoGO5u/7eQ=; b=lNUvomD7i7tGLs/vaOZUxg6uA6poEZN8LRuzYQd4pL/PAo4Fom3TB3R04f8MBjcyjA N23tYzilqGHH/tRF79eP4vP+MUmxTg7TYp+LeTjxlo9zRaRLVu3SQ+CgUiTaK3KVsth3 43YN09MakutY9jpxGqONFlJSkpRniEjzBKINHDT9eEr/MrcU2mIEXMwLeqyXp/4cl+ML gbGTGmWGEu/McnGQypnKZKAowzKwyxUZHXWOQ6zyg7W75upQnprlTuHdN3lw7CceQeGd hoWrjv55FGZ16JYdHhBH5//EeZ91yOIaXy4TXl+5Pkf++CgsdCzPJImXlrse037JqBsR 0l1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748041534; x=1748646334; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YGa5vpAckjVMn+DJyOLrdnNXFOJ4oaSqmPoGO5u/7eQ=; b=VPcxcZHOiS3y1VK1aUlR2QZYlXy8jBdbl3AUGMiy+1vyGK1ETsjpBrhiQyUJ4fggBG p1cDx2mCXb3FFlBkxTv/Ygu61AMDlkmQgnut31oavg0TUF8yB4tQHj3TCuCE+OogY4/n XWsXsvubC2KTg9b6QCQJHDnACp3Do3lV0d+aVl64Tm/PUtUvYVtJy2l+YPczsxiakMdp 1EY1KCWHXBuk101WzXMigKsPpv0p3QOJYpWsz6rDRkL0VVuv0n8TMAXxa8JuxKWYxEVA gGQyc4Qmk88rcf9kjmtvMl7qc/B6K8cSK7NObSHxI6vI1hIXJxG9vYeeOAY1opkPrOTQ c/UA== X-Forwarded-Encrypted: i=1; AJvYcCVmSsK1BxR67oeqFLJRB36JV4EzFYUdl+QzjCKXSA48z2TyEKFFxfqZhcowUAvIh5XwY05VFVvCjoX4w+o=@vger.kernel.org X-Gm-Message-State: AOJu0YzEov16muz4sBjlmEK3DsRPwfEgPydDK/KrsOLwgqcAoOdVgpj9 0glBtl1e7TIj71FU+dSH2Qh1jGWERVChyurbPTNPnFpiBtrZxTGH67go1frVzIRePgFQwEdhVw8 45b/tafHpgCn9Wbiuqfblw4chqw== X-Google-Smtp-Source: AGHT+IFiPOxxNaYi6AA9Ymvqa8x0QHUR555swbbPaDyHWJAxkZVauCz0orPrUoUSiBGG+ARldTE4WLtzf4erBOqE5w== X-Received: from pfpk9.prod.google.com ([2002:aa7:9d09:0:b0:742:a99a:ec59]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:a84:b0:736:6ecd:8e34 with SMTP id d2e1a72fcca58-745fe014bf1mr1931755b3a.18.1748041533972; Fri, 23 May 2025 16:05:33 -0700 (PDT) Date: Fri, 23 May 2025 23:05:19 +0000 In-Reply-To: <20250523230524.1107879-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250523230524.1107879-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523230524.1107879-4-almasrymina@google.com> Subject: [PATCH net-next v2 3/8] net: devmem: preserve sockc_err From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jesper Dangaard Brouer , Ilias Apalodimas , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Andrew Lunn , Shuah Khan , sdf@fomichev.me, ap420073@gmail.com, praan@google.com, shivajikant@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Preserve the error code returned by sock_cmsg_send and return that on err. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- v2: - Remove unnecessary !! (Stan) --- net/ipv4/tcp.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b7b6ab41b496..f64f8276a73c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1067,7 +1067,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) int flags, err, copied =3D 0; int mss_now =3D 0, size_goal, copied_syn =3D 0; int process_backlog =3D 0; - bool sockc_valid =3D true; + int sockc_err =3D 0; int zc =3D 0; long timeo; =20 @@ -1075,13 +1075,10 @@ int tcp_sendmsg_locked(struct sock *sk, struct msgh= dr *msg, size_t size) =20 sockc =3D (struct sockcm_cookie){ .tsflags =3D READ_ONCE(sk->sk_tsflags) = }; if (msg->msg_controllen) { - err =3D sock_cmsg_send(sk, msg, &sockc); - if (unlikely(err)) - /* Don't return error until MSG_FASTOPEN has been - * processed; that may succeed even if the cmsg is - * invalid. - */ - sockc_valid =3D false; + sockc_err =3D sock_cmsg_send(sk, msg, &sockc); + /* Don't return error until MSG_FASTOPEN has been processed; + * that may succeed even if the cmsg is invalid. + */ } =20 if ((flags & MSG_ZEROCOPY) && size) { @@ -1092,7 +1089,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) } else if (sock_flag(sk, SOCK_ZEROCOPY)) { skb =3D tcp_write_queue_tail(sk); uarg =3D msg_zerocopy_realloc(sk, size, skb_zcopy(skb), - sockc_valid && !!sockc.dmabuf_id); + !sockc_err && sockc.dmabuf_id); if (!uarg) { err =3D -ENOBUFS; goto out_err; @@ -1102,7 +1099,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) else uarg_to_msgzc(uarg)->zerocopy =3D 0; =20 - if (sockc_valid && sockc.dmabuf_id) { + if (!sockc_err && sockc.dmabuf_id) { binding =3D net_devmem_get_binding(sk, sockc.dmabuf_id); if (IS_ERR(binding)) { err =3D PTR_ERR(binding); @@ -1116,7 +1113,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) zc =3D MSG_SPLICE_PAGES; } =20 - if (sockc_valid && sockc.dmabuf_id && + if (!sockc_err && sockc.dmabuf_id && (!(flags & MSG_ZEROCOPY) || !sock_flag(sk, SOCK_ZEROCOPY))) { err =3D -EINVAL; goto out_err; @@ -1160,9 +1157,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) /* 'common' sending to sendq */ } =20 - if (!sockc_valid) { - if (!err) - err =3D -EINVAL; + if (sockc_err) { + err =3D sockc_err; goto out_err; } =20 --=20 2.49.0.1151.ga128411c76-goog