Hi Manish,
On Thu, Mar 23, 2023 at 2:22 PM Manish Mandlik <mmandlik@xxxxxxxxxx> wrote:
>
> Hi Luiz,
>
>
> On Tue, Mar 14, 2023 at 1:22 PM Manish Mandlik <mmandlik@xxxxxxxxxx> wrote:
>>
>> Hi Luiz,
>>
>> On Tue, Mar 14, 2023 at 1:00 PM Luiz Augusto von Dentz <luiz.dentz@xxxxxxxxx> wrote:
>>>
>>> Hi Manish,
>>>
>>> On Thu, Mar 2, 2023 at 4:56 PM Luiz Augusto von Dentz
>>> <luiz.dentz@xxxxxxxxx> wrote:
>>> >
>>> > Hi Manish,
>>> >
>>> > On Thu, Mar 2, 2023 at 3:17 PM Manish Mandlik <mmandlik@xxxxxxxxxx> wrote:
>>> > >
>>> > > Add mgmt-tester test for hci devcoredump.
>>> > >
>>> > > ---
>>> > >
>>> > > emulator/vhci.c | 42 ++++++++++++++++++++++++
>>> > > emulator/vhci.h | 2 ++
>>> > > tools/mgmt-tester.c | 78 +++++++++++++++++++++++++++++++++++++++++++++
>>> > > 3 files changed, 122 insertions(+)
>>> > >
>>> > > diff --git a/emulator/vhci.c b/emulator/vhci.c
>>> > > index a12b11e0f..048ea08c6 100644
>>> > > --- a/emulator/vhci.c
>>> > > +++ b/emulator/vhci.c
>>> > > @@ -22,6 +22,7 @@
>>> > > #include <sys/uio.h>
>>> > > #include <fcntl.h>
>>> > > #include <unistd.h>
>>> > > +#include <dirent.h>
>>> > >
>>> > > #include "lib/bluetooth.h"
>>> > > #include "lib/hci.h"
>>> > > @@ -32,6 +33,7 @@
>>> > > #include "vhci.h"
>>> > >
>>> > > #define DEBUGFS_PATH "/sys/kernel/debug/bluetooth"
>>> > > +#define DEVCORE_PATH "/sys/class/devcoredump"
>>> > >
>>> > > struct vhci {
>>> > > enum btdev_type type;
>>> > > @@ -267,3 +269,43 @@ int vhci_set_force_static_address(struct vhci *vhci, bool enable)
>>> > > return vhci_debugfs_write(vhci, "force_static_address", &val,
>>> > > sizeof(val));
>>> > > }
>>> > > +
>>> > > +int vhci_force_devcoredump(struct vhci *vhci, void *data, size_t len)
>>> > > +{
>>> > > + return vhci_debugfs_write(vhci, "force_devcoredump", data, len);
>>> > > +}
>>> > > +
>>> > > +int vhci_read_devcoredump(struct vhci *vhci, void *buf, size_t size)
>>> > > +{
>>> > > + DIR *dir;
>>> > > + struct dirent *entry;
>>> > > + char filename[PATH_MAX];
>>> > > + int fd;
>>> > > + int count;
>>> > > +
>>> > > + dir = opendir(DEVCORE_PATH);
>>> > > + if (dir == NULL)
>>> > > + return -errno;
>>> > > +
>>> > > + while ((entry = readdir(dir)) != NULL) {
>>> > > + if (strstr(entry->d_name, "devcd"))
>>> >
>>> > Hmm, I think I like the term devcd better then devcoredump, it is more
>>> > a cosmetic thing but it seem much better to read vhci_read_devcd than
>>> > vhci_read_devcoredump, etc.
>
> Ack. Will include in the next patch.
>
>>>
>>> >
>>> > > + break;
>>> > > + }
>>> > > +
>>> > > + if (entry == NULL) {
>>> > > + closedir(dir);
>>> > > + return -ENOENT;
>>> > > + }
>>> > > +
>>> > > + sprintf(filename, DEVCORE_PATH "/%s/data", entry->d_name);
>>> > > + fd = open(filename, O_RDONLY);
>>> > > + if (fd < 0) {
>>> > > + closedir(dir);
>>> > > + return -errno;
>>> > > + }
>>> > > +
>>> > > + count = read(fd, buf, size);
>>> > > + close(fd);
>>> > > +
>>> > > + return count;
>>> > > +}
>>> > > diff --git a/emulator/vhci.h b/emulator/vhci.h
>>> > > index 6da56cb58..cb969911c 100644
>>> > > --- a/emulator/vhci.h
>>> > > +++ b/emulator/vhci.h
>>> > > @@ -29,3 +29,5 @@ int vhci_set_msft_opcode(struct vhci *vhci, uint16_t opcode);
>>> > > int vhci_set_aosp_capable(struct vhci *vhci, bool enable);
>>> > > int vhci_set_emu_opcode(struct vhci *vhci, uint16_t opcode);
>>> > > int vhci_set_force_static_address(struct vhci *vhci, bool enable);
>>> > > +int vhci_force_devcoredump(struct vhci *vhci, void *data, size_t len);
>>> > > +int vhci_read_devcoredump(struct vhci *vhci, void *buf, size_t size);
>>> > > diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
>>> > > index a56c38173..70b425547 100644
>>> > > --- a/tools/mgmt-tester.c
>>> > > +++ b/tools/mgmt-tester.c
>>> > > @@ -12511,6 +12511,77 @@ static void test_suspend_resume_success_10(const void *test_data)
>>> > > tester_wait(2, trigger_force_resume, NULL);
>>> > > }
>>> > >
>>> > > +#define MAX_COREDUMP_BUF_LEN 512
>>> > > +#define MAX_COREDUMP_LINE_LEN 40
>>> > > +
>>> > > +static void test_hci_devcoredump(const void *test_data)
>>> > > +{
>>> > > + struct test_data *data = tester_get_data();
>>> > > + struct vhci *vhci = hciemu_get_vhci(data->hciemu);
>>> > > + char buf[MAX_COREDUMP_BUF_LEN] = {0};
>>> > > + char delim[] = "\n";
>>> > > + char *line;
>>> > > + char *saveptr;
>>> > > + int i = 0;
>>> > > +
>>> > > + char dump_data[] = "test data";
>>> > > + char expected[][MAX_COREDUMP_LINE_LEN] = {
>>> > > + "Bluetooth devcoredump",
>>> > > + "State: 2",
>>> > > + "Controller Name: vhci_ctrl",
>>> > > + "Firmware Version: vhci_fw",
>>> > > + "Driver: vhci_drv",
>>> > > + "Vendor: vhci",
>>> > > + "--- Start dump ---",
>>> > > + };
>>> > > +
>>> > > + /* Triggers the devcoredump */
>>> > > + if (vhci_force_devcoredump(vhci, dump_data, sizeof(dump_data))) {
>>> > > + tester_warn("Unable to set force_devcoredump");
>>> > > + tester_test_failed();
>>> > > + return;
>>> > > + }
>>> > > +
>>> > > + /* Read the generated devcoredump file */
>>> > > + if (vhci_read_devcoredump(vhci, buf, sizeof(buf)) <= 0) {
>>> > > + tester_warn("Unable to read devcoredump");
>>> > > + tester_test_failed();
>>> > > + return;
>>> > > + }
>>> > > +
>>> > > + /* Verify if all devcoredump header fields are present */
>>> > > + line = strtok_r(buf, delim, &saveptr);
>>> > > + while (i < ARRAY_SIZE(expected)) {
>>> > > + if (!line || strcmp(line, expected[i])) {
>>> > > + tester_warn("Incorrect coredump data: %s (expected %s)",
>>> > > + line, expected[i]);
>>> > > + tester_test_failed();
>>> > > + return;
>>> > > + }
>>> > > +
>>> > > + if (!strcmp(line, "State: 2")) {
>>> > > + /* After updating the devcoredump state, the HCI
>>> > > + * devcoredump API adds a `\0` at the end. Skip it
>>> > > + * before reading the next line.
>>> > > + */
>>> > > + saveptr++;
>>> > > + }
>>> > > +
>>> > > + line = strtok_r(NULL, delim, &saveptr);
>>> > > + i++;
>>> > > + }
>>> > > +
>>> > > + /* Verify the devcoredump data */
>>> > > + if (!line || strcmp(line, dump_data)) {
>>> > > + tester_warn("Incorrect coredump data: %s (expected %s)", line,
>>> > > + dump_data);
>>> > > + tester_test_failed();
>>> > > + return;
>>> > > + }
>>> > > +
>>> > > + tester_test_passed();
>>> > > +}
>>> > > +
>>> > > int main(int argc, char *argv[])
>>> > > {
>>> > > tester_init(&argc, &argv);
>>> > > @@ -14651,5 +14722,12 @@ int main(int argc, char *argv[])
>>> > > setup_ll_privacy_add_device,
>>> > > test_command_generic);
>>> > >
>>> > > + /* HCI devcoredump
>>> > > + * Setup : Power on
>>> > > + * Run: Trigger devcoredump via force_devcoredump
>>> > > + * Expect: Devcoredump is generated with correct data
>>> > > + */
>>> > > + test_bredrle("HCI devcoredump", NULL, NULL, test_hci_devcoredump);
>>> > > +
>>> >
>>> > Great work, thanks for creating the test for it, lets just split the
>>> > vhci changes for the test itself then add the expected output in the
>>> > patch descriptions.
>
> Do you suggest I split this patch into two? One for vhci changes and another for test changes? And for the expected output, should I include the expected contents of the output devcoredump file OR just the output from the test run like this:
> HCI devcoredump - init
> Read Version callback
> Status: Success (0x00)
> Version 1.22
> Read Commands callback
> Status: Success (0x00)
> Read Index List callback
> Status: Success (0x00)
> Index Added callback
> Index: 0x0000
> Enable management Mesh interface
> Enabling Mesh feature
> Read Info callback
> Status: Success (0x00)
> Address: 00:AA:01:00:00:00
> Version: 0x09
> Manufacturer: 0x05f1
> Supported settings: 0x0001bfff
> Current settings: 0x00000080
> Class: 0x000000
> Name:
> Short name:
> Mesh feature is enabled
> HCI devcoredump - setup
> HCI devcoredump - setup complete
> HCI devcoredump - run
> HCI devcoredump - test passed
> HCI devcoredump - teardown
> Index Removed callback
> Index: 0x0000
> HCI devcoredump - teardown complete
> HCI devcoredump - done
Have just the summary of the new tests you are adding but remove the
timing portion since it doesn't matter in this context.
>>>
>>> Do you need any feedback on this? You might want a v2 before 30 days
>>> otherwise the pw series is removed due to inactivity.
>>
>> I'm in the middle of addressing kernel side code changes, and got caught up in other work. I'll send a new series as soon as possible. Thanks for the 30 day inactivity heads up!
>>
>>>
>>> > > return tester_run();
>>> > > }
>>> > > --
>>> > > 2.40.0.rc0.216.gc4246ad0f0-goog
>>> > >
>>> >
>>> >
>>> > --
>>> > Luiz Augusto von Dentz
>>>
>>>
>>>
>>> --
>>> Luiz Augusto von Dentz
>>
>> Regards,
>> Manish.
>>
>>
>
>
> Regards,
> Manish.
--
Luiz Augusto von Dentz
