From: SeongJae Park <sjpark@amazon.com>
To: "Jürgen Groß" <jgross@suse.com>
Cc: SeongJae Park <sjpark@amazon.com>, <stable@vger.kernel.org>,
SeongJae Park <sjpark@amazon.de>, <doebel@amazon.de>,
<aams@amazon.de>, <mku@amazon.de>, <julien@xen.org>,
<wipawel@amazon.de>, <linux-kernel@vger.kernel.org>,
"Author Redacted" <security@xen.org>
Subject: Re: [PATCH 4/5] xen/xenbus: Count pending messages for each watch
Date: Thu, 17 Dec 2020 16:19:31 +0100 [thread overview]
Message-ID: <20201217151931.8078-1-sjpark@amazon.com> (raw)
In-Reply-To: <76711b5d-4166-19ff-e817-694675051f90@suse.com>
On Thu, 17 Dec 2020 15:50:34 +0100 "Jürgen Groß" <jgross@suse.com> wrote:
> [-- Attachment #1.1.1: Type: text/plain, Size: 3509 bytes --]
>
> On 17.12.20 09:17, SeongJae Park wrote:
> > From: SeongJae Park <sjpark@amazon.de>
> >
> > This commit adds a counter of pending messages for each watch in the
> > struct. It is used to skip unnecessary pending messages lookup in
> > 'unregister_xenbus_watch()'. It could also be used in 'will_handle'
> > callback.
> >
> > This is part of XSA-349
> >
> > This is upstream commit 3dc86ca6b4c8cfcba9da7996189d1b5a358a94fc
> >
> > Cc: stable@vger.kernel.org
> > Signed-off-by: SeongJae Park <sjpark@amazon.de>
> > Reported-by: Michael Kurth <mku@amazon.de>
> > Reported-by: Pawel Wieczorkiewicz <wipawel@amazon.de>
> > Signed-off-by: Author Redacted <security@xen.org>
> > Reviewed-by: Juergen Gross <jgross@suse.com>
> > Signed-off-by: Juergen Gross <jgross@suse.com>
> > ---
> > drivers/xen/xenbus/xenbus_xs.c | 30 ++++++++++++++++++------------
> > include/xen/xenbus.h | 2 ++
> > 2 files changed, 20 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
> > index 0ea1c259f2f1..420d478e1708 100644
> > --- a/drivers/xen/xenbus/xenbus_xs.c
> > +++ b/drivers/xen/xenbus/xenbus_xs.c
> > @@ -701,6 +701,8 @@ int register_xenbus_watch(struct xenbus_watch *watch)
> >
> > sprintf(token, "%lX", (long)watch);
> >
> > + watch->nr_pending = 0;
> > +
>
> I'm missing the incrementing of nr_pending, which was present in the
> upstream patch.
Oops, it should be in this patch, but I mistakenly put it in the fifth patch.
67 --- a/drivers/xen/xenbus/xenbus_xs.c
68 +++ b/drivers/xen/xenbus/xenbus_xs.c
69 @@ -917,6 +917,7 @@ static int process_msg(void)
70 msg->u.watch.vec_size))) {
71 spin_lock(&watch_events_lock);
72 list_add_tail(&msg->list, &watch_events);
73 + msg->u.watch.handle->nr_pending++;
74 wake_up(&watch_events_waitq);
75 spin_unlock(&watch_events_lock);
76 } else {
77 --
And I just realized I even didn't post the fifth patch.
I will fix this and post new version (v3) soon.
Thank you for catching this, Juergen.
Thanks,
SeongJae Park
next prev parent reply other threads:[~2020-12-17 15:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 8:17 [PATCH 0/5] Backport of patch series for stable 4.4 branch SeongJae Park
2020-12-17 8:17 ` [PATCH 1/5] xen/xenbus: Allow watches discard events before queueing SeongJae Park
2020-12-17 8:17 ` [PATCH 2/5] xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() SeongJae Park
2020-12-17 13:04 ` SeongJae Park
2020-12-17 8:17 ` [PATCH 3/5] xen/xenbus/xen_bus_type: Support will_handle watch callback SeongJae Park
2020-12-17 8:17 ` [PATCH 4/5] xen/xenbus: Count pending messages for each watch SeongJae Park
2020-12-17 14:50 ` Jürgen Groß
2020-12-17 15:19 ` SeongJae Park [this message]
2021-01-05 11:01 [PATCH 0/5] Backport of patch series for stable 4.9 branch SeongJae Park
2021-01-05 11:01 ` [PATCH 4/5] xen/xenbus: Count pending messages for each watch SeongJae Park
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217151931.8078-1-sjpark@amazon.com \
--to=sjpark@amazon.com \
--cc=aams@amazon.de \
--cc=doebel@amazon.de \
--cc=jgross@suse.com \
--cc=julien@xen.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mku@amazon.de \
--cc=security@xen.org \
--cc=sjpark@amazon.de \
--cc=stable@vger.kernel.org \
--cc=wipawel@amazon.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).