Revert "io_uring: add zc notification flush requests"

This reverts commit 492dddb4f6e3a5839c27d41ff1fecdbe6c3ab851.

Soon we won't have the very notion of notification flushing, so remove
notification flushing requests.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/8850334ca56e65b413cb34fd158db81d7b2865a3.1662027856.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 9e0b5c8d92cea86ab2043cf3de814393a507cabe..18ae5caf17731df0d3b7d90b868705ccd3ccc926 100644 (file)
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -301,7 +301,6 @@ enum io_uring_op {
  */
 enum {
        IORING_RSRC_UPDATE_FILES,
-       IORING_RSRC_UPDATE_NOTIF,
 };
 
 /*

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 71359a4d0bd4e6e90b71baf7bcd14051940337c1..048f7483fe8ac427e63ad88d4774dfa6c8b7b623 100644 (file)
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -15,7 +15,6 @@
 #include "io_uring.h"
 #include "openclose.h"
 #include "rsrc.h"
-#include "notif.h"
 
 struct io_rsrc_update {
        struct file                     *file;
@@ -741,41 +740,6 @@ static int io_files_update(struct io_kiocb *req, unsigned int issue_flags)
        return IOU_OK;
 }
 
-static int io_notif_update(struct io_kiocb *req, unsigned int issue_flags)
-{
-       struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);
-       struct io_ring_ctx *ctx = req->ctx;
-       unsigned len = up->nr_args;
-       unsigned idx_end, idx = up->offset;
-       int ret = 0;
-
-       io_ring_submit_lock(ctx, issue_flags);
-       if (unlikely(check_add_overflow(idx, len, &idx_end))) {
-               ret = -EOVERFLOW;
-               goto out;
-       }
-       if (unlikely(idx_end > ctx->nr_notif_slots)) {
-               ret = -EINVAL;
-               goto out;
-       }
-
-       for (; idx < idx_end; idx++) {
-               struct io_notif_slot *slot = &ctx->notif_slots[idx];
-
-               if (!slot->notif)
-                       continue;
-               if (up->arg)
-                       slot->tag = up->arg;
-               io_notif_slot_flush_submit(slot, issue_flags);
-       }
-out:
-       io_ring_submit_unlock(ctx, issue_flags);
-       if (ret < 0)
-               req_set_fail(req);
-       io_req_set_res(req, ret, 0);
-       return IOU_OK;
-}
-
 int io_rsrc_update(struct io_kiocb *req, unsigned int issue_flags)
 {
        struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);
@@ -783,8 +747,6 @@ int io_rsrc_update(struct io_kiocb *req, unsigned int issue_flags)
        switch (up->type) {
        case IORING_RSRC_UPDATE_FILES:
                return io_files_update(req, issue_flags);
-       case IORING_RSRC_UPDATE_NOTIF:
-               return io_notif_update(req, issue_flags);
        }
        return -EINVAL;
 }