From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83EF7C433F5 for ; Tue, 26 Apr 2022 18:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EPX2HPuoNVQDdRj8v93tGN4tqP8Nao4brJyuoHLBTDw=; b=kXFBBdzht+hMLP1H5qsie4lnGh HGxXW8kFaNZ9a1D1ASiCaCyiK3h8RS+PrIkmuzC4WSUpDTvSRqcL3QiMW3HePwdVT1Xq+BOb4/m1x rQmjSIgg9RfVf+l2bi6VZMWr92+t8CyL54kYJxpVLk838XSRdGhRXZWu12W5zwYoxFNrMPTi3awLI tWR2wruNreGZBjVnDIjvtwvuAaLFLQAwqvUVbby2Wy2Ax0Ah2IMiNZPrfJW5CMc8nlwpraltiq24e ArgcEoUutPl4eJP7KrgvwhIIu4uu1keioWBaiaugqEsHFuN9loXJ2OxJ4NHnxh2+mUVBal5FKdEJU qTj9J6uA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njPum-00FiOf-KK; Tue, 26 Apr 2022 18:27:56 +0000 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njPoq-00FfbV-8z for linux-nvme@lists.infradead.org; Tue, 26 Apr 2022 18:21:51 +0000 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 23QGQR7M024414 for ; Tue, 26 Apr 2022 11:21:47 -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=EPX2HPuoNVQDdRj8v93tGN4tqP8Nao4brJyuoHLBTDw=; b=EsgZJcQn65C7PaEyIf42HoeskP/DWn+eJEhvM0F3k45g7acSyCVNe02Tz5Rf0ADUYrUY YeKSQFhAEf6vqwqH0qempD8XUGTxcCWASMg4W8SjMo/GHpK19hbyRvTCDPqyLIB4UJ4U aHY9r2CUB5P466u4N5ddv8/fX8FR0m0GsTs= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3fn1ge0d84-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 26 Apr 2022 11:21:47 -0700 Received: from twshared10896.25.frc3.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 26 Apr 2022 11:21:45 -0700 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id 6270CE2E5698; Tue, 26 Apr 2022 11:21:36 -0700 (PDT) From: Stefan Roesch To: , , CC: , Subject: [PATCH v4 06/12] io_uring: modify io_get_cqe for CQE32 Date: Tue, 26 Apr 2022 11:21:28 -0700 Message-ID: <20220426182134.136504-7-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220426182134.136504-1-shr@fb.com> References: <20220426182134.136504-1-shr@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: cVsVldvDVWBl3eKuAgg_jHopBY96jZj1 X-Proofpoint-GUID: cVsVldvDVWBl3eKuAgg_jHopBY96jZj1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-26_05,2022-04-26_02,2022-02-23_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220426_112148_410019_E6D1E792 X-CRM114-Status: GOOD ( 18.26 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Modify accesses to the CQE array to take large CQE's into account. The index needs to be shifted by one for large CQE's. Signed-off-by: Stefan Roesch Signed-off-by: Jens Axboe Reviewed-by: Kanchan Joshi --- fs/io_uring.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index f300130fd9f0..726238dc65dc 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1909,8 +1909,12 @@ static noinline struct io_uring_cqe *__io_get_cqe(= struct io_ring_ctx *ctx) { struct io_rings *rings =3D ctx->rings; unsigned int off =3D ctx->cached_cq_tail & (ctx->cq_entries - 1); + unsigned int shift =3D 0; unsigned int free, queued, len; =20 + if (ctx->flags & IORING_SETUP_CQE32) + shift =3D 1; + /* userspace may cheat modifying the tail, be safe and do min */ queued =3D min(__io_cqring_events(ctx), ctx->cq_entries); free =3D ctx->cq_entries - queued; @@ -1922,15 +1926,26 @@ static noinline struct io_uring_cqe *__io_get_cqe= (struct io_ring_ctx *ctx) ctx->cached_cq_tail++; ctx->cqe_cached =3D &rings->cqes[off]; ctx->cqe_sentinel =3D ctx->cqe_cached + len; - return ctx->cqe_cached++; + ctx->cqe_cached++; + return &rings->cqes[off << shift]; } =20 static inline struct io_uring_cqe *io_get_cqe(struct io_ring_ctx *ctx) { if (likely(ctx->cqe_cached < ctx->cqe_sentinel)) { + struct io_uring_cqe *cqe =3D ctx->cqe_cached; + + if (ctx->flags & IORING_SETUP_CQE32) { + unsigned int off =3D ctx->cqe_cached - ctx->rings->cqes; + + cqe +=3D off; + } + ctx->cached_cq_tail++; - return ctx->cqe_cached++; + ctx->cqe_cached++; + return cqe; } + return __io_get_cqe(ctx); } =20 --=20 2.30.2