Unverified Commit 76e29fd0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13321 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.61-6.6.62 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.60..v6.6.61 | wc -l
47
41+6

Conflicts:
io_uring: fix possible deadlock in io_register_iowq_max_workers()
mm/readahead: do not allow order-1 folio
mm: support order-1 folios in the page cache
mm: always initialise folio->_deferred_lis
mm: refactor folio_undo_large_rmappable()
mm/thp: fix deferred split unqueue naming and locking

 
 
Link:https://gitee.com/openeuler/kernel/pulls/13321

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 2ce6ede8 b0cdc1bb

arch/loongarch/include/asm/loongarch.h

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ 
#define  CSR_ESTAT_IS_WIDTH		15

#define  CSR_ESTAT_IS			(_ULCAST_(0x7fff) << CSR_ESTAT_IS_SHIFT)



#define LOONGARCH_CSR_ERA		0x6	/* ERA */

#define LOONGARCH_CSR_ERA		0x6	/* Exception return address */



#define LOONGARCH_CSR_BADV		0x7	/* Bad virtual address */

arch/powerpc/platforms/powernv/opal-irqchip.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ int __init opal_event_init(void) 
				 name, NULL);

		if (rc) {

			pr_warn("Error %d requesting OPAL irq %d\n", rc, (int)r->start);

			kfree(name);

			continue;

		}

	}

arch/riscv/kvm/aia_imsic.c

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct imsic { 
	/* IMSIC SW-file */

	struct imsic_mrif *swfile;

	phys_addr_t swfile_pa;

	spinlock_t swfile_extirq_lock;

	raw_spinlock_t swfile_extirq_lock;

};



#define imsic_vs_csr_read(__c)			\
@@ -622,7 +622,7 @@ static void imsic_swfile_extirq_update(struct kvm_vcpu *vcpu) 
	 * interruptions between reading topei and updating pending status.

	 */



	spin_lock_irqsave(&imsic->swfile_extirq_lock, flags);

	raw_spin_lock_irqsave(&imsic->swfile_extirq_lock, flags);



	if (imsic_mrif_atomic_read(mrif, &mrif->eidelivery) &&

	    imsic_mrif_topei(mrif, imsic->nr_eix, imsic->nr_msis))
@@ -630,7 +630,7 @@ static void imsic_swfile_extirq_update(struct kvm_vcpu *vcpu) 
	else

		kvm_riscv_vcpu_unset_interrupt(vcpu, IRQ_VS_EXT);



	spin_unlock_irqrestore(&imsic->swfile_extirq_lock, flags);

	raw_spin_unlock_irqrestore(&imsic->swfile_extirq_lock, flags);

}



static void imsic_swfile_read(struct kvm_vcpu *vcpu, bool clear,
@@ -1051,7 +1051,7 @@ int kvm_riscv_vcpu_aia_imsic_init(struct kvm_vcpu *vcpu) 
	}

	imsic->swfile = page_to_virt(swfile_page);

	imsic->swfile_pa = page_to_phys(swfile_page);

	spin_lock_init(&imsic->swfile_extirq_lock);

	raw_spin_lock_init(&imsic->swfile_extirq_lock);



	/* Setup IO device */

	kvm_iodevice_init(&imsic->iodev, &imsic_iodoev_ops);

block/elevator.c

+2 −2
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(elv_unregister); 
static inline bool elv_support_iosched(struct request_queue *q)

{

	if (!queue_is_mq(q) ||

	    (q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED)))

	    (q->tag_set->flags & BLK_MQ_F_NO_SCHED))

		return false;

	return true;

}
@@ -569,7 +569,7 @@ static inline bool elv_support_iosched(struct request_queue *q) 
 */

static struct elevator_type *elevator_get_default(struct request_queue *q)

{

	if (q->tag_set && q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)

	if (q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)

		return NULL;



	if (q->nr_hw_queues != 1 &&

crypto/algapi.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ void crypto_alg_tested(const char *name, int err) 
	q->cra_flags |= CRYPTO_ALG_DEAD;

	alg = test->adult;



	if (list_empty(&alg->cra_list))

	if (crypto_is_dead(alg))

		goto complete;



	if (err == -ECANCELED)