From patchwork Mon Aug 15 17:09:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 12943888 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 C56ECC00140 for ; Mon, 15 Aug 2022 17:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229633AbiHORJd (ORCPT ); Mon, 15 Aug 2022 13:09:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229508AbiHORJc (ORCPT ); Mon, 15 Aug 2022 13:09:32 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A427527B1F for ; Mon, 15 Aug 2022 10:09:31 -0700 (PDT) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27FBOVZV007753 for ; Mon, 15 Aug 2022 10:09:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=facebook; bh=HnWsEyICVZdmWkyPKqdrWkSBy+duAZhGoHPaEwTlAts=; b=Dx0nWKY6EF+Flb1UKUQ7tokkC6FYMPTzq73tTDziMaBL9qwkqpLT7OENHwRzqtWEQM0g QLrRBStYon0UEFr7AJgzE7PtGW+k111BBOkow4ioMKj+sW5wodqP2LRpYa0Ncdziif68 faspN+pGMVTRp3Wpy+suHIJ4gdzCdI+uY1o= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3hyn83t6re-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 15 Aug 2022 10:09:30 -0700 Received: from twshared6324.05.ash7.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 15 Aug 2022 10:09:27 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id BE84749E2E57; Mon, 15 Aug 2022 10:09:20 -0700 (PDT) From: Dylan Yudaken To: , CC: , , Dylan Yudaken Subject: [PATCH liburing] handle buffered writes in read-write test Date: Mon, 15 Aug 2022 10:09:14 -0700 Message-ID: <20220815170914.3094167-1-dylany@fb.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: _o4Npz3W2jT4JYOGrdDHDCWbNdorJd8h X-Proofpoint-GUID: _o4Npz3W2jT4JYOGrdDHDCWbNdorJd8h 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-08-15_08,2022-08-15_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org When buffered writes are used then two things change: 1 - signals will propogate to the submit() call (as they would be effectively ignored when going async) 2 - CQE ordering will change Fix the read-write for both of these cases by ignoring the signal and handling CQE ordering. Signed-off-by: Dylan Yudaken --- test/read-write.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: 15cc446cb8b0caa5c939423d31182eba66141539 diff --git a/test/read-write.c b/test/read-write.c index c5cc469f258d..f50e8242afa4 100644 --- a/test/read-write.c +++ b/test/read-write.c @@ -759,6 +759,7 @@ static int test_write_efbig(void) goto err; } io_uring_prep_writev(sqe, fd, &vecs[i], 1, off); + io_uring_sqe_set_data64(sqe, i); off += BS; } @@ -774,7 +775,7 @@ static int test_write_efbig(void) fprintf(stderr, "wait_cqe=%d\n", ret); goto err; } - if (i < 16) { + if (cqe->user_data < 16) { if (cqe->res != BS) { fprintf(stderr, "bad write: %d\n", cqe->res); goto err; @@ -819,6 +820,8 @@ int main(int argc, char *argv[]) t_create_file(fname, FILE_SIZE); } + signal(SIGXFSZ, SIG_IGN); + vecs = t_create_buffers(BUFFERS, BS); /* if we don't have nonvec read, skip testing that */