NVMe: Retain QUEUE_FLAG_SG_GAPS flag for bio vector alignment.

The nvme queue flag QUEUE_FLAG_SG_GAPS checks for the bio vector
alignment against the page size. In upstream, the QUEUE_FLAG_SG_GAPS
flag is replaced by blk_queue_virt_boundary() and pulling in the
respective patches caused instability in the driver and hence
QUEUE_FLAG_SG_GAPS flag is retained for vector alignment.

Orabug: 26402433

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ec77ee1feabd26362df1363971bf6e26ede9524e..9a44d49121e0e58e2275af9a412e13e05879aeb2 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1416,6 +1416,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
        if (IS_ERR(ns->queue))
                goto out_release_instance;
        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue);
+       queue_flag_set_unlocked(QUEUE_FLAG_SG_GAPS, ns->queue);
        ns->queue->queuedata = ns;
        ns->ctrl = ctrl;