* [PATCH] arm-autonomy/linux-arm-autonomy: Remove Xen irq lock patch
@ 2021-04-23 16:49 Peter Hoyes
2021-05-04 8:45 ` [meta-arm] " Diego Sueiro
0 siblings, 1 reply; 3+ messages in thread
From: Peter Hoyes @ 2021-04-23 16:49 UTC (permalink / raw)
To: meta-arm; +Cc: nd, Peter Hoyes
From: Peter Hoyes <Peter.Hoyes@arm.com>
The following patch has been backported to kernel 5.10.30:
0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
Issue-Id: SCM-2307
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: I9cef017b60891780176dff944e3eca5986746d8a
---
...ange-irq_info-lock-to-raw_spinlock_t.patch | 77 -------------------
.../linux/linux-arm-autonomy.inc | 2 -
2 files changed, 79 deletions(-)
delete mode 100644 meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
diff --git a/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch b/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
deleted file mode 100644
index f37be44..0000000
--- a/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 3bc59ed7bc26c967cfe6eb9c1ef9a1ef9108e99d Mon Sep 17 00:00:00 2001
-From: Luca Fancellu <luca.fancellu@arm.com>
-Date: Tue, 23 Mar 2021 16:16:39 +0000
-Subject: [PATCH 4/4] xen/evtchn: Change irq_info lock to raw_spinlock_t
-
-Unmask operation must be called with interrupt disabled,
-on preempt_rt spin_lock_irqsave/spin_unlock_irqrestore
-don't disable/enable interrupts, so use raw_* implementation
-and change lock variable in struct irq_info from spinlock_t
-to raw_spinlock_t
-
-Issue-Id: SCM-2147
-
-Upstream-Status: Pending
-Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
----
- drivers/xen/events/events_base.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
-index 7bd03f6e0422..b91c19b90b8b 100644
---- a/drivers/xen/events/events_base.c
-+++ b/drivers/xen/events/events_base.c
-@@ -108,7 +108,7 @@ struct irq_info {
- unsigned short eoi_cpu; /* EOI must happen on this cpu-1 */
- unsigned int irq_epoch; /* If eoi_cpu valid: irq_epoch of event */
- u64 eoi_time; /* Time in jiffies when to EOI. */
-- spinlock_t lock;
-+ raw_spinlock_t lock;
-
- union {
- unsigned short virq;
-@@ -280,7 +280,7 @@ static int xen_irq_info_common_setup(struct irq_info *info,
- info->evtchn = evtchn;
- info->cpu = cpu;
- info->mask_reason = EVT_MASK_REASON_EXPLICIT;
-- spin_lock_init(&info->lock);
-+ raw_spin_lock_init(&info->lock);
-
- ret = set_evtchn_to_irq(evtchn, irq);
- if (ret < 0)
-@@ -432,28 +432,28 @@ static void do_mask(struct irq_info *info, u8 reason)
- {
- unsigned long flags;
-
-- spin_lock_irqsave(&info->lock, flags);
-+ raw_spin_lock_irqsave(&info->lock, flags);
-
- if (!info->mask_reason)
- mask_evtchn(info->evtchn);
-
- info->mask_reason |= reason;
-
-- spin_unlock_irqrestore(&info->lock, flags);
-+ raw_spin_unlock_irqrestore(&info->lock, flags);
- }
-
- static void do_unmask(struct irq_info *info, u8 reason)
- {
- unsigned long flags;
-
-- spin_lock_irqsave(&info->lock, flags);
-+ raw_spin_lock_irqsave(&info->lock, flags);
-
- info->mask_reason &= ~reason;
-
- if (!info->mask_reason)
- unmask_evtchn(info->evtchn);
-
-- spin_unlock_irqrestore(&info->lock, flags);
-+ raw_spin_unlock_irqrestore(&info->lock, flags);
- }
-
- #ifdef CONFIG_X86
---
-2.17.1
-
diff --git a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
index 6927987..5361e75 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
+++ b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
@@ -44,8 +44,6 @@ python() {
and oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-guest"):
if LooseVersion(kernelVersion) < '5.9':
d.appendVar('SRC_URI', ' file://files/0001-arm-arm64-xen-Fix-to-convert-percpu-address-to-gfn-c.patch' )
- if '5.10' <= LooseVersion(kernelVersion) < '5.12':
- d.appendVar('SRC_URI', ' file://files/0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch' )
if kernelVersion and LooseVersion(kernelVersion) < '5.10':
if oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-guest"):
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH] arm-autonomy/linux-arm-autonomy: Remove Xen irq lock patch
2021-04-23 16:49 [PATCH] arm-autonomy/linux-arm-autonomy: Remove Xen irq lock patch Peter Hoyes
@ 2021-05-04 8:45 ` Diego Sueiro
2021-05-06 2:50 ` Jon Mason
0 siblings, 1 reply; 3+ messages in thread
From: Diego Sueiro @ 2021-05-04 8:45 UTC (permalink / raw)
To: Peter Hoyes, meta-arm; +Cc: nd
Hello Jon,
Can you please backport this patch to hardknott branch?
Cheers,
--
Diego Sueiro
>-----Original Message-----
>From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
>On Behalf Of Peter Hoyes via lists.yoctoproject.org
>Sent: 23 April 2021 17:50
>To: meta-arm@lists.yoctoproject.org
>Cc: nd <nd@arm.com>; Peter Hoyes <Peter.Hoyes@arm.com>
>Subject: [meta-arm] [PATCH] arm-autonomy/linux-arm-autonomy: Remove
>Xen irq lock patch
>
>From: Peter Hoyes <Peter.Hoyes@arm.com>
>
>The following patch has been backported to kernel 5.10.30:
> 0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
>
>Issue-Id: SCM-2307
>Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
>Change-Id: I9cef017b60891780176dff944e3eca5986746d8a
>---
> ...ange-irq_info-lock-to-raw_spinlock_t.patch | 77 -------------------
> .../linux/linux-arm-autonomy.inc | 2 -
> 2 files changed, 79 deletions(-)
> delete mode 100644 meta-arm-autonomy/recipes-kernel/linux/files/0001-
>xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
>
>diff --git a/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-
>Change-irq_info-lock-to-raw_spinlock_t.patch b/meta-arm-autonomy/recipes-
>kernel/linux/files/0001-xen-evtchn-Change-irq_info-lock-to-
>raw_spinlock_t.patch
>deleted file mode 100644
>index f37be44..0000000
>--- a/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-Change-
>irq_info-lock-to-raw_spinlock_t.patch
>+++ /dev/null
>@@ -1,77 +0,0 @@
>-From 3bc59ed7bc26c967cfe6eb9c1ef9a1ef9108e99d Mon Sep 17 00:00:00
>2001
>-From: Luca Fancellu <luca.fancellu@arm.com>
>-Date: Tue, 23 Mar 2021 16:16:39 +0000
>-Subject: [PATCH 4/4] xen/evtchn: Change irq_info lock to raw_spinlock_t
>-
>-Unmask operation must be called with interrupt disabled, -on preempt_rt
>spin_lock_irqsave/spin_unlock_irqrestore
>-don't disable/enable interrupts, so use raw_* implementation -and change
>lock variable in struct irq_info from spinlock_t -to raw_spinlock_t
>-
>-Issue-Id: SCM-2147
>-
>-Upstream-Status: Pending
>-Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
>----
>- drivers/xen/events/events_base.c | 12 ++++++------
>- 1 file changed, 6 insertions(+), 6 deletions(-)
>-
>-diff --git a/drivers/xen/events/events_base.c
>b/drivers/xen/events/events_base.c
>-index 7bd03f6e0422..b91c19b90b8b 100644
>---- a/drivers/xen/events/events_base.c
>-+++ b/drivers/xen/events/events_base.c
>-@@ -108,7 +108,7 @@ struct irq_info {
>- unsigned short eoi_cpu; /* EOI must happen on this cpu-1 */
>- unsigned int irq_epoch; /* If eoi_cpu valid: irq_epoch of event */
>- u64 eoi_time; /* Time in jiffies when to EOI. */
>-- spinlock_t lock;
>-+ raw_spinlock_t lock;
>-
>- union {
>- unsigned short virq;
>-@@ -280,7 +280,7 @@ static int xen_irq_info_common_setup(struct irq_info
>*info,
>- info->evtchn = evtchn;
>- info->cpu = cpu;
>- info->mask_reason = EVT_MASK_REASON_EXPLICIT;
>-- spin_lock_init(&info->lock);
>-+ raw_spin_lock_init(&info->lock);
>-
>- ret = set_evtchn_to_irq(evtchn, irq);
>- if (ret < 0)
>-@@ -432,28 +432,28 @@ static void do_mask(struct irq_info *info, u8
>reason)
>- {
>- unsigned long flags;
>-
>-- spin_lock_irqsave(&info->lock, flags);
>-+ raw_spin_lock_irqsave(&info->lock, flags);
>-
>- if (!info->mask_reason)
>- mask_evtchn(info->evtchn);
>-
>- info->mask_reason |= reason;
>-
>-- spin_unlock_irqrestore(&info->lock, flags);
>-+ raw_spin_unlock_irqrestore(&info->lock, flags);
>- }
>-
>- static void do_unmask(struct irq_info *info, u8 reason)
>- {
>- unsigned long flags;
>-
>-- spin_lock_irqsave(&info->lock, flags);
>-+ raw_spin_lock_irqsave(&info->lock, flags);
>-
>- info->mask_reason &= ~reason;
>-
>- if (!info->mask_reason)
>- unmask_evtchn(info->evtchn);
>-
>-- spin_unlock_irqrestore(&info->lock, flags);
>-+ raw_spin_unlock_irqrestore(&info->lock, flags);
>- }
>-
>- #ifdef CONFIG_X86
>---
>-2.17.1
>-
>diff --git a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
>b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
>index 6927987..5361e75 100644
>--- a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
>+++ b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
>@@ -44,8 +44,6 @@ python() {
> and oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-
>guest"):
> if LooseVersion(kernelVersion) < '5.9':
> d.appendVar('SRC_URI', ' file://files/0001-arm-arm64-xen-Fix-to-
>convert-percpu-address-to-gfn-c.patch' )
>- if '5.10' <= LooseVersion(kernelVersion) < '5.12':
>- d.appendVar('SRC_URI', ' file://files/0001-xen-evtchn-Change-irq_info-
>lock-to-raw_spinlock_t.patch' )
>
> if kernelVersion and LooseVersion(kernelVersion) < '5.10':
> if oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-
>guest"):
>--
>2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH] arm-autonomy/linux-arm-autonomy: Remove Xen irq lock patch
2021-05-04 8:45 ` [meta-arm] " Diego Sueiro
@ 2021-05-06 2:50 ` Jon Mason
0 siblings, 0 replies; 3+ messages in thread
From: Jon Mason @ 2021-05-06 2:50 UTC (permalink / raw)
To: Diego Sueiro; +Cc: Peter Hoyes, meta-arm, nd
On Tue, May 04, 2021 at 08:45:32AM +0000, Diego Sueiro wrote:
> Hello Jon,
>
> Can you please backport this patch to hardknott branch?
Done
>
> Cheers,
>
> --
> Diego Sueiro
>
> >-----Original Message-----
> >From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> >On Behalf Of Peter Hoyes via lists.yoctoproject.org
> >Sent: 23 April 2021 17:50
> >To: meta-arm@lists.yoctoproject.org
> >Cc: nd <nd@arm.com>; Peter Hoyes <Peter.Hoyes@arm.com>
> >Subject: [meta-arm] [PATCH] arm-autonomy/linux-arm-autonomy: Remove
> >Xen irq lock patch
> >
> >From: Peter Hoyes <Peter.Hoyes@arm.com>
> >
> >The following patch has been backported to kernel 5.10.30:
> > 0001-xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
> >
> >Issue-Id: SCM-2307
> >Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
> >Change-Id: I9cef017b60891780176dff944e3eca5986746d8a
> >---
> > ...ange-irq_info-lock-to-raw_spinlock_t.patch | 77 -------------------
> > .../linux/linux-arm-autonomy.inc | 2 -
> > 2 files changed, 79 deletions(-)
> > delete mode 100644 meta-arm-autonomy/recipes-kernel/linux/files/0001-
> >xen-evtchn-Change-irq_info-lock-to-raw_spinlock_t.patch
> >
> >diff --git a/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-
> >Change-irq_info-lock-to-raw_spinlock_t.patch b/meta-arm-autonomy/recipes-
> >kernel/linux/files/0001-xen-evtchn-Change-irq_info-lock-to-
> >raw_spinlock_t.patch
> >deleted file mode 100644
> >index f37be44..0000000
> >--- a/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-evtchn-Change-
> >irq_info-lock-to-raw_spinlock_t.patch
> >+++ /dev/null
> >@@ -1,77 +0,0 @@
> >-From 3bc59ed7bc26c967cfe6eb9c1ef9a1ef9108e99d Mon Sep 17 00:00:00
> >2001
> >-From: Luca Fancellu <luca.fancellu@arm.com>
> >-Date: Tue, 23 Mar 2021 16:16:39 +0000
> >-Subject: [PATCH 4/4] xen/evtchn: Change irq_info lock to raw_spinlock_t
> >-
> >-Unmask operation must be called with interrupt disabled, -on preempt_rt
> >spin_lock_irqsave/spin_unlock_irqrestore
> >-don't disable/enable interrupts, so use raw_* implementation -and change
> >lock variable in struct irq_info from spinlock_t -to raw_spinlock_t
> >-
> >-Issue-Id: SCM-2147
> >-
> >-Upstream-Status: Pending
> >-Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
> >----
> >- drivers/xen/events/events_base.c | 12 ++++++------
> >- 1 file changed, 6 insertions(+), 6 deletions(-)
> >-
> >-diff --git a/drivers/xen/events/events_base.c
> >b/drivers/xen/events/events_base.c
> >-index 7bd03f6e0422..b91c19b90b8b 100644
> >---- a/drivers/xen/events/events_base.c
> >-+++ b/drivers/xen/events/events_base.c
> >-@@ -108,7 +108,7 @@ struct irq_info {
> >- unsigned short eoi_cpu; /* EOI must happen on this cpu-1 */
> >- unsigned int irq_epoch; /* If eoi_cpu valid: irq_epoch of event */
> >- u64 eoi_time; /* Time in jiffies when to EOI. */
> >-- spinlock_t lock;
> >-+ raw_spinlock_t lock;
> >-
> >- union {
> >- unsigned short virq;
> >-@@ -280,7 +280,7 @@ static int xen_irq_info_common_setup(struct irq_info
> >*info,
> >- info->evtchn = evtchn;
> >- info->cpu = cpu;
> >- info->mask_reason = EVT_MASK_REASON_EXPLICIT;
> >-- spin_lock_init(&info->lock);
> >-+ raw_spin_lock_init(&info->lock);
> >-
> >- ret = set_evtchn_to_irq(evtchn, irq);
> >- if (ret < 0)
> >-@@ -432,28 +432,28 @@ static void do_mask(struct irq_info *info, u8
> >reason)
> >- {
> >- unsigned long flags;
> >-
> >-- spin_lock_irqsave(&info->lock, flags);
> >-+ raw_spin_lock_irqsave(&info->lock, flags);
> >-
> >- if (!info->mask_reason)
> >- mask_evtchn(info->evtchn);
> >-
> >- info->mask_reason |= reason;
> >-
> >-- spin_unlock_irqrestore(&info->lock, flags);
> >-+ raw_spin_unlock_irqrestore(&info->lock, flags);
> >- }
> >-
> >- static void do_unmask(struct irq_info *info, u8 reason)
> >- {
> >- unsigned long flags;
> >-
> >-- spin_lock_irqsave(&info->lock, flags);
> >-+ raw_spin_lock_irqsave(&info->lock, flags);
> >-
> >- info->mask_reason &= ~reason;
> >-
> >- if (!info->mask_reason)
> >- unmask_evtchn(info->evtchn);
> >-
> >-- spin_unlock_irqrestore(&info->lock, flags);
> >-+ raw_spin_unlock_irqrestore(&info->lock, flags);
> >- }
> >-
> >- #ifdef CONFIG_X86
> >---
> >-2.17.1
> >-
> >diff --git a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
> >b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
> >index 6927987..5361e75 100644
> >--- a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
> >+++ b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
> >@@ -44,8 +44,6 @@ python() {
> > and oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-
> >guest"):
> > if LooseVersion(kernelVersion) < '5.9':
> > d.appendVar('SRC_URI', ' file://files/0001-arm-arm64-xen-Fix-to-
> >convert-percpu-address-to-gfn-c.patch' )
> >- if '5.10' <= LooseVersion(kernelVersion) < '5.12':
> >- d.appendVar('SRC_URI', ' file://files/0001-xen-evtchn-Change-irq_info-
> >lock-to-raw_spinlock_t.patch' )
> >
> > if kernelVersion and LooseVersion(kernelVersion) < '5.10':
> > if oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-
> >guest"):
> >--
> >2.25.1
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-06 2:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-23 16:49 [PATCH] arm-autonomy/linux-arm-autonomy: Remove Xen irq lock patch Peter Hoyes
2021-05-04 8:45 ` [meta-arm] " Diego Sueiro
2021-05-06 2:50 ` Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.