From patchwork Tue Jul 26 12:14:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12929223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41B52C43334 for ; Tue, 26 Jul 2022 12:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233235AbiGZMPS (ORCPT ); Tue, 26 Jul 2022 08:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233224AbiGZMPR (ORCPT ); Tue, 26 Jul 2022 08:15:17 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFD1FAE70 for ; Tue, 26 Jul 2022 05:15:15 -0700 (PDT) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26Q0rR8e010368 for ; Tue, 26 Jul 2022 05:15:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=fvuLvGOXfPpDawfY17s+47uVGXBsXbTXyOIpofQR6Tc=; b=PdgXfs48EWXKZUg78cReGEbgL3D+7i23C1FkGa9TH0IOWTPkvgTSR4EDrSOQfrJN31e7 oTiLkOmqD9siiFlZBsOlX25WkB9CLHDC51IHFyAHUrUOSVri+SLf3P/e+6+uWKhTRc64 sDRSoad7AHrFz9KDIytgQBTIfNlld84E5ck= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3hhxbwny4s-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 26 Jul 2022 05:15:15 -0700 Received: from twshared25107.07.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Tue, 26 Jul 2022 05:15:12 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 0C97B397A78C; Tue, 26 Jul 2022 05:15:08 -0700 (PDT) From: Dylan Yudaken To: , CC: , , Dylan Yudaken Subject: [PATCH liburing 1/5] more consistent multishot recvmsg API parameter names Date: Tue, 26 Jul 2022 05:14:58 -0700 Message-ID: <20220726121502.1958288-2-dylany@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220726121502.1958288-1-dylany@fb.com> References: <20220726121502.1958288-1-dylany@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: lTpCwPUyisxLPMV0ruqqj7_zy-z0MLWk X-Proofpoint-ORIG-GUID: lTpCwPUyisxLPMV0ruqqj7_zy-z0MLWk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-26_04,2022-07-26_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Make the parameters more consistent with for example cmsg(3), and with itself (in the form of buf_len). Signed-off-by: Dylan Yudaken --- src/include/liburing.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/include/liburing.h b/src/include/liburing.h index cffdabd71144..d3cbdb037b32 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -734,9 +734,9 @@ static inline void io_uring_prep_recv_multishot(struct io_uring_sqe *sqe, } static inline struct io_uring_recvmsg_out * -io_uring_recvmsg_validate(void *buf, int buf_len, struct msghdr *m) +io_uring_recvmsg_validate(void *buf, int buf_len, struct msghdr *msgh) { - int header = m->msg_controllen + m->msg_namelen + + int header = msgh->msg_controllen + msgh->msg_namelen + sizeof(struct io_uring_recvmsg_out); if (buf_len < header) @@ -751,42 +751,42 @@ static inline void *io_uring_recvmsg_name(struct io_uring_recvmsg_out *o) static inline struct cmsghdr * io_uring_recvmsg_cmsg_firsthdr(struct io_uring_recvmsg_out *o, - struct msghdr *m) + struct msghdr *msgh) { if (o->controllen < sizeof(struct cmsghdr)) return NULL; return (struct cmsghdr *)((unsigned char *) io_uring_recvmsg_name(o) + - m->msg_namelen); + msgh->msg_namelen); } static inline void *io_uring_recvmsg_payload(struct io_uring_recvmsg_out *o, - struct msghdr *m) + struct msghdr *msgh) { return (void *)((unsigned char *)io_uring_recvmsg_name(o) + - m->msg_namelen + m->msg_controllen); + msgh->msg_namelen + msgh->msg_controllen); } static inline size_t io_uring_recvmsg_payload_length(struct io_uring_recvmsg_out *o, - int buf_length, struct msghdr *m) + int buf_len, struct msghdr *msgh) { unsigned long payload_start, payload_end; - payload_start = (unsigned long) io_uring_recvmsg_payload(o, m); - payload_end = (unsigned long) o + buf_length; + payload_start = (unsigned long) io_uring_recvmsg_payload(o, msgh); + payload_end = (unsigned long) o + buf_len; return payload_end - payload_start; } static inline struct cmsghdr * -io_uring_recvmsg_cmsg_nexthdr(struct io_uring_recvmsg_out *o, struct msghdr *m, +io_uring_recvmsg_cmsg_nexthdr(struct io_uring_recvmsg_out *o, struct msghdr *msgh, struct cmsghdr *cmsg) { unsigned char *end; if (cmsg->cmsg_len < sizeof(struct cmsghdr)) return NULL; - end = (unsigned char *) io_uring_recvmsg_cmsg_firsthdr(o, m) + + end = (unsigned char *) io_uring_recvmsg_cmsg_firsthdr(o, msgh) + o->controllen; cmsg = (struct cmsghdr *)((unsigned char *) cmsg + CMSG_ALIGN(cmsg->cmsg_len));